git » jacl.git » commit 3164ab4

minor test cleanups

author Alan Dipert
2020-02-25 02:15:08 UTC
committer Alan Dipert
2020-02-25 02:15:08 UTC
parent 0b7bdd0653ea8f026efa673b0a12592adc92c497

minor test cleanups

jacl-tests.lisp +11 -10

diff --git a/jacl-tests.lisp b/jacl-tests.lisp
index 4b71d76..f9831b9 100644
--- a/jacl-tests.lisp
+++ b/jacl-tests.lisp
@@ -3,11 +3,6 @@
 (let* ((jpkg (jacl:\. (jacl:%js "Package") (|get| @"JACL"))))
   (jacl:\. *package* (|usePackage| jpkg)))
 
-(defun read1 (s)
-  (\. (%new @|Reader| (%new @|StringStream| s)) (|read|)))
-
-(\. @|QUnit| (|module| @"Reader"))
-
 (defvar *is*)
 
 (defmacro deftest (label &rest body)
@@ -21,12 +16,18 @@
 (defun assert= (x y label)
   (\. *is* (|strictEqual| x y (\. label (|toString|)))))
 
+(defun read1 (s)
+  (let ((s (\. s (|toString|))))
+    (\. (%new @|Reader| (%new @|StringStream| s)) (|read|))))
+
+(\. @|QUnit| (|module| @"Reader"))
+
 (deftest "Integers"
-  (assert= (await (read1 @"123 "))   123  "single integer")
-  (assert= (await (read1 @"+9912 ")) 9912 "integer with leading +")
-  (assert= (await (read1 @"0 "))     0    "zero")
-  (assert= (await (read1 @"-32 "))   -32  "negative number")
-  (assert= (await (read1 @"1. "))    1.   "number with trailing dot"))
+  (assert= (await (read1 "123 "))   123  "single integer")
+  (assert= (await (read1 "+9912 ")) 9912 "integer with leading +")
+  (assert= (await (read1 "0 "))     0    "zero")
+  (assert= (await (read1 "-32 "))   -32  "negative number")
+  (assert= (await (read1 "1. "))    1.   "number with trailing dot"))
 
 (deftest "Symbols"
   (let ((sym (await (read1 @"somesym "))))