Fix some tests broken by recent definitions change.

diff --git a/basis/help/definitions/definitions-tests.factor b/basis/help/definitions/definitions-tests.factor
index 4f916cfe82e1ae78b1658d7c23ba055b4c0d516b..b230cf0f5633e5399052fdcb93bfc144685d7a8a 100644 (file)
--- a/basis/help/definitions/definitions-tests.factor
+++ b/basis/help/definitions/definitions-tests.factor
@@ -1,4 +1,4 @@
-USING: math definitions help.topics help tools.test
+USING: math definitions help.topics help tools.test sets
 prettyprint parser io.streams.string kernel source-files
 assocs namespaces words io sequences eval accessors see ;
 IN: help.definitions.tests
@@ -10,7 +10,7 @@ IN: help.definitions.tests
         "IN: help.definitions.tests USING: help.syntax ; : hello ( -- ) ; HELP: hello \"test\" ; ARTICLE: \"hello\" \"world\" ; ARTICLE: \"hello2\" \"world\" ;" <string-reader> "foo"
         parse-stream drop
 
-        "foo" source-file definitions>> first assoc-size
+        "foo" source-file definitions>> first cardinality
     ] unit-test
 
     [ t ] [ "hello" articles get key? ] unit-test
@@ -23,7 +23,7 @@ IN: help.definitions.tests
         "IN: help.definitions.tests USING: help.syntax ; : hello ( -- ) ; ARTICLE: \"hello\" \"world\" ;" <string-reader> "foo"
         parse-stream drop
 
-        "foo" source-file definitions>> first assoc-size
+        "foo" source-file definitions>> first cardinality
     ] unit-test
 
     [ t ] [ "hello" articles get key? ] unit-test

diff --git a/core/parser/parser-tests.factor b/core/parser/parser-tests.factor
index 855dfebe0814a6f9785886dad4238a67bd4db5c1..a4fed6330a55b78cf0b49ae817a9c36d3db1253a 100644 (file)
--- a/core/parser/parser-tests.factor
+++ b/core/parser/parser-tests.factor
@@ -110,7 +110,7 @@ DEFER: foo
     "IN: parser.tests : smudge-me ( -- ) ;" <string-reader> "foo"
     parse-stream drop
 
-    "foo" source-file definitions>> first assoc-size
+    "foo" source-file definitions>> first cardinality
 ] unit-test
 
 [ t ] [ "smudge-me" "parser.tests" lookup-word >boolean ] unit-test
@@ -127,21 +127,21 @@ DEFER: foo
     "IN: parser.tests USING: math strings ; GENERIC: smudge-me ( a -- b ) M: integer smudge-me ; M: string smudge-me ;" <string-reader> "foo"
     parse-stream drop
 
-    "foo" source-file definitions>> first assoc-size
+    "foo" source-file definitions>> first cardinality
 ] unit-test
 
 [ 1 ] [
     "IN: parser.tests USING: arrays ; M: array smudge-me ;" <string-reader> "bar"
     parse-stream drop
 
-    "bar" source-file definitions>> first assoc-size
+    "bar" source-file definitions>> first cardinality
 ] unit-test
 
 [ 2 ] [
     "IN: parser.tests USING: math strings ; GENERIC: smudge-me ( a -- b ) M: integer smudge-me ;" <string-reader> "foo"
     parse-stream drop
 
-    "foo" source-file definitions>> first assoc-size
+    "foo" source-file definitions>> first cardinality
 ] unit-test
 
 [ t ] [

diff --git a/core/vocabs/loader/loader-tests.factor b/core/vocabs/loader/loader-tests.factor
index fd1f90de5b2be0cfaa6d74a38266ca2189258558..ea6052d7d72a923b9dd1d129967c76da1fcaa5ff 100644 (file)
--- a/core/vocabs/loader/loader-tests.factor
+++ b/core/vocabs/loader/loader-tests.factor
@@ -1,5 +1,5 @@
 USING: vocabs.loader tools.test continuations vocabs math
-kernel arrays sequences namespaces io.streams.string
+kernel arrays sequences namespaces io.streams.string sets
 parser source-files words assocs classes.tuple definitions
 debugger compiler.units accessors eval vocabs.hierarchy
 combinators vocabs.parser grouping vocabs.files vocabs.refresh ;
@@ -41,14 +41,14 @@ IN: vocabs.loader.tests
 
 2 [
     [ "vocabs.loader.test.a" require ] must-fail
-    
+
     [ f ] [ "vocabs.loader.test.a" lookup-vocab source-loaded?>> ] unit-test
-    
+
     [ t ] [
         "resource:core/vocabs/loader/test/a/a.factor"
         source-file definitions>> dup USE: prettyprint .
         "v-l-t-a-hello" "vocabs.loader.test.a" lookup-word dup .
-        swap first key?
+        swap first in?
     ] unit-test
 ] times