diff --git a/collects/tests/typed-scheme/succeed/strings.rkt b/collects/tests/typed-scheme/succeed/strings.rkt deleted file mode 100644 index 280dd410d5..0000000000 --- a/collects/tests/typed-scheme/succeed/strings.rkt +++ /dev/null @@ -1,75 +0,0 @@ -#lang typed/racket - -(: s1 String) -(: s2 String) -(: s3 String) -(: s4 String) -(: s5 String) -(: s6 String) - -(define s1 "abc") -(define s2 "def") -(define s3 "DEF") -(define s4 (string #\a #\b #\c)) -(define s5 (make-string 4 #\b)) -(define s6 (build-string 26 integer->char)) - - - -(string? s1) -(string? 2) - -(string->immutable-string s5) -(string-length s6) -(string-copy s3) -(string-copy! (make-string 4) 0 s4) -(string-copy! (make-string 4) 1 s4 1) -(string-copy! (make-string 4) 1 s4 1 2) - -(string-fill! (make-string 5) #\Z) - -(string-append) -(string-append s1 s2) -(string-append s1 s2 s3) - -(string->list s6) -(list->string (list #\a #\d #\d)) - -(string=? s2 s3) -(string? s2 s3) -(string<=? s2 s3) -(string>=? s2 s3) - -(string-upcase s2) -(string-downcase s3) -(string-titlecase s4) -(string-foldcase s5) - - -(string-ci=? s2 s3) -(string-ci? s2 s3) -(string-ci<=? s2 s3) -(string-ci>=? s2 s3) - - -(string-normalize-nfd s2) -(string-normalize-nfkd s3) -(string-normalize-nfc s4) -(string-normalize-nfkc s5) - - - -(string-locale=? s2 s3) -(string-locale? s2 s3) - -(string-locale-upcase s2) -(string-locale-downcase s3) - - -(string-locale-ci=? s2 s3) -(string-locale-ci? s2 s3) - diff --git a/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt b/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt index 07c0b0b833..fbe55655d2 100644 --- a/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt @@ -883,8 +883,63 @@ (tc-e (path->directory-path "foo") -Path) (tc-e (path->directory-path (string->some-system-path "foo" 'unix)) -SomeSystemPath) + ;;String Tests + (tc-e (string? "a") #:ret (ret B (-FS -top -bot))) + (tc-e (string? 2) #:ret (ret B (-FS -bot -top))) - + (tc-e (string->immutable-string (string #\a #\b)) -String) + (tc-e (string-length (make-string 5 #\z)) -Index) + (tc-e (string-copy (build-string 26 integer->char)) -String) + (tc-e (string-copy! (make-string 4) 0 "foob") -Void) + (tc-e (string-copy! (make-string 4) 1 "bark" 1) -Void) + (tc-e (string-copy! (make-string 4) 1 "zend" 1 2) -Void) + + (tc-e (string-fill! (make-string 5) #\Z) -Void) + + (tc-e (string-append) -String) + (tc-e (string-append "a" "b") -String) + (tc-e (string-append "c" "d" "f") -String) + + (tc-e (string->list "abcde") (-lst -Char)) + (tc-e (list->string (list #\a #\d #\d)) -String) + + (tc-e (string=? "a" "a") B) + (tc-e (string? "a" "a") B) + (tc-e (string<=? "a" "a") B) + (tc-e (string>=? "a" "a") B) + + (tc-e (string-upcase "a") -String) + (tc-e (string-downcase "a") -String) + (tc-e (string-titlecase "a") -String) + (tc-e (string-foldcase "a") -String) + + + (tc-e (string-ci=? "a" "A") B) + (tc-e (string-ci? "a" "A") B) + (tc-e (string-ci<=? "a" "A") B) + (tc-e (string-ci>=? "a" "A") B) + + + (tc-e (string-normalize-nfd "a") -String) + (tc-e (string-normalize-nfkd "a") -String) + (tc-e (string-normalize-nfc "a") -String) + (tc-e (string-normalize-nfkc "a") -String) + + + + (tc-e (string-locale=? "a" "a") B) + (tc-e (string-locale? "a" "a") B) + + (tc-e (string-locale-upcase "a") -String) + (tc-e (string-locale-downcase "a") -String) + + + (tc-e (string-locale-ci=? "a" "A") B) + (tc-e (string-locale-ci? "a" "A") B) )