From 8428f66933f1cfb9c20e818667b8ef36eb93b614 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Wed, 6 Feb 2008 15:00:10 -0600
Subject: [PATCH] Fixing unit tests

---
 core/classes/classes-tests.factor      |  6 ++++--
 core/generic/generic-tests.factor      |  2 +-
 core/inference/inference-tests.factor  |  4 ++--
 core/tuples/tuples-tests.factor        |  2 +-
 core/vocabs/loader/loader-tests.factor | 17 +++++++----------
 extra/combinators/lib/lib-tests.factor |  2 +-
 extra/tools/test/test.factor           |  2 +-
 7 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/core/classes/classes-tests.factor b/core/classes/classes-tests.factor
index d78436bd5f..c7024a7490 100755
--- a/core/classes/classes-tests.factor
+++ b/core/classes/classes-tests.factor
@@ -169,8 +169,10 @@ UNION: redefine-bug-2 redefine-bug-1 quotation ;
 UNION: forget-class-bug-1 integer ;
 UNION: forget-class-bug-2 forget-class-bug-1 dll ;
 
-FORGET: forget-class-bug-1
-FORGET: forget-class-bug-2
+[
+    \ forget-class-bug-1 forget
+    \ forget-class-bug-2 forget
+] with-compilation-unit
 
 [ f ] [ forget-class-bug-1 typemap get values [ memq? ] with contains? ] unit-test
 
diff --git a/core/generic/generic-tests.factor b/core/generic/generic-tests.factor
index e4d4160605..e3fdbc7b46 100755
--- a/core/generic/generic-tests.factor
+++ b/core/generic/generic-tests.factor
@@ -155,7 +155,7 @@ M: string my-hook "a string" ;
 
 [ "an integer" ] [ 3 my-var set my-hook ] unit-test
 [ "a string" ] [ my-hook my-var set my-hook ] unit-test
-[ 1.0 my-var set my-hook ] [ [ T{ no-method f 1.0 my-hook } = ] must-fail-with
+[ 1.0 my-var set my-hook ] [ T{ no-method f 1.0 my-hook } = ] must-fail-with
 
 GENERIC: tag-and-f ( x -- x x )
 
diff --git a/core/inference/inference-tests.factor b/core/inference/inference-tests.factor
index 1738a71b7e..b43226166a 100755
--- a/core/inference/inference-tests.factor
+++ b/core/inference/inference-tests.factor
@@ -326,10 +326,10 @@ DEFER: bar
 : bad-bin ( a b -- ) 5 [ 5 bad-bin bad-bin 5 ] [ 2drop ] if ;
 [ [ bad-bin ] infer ] must-fail
 
-[ [ [ r> ] infer ] [ inference-error? ] must-fail-with
+[ [ r> ] infer ] [ inference-error? ] must-fail-with
 
 ! Regression
-[ [ [ get-slots ] infer ] [ inference-error? ] must-fail-with
+[ [ get-slots ] infer ] [ inference-error? ] must-fail-with
 
 ! Test some curry stuff
 { 1 1 } [ 3 [ ] curry 4 [ ] curry if ] unit-test-effect
diff --git a/core/tuples/tuples-tests.factor b/core/tuples/tuples-tests.factor
index dede1a2136..c9656a3b9e 100755
--- a/core/tuples/tuples-tests.factor
+++ b/core/tuples/tuples-tests.factor
@@ -123,7 +123,7 @@ TUPLE: yo-momma ;
     [ ] [ \ yo-momma forget ] unit-test
     [ f ] [ \ yo-momma typemap get values memq? ] unit-test
 
-    [ f ] [ \ yo-momma crossref ] unit-test
+    [ f ] [ \ yo-momma crossref get at ] unit-test
 ] with-compilation-unit
 
 TUPLE: loc-recording ;
diff --git a/core/vocabs/loader/loader-tests.factor b/core/vocabs/loader/loader-tests.factor
index 764f14e45f..3a8fc37583 100755
--- a/core/vocabs/loader/loader-tests.factor
+++ b/core/vocabs/loader/loader-tests.factor
@@ -63,14 +63,12 @@ IN: temporary
 
 [ 2 ] [ "count-me" get-global ] unit-test
 
-[ t ] [
-    [
-        "IN: vocabs.loader.test.a v-l-t-a-hello"
-        <string-reader>
-        "resource:core/vocabs/loader/test/a/a.factor"
-        parse-stream
-    ] catch [ no-word? ] is?
-] unit-test
+[
+    "IN: vocabs.loader.test.a v-l-t-a-hello"
+    <string-reader>
+    "resource:core/vocabs/loader/test/a/a.factor"
+    parse-stream
+] [ [ no-word? ] is? ] must-fail-with
 
 0 "count-me" set-global
 
@@ -121,8 +119,7 @@ IN: temporary
 [ "kernel" vocab where ] unit-test
 
 [ t ] [
-    [ "vocabs.loader.test.d" require ] catch
-    [ :1 ] when
+    [ "vocabs.loader.test.d" require ] [ :1 ] recover
     "vocabs.loader.test.d" vocab-source-loaded?
 ] unit-test
 
diff --git a/extra/combinators/lib/lib-tests.factor b/extra/combinators/lib/lib-tests.factor
index 235f441b8b..20f52b2ea3 100755
--- a/extra/combinators/lib/lib-tests.factor
+++ b/extra/combinators/lib/lib-tests.factor
@@ -1,5 +1,5 @@
 USING: combinators.lib kernel math math.ranges random sequences
-tools.test inference continuations arrays vectors ;
+tools.test tools.test.inference continuations arrays vectors ;
 IN: temporary
 
 [ 5 ] [ [ 10 random ] [ 5 = ] generate ] unit-test
diff --git a/extra/tools/test/test.factor b/extra/tools/test/test.factor
index 1037323ddb..9590f32539 100755
--- a/extra/tools/test/test.factor
+++ b/extra/tools/test/test.factor
@@ -37,7 +37,7 @@ M: expected-error summary
 : must-fail-with ( quot test -- )
     >r [ expected-error construct-empty throw ] compose r>
     [ recover ] 2curry
-    [ ] swap unit-test ;
+    [ t ] swap unit-test ;
 
 : must-fail ( quot -- )
     [ drop t ] must-fail-with ;