Delete empty unit tests files, remove 1- and 1+, reorder IN: lines in a lot of places...

[factor.git] / basis / concurrency / flags / flags-tests.factor

diff --git a/basis/concurrency/flags/flags-tests.factor b/basis/concurrency/flags/flags-tests.factor
old mode 100755 (executable)
new mode 100644 (file)
index 9d3f6de..4fc00b7
--- a/basis/concurrency/flags/flags-tests.factor
+++ b/basis/concurrency/flags/flags-tests.factor
@@ -1,8 +1,8 @@
-IN: concurrency.flags.tests\r
 USING: tools.test concurrency.flags concurrency.combinators\r
-kernel threads locals accessors ;\r
+kernel threads locals accessors calendar ;\r
+IN: concurrency.flags.tests\r
 \r
-:: flag-test-1 ( -- )\r
+:: flag-test-1 ( -- val )\r
     [let | f [ <flag> ] |\r
         [ f raise-flag ] "Flag test" spawn drop\r
         f lower-flag\r
@@ -11,16 +11,16 @@ kernel threads locals accessors ;
 \r
 [ f ] [ flag-test-1 ] unit-test\r
 \r
-:: flag-test-2 ( -- )\r
+:: flag-test-2 ( -- ? )\r
     [let | f [ <flag> ] |\r
-        [ 1000 sleep f raise-flag ] "Flag test" spawn drop\r
+        [ 1 seconds sleep f raise-flag ] "Flag test" spawn drop\r
         f lower-flag\r
         f value>>\r
     ] ;\r
 \r
 [ f ] [ flag-test-2 ] unit-test\r
 \r
-:: flag-test-3 ( -- )\r
+:: flag-test-3 ( -- val )\r
     [let | f [ <flag> ] |\r
         f raise-flag\r
         f value>>\r
@@ -28,7 +28,7 @@ kernel threads locals accessors ;
 \r
 [ t ] [ flag-test-3 ] unit-test\r
 \r
-:: flag-test-4 ( -- )\r
+:: flag-test-4 ( -- val )\r
     [let | f [ <flag> ] |\r
         [ f raise-flag ] "Flag test" spawn drop\r
         f wait-for-flag\r
@@ -37,9 +37,9 @@ kernel threads locals accessors ;
 \r
 [ t ] [ flag-test-4 ] unit-test\r
 \r
-:: flag-test-5 ( -- )\r
+:: flag-test-5 ( -- val )\r
     [let | f [ <flag> ] |\r
-        [ 1000 sleep f raise-flag ] "Flag test" spawn drop\r
+        [ 1 seconds sleep f raise-flag ] "Flag test" spawn drop\r
         f wait-for-flag\r
         f value>>\r
     ] ;\r
@@ -48,6 +48,6 @@ kernel threads locals accessors ;
 \r
 [ ] [\r
     { 1 2 } <flag>\r
-    [ [ 1000 sleep raise-flag ] curry "Flag test" spawn drop ]\r
+    [ [ 1 seconds sleep raise-flag ] curry "Flag test" spawn drop ]\r
     [ [ wait-for-flag drop ] curry parallel-each ] bi\r
 ] unit-test\r