unicode: Update to 11.0

[factor.git] / basis / unicode / breaks / breaks-tests.factor

diff --git a/basis/unicode/breaks/breaks-tests.factor b/basis/unicode/breaks/breaks-tests.factor
index d7dcd604c37f3812279f2f61f91703c93f28918d..469d0ef830614f90d35e93f4d9947afb8fac6a21 100644 (file)
--- a/basis/unicode/breaks/breaks-tests.factor
+++ b/basis/unicode/breaks/breaks-tests.factor
@@ -17,11 +17,13 @@ IN: unicode.breaks.tests
 { 16 } [ 11 "what am I saying" first-word-from ] unit-test
 { 10 } [ 11 "what am I saying" last-word-from ] unit-test
 
+{ { t f t t f t } } [ 6 <iota> [ "as df" word-break-at? ] map ] unit-test
+
 : grapheme-break-test ( -- filename )
-    "vocab:unicode/breaks/GraphemeBreakTest.txt" ;
+    "vocab:unicode/UCD/auxiliary/GraphemeBreakTest.txt" ;
 
 : word-break-test ( -- filename )
-    "vocab:unicode/breaks/WordBreakTest.txt" ;
+    "vocab:unicode/UCD/auxiliary/WordBreakTest.txt" ;
 
 : parse-test-file ( file-name -- tests )
     utf8 file-lines
@@ -36,19 +38,21 @@ IN: unicode.breaks.tests
         harvest
     ] map ;
 
-:: test ( tests quot -- )
+:: test-unicode-breaks ( tests quot -- )
     tests [
         [ 1quotation ]
         [ concat [ quot call [ "" like ] map ] curry ] bi unit-test
     ] each ;
 
+! XXX: not used?
 : grapheme-test ( tests -- )
     [
         [ 1quotation ]
         [ concat [ >graphemes [ "" like ] map ] curry ] bi unit-test
     ] each ;
 
-grapheme-break-test parse-test-file [ >graphemes ] test
-word-break-test parse-test-file [ >words ] test
+: run-grapheme-break-tests ( -- )
+    grapheme-break-test parse-test-file [ >graphemes ] test-unicode-breaks ;
 
-{ { t f t t f t } } [ 6 <iota> [ "as df" word-break-at? ] map ] unit-test
+: run-word-break-tests ( -- )
+    word-break-test parse-test-file [ >words ] test-unicode-breaks ;