test/timetest.rb in openwferu-0.9.1 vs test/timetest.rb in openwferu-0.9.2

@@ -1,17 +1,17 @@
 
 #
-# Testing OpenWFEru
+# Testing OpenWFE
 #
 # John Mettraux at openwfe.org
 #
 # Sun Oct 29 16:18:25 JST 2006
 #
 
 require 'test/unit'
-require 'otime'
-require 'ru/scheduler'
+require 'openwfe/otime'
+require 'openwfe/util/scheduler'
 
 #
 # testing otime and the scheduler
 #
 
@@ -21,10 +21,34 @@
     #end
 
     #def teardown
     #end
 
+    #def test_to_iso_date
+    def xxxx_to_iso_date
+        #
+        # well... this test is not timezone friendly...
+        # commented out thus...
+
+        t = 1169019813.93468
+
+        s = OpenWFE.to_iso8601_date(t)
+        puts s
+
+        assert \
+            OpenWFE.to_iso8601_date(t) == "2007-01-17 02:43:33-0500",
+            "conversion to iso8601 date failed"
+
+        d = OpenWFE.to_ruby_time(s)
+
+        #puts d.to_s
+
+        assert \
+            d.to_s == "2007-01-17T02:43:33-0500",
+            "iso8601 date parsing failed"
+    end
+
     def test_is_digit
 
         for i in 0...9
             si = "#{i}"
             assert \
@@ -40,72 +64,56 @@
             "the character 'a' is not a character digit"
     end
 
     def test_parse_time_string
 
+        pts("500", 0.5)
         pts("1000", 1.0)
         pts("1h", 3600.0)
         pts("1h10s", 3610.0)
     end
 
     def test_scheduler_0
 
         $var = nil
 
-        scheduler = OpenWFEru::Scheduler.new()
+        scheduler = OpenWFE::Scheduler.new()
         scheduler.start
 
-        scheduler.schedule_in('2s', TestSchedulable.new, nil)
+        sid = scheduler.schedule_in('2s', TestSchedulable.new, nil)
 
+        assert \
+            sid,
+            "scheduler did not return a job id"
+
+        assert \
+            (not $var),
+            "scheduler_0 is blocking but should not"
+
         sleep(2.5)
         scheduler.stop
 
         #puts ">#{$var}<"
 
         assert \
             ($var == "ok"),
             "scheduler_0 didn't work"
     end
 
-    def test_cron_0
-        $var = 0
-
-        scheduler = OpenWFEru::Scheduler.new()
-        scheduler.start
-
-        scheduler.schedule('* * * * *', CounterSchedulable.new, nil)
-
-        sleep(120)
-        scheduler.stop
-
-        #puts ">#{$var}<"
-
-        assert \
-            ($var == 2),
-            "cron_0 failed, $var is #{$var}"
-    end
-
     protected
 
         class TestSchedulable
-            include OpenWFEru::Schedulable
+            include OpenWFE::Schedulable
 
             def trigger (params)
                 $var = "ok"
             end
         end
 
-        class CounterSchedulable
-            include OpenWFEru::Schedulable
-
-            def trigger (params)
-                $var = $var + 1
-            end
-        end
-
         def pts (time_string, seconds)
+
             assert \
-                ((OpenWFE::parse_time_string(time_string) == seconds),
-                 "'#{time_string}' did not map to #{seconds} seconds")
+                OpenWFE::parse_time_string(time_string) == seconds,
+                "'#{time_string}' did not map to #{seconds} seconds"
         end
 
 end