From 1eda1e65e939b59238124a98fdcb38b024b1eb65 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Fri, 8 Nov 2013 21:42:17 -0700 Subject: [PATCH] "racket-test" clean-up Move a few tests, and clear out a lot of junk. original commit: 29a0c44c98d5c8d3660e4bd10eb566c7ec6e46e2 --- .../compatibility-test/LICENSE.txt | 10 +++++ .../compatibility-test/info.rkt | 8 ++++ .../compatibility-test/tests/mzlib}/awk.rktl | 4 +- .../compatibility-test/tests/mzlib}/binc.rktl | 0 .../tests/mzlib/cmdline.rktl | 38 +++++++++++++++++++ .../tests/mzlib}/compat.rktl | 0 .../tests/mzlib}/contract-mzlib-test.rktl | 0 .../compatibility-test/tests/mzlib}/etc.rktl | 16 ++++++++ .../compatibility-test/tests/mzlib}/kw.rktl | 0 .../tests/mzlib/loadtest.rktl | 1 + .../tests/mzlib}/macrolib.rktl | 0 .../tests/mzlib}/pconvert.rktl | 0 .../tests/mzlib}/restart.rktl | 0 .../tests/mzlib/serialize.rktl | 16 ++++++++ .../tests/mzlib}/string-mzlib.rktl | 0 .../tests/mzlib}/structlib.rktl | 0 .../compatibility-test/tests/mzlib/test.rkt | 4 ++ .../tests/mzlib/testing.rktl | 1 + .../compatibility-test/tests/mzlib/tests.rktl | 17 +++++++++ .../tests/mzlib}/threadlib.rktl | 0 .../tests/mzlib}/ttt/uinc4.rktl | 0 .../compatibility-test/tests/mzlib}/uinc.rktl | 0 .../tests/mzlib}/uinc2.rktl | 0 .../tests/mzlib}/uinc3.rktl | 0 .../compatibility-test/tests/mzlib}/unit.rktl | 0 .../tests/mzlib}/unitsig.rktl | 0 26 files changed, 113 insertions(+), 2 deletions(-) create mode 100644 pkgs/compatibility-pkgs/compatibility-test/LICENSE.txt create mode 100644 pkgs/compatibility-pkgs/compatibility-test/info.rkt rename pkgs/{racket-pkgs/racket-test/tests/racket => compatibility-pkgs/compatibility-test/tests/mzlib}/awk.rktl (87%) rename pkgs/{racket-pkgs/racket-test/tests/racket => compatibility-pkgs/compatibility-test/tests/mzlib}/binc.rktl (100%) create mode 100644 pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/cmdline.rktl rename pkgs/{racket-pkgs/racket-test/tests/racket => compatibility-pkgs/compatibility-test/tests/mzlib}/compat.rktl (100%) rename pkgs/{racket-pkgs/racket-test/tests/racket => compatibility-pkgs/compatibility-test/tests/mzlib}/contract-mzlib-test.rktl (100%) rename pkgs/{racket-pkgs/racket-test/tests/racket => compatibility-pkgs/compatibility-test/tests/mzlib}/etc.rktl (67%) rename pkgs/{racket-pkgs/racket-test/tests/racket => compatibility-pkgs/compatibility-test/tests/mzlib}/kw.rktl (100%) create mode 100644 pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/loadtest.rktl rename pkgs/{racket-pkgs/racket-test/tests/racket => compatibility-pkgs/compatibility-test/tests/mzlib}/macrolib.rktl (100%) rename pkgs/{racket-pkgs/racket-test/tests/racket => compatibility-pkgs/compatibility-test/tests/mzlib}/pconvert.rktl (100%) rename pkgs/{racket-pkgs/racket-test/tests/racket => compatibility-pkgs/compatibility-test/tests/mzlib}/restart.rktl (100%) create mode 100644 pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/serialize.rktl rename pkgs/{racket-pkgs/racket-test/tests/racket => compatibility-pkgs/compatibility-test/tests/mzlib}/string-mzlib.rktl (100%) rename pkgs/{racket-pkgs/racket-test/tests/racket => compatibility-pkgs/compatibility-test/tests/mzlib}/structlib.rktl (100%) create mode 100644 pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/test.rkt create mode 100644 pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/testing.rktl create mode 100644 pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/tests.rktl rename pkgs/{racket-pkgs/racket-test/tests/racket => compatibility-pkgs/compatibility-test/tests/mzlib}/threadlib.rktl (100%) rename pkgs/{racket-pkgs/racket-test/tests/racket => compatibility-pkgs/compatibility-test/tests/mzlib}/ttt/uinc4.rktl (100%) rename pkgs/{racket-pkgs/racket-test/tests/racket => compatibility-pkgs/compatibility-test/tests/mzlib}/uinc.rktl (100%) rename pkgs/{racket-pkgs/racket-test/tests/racket => compatibility-pkgs/compatibility-test/tests/mzlib}/uinc2.rktl (100%) rename pkgs/{racket-pkgs/racket-test/tests/racket => compatibility-pkgs/compatibility-test/tests/mzlib}/uinc3.rktl (100%) rename pkgs/{racket-pkgs/racket-test/tests/racket => compatibility-pkgs/compatibility-test/tests/mzlib}/unit.rktl (100%) rename pkgs/{racket-pkgs/racket-test/tests/racket => compatibility-pkgs/compatibility-test/tests/mzlib}/unitsig.rktl (100%) diff --git a/pkgs/compatibility-pkgs/compatibility-test/LICENSE.txt b/pkgs/compatibility-pkgs/compatibility-test/LICENSE.txt new file mode 100644 index 0000000..3ae2623 --- /dev/null +++ b/pkgs/compatibility-pkgs/compatibility-test/LICENSE.txt @@ -0,0 +1,10 @@ +compatibility-lib +Copyright (c) 2010-2013 PLT Design Inc. + +This package is distributed under the GNU Lesser General Public +License (LGPL). This means that you can link Racket into proprietary +applications, provided you follow the rules stated in the LGPL. You +can also modify this package; if you distribute a modified version, +you must distribute it under the terms of the LGPL, which in +particular means that you must release the source code for the +modified software. See COPYING_LESSER.txt for more information. diff --git a/pkgs/compatibility-pkgs/compatibility-test/info.rkt b/pkgs/compatibility-pkgs/compatibility-test/info.rkt new file mode 100644 index 0000000..cebd005 --- /dev/null +++ b/pkgs/compatibility-pkgs/compatibility-test/info.rkt @@ -0,0 +1,8 @@ +#lang info +(define collection 'multi) +(define deps '("base" + "racket-test")) + +(define pkg-desc "tests for \"compatibility-lib\"") + +(define pkg-authors '(mflatt)) diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/awk.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/awk.rktl similarity index 87% rename from pkgs/racket-pkgs/racket-test/tests/racket/awk.rktl rename to pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/awk.rktl index 73d00c8..6b22fcb 100644 --- a/pkgs/racket-pkgs/racket-test/tests/racket/awk.rktl +++ b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/awk.rktl @@ -8,8 +8,8 @@ (define-syntax (test-awk stx) (syntax-case stx () [(_ val body ...) - (with-syntax ([next (datum->syntax-object stx 'next)] - [result (datum->syntax-object stx 'result)]) + (with-syntax ([next (datum->syntax stx 'next)] + [result (datum->syntax stx 'result)]) (syntax (let* ([p (open-input-string "Hello world.")] [next (lambda () (let ([o (read p)]) diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/binc.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/binc.rktl similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/racket/binc.rktl rename to pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/binc.rktl diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/cmdline.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/cmdline.rktl new file mode 100644 index 0000000..95b88c3 --- /dev/null +++ b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/cmdline.rktl @@ -0,0 +1,38 @@ + +(load-relative "loadtest.rktl") + +(Section 'command-line) + +(require mzlib/cmdline) + +(test (void) 'cmdline + (command-line "something" #("-ab") + (once-each + [("-a") "ok" 5] + [("-b" "--more") "Help" 7]))) + +;; test that keywords are compared for the literal symbol +(test "foo" 'cmdline + (let ([once-each 3] [args "args"]) + (command-line "something" #("-ab" "foo") + (once-each + [("-a") "ok" 5] + [("-b" "--more") "Help" 7]) + (args (x) x)))) + +(syntax-test #'(command-line)) +(syntax-test #'(command-line "hello")) +(err/rt-test (command-line 'hello #("ok"))) +(syntax-test #'(command-line "hello" #("ok") (bad))) +(syntax-test #'(command-line "hello" #("ok") (once-any ()))) +(syntax-test #'(command-line "hello" #("ok") (once-any ("-ok")))) +(syntax-test #'(command-line "hello" #("ok") (once-any ("-ok" "the ok flag")))) +(syntax-test #'(command-line "hello" #("ok") (once-any ("-ok" a "the ok flag")))) +(syntax-test #'(command-line "hello" #("ok") (once-any ("-ok" (a) "the ok flag")))) +(syntax-test #'(command-line "hello" #("ok") (once-any ("-ok" a "the ok flag") ()))) +(syntax-test #'(command-line "hello" #("ok") (args 'done) (once-any ("-ok" a "the ok flag" 7)))) +(syntax-test #'(command-line "hello" #("ok") (args (ok) 'done) (once-any ("-ok" a "the ok flag" 7)))) +(syntax-test #'(command-line "hello" #("ok") (=> 'done) (once-any ("-ok" a "the ok flag" 7)))) +(syntax-test #'(command-line "hello" #("ok") (=> 1 2 3 4) (once-any ("-ok" a "the ok flag" 7)))) + +(report-errs) diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/compat.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/compat.rktl similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/racket/compat.rktl rename to pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/compat.rktl diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/contract-mzlib-test.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/contract-mzlib-test.rktl similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/racket/contract-mzlib-test.rktl rename to pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/contract-mzlib-test.rktl diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/etc.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/etc.rktl similarity index 67% rename from pkgs/racket-pkgs/racket-test/tests/racket/etc.rktl rename to pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/etc.rktl index 4b462e9..41256ae 100644 --- a/pkgs/racket-pkgs/racket-test/tests/racket/etc.rktl +++ b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/etc.rktl @@ -49,5 +49,21 @@ (define goo 10) 12)) +(let () + (test 3 (rec f (λ (x) 3)) 3) + (test 3 (rec f (λ (x) x)) 3) + (test 2 (rec f (λ (x) (if (= x 3) (f 2) x))) 3) + (test 3 (rec (f x) 3) 3) + (test 3 (rec (f x) x) 3) + (test 2 (rec (f x) (if (= x 3) (f 2) x)) 3) + (test 2 (rec (f x . y) (car y)) 1 2 3) + (test 2 'no-duplications + (let ([x 1]) (rec ignored (begin (set! x (+ x 1)) void)) x)) + (test 'f object-name (rec (f x) x)) + (test 'f object-name (rec (f x . y) x)) + (test 'f object-name (rec f (lambda (x) x))) + (test (list 2) (rec (f . x) (if (= (car x) 3) (f 2) x)) 3)) + + (report-errs) diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/kw.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/kw.rktl similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/racket/kw.rktl rename to pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/kw.rktl diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/loadtest.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/loadtest.rktl new file mode 100644 index 0000000..97a89e7 --- /dev/null +++ b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/loadtest.rktl @@ -0,0 +1 @@ +(load (collection-file-path "loadtest.rktl" "tests/racket")) diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/macrolib.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/macrolib.rktl similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/racket/macrolib.rktl rename to pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/macrolib.rktl diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/pconvert.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/pconvert.rktl similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/racket/pconvert.rktl rename to pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/pconvert.rktl diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/restart.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/restart.rktl similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/racket/restart.rktl rename to pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/restart.rktl diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/serialize.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/serialize.rktl new file mode 100644 index 0000000..7b7cc5b --- /dev/null +++ b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/serialize.rktl @@ -0,0 +1,16 @@ + +(load-relative "loadtest.rktl") + +(Section 'serialization) + +(module ser-mod mzscheme + (require mzlib/serialize) + (provide ser-mod-test) + + (define-serializable-struct foo (a b)) + + (define (ser-mod-test) + (foo-a (deserialize (serialize (make-foo 1 2)))))) + +(require 'ser-mod) +(test 1 ser-mod-test) diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/string-mzlib.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/string-mzlib.rktl similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/racket/string-mzlib.rktl rename to pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/string-mzlib.rktl diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/structlib.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/structlib.rktl similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/racket/structlib.rktl rename to pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/structlib.rktl diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/test.rkt b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/test.rkt new file mode 100644 index 0000000..3d4b07a --- /dev/null +++ b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/test.rkt @@ -0,0 +1,4 @@ +#lang racket/load + +(define quiet-load (collection-file-path "tests.rktl" "tests" "mzlib")) +(load (collection-file-path "quiet.rktl" "tests" "racket")) diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/testing.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/testing.rktl new file mode 100644 index 0000000..8e3014e --- /dev/null +++ b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/testing.rktl @@ -0,0 +1 @@ +(load (collection-file-path "testing.rktl" "tests/racket")) \ No newline at end of file diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/tests.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/tests.rktl new file mode 100644 index 0000000..2748e17 --- /dev/null +++ b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/tests.rktl @@ -0,0 +1,17 @@ +(load "loadtest.rktl") + +(load-in-sandbox "kw.rktl") +(load-in-sandbox "awk.rktl") +(load-in-sandbox "etc.rktl") +(load-in-sandbox "compat.rktl") +(load-in-sandbox "unit.rktl") +(load-in-sandbox "unitsig.rktl") +(load-in-sandbox "string-mzlib.rktl") +(load-in-sandbox "threadlib.rktl") +(load-in-sandbox "serialize.rktl") +(load-in-sandbox "pconvert.rktl") +(load-in-sandbox "cmdline.rktl") +(load-in-sandbox "restart.rktl") +(load-in-sandbox "macrolib.rktl") +(load-in-sandbox "structlib.rktl") +(load-in-sandbox "contract-mzlib-test.rktl") diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/threadlib.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/threadlib.rktl similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/racket/threadlib.rktl rename to pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/threadlib.rktl diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/ttt/uinc4.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/ttt/uinc4.rktl similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/racket/ttt/uinc4.rktl rename to pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/ttt/uinc4.rktl diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/uinc.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/uinc.rktl similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/racket/uinc.rktl rename to pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/uinc.rktl diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/uinc2.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/uinc2.rktl similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/racket/uinc2.rktl rename to pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/uinc2.rktl diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/uinc3.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/uinc3.rktl similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/racket/uinc3.rktl rename to pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/uinc3.rktl diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/unit.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/unit.rktl similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/racket/unit.rktl rename to pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/unit.rktl diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/unitsig.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/unitsig.rktl similarity index 100% rename from pkgs/racket-pkgs/racket-test/tests/racket/unitsig.rktl rename to pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/unitsig.rktl