factor: Retrying on the unit tests. Also normalize some syntax with FUNCTION:.

[factor.git] / core / classes / classes-tests.factor

diff --git a/core/classes/classes-tests.factor b/core/classes/classes-tests.factor
index 2f46d516aa0dfd1969816635ea5f3bf8b4f08e27..1fbbb62899cad0134968a53b34450662feafe729 100644 (file)
--- a/core/classes/classes-tests.factor
+++ b/core/classes/classes-tests.factor
@@ -6,22 +6,22 @@ classes.algebra definitions source-files compiler.units
 kernel.private sorting vocabs memory eval accessors sets ;
 IN: classes.tests
 
-[ t ] [ 3 object instance? ] unit-test
-[ t ] [ 3 fixnum instance? ] unit-test
-[ f ] [ 3 float instance? ] unit-test
-[ t ] [ 3 number instance? ] unit-test
-[ f ] [ 3 null instance? ] unit-test
+{ t } [ 3 object instance? ] unit-test
+{ t } [ 3 fixnum instance? ] unit-test
+{ f } [ 3 float instance? ] unit-test
+{ t } [ 3 number instance? ] unit-test
+{ f } [ 3 null instance? ] unit-test
 
 ! Regression
 GENERIC: method-forget-test ( obj -- obj )
 TUPLE: method-forget-class ;
 M: method-forget-class method-forget-test ;
 
-[ f ] [ \ method-forget-test "methods" word-prop assoc-empty? ] unit-test
-[ ] [ [ \ method-forget-class forget ] with-compilation-unit ] unit-test
-[ t ] [ \ method-forget-test "methods" word-prop assoc-empty? ] unit-test
+{ f } [ \ method-forget-test "methods" word-prop assoc-empty? ] unit-test
+{ } [ [ \ method-forget-class forget ] with-compilation-unit ] unit-test
+{ t } [ \ method-forget-test "methods" word-prop assoc-empty? ] unit-test
 
-[ { } { } ] [
+{ { } { } } [
     all-words [ class? ] filter
     implementors-map get keys
     [ natural-sort ] bi@
@@ -32,7 +32,7 @@ M: method-forget-class method-forget-test ;
 USE: multiline
 
 ! So the user has some code...
-[ ] [
+{ } [
     """IN: classes.test.a
     GENERIC: g ( a -- b )
     TUPLE: x ;
@@ -42,7 +42,7 @@ USE: multiline
 ] unit-test
 
 ! Note that q inlines M: x g ;
-[ ] [
+{ } [
     """IN: classes.test.b
     USE: classes.test.a
     USE: kernel
@@ -51,7 +51,7 @@ USE: multiline
 ] unit-test
 
 ! Now, the user removes the z class and adds a method,
-[ ] [
+{ } [
     """IN: classes.test.a
     GENERIC: g ( a -- b )
     TUPLE: x ;
@@ -62,7 +62,7 @@ USE: multiline
 ] unit-test
 
 ! And changes the definition of q
-[ ] [
+{ } [
     """IN: classes.test.b
     USE: classes.test.a
     USE: kernel
@@ -71,7 +71,7 @@ USE: multiline
 ] unit-test
 
 ! Similar problem, but with anonymous classes
-[ ] [
+{ } [
     """IN: classes.test.c
     USE: kernel
     GENERIC: g ( a -- b )
@@ -80,7 +80,7 @@ USE: multiline
     "class-intersect-no-method-c" parse-stream drop
 ] unit-test
 
-[ ] [
+{ } [
     """IN: classes.test.d
     USE: classes.test.c
     USE: kernel
@@ -89,7 +89,7 @@ USE: multiline
 ] unit-test
 
 ! Now, the user removes the z class and adds a method,
-[ ] [
+{ } [
     """IN: classes.test.c
     USE: kernel
     GENERIC: g ( a -- b )
@@ -107,11 +107,11 @@ USE: multiline
 
 TUPLE: forgotten-predicate-test ;
 
-[ ] [ [ \ forgotten-predicate-test forget ] with-compilation-unit ] unit-test
-[ f ] [ \ forgotten-predicate-test? predicate? ] unit-test
+{ } [ [ \ forgotten-predicate-test forget ] with-compilation-unit ] unit-test
+{ f } [ \ forgotten-predicate-test? predicate? ] unit-test
 
 GENERIC: generic-predicate? ( a -- b )
 
-[ ] [ "IN: classes.tests TUPLE: generic-predicate ;" eval( -- ) ] unit-test
+{ } [ "IN: classes.tests TUPLE: generic-predicate ;" eval( -- ) ] unit-test
 
-[ f ] [ \ generic-predicate? generic? ] unit-test
+{ f } [ \ generic-predicate? generic? ] unit-test