openwferu 0.9.9 → 0.9.10

data/test/flowtestbase.rb

@@ -20,6 +20,7 @@ require 'rutest_utils'
 include OpenWFE
 
 
+#$SLEEP_TIME = 0.100
 $WORKFLOW_ENGINE_CLASS = Engine
 
 persistence = ENV["__persistence__"]
@@ -27,8 +28,10 @@ persistence = ENV["__persistence__"]
 require "openwfe/engine/file_persisted_engine" if persistence
 
 if persistence == "pure-persistence"
+    #$SLEEP_TIME = 0.999
     $WORKFLOW_ENGINE_CLASS = FilePersistedEngine
 elsif persistence == "cached-persistence"
+    #$SLEEP_TIME = 0.250
     $WORKFLOW_ENGINE_CLASS = CachedFilePersistedEngine
 end
     
@@ -37,7 +40,6 @@ puts
 puts "testing with engine of class " + $WORKFLOW_ENGINE_CLASS.to_s
 puts
 
-#class FlowTestBase < Test::Unit::TestCase
 module FlowTestBase
 
     attr_reader \
@@ -86,10 +88,6 @@ module FlowTestBase
         @engine.stop if @engine
     end
 
-    #def default_test ()
-    #    assert true
-    #end
-
     protected
 
         def print_exp_list (l)
@@ -123,14 +121,29 @@ module FlowTestBase
 
             fei = @engine.launch(li)
 
-            #sleep(sleep_time)
-            @engine.get_scheduler.join_until_no_more_jobs if join
+            #if join == true
+            #    @engine.get_scheduler.join_until_no_more_jobs
+            #elsif join.is_a?(Numeric)
+            #    sleep join
+            #end
+            #if join.is_a?(Numeric)
+            #    sleep join
+            #elsif join == true
+            #    @engine.wait_for_engine
+            #else
+            #    sleep $SLEEP_TIME
+            #end
+            if join.is_a?(Numeric)
+                sleep join
+            else
+                @engine.wait_for fei
+            end
 
             trace = @tracer.to_s
 
             #puts "...'#{trace}' ?= '#{expectedTrace}'"
 
-            if expectedTrace.kind_of? [].class
+            if expectedTrace.kind_of?(Array)
 
                 result = false
                 expectedTrace.each do |etrace|

data/test/ft_0b_sequence.rb

@@ -20,14 +20,16 @@ class FlowTest0b < Test::Unit::TestCase
     #end
 
     def test_sequence
-        dotest(\
-'''<process-definition name="n" revision="0">
+        dotest(
+            '''
+<process-definition name="n" revision="0">
     <sequence>
         <print>a</print>
         <print>b</print>
     </sequence>
-</process-definition>''', '''a
-b''')
+</process-definition>
+            '''.strip, 
+            "a\nb")
     end
 
 end

data/test/ft_10_loop.rb

@@ -42,7 +42,8 @@ class FlowTest10 < Test::Unit::TestCase
         </loop>
     </sequence>
 </process-definition>''', 
-        $s)
+        $s,
+        true)
     end
 
     #def xxxx_loop_1
@@ -60,7 +61,8 @@ class FlowTest10 < Test::Unit::TestCase
         </loop>
     </sequence>
 </process-definition>''', 
-        $s)
+        $s,
+        true)
     end
 
     #def xxxx_loop_2
@@ -76,7 +78,8 @@ class FlowTest10 < Test::Unit::TestCase
         </loop>
     </sequence>
 </process-definition>''', 
-        $s)
+        $s,
+        true)
     end
 
     #def xxxx_loop_3
@@ -92,7 +95,8 @@ class FlowTest10 < Test::Unit::TestCase
         </loop>
     </sequence>
 </process-definition>''', 
-        $s)
+        $s,
+        true)
     end
 
     #def xxxx_loop_4
