openwferu 0.9.13 → 0.9.14

data/test/flowtestbase.rb

@@ -42,6 +42,9 @@ module FlowTestBase
     attr_reader \
         :engine, :tracer
 
+    #
+    # SETUP
+    #
     def setup
 
         @engine = $WORKFLOW_ENGINE_CLASS.new
@@ -80,13 +83,22 @@ module FlowTestBase
         end
     end
 
+    #
+    # TEARDOWN
+    #
     def teardown
-
-        @engine.stop if @engine
+        if @engine
+            $OWFE_LOG.level = Logger::INFO
+            @engine.stop 
+        end
     end
 
     protected
 
+        def log_level_to_debug
+            $OWFE_LOG.level = Logger::DEBUG
+        end
+
         def print_exp_list (l)
             puts
             l.each do |fexp|
@@ -100,13 +112,14 @@ module FlowTestBase
             i = s.index('`')
             #s = s[i+1..s.length-2]
             s = s[i+6..s.length-2]
-            return s
+            s
         end
 
         #
         # dotest()
         #
-        def dotest (flowDef, expectedTrace, join=false, allowRemainingExpressions=false)
+        def dotest (
+            flowDef, expectedTrace, join=false, allowRemainingExpressions=false)
 
             @tracer.clear
 
@@ -118,6 +131,8 @@ module FlowTestBase
 
             fei = @engine.launch(li)
 
+            $OWFE_LOG.info { "dotest() launched #{fei.to_s}" }
+
             if join.is_a?(Numeric)
                 sleep join
             else
@@ -161,28 +176,41 @@ module FlowTestBase
             end
 
             if allowRemainingExpressions
-                engine.get_expression_storages.each do |storage|
-                    storage.purge
-                end
+
+                purge_engine
+
                 return fei
             end
 
             exp_storage = engine.get_expression_storage
+            size = exp_storage.size
 
-            if exp_storage.length != 1
+            if size != 1
                 puts
                 puts "    remaining expressions : #{exp_storage.length}"
                 puts
                 puts exp_storage.to_s
                 puts
+                puts OpenWFE::caller_to_s(0, 2)
+                puts
+
+                purge_engine
             end
 
-            assert \
-                exp_storage.length == 1,
+            assert_equal(
+                size,
+                1,
                 "there are expressions remaining in the expression pool " +
-                "(#{exp_storage.length})"
+                "(#{exp_storage.length})")
 
-            return fei
+            fei
+        end
+
+        def purge_engine
+
+            @engine.get_expression_storages.each do |storage|
+                storage.purge
+            end
         end
 
 end

data/test/ft_21_cron.rb

@@ -26,17 +26,19 @@ class FlowTest21 < Test::Unit::TestCase
     #
 
     class TestDefinition0 < ProcessDefinition
-        def make
-            process_definition :name => "rs0", :revision => "0" do
-                cron :tab => "* * * * *", :name => "cron" do
-                    participant :cron_event
-                end
-            end
+        cron :tab => "* * * * *", :name => "cron" do
+            participant :cron_event
         end
     end
 
+    #
+    # this one tests whether a cron event is removed when his process
+    # terminates, as should be.
+    #
     def test_0
 
+        #log_level_to_debug
+
         @engine.register_participant(:cron_event) do
             @tracer << "cron_event"
         end
@@ -44,5 +46,29 @@ class FlowTest21 < Test::Unit::TestCase
         dotest(TestDefinition0, "", 62)
     end
 
+    #
+    # Test 1
+    #
+
+    class TestDefinition1 < ProcessDefinition
+        sequence do
+            cron :every => "2s", :name => "cron" do
+                participant :cron_event
+            end
+            _sleep "10s"
+        end
+    end
+
+    def test_1
+
+        #log_level_to_debug
+
+        @engine.register_participant(:cron_event) do
+            @tracer << "."
+        end
+
+        dotest(TestDefinition1, [ "....", "....." ])
+    end
+
 end
 

