From 8a4db990297699eb69f1e5c105230fa75314dc54 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Wed, 6 Feb 2008 13:15:15 -0600
Subject: [PATCH] Improved tools.test

---
 extra/tools/test/test.factor | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/extra/tools/test/test.factor b/extra/tools/test/test.factor
index 2a26c8639e..aa994e91d2 100755
--- a/extra/tools/test/test.factor
+++ b/extra/tools/test/test.factor
@@ -3,7 +3,7 @@
 USING: namespaces arrays prettyprint sequences kernel
 vectors quotations words parser assocs combinators
 continuations debugger io io.files vocabs tools.time
-vocabs.loader source-files compiler.units ;
+vocabs.loader source-files compiler.units inspector ;
 IN: tools.test
 
 SYMBOL: failures
@@ -30,9 +30,17 @@ SYMBOL: this-test
 
 TUPLE: expected-error ;
 
-: unit-test-fails ( quot -- )
-    [ f ] append [ [ drop t ] recover ] curry
-    [ t ] swap unit-test ;
+M: expected-error summary
+    drop
+    "The unit test expected the quotation to throw an error" ;
+
+: must-fail-with ( quot test -- )
+    >r [ expected-error construct-empty throw ] compose r>
+    [ recover ] 2curry
+    [ ] swap unit-test ;
+
+: must-fail ( quot -- )
+    [ drop t ] must-fail-with ;
 
 : run-test ( path -- failures )
     [ "temporary" forget-vocab ] with-compilation-unit