@@ -108,7 +112,8 @@ class FlowTest10 < Test::Unit::TestCase
         </loop>
     </sequence>
 </process-definition>''', 
-        $s)
+        $s,
+        true)
     end
 
 end

data/test/ft_10b_loop2.rb

@@ -52,11 +52,14 @@ class FlowTest10b < Test::Unit::TestCase
 
         dotest(
             TestDefinition0,
-            """0
+            """
+0
 1
 2
 3
-4""")
+4
+            """.strip,
+            true)
     end
 
 end

data/test/ft_11_ppd.rb

@@ -76,8 +76,11 @@ c""")
     #def xxxx_ppd_1
         dotest(
             TestDefinition1,
-            """toto:nada
-ftoto:_nada__321""")
+            """
+toto:nada
+ftoto:_nada__321
+            """.strip,
+            true)
     end
 
 
@@ -104,7 +107,8 @@ ftoto:_nada__321""")
     #def xxxx_ppd_2
         dotest(
             TestDefinition2,
-            "toto:nada")
+            "toto:nada",
+            true)
     end
 
 
@@ -189,8 +193,11 @@ end
 
         dotest(
             TestDefinition4,
-            """a
-b""")
+            """
+a
+b
+            """.strip,
+            0.300)
 
         assert \
             s == CODE4,

data/test/ft_1_unset.rb

@@ -21,16 +21,19 @@ class FlowTest1 < Test::Unit::TestCase
 
     #def xxxx_unset_0
     def test_unset_0
-        dotest(\
-'''<process-definition name="n" revision="0">
+        dotest(
+            '''
+<process-definition name="n" revision="0">
     <sequence>
         <set variable="x" value="y" />
         <print>set ${x} ${v:x}</print>
         <unset variable="x" />
         <print>unset ${x} ${v:x}</print>
     </sequence>
-</process-definition>''', 'set y y
-unset')
+</process-definition>
+            '''.strip, 
+            "set y y\nunset",
+            true)
     end
 
     #def xxxx_unset_1
@@ -63,35 +66,41 @@ unset y')
 
     #def xxxx_unset_3
     def test_unset_3
-        dotest(\
-'''<process-definition name="n" revision="0">
+        dotest(
+            '''
+<process-definition name="n" revision="0">
     <sequence>
         <set variable="//x" value="y" />
         <print>set ${x}</print>
         <unset variable="//x" />
         <print>unset ${x}</print>
     </sequence>
-</process-definition>''', 'set y
-unset')
+</process-definition>
+            '''.strip, 
+            "set y\nunset",
+            true)
     end
 
     #def xxxx_unset_4
     def test_unset_4
-        dotest(\
-'''<process-definition name="n" revision="0">
+        dotest(
+            '''
+<process-definition name="n" revision="0">
     <sequence>
         <set variable="/x" value="y" />
         <print>set ${x}</print>
         <unset variable="x" />
         <print>unset ${x}</print>
     </sequence>
-</process-definition>''', 'set y
-unset')
+</process-definition>
+            '''.strip, 
+            "set y\nunset",
+            true)
     end
 
     #def xxxx_unset_5
     def test_unset_5
-        dotest(\
+        dotest(
 '''<process-definition name="n" revision="0">
     <sequence>
         <set variable="/x" value="y" />

data/test/ft_23c_wait.rb

@@ -45,10 +45,12 @@ class FlowTest23c < Test::Unit::TestCase
     def test_0
         dotest(
             Wait0c, 
-            """before done
+            """
+before done
 after when
-over""", 
-        true)
+over
+            """.strip, 
+            3)
     end
 
     #
@@ -77,10 +79,12 @@ over""",
     def test_1
         dotest(
             Wait1c, 
-            """before done
+            """
+before done
 after when
-over""", 
-        true)
+over
+            """.strip, 
+            4)
     end
 
 end

data/test/ft_25_cancel.rb

@@ -24,15 +24,18 @@ class FlowTest25 < Test::Unit::TestCase
     # TEST 0
 
     def test_cancel_0
-        dotest(\
-'''<process-definition name="25_cancel" revision="0">
+        dotest(
+            '''
+<process-definition name="25_cancel" revision="0">
     <sequence>
         <print>before</print>
         <cancel-process/>
         <print>after</print>
     </sequence>
-</process-definition>''', 
-"before")
+</process-definition>
+            '''.strip, 
+            "before",
+            0.500)
     end
 
 
@@ -52,7 +55,10 @@ class FlowTest25 < Test::Unit::TestCase
     end
 
     def test_cancel_1
-        dotest(TestDefinition1, "before")
+        dotest(
+            TestDefinition1, 
+            "before", 
+            0.500)
     end
 
 

data/test/ft_27_getflowpos.rb

@@ -43,28 +43,43 @@ class FlowTest27 < Test::Unit::TestCase
 
         fei = @engine.launch(TestDefinition0)
 
+        sleep 0.500
+
         l = @engine.get_expression_pool.get_flow_position(fei.wfid)
 
         #print_exp_list(l)
 
-        assert \
-            l.size == 3, 
-            "get_flow_position() returned #{l.size} elements"
+        assert_equal \
+            l.size, 3, "get_flow_position() returned #{l.size} elements"
 
         wi = sp.first_workitem
 
         sp.forward(wi)
 
+        @engine.wait_for fei
+
         assert_equal sp.size, 0
     end
 
 
+    #
+    # TEST 0b
+
+    class Gfp27b < ProcessDefinition
+        sequence do
+            store_p
+        end
+    end
+
     #def xxxx_gfp_0b
     def test_gfp_0b
 
         sp = @engine.register_participant("store_p", OpenWFE::YamlParticipant)
 
-        fei = @engine.launch(TestDefinition0)
+        #fei = @engine.launch TestDefinition0
+        fei = @engine.launch Gfp27b
+
+        sleep 0.500
 
         l = @engine.get_flow_position(fei.wfid)
             #
@@ -92,6 +107,8 @@ class FlowTest27 < Test::Unit::TestCase
 
         sp.forward(wi)
 
+        @engine.wait_for fei
+
         assert_equal sp.size, 0
     end
 

data/test/ft_28_fileparticipant.rb

@@ -55,7 +55,7 @@ class FlowTest28 < Test::Unit::TestCase
             FileUtils.mv(path, "./work/in/")
         end
 
-        sleep 0.7
+        sleep 2
 
         assert_equal \
             engine.get_expression_storage.size, 1

data/test/ft_2c_concurrence.rb

@@ -30,9 +30,10 @@ class FlowTest2c < Test::Unit::TestCase
     </concurrence>
 </process-definition>''', 
             [ '''a
-b''', '''b
-a''' ],
-            true)
+b''', 
+              '''b
+a''' 
+            ])
     end
 
 
@@ -53,7 +54,10 @@ a''' ],
     end
 
     def test_con_1
-        dotest(TestCon2c1, "a\nc\nb", true)
+        dotest(
+            TestCon2c1, 
+            "a\nc\nb",
+            2)
     end
 
 end

data/test/ft_30_socketlistener.rb

@@ -58,6 +58,8 @@ class FlowTest30 < Test::Unit::TestCase
         #puts ">>>#{reply}<<<"
         assert (reply.match "^.fei .*0.$")
 
+        sleep 0.100
+
         trace = @tracer.to_s
 
         assert_equal trace, "ok"
@@ -87,6 +89,8 @@ class FlowTest30 < Test::Unit::TestCase
         #puts ">>>#{reply}<<<"
         assert (reply.match "^.fei .*0.$")
 
+        sleep 0.100
+
         trace = @tracer.to_s
 
         assert_equal trace, "ok1"
@@ -118,6 +122,8 @@ class FlowTest30 < Test::Unit::TestCase
         #puts ">>>#{reply}<<<"
         assert (reply.match "^.fei .*0.$")
 
+        sleep 0.100
+
         trace = @tracer.to_s
 
         assert_equal trace, "ok2"
@@ -164,6 +170,8 @@ class FlowTest30 < Test::Unit::TestCase
 
         trace = trace.strip
 
+        sleep 0.300
+
         assert_equal @tracer.to_s, trace
     end
 

data/test/ft_32_journal.rb

@@ -50,13 +50,14 @@ class FlowTest32 < Test::Unit::TestCase
             @tracer << "bravo\n"
         end
 
-        fei = dotest(TestDefinition0, "alpha\nbravo")
+        #fei = dotest(TestDefinition0, "alpha\nbravo")
+        fei = dotest(TestDefinition0, "alpha\nbravo", 0.250)
 
         journal_service = @engine.application_context["journal"]
 
         fn = journal_service.donedir + "/" + fei.wfid + ".journal"
 
-        #journal_service.analyze fn
+        #puts journal_service.analyze fn
 
         #sleep(10)
 
@@ -68,6 +69,12 @@ class FlowTest32 < Test::Unit::TestCase
             #
             # flow waits
 
+        sleep 0.250
+
+        #puts
+        #puts @engine.get_expression_storage.to_s
+        #puts
+
         assert_equal @engine.get_expression_storage.size, 6
 
         journal_service.replay fn, 18, true
@@ -76,6 +83,8 @@ class FlowTest32 < Test::Unit::TestCase
             #
             # flow resumes
 
+        sleep 0.500
+
         assert_equal @engine.get_expression_storage.size, 1
     end
 

data/test/ft_34_cancelwfid.rb

@@ -39,6 +39,8 @@ class FlowTest34 < Test::Unit::TestCase
 
         fei = @engine.launch(TestCancelWfid0)
 
+        sleep 0.500
+
         @engine.cancel_process(fei.wfid)
 
         l = @engine.list_processes()
@@ -56,6 +58,8 @@ class FlowTest34 < Test::Unit::TestCase
 
         fei = @engine.launch(TestCancelWfid0)
 
+        sleep 0.500
+
         @engine.cancel_process(fei.wfid)
 
         #l = @engine.list_processes()

data/test/ft_36_subprocids.rb

@@ -87,7 +87,8 @@ class FlowTest36 < Test::Unit::TestCase
         end
 
         @engine.launch(TestIteratorSubId0)
-        #puts @tracer
+
+        sleep 0.250
 
         assert_equal feis.keys.size, 2
     end

data/test/ft_37_pnames.rb

@@ -48,7 +48,7 @@ class FlowTest37 < Test::Unit::TestCase
 
         dotest(DEF0, "sps\nsps_1")
 
-        dotest(TestPnames1, "sps\nsps_1")
+        dotest(TestPnames1, "sps\nsps_1", true)
     end
 
 end

data/test/ft_38_tag.rb

@@ -38,7 +38,7 @@ class FlowTest38 < Test::Unit::TestCase
 
     def test_tag_0
 
-        dotest(TestTag0, "blah", true)
+        dotest(TestTag0, "blah")
     end
 
 
@@ -63,13 +63,13 @@ class FlowTest38 < Test::Unit::TestCase
 
         count = 0
 
-        @engine.register_participant(:count) do
+        @engine.register_participant :count do
             count += 1
         end
 
-        dotest(TestTag1, "blah\nhello", true)
+        dotest TestTag1, "blah\nhello", 2
 
-        assert_equal count, 2
+        assert_equal count, 1
     end
 
 
@@ -97,7 +97,7 @@ class FlowTest38 < Test::Unit::TestCase
             count += 1
         end
 
-        dotest(TestTag2, "hello\nblah", true)
+        dotest TestTag2, "hello\nblah", true
 
         assert_equal count, 1
     end

data/test/ft_39_reserve.rb

@@ -60,47 +60,7 @@ class FlowTest39 < Test::Unit::TestCase
     # Test 2
     #
 
-    class TestReserve39a2 < ProcessDefinition
-        #
-        # doesn't prove it enough though...
-        #
-        concurrence do
-            reserve :mutex => :toto do
-                sequence do
-                    test_alpha
-                    test_bravo
-                end
-            end
-            reserve :mutex => :toto do
-                sequence do
-                    test_charly
-                    test_delta
-                end
-            end
-        end
-    end
-
-    def test_2
-
-        dotest(
-            TestReserve39a2, 
-            [
-"""
-test-charly
-test-delta
-test-alpha
-test-bravo
-""".strip, 
-"""
-test-alpha
-test-bravo
-test-charly
-test-delta
-""".strip, 
-            ],
-            true)
-    end
-
+    # moved to ft_39b_reserve.rb
 
     #
     # Test 3