diff --git a/collects/tests/typed-scheme/unit-tests/all-tests.rkt b/collects/tests/typed-scheme/unit-tests/all-tests.rkt index 27fb506979..1877481039 100644 --- a/collects/tests/typed-scheme/unit-tests/all-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/all-tests.rkt @@ -3,16 +3,20 @@ (require "test-utils.ss" "typecheck-tests.ss" ;;fail + "subtype-tests.ss" ;; pass "type-equal-tests.ss" ;; pass "remove-intersect-tests.ss" ;; pass "parse-type-tests.ss" ;; pass - "type-annotation-test.ss" ;; pass - "module-tests.ss" ;; pass "subst-tests.ss" ;; pass "infer-tests.ss" ;; pass + "type-annotation-test.ss" ;; pass + + "module-tests.ss" ;; pass "contract-tests.ss" - (r:infer infer infer-dummy) racunit) + + (r:infer infer infer-dummy) + racunit racunit/text-ui) (provide unit-tests) @@ -22,7 +26,7 @@ (make-test-suite "Unit Tests" (for/list ([f (list - typecheck-tests + typecheck-tests subtype-tests type-equal-tests restrict-tests diff --git a/collects/tests/typed-scheme/unit-tests/type-annotation-test.rkt b/collects/tests/typed-scheme/unit-tests/type-annotation-test.rkt index 8e73752988..0f8c3d1db2 100644 --- a/collects/tests/typed-scheme/unit-tests/type-annotation-test.rkt +++ b/collects/tests/typed-scheme/unit-tests/type-annotation-test.rkt @@ -1,11 +1,12 @@ #lang scheme/base (require "test-utils.ss" (for-syntax scheme/base) - (private type-annotation parse-type base-types) - (types convenience utils) - (env type-environments type-name-env init-envs) + typed-scheme/private/type-annotation + typed-scheme/private/parse-type + (types abbrev utils) + (env type-environments init-envs) (utils tc-utils) - (rep type-rep) + (rep type-rep filter-rep object-rep) racunit) (provide type-annotation-tests) @@ -13,10 +14,8 @@ (define-syntax-rule (tat ann-stx ty) (check-tc-result-equal? (format "~a" (quote ann-stx)) (type-ascription (let ([ons (current-namespace)] - [ns (make-empty-namespace)]) + [ns (make-base-namespace)]) (parameterize ([current-namespace ns]) - (namespace-attach-module ons 'racket/base ns) - (namespace-require 'racket/base) (namespace-require 'typed-scheme/private/prims) (namespace-require 'typed-scheme/private/base-types) (namespace-require 'typed-scheme/private/base-types-extra) diff --git a/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt b/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt index 82c5b3cb98..cfa8373285 100644 --- a/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt @@ -6,7 +6,8 @@ (require (private base-env prims type-annotation base-types-extra base-env-numeric - base-env-indexing) + base-env-indexing + parse-type) (typecheck typechecker) (rep type-rep filter-rep object-rep) (rename-in (types utils union convenience abbrev) @@ -17,7 +18,7 @@ (utils tc-utils utils) unstable/mutated-vars (env type-name-env type-environments init-envs) - racunit + racunit racunit/text-ui syntax/parse (for-syntax (utils tc-utils) (typecheck typechecker)