data/test/ft_26_load.rb

@@ -13,7 +13,7 @@ require 'openwfe/expressions/raw_prog'
 include OpenWFE
 
 
-class FlowTest26 < Test::Unit::TestCase
+class FlowTest26c < Test::Unit::TestCase
     include FlowTestBase
 
     #def setup
@@ -102,6 +102,12 @@ class FlowTest26 < Test::Unit::TestCase
         # L2 Cache (per processor): 4 MB
         # Memory:                   2 GB
         # Bus Speed:                667 MHz
+
+        # Thu Sep 13 15:38:46 JST 2007
+        #
+        #     100 in    3s (in memory engine)
+        #   1'000 in   85s (in memory engine)
+        #  10'000 in     s (in memory engine)
     end
 
 
@@ -125,7 +131,7 @@ class FlowTest26 < Test::Unit::TestCase
             #puts "(#{workitem.flow_id} => #{map[workitem.flow_id]})"
         end
 
-        n = 100
+        n = 10000
 
         n.times do |i|
 

data/test/ft_26c_load.rb

@@ -61,5 +61,24 @@ class FlowTest26c < Test::Unit::TestCase
         assert_equal $count, N
     end
 
+    #
+    # Thu Sep 13 15:41:20 JST 2007
+    #
+    # ruby 1.8.5 (2006-12-25 patchlevel 12) [i686-darwin8.8.3]
+    #
+    # 10_000 in 27.69s
+    #
+    # before optimization : 10k in 138.341
+    #
+    #
+    # ruby 1.8.5 (2007-09-13 rev 3876) [i386-jruby1.1]
+    #
+    # 10_000 in 53.96s
+    #
+    # ruby 1.8.5 (2007-09-13 rev 3876) [i386-jruby1.1]
+    # -O -J-server
+    #
+    # 10_000 in 42.616s
+
 end
 

data/test/ft_27_getflowpos.rb

@@ -43,7 +43,7 @@ class FlowTest27 < Test::Unit::TestCase
 
         fei = @engine.launch(TestDefinition0)
 
-        sleep 0.500
+        sleep 0.100
 
         l = @engine.get_process_stack(fei.wfid)
 
@@ -52,7 +52,7 @@ class FlowTest27 < Test::Unit::TestCase
         assert_equal \
             l.size, 3, "get_process_stack() returned #{l.size} elements"
 
-        ps = @engine.get_process_status
+        ps = @engine.list_process_status
         #puts
         #puts ps[fei.parent_wfid].to_s
         #puts
@@ -61,7 +61,7 @@ class FlowTest27 < Test::Unit::TestCase
         assert_equal ps[fei.parent_wfid].expressions.size, 1
         assert_kind_of ParticipantExpression, ps[fei.parent_wfid].expressions[0]
 
-        ps = @engine.get_process_status fei.wfid[0, 4]
+        ps = @engine.list_process_status fei.wfid[0, 4]
 
         assert_equal ps[fei.parent_wfid].errors.size, 0
         assert_equal ps[fei.parent_wfid].expressions.size, 1
@@ -97,7 +97,7 @@ class FlowTest27 < Test::Unit::TestCase
         #fei = @engine.launch TestDefinition0
         fei = @engine.launch Gfp27b
 
-        sleep 0.500
+        sleep 0.100
 
         #l = @engine.get_process_stack(fei.wfid)
         l = @engine.get_process_stack(fei)

data/test/ft_2_concurrence.rb

@@ -24,8 +24,9 @@ class FlowTest2 < Test::Unit::TestCase
 
     #def xxxx_con_1
     def test_con_1
