adjust testing macro

sugar/test/main.rkt

@@ -1,22 +1,21 @@
 #lang racket
-(require (for-syntax racket/syntax))
+(require (for-syntax racket/syntax syntax/strip-context))
 
 (define-syntax (eval-as-untyped stx)
   (syntax-case stx ()
     [(_ exprs ...)
-     (let ([sym (generate-temporary)]
-           [sym2 (generate-temporary)])
-       (datum->syntax
-        stx
-        `(begin
-          (module ,sym racket
-            (require rackunit "../main.rkt" net/url)
-            ,@(syntax->datum #'(exprs ...)))
-          (require ',sym)
-          (module ,sym2 racket
-            (require rackunit (submod "../main.rkt" safe) net/url)
-            ,@(syntax->datum #'(exprs ...)))
-          (require ',sym2))))]))
+     (with-syntax ([module-without-contracts (generate-temporary)]
+                   [module-with-contracts (generate-temporary)])
+       (replace-context stx
+                        #'(begin
+                            (module module-without-contracts racket
+                              (require rackunit "../main.rkt" net/url)
+                              exprs ...)
+                            (require 'module-without-contracts)
+                            (module module-with-contracts racket
+                              (require rackunit (submod "../main.rkt" safe) net/url)
+                              exprs ...)
+                            (require 'module-with-contracts))))]))
 
 
 (eval-as-untyped
@@ -28,7 +27,7 @@
  (check-equal? (->int (string->path "42")) 42)
  (check-equal? (->int #\A) 65)
  (check-equal? (->int (make-list 42 null)) 42)
-
+ 
  (check-equal? (->string "foo") "foo")
  (check-equal? (->string #"foo") "foo")
  (check-equal? (->string '()) "")
@@ -39,18 +38,18 @@
  (define file-name-as-text "foo.txt")
  (check-equal? (->string (string->path file-name-as-text)) file-name-as-text)
  (check-equal? (->string #\¶) "¶")
-
+ 
  (check-equal? (->path "foo") (string->path "foo"))
  (check-equal? (->path #"foo") (string->path "foo"))
  (check-equal? (->path 'foo) (string->path "foo"))
  (check-equal? (->path 123) (string->path "123"))
  (check-equal? (->path (string->url "foo/bar.html")) (string->path "foo/bar.html"))
-
+ 
  (check-equal? (->list '(1 2 3)) '(1 2 3))
  (check-equal? (->list (list->vector '(1 2 3))) '(1 2 3))
  (check-not-false (andmap (lambda (e) (member e '(1 2 3))) (->list (set 1 2 3))))
  (check-equal? (->list "foo") (list "foo"))
-
+ 
  (check-true (->boolean #t))
  (check-false (->boolean #f))
  (check-true (->boolean "#f"))
@@ -61,71 +60,71 @@
  (check-false (members-unique? '(a b c c)))
  (check-true (members-unique? "zoey"))
  (check-false (members-unique? "zooey"))
-
+ 
  (check-equal? (trimf (list 4 1 2 3 4) even?) '(1 2 3))
  (check-equal? (trimf (list 1 3 2 4 5 6 8 9 13) odd?) '(2 4 5 6 8))
  (check-equal? (filter-split '(1 2 3 4 5 6) even?) '((1)(3)(5)))
-
+ 
  (define foo-path-strings '("foo" "foo.txt" "foo.bar" "foo.bar.txt"))
  (match-define (list foo-path foo.txt-path foo.bar-path foo.bar.txt-path) (map ->path foo-path-strings))
  ;; test the sample paths before using them for other tests
  (define foo-paths (list foo-path foo.txt-path foo.bar-path foo.bar.txt-path))
  (for-each check-equal? (map ->string foo-paths) foo-path-strings)
-
+ 
  (check-false (has-ext? foo-path 'txt))
  (check-true (foo.txt-path . has-ext? . 'txt))
  (check-true ((->path "foo.TXT") . has-ext? . 'txt))
  (check-true (has-ext? foo.bar.txt-path 'txt))
  (check-false (foo.bar.txt-path . has-ext? . 'doc)) ; wrong extension
-
+ 
  (check-equal? (get-ext (->path "foo.txt")) "txt")
  (check-false (get-ext "foo"))
-
+ 
  (check-equal? (add-ext (string->path "foo") "txt") (string->path "foo.txt"))
  (check-equal? (remove-ext foo-path) foo-path)
  (check-equal? (remove-ext (->path ".foo.txt")) (->path ".foo.txt"))
  (check-equal? (remove-ext foo.txt-path) foo-path)
  (check-equal? (remove-ext foo.bar.txt-path) foo.bar-path)
  (check-not-equal? (remove-ext foo.bar.txt-path) foo-path) ; does not remove all extensions
-
+ 
  (check-equal? (remove-ext* foo-path) foo-path)
  (check-equal? (remove-ext* foo.txt-path) foo-path)
  (check-equal? (remove-ext* (->path ".foo.txt")) (->path ".foo.txt"))
  (check-not-equal? (remove-ext* foo.bar.txt-path) foo.bar-path) ; removes more than one ext
  (check-equal? (remove-ext* foo.bar.txt-path) foo-path)
-
+ 
  (check-true (has-binary-ext? "foo.MP3"))
  (check-false (has-binary-ext? "foo.py"))
-
+ 
  (check-equal? (slice-at (range 5) 1) '((0) (1) (2) (3) (4)))
  (check-equal? (slice-at (range 5) 2) '((0 1) (2 3) (4)))
  (check-equal? (slice-at (range 5) 2 #t) '((0 1) (2 3)))
  (check-equal? (slice-at (range 5) 3) '((0 1 2) (3 4)))
  (check-equal? (slice-at (range 5) 3 #t) '((0 1 2)))
-
+ 
  (check-equal? (slicef '(0 1 2 0 0 0 3) positive?) '((0) (1 2) (0 0 0) (3)))
  (check-equal? (slicef '(0 1 2 0 0 0 3) positive?) (slicef '(0 1 2 0 0 0 3) zero?))
  (check-equal? (slicef '(1 (1) (1) 1 1 1 (1)) list?) '((1) ((1) (1)) (1 1 1) ((1))))
  (check-equal? (slicef '(1 2 3 4 5) list?) '((1 2 3 4 5)))
-
+ 
  (check-equal? (slicef-at (range 5) even?) '((0 1) (2 3) (4)))
  (check-equal? (slicef-at (range 5) odd?) '((0) (1 2) (3 4)))
  (check-equal? (slicef-at (range 5) odd? #t) '((1 2) (3 4)))
  (check-equal? (slicef-at (range 5) procedure?) '((0 1 2 3 4)))
-
+ 
  (check-equal? (slicef-at '(1 2 2 1 2) even?) '((1) (2) (2 1) (2)))
  (check-equal? (slicef-at '(1 2 2 1 2) even? #t) '((2) (2 1) (2)))
-
+ 
  (check-equal? (sublist (range 5) 0 0) '())
  (check-equal? (sublist (range 5) 0 1) '(0))
  (check-equal? (sublist (range 5) 0 5) '(0 1 2 3 4))
-
+ 
  (check-equal? (break-at '(5 6 7 8) '()) '((5 6 7 8)))
  (check-equal? (break-at '(5 6 7 8) '(0)) '((5 6 7 8)))
  (check-equal? (break-at '(5 6 7 8) '(1 2 3)) '((5) (6) (7) (8)))
  (check-equal? (break-at '(5 6 7 8) '(1 3)) '((5) (6 7) (8)))
  (check-equal? (break-at '(5 6 7 8) '(1)) (break-at '(5 6 7 8) 1))
-
+ 
  (define xs (range 5))
  (check-equal? (map (λ(a b c) (list a b c)) (shift xs -1) (shift xs 0) (shift xs 1)) '((1 0 #f) (2 1 0) (3 2 1) (4 3 2) (#f 4 3)))
  (check-equal? (map (λ(a b c) (list a b c)) (shift xs -1 'ignored #t) (shift xs 0 'ignored #t) (shift xs 1 'ignored #t)) '((1 0 4) (2 1 0) (3 2 1) (4 3 2) (0 4 3)))
@@ -133,21 +132,21 @@
  (check-equal? (shifts xs '(-1 0 1) 'boing #t)  `((1 2 3 4 0) ,xs (4 0 1 2 3)))
  (check-equal? (shift xs 5 0) (make-list 5 0))
  (check-exn exn:fail? (λ() (shift xs -10)))
-
+ 
  (check-true (urlish? (->path "/Users/MB/home.html")))
  (check-true (urlish? "/Users/MB/home.html?foo=bar"))
  (check-true (urlish? (->symbol "/Users/MB/home")))
-
+ 
  (check-true (pathish? (->path "/Users/MB/home")))
  (check-true (pathish? "/Users/MB/home"))
  (check-true (pathish? (->symbol "/Users/MB/home")))
-
+ 
  (check-equal? (filter-split '("foo" " " "bar" "\n" "\n" "ino") (λ(x) (< (string-length x) 3))) '(("foo")("bar")("ino")))
-
+ 
  (check-exn exn:fail? (λ _ (slice-at (range 5) 0))) ; needs a positive integer as second arg
  (check-exn exn:fail? (λ _ (slicef-at (range 5) 3))) ; needs a procedure as second arg
-
-
+ 
+ 
  (define ys (range 5))
  (check-equal? (values->list (shift/values ys -1 'boing)) '(1 2 3 4 boing))
  (check-equal? (values->list (shift/values ys '(-1 0 1) 'boing)) `((1 2 3 4 boing) ,xs (boing 0 1 2 3))))