From dd31aa951201c1c1397875d54ecc0c875f2bfc42 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Fri, 26 Feb 2010 20:39:56 +0000 Subject: [PATCH] Switching many uses of old Schemeunit to new svn: r18360 --- collects/tests/macro-debugger/all-tests.ss | 9 ++++----- collects/tests/macro-debugger/gentests.ss | 12 ++++++------ collects/tests/macro-debugger/tests/collects.ss | 10 +++++----- collects/tests/macro-debugger/tests/hiding.ss | 5 ++--- collects/tests/macro-debugger/tests/policy.ss | 5 ++--- collects/tests/macro-debugger/tests/regression.ss | 4 ++-- collects/tests/srfi/1/alist-test.ss | 5 ++--- collects/tests/srfi/1/all-1-tests.ss | 2 +- collects/tests/srfi/1/cons-test.ss | 5 ++--- collects/tests/srfi/1/delete-test.ss | 5 ++--- collects/tests/srfi/1/filter-test.ss | 5 ++--- collects/tests/srfi/1/fold-test.ss | 6 ++---- collects/tests/srfi/1/lset-test.ss | 5 ++--- collects/tests/srfi/1/misc-test.ss | 6 ++---- collects/tests/srfi/1/predicate-test.ss | 6 ++---- collects/tests/srfi/1/run-tests.ss | 6 +++--- collects/tests/srfi/1/search-test.ss | 4 ++-- collects/tests/srfi/1/selector-test.ss | 4 ++-- collects/tests/srfi/13/string-test.ss | 4 ++-- collects/tests/srfi/14/char-set-test.ss | 5 ++--- collects/tests/srfi/2/and-let-test.ss | 4 ++-- collects/tests/srfi/26/cut-test.ss | 5 ++--- collects/tests/srfi/4/srfi-4-test.ss | 9 ++++----- collects/tests/srfi/40/all-srfi-40-tests.ss | 5 ++--- collects/tests/srfi/40/run-tests.ss | 6 +++--- collects/tests/srfi/43/all-srfi-43-tests.ss | 5 ++--- collects/tests/srfi/43/constructor-tests.ss | 2 +- collects/tests/srfi/43/conversion-tests.ss | 2 +- collects/tests/srfi/43/iteration-tests.ss | 2 +- collects/tests/srfi/43/mutator-tests.ss | 2 +- collects/tests/srfi/43/predicate-tests.ss | 2 +- collects/tests/srfi/43/run-tests.ss | 6 +++--- collects/tests/srfi/43/searching-tests.ss | 2 +- collects/tests/srfi/69/hash-tests.ss | 2 +- collects/tests/srfi/all-srfi-tests.ss | 2 +- collects/tests/srfi/run-tests.ss | 6 +++--- .../web-server/dispatchers/dispatch-servlets-test.ss | 8 +------- collects/tests/web-server/formlets-test.ss | 5 ----- 38 files changed, 79 insertions(+), 109 deletions(-) diff --git a/collects/tests/macro-debugger/all-tests.ss b/collects/tests/macro-debugger/all-tests.ss index a142bf2200..9dd0ec8908 100644 --- a/collects/tests/macro-debugger/all-tests.ss +++ b/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 diff --git a/collects/tests/macro-debugger/gentests.ss b/collects/tests/macro-debugger/gentests.ss index 2fc2c852fb..760ba14f54 100644 --- a/collects/tests/macro-debugger/gentests.ss +++ b/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) diff --git a/collects/tests/macro-debugger/tests/collects.ss b/collects/tests/macro-debugger/tests/collects.ss index 524b5629ea..9e1c9487db 100644 --- a/collects/tests/macro-debugger/tests/collects.ss +++ b/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) diff --git a/collects/tests/macro-debugger/tests/hiding.ss b/collects/tests/macro-debugger/tests/hiding.ss index b4de80e0e1..de6d130e50 100644 --- a/collects/tests/macro-debugger/tests/hiding.ss +++ b/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) diff --git a/collects/tests/macro-debugger/tests/policy.ss b/collects/tests/macro-debugger/tests/policy.ss index d0585a36f2..0069e0aed5 100644 --- a/collects/tests/macro-debugger/tests/policy.ss +++ b/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) diff --git a/collects/tests/macro-debugger/tests/regression.ss b/collects/tests/macro-debugger/tests/regression.ss index dc1e65363e..8c208391b7 100644 --- a/collects/tests/macro-debugger/tests/regression.ss +++ b/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) diff --git a/collects/tests/srfi/1/alist-test.ss b/collects/tests/srfi/1/alist-test.ss index 95d2c96bce..6ab78110ae 100644 --- a/collects/tests/srfi/1/alist-test.ss +++ b/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) diff --git a/collects/tests/srfi/1/all-1-tests.ss b/collects/tests/srfi/1/all-1-tests.ss index b35d59afa3..e9ad57fe06 100644 --- a/collects/tests/srfi/1/all-1-tests.ss +++ b/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" diff --git a/collects/tests/srfi/1/cons-test.ss b/collects/tests/srfi/1/cons-test.ss index 9c1cbfa584..734db4af3b 100644 --- a/collects/tests/srfi/1/cons-test.ss +++ b/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) diff --git a/collects/tests/srfi/1/delete-test.ss b/collects/tests/srfi/1/delete-test.ss index 50626c76be..46a89fbbab 100644 --- a/collects/tests/srfi/1/delete-test.ss +++ b/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) diff --git a/collects/tests/srfi/1/filter-test.ss b/collects/tests/srfi/1/filter-test.ss index ee8926e5e0..d18bd1f85e 100644 --- a/collects/tests/srfi/1/filter-test.ss +++ b/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) diff --git a/collects/tests/srfi/1/fold-test.ss b/collects/tests/srfi/1/fold-test.ss index da11ce5d2f..bf1e8f9cc8 100644 --- a/collects/tests/srfi/1/fold-test.ss +++ b/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)) diff --git a/collects/tests/srfi/1/lset-test.ss b/collects/tests/srfi/1/lset-test.ss index 761a2edf0e..d57938e188 100644 --- a/collects/tests/srfi/1/lset-test.ss +++ b/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) diff --git a/collects/tests/srfi/1/misc-test.ss b/collects/tests/srfi/1/misc-test.ss index ab98c16ff5..b8a72c5f2f 100644 --- a/collects/tests/srfi/1/misc-test.ss +++ b/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!)) diff --git a/collects/tests/srfi/1/predicate-test.ss b/collects/tests/srfi/1/predicate-test.ss index f7d787cedb..8f846805cc 100644 --- a/collects/tests/srfi/1/predicate-test.ss +++ b/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) diff --git a/collects/tests/srfi/1/run-tests.ss b/collects/tests/srfi/1/run-tests.ss index e817e41afd..e4cfd86d66 100644 --- a/collects/tests/srfi/1/run-tests.ss +++ b/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) diff --git a/collects/tests/srfi/1/search-test.ss b/collects/tests/srfi/1/search-test.ss index 15b7f2a98f..fd2e9f8e9f 100644 --- a/collects/tests/srfi/1/search-test.ss +++ b/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) diff --git a/collects/tests/srfi/1/selector-test.ss b/collects/tests/srfi/1/selector-test.ss index 196777d8c2..ba9edd9a28 100644 --- a/collects/tests/srfi/1/selector-test.ss +++ b/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) diff --git a/collects/tests/srfi/13/string-test.ss b/collects/tests/srfi/13/string-test.ss index 1aec1fa11c..5191748594 100644 --- a/collects/tests/srfi/13/string-test.ss +++ b/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) diff --git a/collects/tests/srfi/14/char-set-test.ss b/collects/tests/srfi/14/char-set-test.ss index f370a3a2bb..4f25d619c7 100644 --- a/collects/tests/srfi/14/char-set-test.ss +++ b/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 diff --git a/collects/tests/srfi/2/and-let-test.ss b/collects/tests/srfi/2/and-let-test.ss index 53f19ed188..2cd38ea1ba 100644 --- a/collects/tests/srfi/2/and-let-test.ss +++ b/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 diff --git a/collects/tests/srfi/26/cut-test.ss b/collects/tests/srfi/26/cut-test.ss index 95828fc406..d053599e42 100644 --- a/collects/tests/srfi/26/cut-test.ss +++ b/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) diff --git a/collects/tests/srfi/4/srfi-4-test.ss b/collects/tests/srfi/4/srfi-4-test.ss index a80f888430..3434ef1e3b 100644 --- a/collects/tests/srfi/4/srfi-4-test.ss +++ b/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) ) diff --git a/collects/tests/srfi/40/all-srfi-40-tests.ss b/collects/tests/srfi/40/all-srfi-40-tests.ss index a821c3237d..bdc6627dfb 100644 --- a/collects/tests/srfi/40/all-srfi-40-tests.ss +++ b/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 diff --git a/collects/tests/srfi/40/run-tests.ss b/collects/tests/srfi/40/run-tests.ss index 55d636ee7c..ec2e6d6957 100644 --- a/collects/tests/srfi/40/run-tests.ss +++ b/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) diff --git a/collects/tests/srfi/43/all-srfi-43-tests.ss b/collects/tests/srfi/43/all-srfi-43-tests.ss index acd05e9d09..0ee7c197d7 100644 --- a/collects/tests/srfi/43/all-srfi-43-tests.ss +++ b/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" diff --git a/collects/tests/srfi/43/constructor-tests.ss b/collects/tests/srfi/43/constructor-tests.ss index 38c7c18b44..217a9ffe04 100644 --- a/collects/tests/srfi/43/constructor-tests.ss +++ b/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) diff --git a/collects/tests/srfi/43/conversion-tests.ss b/collects/tests/srfi/43/conversion-tests.ss index d4c6c4ba8a..43340d7c9e 100644 --- a/collects/tests/srfi/43/conversion-tests.ss +++ b/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) diff --git a/collects/tests/srfi/43/iteration-tests.ss b/collects/tests/srfi/43/iteration-tests.ss index 0273da6aca..514ddd4398 100644 --- a/collects/tests/srfi/43/iteration-tests.ss +++ b/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) diff --git a/collects/tests/srfi/43/mutator-tests.ss b/collects/tests/srfi/43/mutator-tests.ss index faa4aabc1f..8ef936f896 100644 --- a/collects/tests/srfi/43/mutator-tests.ss +++ b/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) diff --git a/collects/tests/srfi/43/predicate-tests.ss b/collects/tests/srfi/43/predicate-tests.ss index 5b0da7be4f..32a82dd82d 100644 --- a/collects/tests/srfi/43/predicate-tests.ss +++ b/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) diff --git a/collects/tests/srfi/43/run-tests.ss b/collects/tests/srfi/43/run-tests.ss index aa9dd9f940..bef2758593 100644 --- a/collects/tests/srfi/43/run-tests.ss +++ b/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) diff --git a/collects/tests/srfi/43/searching-tests.ss b/collects/tests/srfi/43/searching-tests.ss index da730ed6e4..d3fd4eaee9 100644 --- a/collects/tests/srfi/43/searching-tests.ss +++ b/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) diff --git a/collects/tests/srfi/69/hash-tests.ss b/collects/tests/srfi/69/hash-tests.ss index 6f8ee18a3b..cb09f6feba 100644 --- a/collects/tests/srfi/69/hash-tests.ss +++ b/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)) diff --git a/collects/tests/srfi/all-srfi-tests.ss b/collects/tests/srfi/all-srfi-tests.ss index c89e920390..85c7530761 100644 --- a/collects/tests/srfi/all-srfi-tests.ss +++ b/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" diff --git a/collects/tests/srfi/run-tests.ss b/collects/tests/srfi/run-tests.ss index 3c43ec3bde..ba8d6abb63 100644 --- a/collects/tests/srfi/run-tests.ss +++ b/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) diff --git a/collects/tests/web-server/dispatchers/dispatch-servlets-test.ss b/collects/tests/web-server/dispatchers/dispatch-servlets-test.ss index cecef1c85e..9002d9de3b 100644 --- a/collects/tests/web-server/dispatchers/dispatch-servlets-test.ss +++ b/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) + "#")))) \ No newline at end of file diff --git a/collects/tests/web-server/formlets-test.ss b/collects/tests/web-server/formlets-test.ss index 9b469fcb37..78eb6fb936 100644 --- a/collects/tests/web-server/formlets-test.ss +++ b/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) -|#