+
         dotest(
-'''<process-definition name="con" revision="1">
+'''<process-definition name="ft_2_concurrence" revision="1">
     <concurrence
         count="1"
     >
@@ -37,14 +38,16 @@ class FlowTest2 < Test::Unit::TestCase
     </concurrence>
 </process-definition>''', 
             "a", 
-            true,
-            false)
+            true)
     end
 
-    #def xxxx_con_2
-    def test_con_2
+    def xxxx_con_2
+    #def test_con_2
+
+        #$OWFE_LOG.level = Logger::INFO
+
         dotest(
-'''<process-definition name="con" revision="2">
+'''<process-definition name="ft_2_concurrence" revision="2">
     <concurrence over-if="true">
         <sequence>
             <sleep for="1s"/>
@@ -55,12 +58,14 @@ class FlowTest2 < Test::Unit::TestCase
 </process-definition>''', 
             "b",
             true)
+
+        #$OWFE_LOG.level = Logger::INFO
     end
 
     #def xxxx_con_3
     def test_con_3
         dotest(
-'''<process-definition name="con" revision="3">
+'''<process-definition name="ft_2_concurrence" revision="3">
     <concurrence over-if="${over}">
         <print>a</print>
         <set variable="over" value="true" />
@@ -73,7 +78,7 @@ class FlowTest2 < Test::Unit::TestCase
     #def xxxx_con_4
     def test_con_4
         dotest(
-'''<process-definition name="con" revision="4">
+'''<process-definition name="ft_2_concurrence" revision="4">
     <concurrence over-if="${nada}">
         <sequence>
             <sleep for="1s"/>
@@ -90,7 +95,7 @@ a""",
     #def xxxx_con_5
     def test_con_5
         dotest(
-'''<process-definition name="con" revision="5">
+'''<process-definition name="ft_2_concurrence" revision="5">
     <concurrence over-if="false">
         <sequence>
             <sleep for="1s"/>

data/test/ft_32_journal.rb

@@ -83,7 +83,7 @@ class FlowTest32 < Test::Unit::TestCase
             #
             # flow resumes
 
-        sleep 0.700
+        sleep 0.250
 
         assert_equal @engine.get_expression_storage.size, 1
     end

data/test/ft_32c_journal.rb

@@ -55,7 +55,8 @@ class FlowTest32c < Test::Unit::TestCase
         #fei = dotest(Test0, "alpha", 0.500, true)
         li = LaunchItem.new Test0
         fei = @engine.launch li
-        sleep 0.500
+
+        sleep 0.250
 
         get_journal.flush_buckets
 
@@ -74,7 +75,7 @@ class FlowTest32c < Test::Unit::TestCase
 
         get_journal.replay_at_error error_event
 
-        sleep 1.0
+        sleep 0.500
 
         assert_equal get_error_count(fei.wfid), 2
 

data/test/ft_32d_journal.rb

@@ -55,7 +55,8 @@ class FlowTest32d < Test::Unit::TestCase
         #fei = dotest(Test0, "alpha", 0.500, true)
         li = LaunchItem.new Test0
         fei = @engine.launch li
-        sleep 0.500
+
+        sleep 0.200
 
         get_journal.flush_buckets
 

data/test/ft_34_cancelwfid.rb

@@ -39,10 +39,12 @@ class FlowTest34 < Test::Unit::TestCase
 
         fei = @engine.launch(TestCancelWfid0)
 
-        sleep 0.500
+        sleep 0.100
 
         @engine.cancel_process(fei.wfid)
 
+        sleep 0.300
+
         l = @engine.list_processes()
 
         assert_equal l.size, 0
@@ -53,16 +55,18 @@ class FlowTest34 < Test::Unit::TestCase
 
     def test_cancelwfid_1
 
+        log_level_to_debug
+
         sp = @engine.register_participant(
             "store_participant", OpenWFE::YamlParticipant)
 
         fei = @engine.launch(TestCancelWfid0)
 
-        sleep 0.500
+        sleep 0.100
 
         @engine.cancel_process(fei.wfid)
 
-        sleep 0.500
+        sleep 0.100
 
         assert_equal @engine.get_process_stack(fei.wfid).size, 0
 

data/test/ft_35_localdefs.rb

@@ -32,6 +32,8 @@ class FlowTest35 < Test::Unit::TestCase
     #def xxxx_local_0
     def test_local_0
 
+        #log_level_to_debug
+
         li = OpenWFE::LaunchItem.new
         li.wfdurl = "file:doc/res/defs/testdef.rb"
 
@@ -59,5 +61,16 @@ b
 c""")
     end
 
+
+    #
+    # TEST 2
+
+    def test_local_2
+
+        @engine.launch("file:doc/res/defs/testdef.rb")
+        sleep 0.300
+        assert_equal @tracer.to_s, "a\nb\nc"
+    end
+
 end
 

data/test/ft_38_tag.rb

@@ -38,6 +38,8 @@ class FlowTest38 < Test::Unit::TestCase
 
     def test_tag_0
 
+        log_level_to_debug
+
         dotest(TestTag0, "blah")
     end
 
@@ -58,8 +60,8 @@ class FlowTest38 < Test::Unit::TestCase
         end
     end
 
-    #def xxxx_tag_1
-    def test_tag_1
+    def xxxx_tag_1
+    #def test_tag_1
 
         count = 0
 
@@ -88,8 +90,8 @@ class FlowTest38 < Test::Unit::TestCase
         end
     end
 
-    #def xxxx_tag_2
-    def test_tag_2
+    def xxxx_tag_2
+    #def test_tag_2
 
         count = 0
 
@@ -118,8 +120,8 @@ class FlowTest38 < Test::Unit::TestCase
         end
     end
 
-    #def xxxx_tag_3
-    def test_tag_3
+    def xxxx_tag_3
+    #def test_tag_3
 
         dotest TestTag3, "1\n3"
     end

data/test/ft_49_condition.rb

@@ -104,6 +104,10 @@ class FlowTest49 < Test::Unit::TestCase
             _print "2 ${f:__result__}"
             _if :rnot => "1 > -1"
             _print "3 ${f:__result__}"
+            _if :rtest => "workitem.attributes.size % 2 == 0"
+            _print "4 ${f:__result__}"
+            _if :rtest => "wi.attributes.size % 2 == 1"
+            _print "5 ${f:__result__}"
         end
     end
 
@@ -116,7 +120,9 @@ class FlowTest49 < Test::Unit::TestCase
 0 true
 1 true
 2 true
-3
+3 
+4 
+5 true
             """.strip)
     end
 

data/test/ft_55_ptimeout.rb

@@ -29,34 +29,33 @@ class FlowTest55 < Test::Unit::TestCase
     #
 
     class Test0 < ProcessDefinition
-        sequence do
-            concurrence :count => 1 do
-                sequence do
-                    participant :ref => "channel_z", :timeout => "1s"
-                    _print "cancelled?"
-                end
-                _print "concurrence done"
+        concurrence :count => 1 do
+            sequence do
+                participant :ref => "channel_z", :timeout => "1s"
+                _print "cancelled?"
             end
+            _print "concurrence done"
         end
     end
 
     #def xxxx_0
     def test_0
 
-        @engine.register_participant :channel_z, NullParticipant
-
-        #class << @engine.get_scheduler
+        #scheduler = @engine.get_scheduler
+        #class << scheduler
         #    attr_reader :pending_jobs
         #end
-            #
-            # having a look into the scheduler
 
-        #require 'pp'; pp @engine.get_scheduler.pending_jobs
+        log_level_to_debug
+
+        @engine.register_participant :channel_z, NullParticipant
+
+        #require 'pp'; pp(scheduler.pending_jobs)
         assert_no_jobs_left
 
         dotest(Test0, "concurrence done")
 
-        #require 'pp'; pp @engine.get_scheduler.pending_jobs
+        #require 'pp'; pp(scheduler.pending_jobs)
         assert_no_jobs_left
     end
 

data/test/ft_57_a.rb

@@ -105,5 +105,22 @@ a|b|3
             """.strip,
             "a|2|c")
     end
