Fixed test suite.

2 files changed, 26 insertions, 19 deletions

diff --git a/stdlib/source/library/lux/meta/macro/expansion.lux b/stdlib/source/library/lux/meta/macro/expansion.lux
index 9364ecc77..62c4e6905 100644
--- a/stdlib/source/library/lux/meta/macro/expansion.lux
+++ b/stdlib/source/library/lux/meta/macro/expansion.lux
@@ -104,10 +104,10 @@
 
 (with_template [<macro> <func>]
   [(def .public <macro>
-     (.macro (_ tokens)
-       (let [[module _] (.symbol .._)
-             [_ short] (.symbol <macro>)
-             macro_name [module short]]
+     (let [[module _] (.symbol .._)
+           [_ short] (.symbol <macro>)
+           macro_name [module short]]
+       (.macro (_ tokens)
          (when (is (Maybe [Bit Code])
                    (when tokens
                      (list [_ {.#Text "omit"}]
diff --git a/stdlib/source/library/lux/test/unit.lux b/stdlib/source/library/lux/test/unit.lux
index 02e063447..62e075537 100644
--- a/stdlib/source/library/lux/test/unit.lux
+++ b/stdlib/source/library/lux/test/unit.lux
@@ -59,23 +59,30 @@
   (-> Text Test Test)
   (|>> %.text context'))
 
-(def .public failure
-  (-> Text Test)
-  (|>> (format "[Failure] ")
-       [tally.failure]
-       async#in))
-
-(def .public success
-  (-> Text Test)
-  (|>> (format "[Success] ")
-       [tally.success]
-       async#in))
+(with_template [<prefix> <tally> <raw> <quoted>]
+  [(def <raw>
+     (-> Text Test)
+     (|>> (format <prefix>)
+          [<tally>]
+          async#in))
+
+   (def .public <quoted>
+     (-> Text Test)
+     (|>> %.text <raw>))]
+
+  ["[Failure] " tally.failure failure' failure]
+  ["[Success] " tally.success success' success]
+  )
+
+(def (test' message condition)
+  (-> Text Bit Test)
+  (if condition
+    (success' message)
+    (failure' message)))
 
 (def .public (test message condition)
   (-> Text Bit Test)
-  (if condition
-    (success message)
-    (failure message)))
+  (test' (%.text message) condition))
 
 (def definition_separator " & ")
 
@@ -91,7 +98,7 @@
                     (list#each ..coverage_format)
                     (text.interposed ..definition_separator))
         coverage (set.of_list symbol.hash coverage)]
-    (|> (..test message condition)
+    (|> (..test' message condition)
         (async#each (function (_ [tally documentation])
                       [(revised tally.#actual (set.union coverage) tally)
                        documentation])))))