Switching many uses of old Schemeunit to new

svn: r18360

collects/tests/macro-debugger/all-tests.ss

@@ -1,7 +1,6 @@
-
 #lang scheme/base
-(require (planet "test.ss" ("schematics" "schemeunit.plt" 2 9))
-         (planet "graphical-ui.ss" ("schematics" "schemeunit.plt" 2 9)))
+(require schemeunit
+         schemeunit/gui)
 (require macro-debugger/model/debug
          "gentest-framework.ss"
          "gentests.ss"
@@ -16,8 +15,8 @@
          "tests/collects.ss")
 (provide go)
 
-(define (go) (test/graphical-ui all-tests))
-(define (collects) (test/graphical-ui big-libs-tests))
+(define (go) (test/gui all-tests))
+(define (collects) (test/gui big-libs-tests))
 
 (define protos
   (list proto:kernel-forms

collects/tests/macro-debugger/gentests.ss

@@ -1,6 +1,6 @@
 #lang scheme/base
-(require (planet "test.ss" ("schematics" "schemeunit.plt" 2 9))
-         macro-debugger/model/debug
+(require schemeunit)
+(require macro-debugger/model/debug
          macro-debugger/model/stx-util
          "gentest-framework.ss"
          "test-setup.ss")
@@ -23,9 +23,9 @@
   (mk-test "Hiding: Reductions" checker-for-hidden-steps protos))
 
 (define (mk-test label checker protos)
-  (apply test-suite label
-         (filter values 
-                 (map (mk-gen-test checker) protos))))
+  (make-test-suite label
+                   (filter values 
+                           (map (mk-gen-test checker) protos))))
 
 (define (mk-gen-test f)
   (define (gen prototest)
@@ -33,7 +33,7 @@
       [(struct collection (label contents))
        (let ([tests (filter values (map gen contents))])
          (and (pair? tests)
-              (apply test-suite label tests)))]
+              (make-test-suite label tests)))]
       [(struct individual (label form attrs))
        (f label form attrs)]))
   gen)

collects/tests/macro-debugger/tests/collects.ss

@@ -1,6 +1,6 @@
 #lang scheme/base
-(require (planet "test.ss" ("schematics" "schemeunit.plt" 2 9))
-         (planet "graphical-ui.ss" ("schematics" "schemeunit.plt" 2 9)))
+(require schemeunit
+         schemeunit/gui)
 (require macro-debugger/model/debug
          scheme/path
          scheme/gui)