+
+    #
+    # Test 3
+    #
+
+    class Test3 < ProcessDefinition
+        sequence do
+            _set :field => "other" do
+                reval { "77" }
+            end
+            _print "${f:other}"
+        end
+    end
+
+    def test_3
+        dotest(Test3, "77")
+    end
 end
 

data/test/ft_58_ejournal.rb

@@ -50,7 +50,7 @@ class FlowTest58 < Test::Unit::TestCase
         li = LaunchItem.new Test0
         fei = @engine.launch li
 
-        sleep 0.500
+        sleep 0.200
 
         assert File.exist?("work/ejournal/#{fei.parent_wfid}.ejournal") \
             if @engine.is_a?(FilePersistedEngine)
@@ -70,7 +70,7 @@ class FlowTest58 < Test::Unit::TestCase
 
         ejournal.replay_at_last_error fei.wfid
 
-        sleep 0.500
+        sleep 0.200
 
         errors = ejournal.get_error_log fei
 
@@ -104,7 +104,7 @@ class FlowTest58 < Test::Unit::TestCase
 
         ejournal.replay_at_error second_error
 
-        sleep 0.300
+        sleep 0.200
 
         assert_equal @tracer.to_s, "alpha\nnada\nbravo"
 

data/test/ft_59_ps.rb

