use new schemeunit

svn: r18361

collects/tests/typed-scheme/main.ss

@@ -2,8 +2,7 @@
 
 (provide go go/text)
 
-(require (planet schematics/schemeunit:2/test)
+(require schemeunit schemeunit/text-ui
-         (planet schematics/schemeunit:2/text-ui)
          mzlib/etc scheme/port
          compiler/compiler
          scheme/match
@@ -59,8 +58,7 @@
                            [current-directory path]
                            [current-output-port (open-output-nowhere)])
               (loader p)))))))
-    (apply test-suite dir
+    (make-test-suite dir tests)))
-           tests)))
 
 (define (dr p)
   #;((compile-zos #f) (list p) 'auto)
@@ -88,7 +86,7 @@
               unit-tests int-tests))
 
 (define (go) (test/gui tests))
-(define (go/text) (test/text-ui tests))
+(define (go/text) (run-tests tests))
 
 (provide go go/text)
 

collects/tests/typed-scheme/unit-tests/all-tests.ss

@@ -2,7 +2,6 @@
 
 (require 
  "test-utils.ss"
- "planet-requires.ss"
  "typecheck-tests.ss" ;;fail
  "subtype-tests.ss" ;; pass
  "type-equal-tests.ss" ;; pass
@@ -13,18 +12,14 @@
  "subst-tests.ss" ;; pass
  "infer-tests.ss" ;; pass
  "contract-tests.ss"
- )
+ (r:infer infer infer-dummy) schemeunit)
-
-(require (r:infer infer infer-dummy)
-         (schemeunit))
 
 (provide unit-tests)
 
 (infer-param infer)
 
 (define unit-tests
-  (apply
+  (make-test-suite 
-   test-suite 
    "Unit Tests"
    (for/list ([f (list
                   typecheck-tests

collects/tests/typed-scheme/unit-tests/contract-tests.ss

@@ -1,13 +1,13 @@
 #lang scheme/base
 
-(require "test-utils.ss" "planet-requires.ss"
+(require "test-utils.ss" 
          (for-syntax scheme/base)
          (for-template scheme/base)
          (private type-contract)	 
 	 (rep type-rep filter-rep object-rep)
          (types utils union convenience)
          (utils tc-utils)
-         (schemeunit))
+         schemeunit)
 
 (define-syntax-rule (t e)
   (test-not-exn (format "~a" e) (lambda () (type->contract e (lambda _ (error "type could not be converted to contract"))))))

collects/tests/typed-scheme/unit-tests/infer-tests.ss

@@ -1,9 +1,9 @@
 #lang scheme/base
-(require "test-utils.ss" "planet-requires.ss" (for-syntax scheme/base))
+(require "test-utils.ss" (for-syntax scheme/base))
 (require (rep type-rep)
 	 (r:infer infer)
 	 (types convenience union utils abbrev)
-         (schemeunit))
+         schemeunit)
 
 
 

collects/tests/typed-scheme/unit-tests/module-tests.ss

@@ -1,6 +1,5 @@
 #lang scheme
-(require "test-utils.ss" "planet-requires.ss")
+(require "test-utils.ss" schemeunit)
-(require (schemeunit))
 
 (provide module-tests)
 

collects/tests/typed-scheme/unit-tests/parse-type-tests.ss

@@ -1,6 +1,6 @@
 #lang scheme/base
-(require "test-utils.ss" "planet-requires.ss" (for-syntax scheme/base))
+(require "test-utils.ss" (for-syntax scheme/base)
-(require (utils tc-utils)
+         (utils tc-utils)
 	 (env type-alias-env type-environments type-name-env init-envs)
 	 (rep type-rep)
 	 (rename-in (types comparison subtype union utils convenience)
@@ -8,7 +8,7 @@
          (private base-types-new base-types-extra colon)
          (for-template (private base-types-new base-types-extra base-env colon))
          (private parse-type)
-         (schemeunit))
+         schemeunit)
 
 (provide parse-type-tests)
 

collects/tests/typed-scheme/unit-tests/remove-intersect-tests.ss

@@ -1,9 +1,9 @@
 #lang scheme/base
-(require "test-utils.ss" "planet-requires.ss" (for-syntax scheme/base))
+(require "test-utils.ss" (for-syntax scheme/base)
-(require (rep type-rep)
+         (rep type-rep)
 	 (r:infer infer infer-dummy)
          (types convenience subtype union remove-intersect)
-         (schemeunit))
+         schemeunit)
 
 (define-syntax (over-tests stx)    
   (syntax-case stx ()

collects/tests/typed-scheme/unit-tests/subst-tests.ss

@@ -1,9 +1,9 @@
 #lang scheme/base
 
-(require "test-utils.ss" "planet-requires.ss" (for-syntax scheme/base))
+(require "test-utils.ss" (for-syntax scheme/base)
-(require (rep type-rep)
+         (rep type-rep)
 	 (types utils abbrev)
-         (schemeunit))
+         schemeunit)
 
 (define-syntax-rule (s img var tgt result)
   (test-eq? "test" (substitute img 'var tgt) result))

collects/tests/typed-scheme/unit-tests/subtype-tests.ss

@@ -1,12 +1,11 @@
 #lang scheme/base
 
-(require "test-utils.ss" "planet-requires.ss")
+(require "test-utils.ss"
-
+         (types subtype convenience union)
-(require (types subtype convenience union)
 	 (rep type-rep)
 	 (env init-envs type-environments)
 	 (r:infer infer infer-dummy)
-         (schemeunit)
+         schemeunit
          (for-syntax scheme/base))
 
 (provide subtype-tests)

collects/tests/typed-scheme/unit-tests/test-utils.ss

@@ -1,27 +1,27 @@
 #lang scheme/base
 (provide (all-defined-out))
 
-(require "planet-requires.ss"
+(require scheme/require-syntax
-         scheme/require-syntax
          scheme/match
+         scheme/gui/dynamic
 	 typed-scheme/utils/utils
-         (for-syntax scheme/base))
+         (for-syntax scheme/base)
-
+         (types comparison utils) 
-
+         schemeunit schemeunit/text-ui)
-(require (types comparison utils)
-         (schemeunit))
 
 (provide private typecheck (rename-out [infer r:infer]) utils env rep types)
 
 (define (mk-suite ts)
   (match (map (lambda (f) (f)) ts)
 	 [(list t) t]
-	 [ts (apply test-suite "Combined Test Suite" ts)]))
+	 [ts (make-test-suite "Combined Test Suite" ts)]))
 
 (define (run . ts)
-  (test/text-ui (mk-suite ts)))
+  (run-tests (mk-suite ts)))
 
-(define (test/gui suite) ((dynamic-require '(planet schematics/schemeunit:2/graphical-ui) 'test/graphical-ui) suite))
+(define (test/gui suite) 
+  (((dynamic-require 'schemeunit/private/gui/gui 'make-gui-runner))
+   suite))
 
 (define (run/gui . ts)
   (test/gui (mk-suite ts)))

collects/tests/typed-scheme/unit-tests/type-annotation-test.ss

@@ -1,12 +1,12 @@
 #lang scheme/base
-(require "test-utils.ss" "planet-requires.ss"
+(require "test-utils.ss"
-         (for-syntax scheme/base))
+         (for-syntax scheme/base)
-(require (private type-annotation parse-type base-types)
+         (private type-annotation parse-type base-types)
          (types convenience utils)
 	 (env type-environments type-name-env init-envs)
 	 (utils tc-utils)
 	 (rep type-rep)
-         (schemeunit))
+         schemeunit)
 
 (provide type-annotation-tests)
 

collects/tests/typed-scheme/unit-tests/type-equal-tests.ss

@@ -1,9 +1,9 @@
 #lang scheme/base
 
-(require "test-utils.ss" "planet-requires.ss" (for-syntax scheme/base))
+(require "test-utils.ss" (for-syntax scheme/base)
-(require (rep type-rep)
+         (rep type-rep)
 	 (types comparison abbrev union)
-         (schemeunit))
+         schemeunit)
 
 (provide type-equal-tests)
 

collects/tests/typed-scheme/unit-tests/typecheck-tests.ss

@@ -1,6 +1,6 @@
 #lang scheme/base
 
-(require "test-utils.ss" "planet-requires.ss"
+(require "test-utils.ss"
          (for-syntax scheme/base)
          (for-template scheme/base))
 (require (private base-env prims type-annotation 
@@ -15,20 +15,17 @@
          (utils tc-utils utils)
          unstable/mutated-vars
          (env type-name-env type-environments init-envs)
-         (schemeunit)
+         schemeunit
-         syntax/parse)
+         syntax/parse
-
+         (for-syntax (utils tc-utils)
-(require (for-syntax (utils tc-utils)
                      (typecheck typechecker)
 	             (env type-env)
 	             (private base-env base-env-numeric
 			      base-env-indexing-old))
          (for-template (private base-env base-types-new base-types-extra
 				base-env-numeric
-				base-env-indexing-old)))
+				base-env-indexing-old))
-
+         (for-syntax syntax/kerncase syntax/parse))
-
-(require (for-syntax syntax/kerncase syntax/parse))
 
 (provide typecheck-tests g tc-expr/expand)