@@ -47,11 +47,11 @@
 
 (define (test-libs name mods)
   (test-suite name
-    (apply test-suite "Trace & Parse"
+    (apply make-test-suite "Trace & Parse"
            (for/list ([m mods]) (test-lib/deriv m)))
-    (apply test-suite "Reductions"
+    (apply make-test-suite "Reductions"
            (for/list ([m mods]) (test-lib/hide m hide-none-policy)))
-    (apply test-suite "Standard hiding"
+    (apply make-test-suite "Standard hiding"
            (for/list ([m mods]) (test-lib/hide m standard-policy)))))
 
 (define (test-lib/deriv m)

collects/tests/macro-debugger/tests/hiding.ss

@@ -1,7 +1,6 @@
-
 #lang scheme/base
-(require (planet "test.ss" ("schematics" "schemeunit.plt" 2 8))
-         macro-debugger/model/debug
+(require schemeunit)
+(require macro-debugger/model/debug
          "../test-setup.ss")
 (provide specialized-hiding-tests)
 

collects/tests/macro-debugger/tests/policy.ss

@@ -1,7 +1,6 @@
 #lang scheme/base
-
-(require (planet "test.ss" ("schematics" "schemeunit.plt" 2 8))
-         macro-debugger/model/debug
+(require schemeunit)
+(require macro-debugger/model/debug
          "../test-setup.ss")
 (provide policy-tests)
 

collects/tests/macro-debugger/tests/regression.ss

@@ -1,6 +1,6 @@
 #lang scheme/base
-(require (planet "test.ss" ("schematics" "schemeunit.plt" 2 8))
-         macro-debugger/model/debug
+(require schemeunit)
+(require macro-debugger/model/debug
          macro-debugger/model/steps
          "../test-setup.ss")
 (provide regression-tests)

collects/tests/srfi/1/alist-test.ss

@@ -33,9 +33,8 @@
 ;; stone@math.grin.edu
 
 (module alist-test mzscheme
-
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-           (all-except srfi/1/alist assoc)
+  (require schemeunit)
+  (require (all-except srfi/1/alist assoc)
            (rename srfi/1/alist s:assoc assoc))
 
   (provide alist-tests)

collects/tests/srfi/1/all-1-tests.ss

@@ -1,6 +1,6 @@
 (module all-1-tests mzscheme
   
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)))
+  (require schemeunit)
   (require "alist-test.ss"
            "cons-test.ss"
            "delete-test.ss"

collects/tests/srfi/1/cons-test.ss

@@ -34,9 +34,8 @@
 
 (module cons-test
   mzscheme
-
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-           srfi/1/cons)
+  (require schemeunit)
+  (require srfi/1/cons)
 
   (provide cons-tests)
 

collects/tests/srfi/1/delete-test.ss

@@ -34,9 +34,8 @@
 
 (module delete-test
   mzscheme
-
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-           (all-except srfi/1/delete member))
+  (require schemeunit)
+  (require (all-except srfi/1/delete member))
 
   (provide delete-tests)
 

collects/tests/srfi/1/filter-test.ss

@@ -34,9 +34,8 @@
 
 (module filter-test
   mzscheme
-
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-           (all-except srfi/1/filter member))
+  (require schemeunit)
+  (require (all-except srfi/1/filter member))
 
   (provide filter-tests)
 

collects/tests/srfi/1/fold-test.ss

@@ -34,10 +34,8 @@
 
 (module fold-test
   mzscheme
-
-  (require
-   (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-   (all-except srfi/1/fold map for-each)
+  (require schemeunit)
+  (require (all-except srfi/1/fold map for-each)
    (rename srfi/1/fold s:map map)
    (rename srfi/1/fold s:for-each for-each))
 

collects/tests/srfi/1/lset-test.ss

@@ -34,9 +34,8 @@
 
 (module lset-test
   mzscheme
-
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-           srfi/1/lset)
+  (require schemeunit)
+  (require srfi/1/lset)
 
   (provide lset-tests)
 

collects/tests/srfi/1/misc-test.ss

@@ -34,10 +34,8 @@
 
 (module misc-test
   mzscheme
-
-  (require
-   (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-   (all-except srfi/1/misc append! reverse!)
+  (require schemeunit)
+  (require (all-except srfi/1/misc append! reverse!)
    (rename srfi/1/misc s:append! append!)
    (rename srfi/1/misc s:reverse! reverse!))
 

collects/tests/srfi/1/predicate-test.ss

@@ -34,10 +34,8 @@
 
 (module predicate-test
   mzscheme
-
-  (require
-   (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-   srfi/1/predicate
+  (require schemeunit)
+  (require srfi/1/predicate
    srfi/1/cons)
 
   (provide predicate-tests)

collects/tests/srfi/1/run-tests.ss

@@ -1,5 +1,5 @@
-(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)))
-(require (planet "text-ui.ss" ("schematics" "schemeunit.plt" 2)))
+(require schemeunit)
+(require schemeunit/text-ui)
 (require "all-1-tests.ss")
 
-(test/text-ui all-1-tests)
+(run-tests all-1-tests)

collects/tests/srfi/1/search-test.ss

@@ -35,8 +35,8 @@
 (module search-test
   mzscheme
 
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-           (all-except srfi/1/search member))
+  (require schemeunit)
+  (require (all-except srfi/1/search member))
 
   (provide search-tests)
 

collects/tests/srfi/1/selector-test.ss

@@ -35,8 +35,8 @@
 (module selector-test
   mzscheme
 
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-           srfi/1/selector)
+  (require schemeunit)
+  (require srfi/1/selector)
 
   (provide selector-tests)
 

collects/tests/srfi/13/string-test.ss

@@ -27,8 +27,8 @@
 
 (module string-test mzscheme
   ;; Noel's Test Framework: (get your copy @ schematics.sourceforge.net)
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-           srfi/13/string
+  (require schemeunit)
+  (require srfi/13/string
            srfi/14/char-set
 	   )
   (provide string-tests)

collects/tests/srfi/14/char-set-test.ss

@@ -27,9 +27,8 @@
 
 (module char-set-test mzscheme
 
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-           srfi/14/char-set
-           )
+  (require schemeunit)
+  (require srfi/14/char-set)
   (provide char-set-tests)
 
   (define char-set-tests

collects/tests/srfi/2/and-let-test.ss

@@ -26,8 +26,8 @@
 ;; Commentary:
 
 (module and-let-test mzscheme
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-	   srfi/2/and-let)
+  (require schemeunit)
+  (require srfi/2/and-let)
   (provide and-let*-tests)
 
   (define and-let*-tests

collects/tests/srfi/26/cut-test.ss

@@ -23,9 +23,8 @@
 ; $Id: cut-test.ss,v 1.1 2002/06/20 15:40:52 noel Exp $
 
 (module cut-test mzscheme
-
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-           srfi/26/cut)
+  (require schemeunit)
+  (require srfi/26/cut)
 
   (provide cut-tests)
 

collects/tests/srfi/4/srfi-4-test.ss

@@ -1,9 +1,8 @@
 (module srfi-4-test mzscheme
   
-  (require
-   (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-   (planet "text-ui.ss" ("schematics" "schemeunit.plt" 2))
-   srfi/4)
+  (require schemeunit)
+  (require schemeunit/text-ui
+           srfi/4)
   
   (provide srfi-4-tests)
 
@@ -98,6 +97,6 @@
      ))
 
 
-  (test/text-ui srfi-4-tests)
+  (run-tests srfi-4-tests)
   
   )

collects/tests/srfi/40/all-srfi-40-tests.ss

@@ -1,7 +1,6 @@
 (module all-srfi-40-tests mzscheme
-  
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-           srfi/40)
+  (require schemeunit)
+  (require srfi/40)
   (provide all-srfi-40-tests)
   
   (define from0

collects/tests/srfi/40/run-tests.ss

@@ -1,5 +1,5 @@
-(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)))
-(require (planet "text-ui.ss" ("schematics" "schemeunit.plt" 2)))
+(require schemeunit)
+(require schemeunit/text-ui)
 (require "all-srfi-40-tests.ss")
 
-(test/text-ui all-srfi-40-tests)
+(run-tests all-srfi-40-tests)

collects/tests/srfi/43/all-srfi-43-tests.ss

@@ -1,7 +1,6 @@
 (module all-srfi-43-tests mzscheme
-  
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-           "constructor-tests.ss"
+  (require schemeunit)
+  (require "constructor-tests.ss"
            "predicate-tests.ss"
            "iteration-tests.ss"
            "searching-tests.ss"

collects/tests/srfi/43/constructor-tests.ss

@@ -1,6 +1,6 @@
 (module constructor-tests mzscheme
 
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)))
+  (require schemeunit)
   (require srfi/43/vector-lib)
 
   (provide constructor-tests)

collects/tests/srfi/43/conversion-tests.ss

@@ -1,6 +1,6 @@
 (module conversion-tests mzscheme
   
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)))
+  (require schemeunit)
   (require srfi/43/vector-lib)
   
   (provide conversion-tests)

collects/tests/srfi/43/iteration-tests.ss

@@ -1,6 +1,6 @@
 (module iteration-tests mzscheme
   
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)))
+  (require schemeunit)
   (require srfi/43/vector-lib)
   
   (provide iteration-tests)

collects/tests/srfi/43/mutator-tests.ss

@@ -1,6 +1,6 @@
 (module mutator-tests mzscheme
   
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)))
+  (require schemeunit)
   (require srfi/43/vector-lib)
   
   (provide mutator-tests)

collects/tests/srfi/43/predicate-tests.ss

@@ -1,6 +1,6 @@
 (module predicate-tests mzscheme
 
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)))
+  (require schemeunit)
   (require srfi/43/vector-lib)
 
   (provide predicate-tests)

collects/tests/srfi/43/run-tests.ss

@@ -1,5 +1,5 @@
-(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)))
-(require (planet "text-ui.ss" ("schematics" "schemeunit.plt" 2)))
+(require schemeunit)
+(require schemeunit/text-ui)
 (require "all-srfi-43-tests.ss")
 
-(test/text-ui all-srfi-43-tests)
+(run-tests all-srfi-43-tests)

collects/tests/srfi/43/searching-tests.ss

@@ -1,6 +1,6 @@
 (module searching-tests mzscheme
   
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)))
+  (require schemeunit)
   (require srfi/43/vector-lib)
   
   (provide searching-tests)

collects/tests/srfi/69/hash-tests.ss

@@ -1,6 +1,6 @@
 (module hash-tests mzscheme
 
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)))
+  (require schemeunit)
 
   (require srfi/1/list
            (prefix h: srfi/69))

collects/tests/srfi/all-srfi-tests.ss

@@ -1,6 +1,6 @@
 (module all-srfi-tests mzscheme
   
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)))
+  (require schemeunit)
   (require "1/all-1-tests.ss"
            "2/and-let-test.ss"
            "4/srfi-4-test.ss"

collects/tests/srfi/run-tests.ss

@@ -1,7 +1,7 @@
 #lang scheme/base
 
-(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)))
-(require (planet "text-ui.ss" ("schematics" "schemeunit.plt" 2)))
+(require schemeunit)
+(require schemeunit/text-ui)
 (require "all-srfi-tests.ss")
 
-(test/text-ui all-srfi-tests)
+(run-tests all-srfi-tests)

collects/tests/web-server/dispatchers/dispatch-servlets-test.ss

@@ -113,10 +113,4 @@
                           [k0 (first ((sxpath "//a/@href/text()") (call d url0 empty)))])
                      (sleep 3)
                      (call d k0 empty))
-                   "#"))))
-
-
-; Comment in to run tests
-#;(require #;(planet "graphical-ui.ss" ("schematics" "schemeunit.plt" 2))
-           (planet "text-ui.ss" ("schematics" "schemeunit.plt" 2)))
-#;(test/text-ui dispatch-servlets-tests)
+                   "#"))))

collects/tests/web-server/formlets-test.ss

@@ -254,8 +254,3 @@
                                (list "Jay" (make-date 10 6) (make-date 10 8))))))
    
    ))
-
-#|
-(require (planet "graphical-ui.ss" ("schematics" "schemeunit.plt" 2)))
-(test/graphical-ui all-formlets-tests)
-|#