Fixes #2966

[factor.git] / extra / id3 / id3-tests.factor

diff --git a/extra/id3/id3-tests.factor b/extra/id3/id3-tests.factor
index aefbec8550b6c37eb46570e26bd2ab8254c5f6c4..2967a93a659518ad261be9fe6585c963efa6b604 100644 (file)
--- a/extra/id3/id3-tests.factor
+++ b/extra/id3/id3-tests.factor
@@ -1,42 +1,46 @@
 ! Copyright (C) 2009 Tim Wawrzynczak
-! See http://factorcode.org/license.txt for BSD license.
-USING: tools.test id3 combinators ;
+! See https://factorcode.org/license.txt for BSD license.
+USING: tools.test id3 combinators grouping id3.private
+sequences math ;
 IN: id3.tests
 
 : id3-params ( id3 -- title artist album year comment genre )
     {
-        [ id3-title ]
-        [ id3-artist ]
-        [ id3-album ]
-        [ id3-year ]
-        [ id3-comment ]
-        [ id3-genre ]
+        [ title ]
+        [ artist ]
+        [ album ]
+        [ year ]
+        [ comment ]
+        [ genre ]
     } cleave ;
 
-[
-   "BLAH"
-   "ARTIST"
-   "ALBUM"
-   "2009"
-   "COMMENT"
-   "Bluegrass"
-] [ "vocab:id3/tests/blah.mp3" file-id3-tags id3-params ] unit-test
+{
+    "BLAH"
+    "ARTIST"
+    "ALBUM"
+    "2009"
+    "COMMENT"
+    "Bluegrass"
+} [ "vocab:id3/tests/blah.mp3" mp3>id3 id3-params ] unit-test
 
-[
+{
     "Anthem of the Trinity"
     "Terry Riley"
     "Shri Camel"
     f
     f
     "Classical"
-] [ "vocab:id3/tests/blah2.mp3" file-id3-tags id3-params ] unit-test
+} [ "vocab:id3/tests/blah2.mp3" mp3>id3 id3-params ] unit-test
+
+{
+    "Stormy Weather"
+    "Frank Sinatra"
+    "Night and Day Frank Sinatra"
+     f
+    "eng, AG# 08E1C12E"
+    "Big Band"
+} [ "vocab:id3/tests/blah3.mp3" mp3>id3 id3-params ] unit-test
 
-[    
-   "Stormy Weather"
-   "Frank Sinatra"
-   "Night and Day Frank Sinatra"
-    f
-   "eng, AG# 08E1C12E"
-   "Big Band"
-] [ "vocab:id3/tests/blah3.mp3" file-id3-tags id3-params ] unit-test
 
+{ t }
+[ 10000 <iota> [ synchsafe>sequence sequence>synchsafe ] map [ < ] monotonic? ] unit-test