@@ -40,9 +40,9 @@ class FlowTest59 < Test::Unit::TestCase
 
         fei = @engine.launch Def59
 
-        sleep 0.500
+        sleep 0.250
 
-        ps = @engine.get_process_status
+        ps = @engine.list_process_status
         #puts ps
 
         assert_equal ps[fei.wfid].expressions.size, 2
@@ -69,9 +69,9 @@ class FlowTest59 < Test::Unit::TestCase
 
         fei = @engine.launch Def59b
 
-        sleep 0.500
+        sleep 0.100
 
-        ps = @engine.get_process_status
+        ps = @engine.list_process_status
         #puts ps
 
         assert_equal ps[fei.wfid].expressions.size, 1
@@ -99,9 +99,9 @@ class FlowTest59 < Test::Unit::TestCase
 
         fei = @engine.launch Def59_1
 
-        sleep 0.500
+        sleep 0.200
 
-        ps = @engine.get_process_status
+        ps = @engine.list_process_status
         #puts ps
         #puts ps[fei.wfid].errors
 

data/test/ft_60_ecancel.rb

@@ -40,9 +40,8 @@ class FlowTest60 < Test::Unit::TestCase
         #$OWFE_LOG.level = Logger::DEBUG
 
         fei = @engine.launch TestDefinition0
-        fei = fei.dup
 
-        sleep 0.500
+        sleep 0.200
 
         #puts
         #puts @engine.get_process_stack fei.wfid
@@ -52,7 +51,7 @@ class FlowTest60 < Test::Unit::TestCase
         fei.expression_name = "sequence"
         @engine.cancel_expression fei
 
-        sleep 0.700
+        sleep 0.200
 
         assert_equal @tracer.to_s, "a\nb.0\nc"
 
@@ -66,9 +65,8 @@ class FlowTest60 < Test::Unit::TestCase
         #$OWFE_LOG.level = Logger::DEBUG
 
         fei = @engine.launch TestDefinition0
-        fei = fei.dup
 
-        sleep 0.500
+        sleep 0.200
 
         fei.expression_id = "0.0.1.2"
         fei.expression_name = "print"

data/test/ft_61_elsub.rb

@@ -38,13 +38,11 @@ class FlowTest61 < Test::Unit::TestCase
 
     def test_0
 
-        $OWFE_LOG.level = Logger::DEBUG
+        log_level_to_debug
 
         engine.launch EngineLevelProcessDefinition
         sleep 0.700
-        dotest TestDefinition0, "nada"
-
-        $OWFE_LOG.level = Logger::INFO
+        dotest TestDefinition0, "nada", false, true
     end
 
 end