openwferu 0.9.15 → 0.9.16

data/test/ft_16_fqv.rb

@@ -20,7 +20,7 @@ class FlowTest16 < Test::Unit::TestCase
     #end
 
     def test_fqv_0
-        dotest(\
+        dotest(
 '''<process-definition name="n" revision="0">
     <sequence>
         <set variable="x"><q>y</q></set>
@@ -31,7 +31,7 @@ class FlowTest16 < Test::Unit::TestCase
     end
 
     def test_fqv_1
-        dotest(\
+        dotest(
 '''<process-definition name="n" revision="0">
     <sequence>
         <set variable="x0"><q>y0</q></set>
@@ -43,7 +43,7 @@ class FlowTest16 < Test::Unit::TestCase
     end
 
     def test_fqv_2
-        dotest(\
+        dotest(
 '''<process-definition name="n" revision="0">
     <sequence>
         <set field="x0"><q>y0</q></set>
@@ -54,5 +54,20 @@ class FlowTest16 < Test::Unit::TestCase
 'x1 is "y0"')
     end
 
+    class Fqv3 < OpenWFE::ProcessDefinition
+        sequence do
+            _set :f => "x0" do
+                _q "y0"
+            end
+            _set :v => "x1" do
+                _f "x0"
+            end
+            _print "x1 is \"${x1}\""
+        end
+    end
+    def test_fqv_3
+        dotest(Fqv3, 'x1 is "y0"')
+    end
+
 end
 

data/test/ft_23c_wait.rb

@@ -43,14 +43,15 @@ class FlowTest23c < Test::Unit::TestCase
     end
 
     def test_0
+
         dotest(
             Wait0c, 
             """
 before done
 after wait
 over
-            """.strip, 
-            3)
+            """.strip)
+            #3)
     end
 
     #
@@ -77,15 +78,16 @@ over
     end
 
     def test_1
+
         dotest(
             Wait1c, 
             """
 before done
 after when
 over
-            """.strip, 
-            4)
+            """.strip)
+            #4)
     end
-
+    
 end
 

data/test/ft_25_cancel.rb

@@ -24,6 +24,7 @@ class FlowTest25 < Test::Unit::TestCase
     # TEST 0
 
     def test_cancel_0
+
         dotest(
             '''
 <process-definition name="25_cancel" revision="0">
@@ -35,7 +36,7 @@ class FlowTest25 < Test::Unit::TestCase
 </process-definition>
             '''.strip, 
             "before",
-            0.500)
+            0.700)
     end
 
 
@@ -55,10 +56,11 @@ class FlowTest25 < Test::Unit::TestCase
     end
 
     def test_cancel_1
+
         dotest(
             TestDefinition1, 
-            "before", 
-            0.500)
+            "before",
+            0.900)
     end
 
 

data/test/ft_27_getflowpos.rb

@@ -43,14 +43,14 @@ class FlowTest27 < Test::Unit::TestCase
 
         fei = @engine.launch(TestDefinition0)
 
-        sleep 0.100
+        sleep 0.200
 
         l = @engine.get_process_stack(fei.wfid)
 
-        #print_exp_list(l)
+        #print_exp_list l
 
         assert_equal \
-            l.size, 3, "get_process_stack() returned #{l.size} elements"
+            3, l.size, "get_process_stack() returned #{l.size} elements"
 
         ps = @engine.list_process_status
         #puts
@@ -61,6 +61,8 @@ class FlowTest27 < Test::Unit::TestCase
         assert_equal ps[fei.parent_wfid].expressions.size, 1
         assert_kind_of ParticipantExpression, ps[fei.parent_wfid].expressions[0]
 
+        assert_not_nil ps[fei.parent_wfid].launch_time
+
         ps = @engine.list_process_status fei.wfid[0, 4]
 
         assert_equal ps[fei.parent_wfid].errors.size, 0
@@ -89,15 +91,16 @@ class FlowTest27 < Test::Unit::TestCase
         end
     end
 
-    #def xxxx_gfp_0b
     def test_gfp_0b
 
-        sp = @engine.register_participant("store_p", OpenWFE::YamlParticipant)
+        log_level_to_debug
+
+        sp = @engine.register_participant "store_p", OpenWFE::YamlParticipant
 
         #fei = @engine.launch TestDefinition0
         fei = @engine.launch Gfp27b
 
-        sleep 0.100
+        sleep 0.200
 
         #l = @engine.get_process_stack(fei.wfid)
         l = @engine.get_process_stack(fei)
@@ -106,16 +109,16 @@ class FlowTest27 < Test::Unit::TestCase
 
         #print_exp_list l
 
-        assert_equal l.size, 3
+        assert_equal 3, l.size
 
         l = @engine.list_processes()
-        assert_equal l.size, 1
+        assert_equal 1, l.size
 
         l = @engine.list_processes(false, "nada")
-        assert_equal l.size, 0
+        assert_equal 0, l.size
 
         l = @engine.list_workflows(false, fei.wfid[0, 3])
-        assert_equal l.size, 1
+        assert_equal 1, l.size
 
         #
         # resume flow and terminate it
@@ -128,7 +131,7 @@ class FlowTest27 < Test::Unit::TestCase
 
         @engine.wait_for fei
 
-        assert_equal sp.size, 0
+        assert_equal 0, sp.size
     end
 
 end

data/test/ft_28_fileparticipant.rb

@@ -48,17 +48,16 @@ class FlowTest28 < Test::Unit::TestCase
 
         fei = @engine.launch(TestDefinition0)
 
-        sleep 0.1
+        sleep 0.300
 
         Find.find("./work/out/") do |path|
             next unless path.match ".*\.yaml$"
             FileUtils.mv(path, "./work/in/")
         end
 
-        sleep 2
+        sleep 2.000
 
-        assert_equal \
-            engine.get_expression_storage.size, 1
+        assert_equal 1, engine.get_expression_storage.size
     end
 
 end

data/test/ft_2_concurrence.rb

@@ -22,9 +22,10 @@ class FlowTest2 < Test::Unit::TestCase
 
     # test_con_0 got moved to ft_2c_concurrence.rb
 
-    #def xxxx_con_1
     def test_con_1
 
+        #log_level_to_debug
+
         dotest(
 '''<process-definition name="ft_2_concurrence" revision="1">
     <concurrence
@@ -41,10 +42,7 @@ class FlowTest2 < Test::Unit::TestCase
             true)
     end
 
-    def xxxx_con_2
-    #def test_con_2
-
-        #$OWFE_LOG.level = Logger::INFO
+    def _test_con_2
 
         dotest(
 '''<process-definition name="ft_2_concurrence" revision="2">
@@ -58,12 +56,10 @@ 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="ft_2_concurrence" revision="3">
     <concurrence over-if="${over}">
@@ -75,8 +71,8 @@ class FlowTest2 < Test::Unit::TestCase
             true)
     end
 
-    #def xxxx_con_4
     def test_con_4
+
         dotest(
 '''<process-definition name="ft_2_concurrence" revision="4">
     <concurrence over-if="${nada}">
@@ -92,8 +88,8 @@ a""",
             true)
     end
 
-    #def xxxx_con_5
     def test_con_5
+
         dotest(
 '''<process-definition name="ft_2_concurrence" revision="5">
     <concurrence over-if="false">
@@ -122,9 +118,9 @@ a""",
         end
     end
 
-    #def xxxx_con_6
     def test_con_6
-        dotest(TestDefinition6, "b\nc")
+
+        dotest TestDefinition6, "b\nc"
     end
 
 end

data/test/ft_2b_concurrence.rb

@@ -39,9 +39,10 @@ class FlowTest2b < Test::Unit::TestCase
     #
     # TEST 0
 
-    #def xxxx_con_0
     def test_con_0
+
         prepare()
+
         dotest(\
 '''<process-definition name="2b_con" revision="0">
     <sequence>
@@ -169,7 +170,7 @@ ${f:charly}</print>
     end
 
     def test_2
-        dotest(Isolate01, "0\n1\n2", true)
+        dotest Isolate01, "0\n1\n2", true
     end
 
 end

data/test/ft_30_socketlistener.rb

@@ -31,13 +31,12 @@ class FlowTest30 < Test::Unit::TestCase
     # TEST 0
 
     class TestDefinition0 < ProcessDefinition
-        def make
-            _print "${f:message}"
-        end
+        _print "${f:message}"
     end
 
-    #def xxxx_sl_0
-    def test_sl_0
+    def test_0
+
+        log_level_to_debug
 
         sl = OpenWFE::SocketListener.new(
             "socket_listener", @engine.application_context, 7008)
@@ -58,7 +57,7 @@ class FlowTest30 < Test::Unit::TestCase
         #puts ">>>#{reply}<<<"
         assert (reply.match "^.fei .*0.$")
 
-        sleep 0.100
+        sleep 0.200
 
         trace = @tracer.to_s
 

data/test/ft_32c_journal.rb

@@ -56,7 +56,7 @@ class FlowTest32c < Test::Unit::TestCase
         li = LaunchItem.new Test0
         fei = @engine.launch li
 
-        sleep 0.250
+        sleep 0.500
 
         get_journal.flush_buckets
 
@@ -77,7 +77,7 @@ class FlowTest32c < Test::Unit::TestCase
 
         sleep 0.500
 
-        assert_equal get_error_count(fei.wfid), 2
+        assert_equal 2, get_error_count(fei.wfid)
 
         #
         # fixing the cause of the error and then replaying the error

data/test/ft_32d_journal.rb

@@ -42,7 +42,7 @@ class FlowTest32d < Test::Unit::TestCase
 
         @engine.application_context[:keep_journals] = true
 
-        @engine.init_service("journal", Journal)
+        @engine.init_service "journal", Journal
 
         @engine.register_participant(:alpha) do |wi|
             @tracer << "alpha\n"
@@ -56,13 +56,11 @@ class FlowTest32d < Test::Unit::TestCase
         li = LaunchItem.new Test0
         fei = @engine.launch li
 
-        sleep 0.200
+        sleep 0.500
 
         get_journal.flush_buckets
 
-        fn = get_journal.workdir + "/" + fei.wfid + ".journal"
-
-        assert_equal get_error_count(fei.wfid), 1
+        assert_equal 1, get_error_count(fei.wfid)
 
         @engine.register_participant(:nada) do |wi|
             @tracer << "nada\n"
@@ -77,8 +75,9 @@ class FlowTest32d < Test::Unit::TestCase
 
         sleep 1.0
 
-        assert_equal @tracer.to_s, "alpha\nnada\nbravo"
+        assert_equal "alpha\nnada\nbravo", @tracer.to_s 
 
+        fn = get_journal.workdir + "/" + fei.wfid + ".journal"
         assert (not File.exist?(fn))
     end
 

data/test/ft_33_description.rb

@@ -81,19 +81,24 @@ class FlowTest33 < Test::Unit::TestCase
     # TEST 4
 
     def test_4
+
+        @engine.register_participant :check do |fexp, wi|
+            @tracer << fexp.lookup_variable('description').class.name
+            @tracer << "\n"
+        end
+
         dotest(
 """<process-definition name='test_1' revision='x'>
     <description language='en'>nothing</description>
     <description language='es'>nada</description>
     <sequence>
+        <participant ref='check' />
         <print>${description}</print>
         <print>${description__en}</print>
         <print>${description__es}</print>
     </sequence>
 </process-definition>""", 
-            """nothing
-nothing
-nada""")
+            "String\nnothing\nnothing\nnada")
     end
 
 end

data/test/ft_34_cancelwfid.rb

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

data/test/ft_38_tag.rb

@@ -38,9 +38,9 @@ class FlowTest38 < Test::Unit::TestCase
 
     def test_tag_0
 
-        log_level_to_debug
+        #log_level_to_debug
 
-        dotest(TestTag0, "blah")
+        dotest TestTag0, "blah"
     end
 
 
@@ -60,8 +60,7 @@ class FlowTest38 < Test::Unit::TestCase
         end
     end
 
-    def xxxx_tag_1
-    #def test_tag_1
+    def test_tag_1
 
         count = 0
 
@@ -71,7 +70,7 @@ class FlowTest38 < Test::Unit::TestCase
 
         dotest TestTag1, "blah\nhello", 2
 
-        assert_equal count, 1
+        assert_equal 1, count
     end
 
 
@@ -90,8 +89,7 @@ class FlowTest38 < Test::Unit::TestCase
         end
     end
 
-    def xxxx_tag_2
-    #def test_tag_2
+    def test_tag_2
 
         count = 0
 
@@ -101,7 +99,7 @@ class FlowTest38 < Test::Unit::TestCase
 
         dotest TestTag2, "hello\nblah", true
 
-        assert_equal count, 1
+        assert_equal 1, count
     end
 
 
@@ -120,8 +118,7 @@ class FlowTest38 < Test::Unit::TestCase
         end
     end
 
-    def xxxx_tag_3
-    #def test_tag_3
+    def test_tag_3
 
         dotest TestTag3, "1\n3"
     end

data/test/ft_39_reserve.rb

@@ -33,7 +33,8 @@ class FlowTest39 < Test::Unit::TestCase
     end
 
     def test_0
-        dotest(TestReserve39a0, "ok", true)
+
+        dotest TestReserve39a0, "ok", true
     end
 
 
@@ -52,7 +53,8 @@ class FlowTest39 < Test::Unit::TestCase
     end
 
     def test_1
-        dotest(TestReserve39a1, "true\ntrue\nover.", true)
+
+        dotest TestReserve39a1, "true\ntrue\nover.", true 
     end
 
 

data/test/ft_3_equals.rb

@@ -20,7 +20,7 @@ class FlowTest3 < Test::Unit::TestCase
     #end
 
     def test_equals_0
-        dotest(\
+        dotest(
 '''<process-definition name="equals_0" revision="0">
     <sequence>
         <equals value="a" other-value="a" />
@@ -30,7 +30,7 @@ class FlowTest3 < Test::Unit::TestCase
     end
 
     def test_equals_1
-        dotest(\
+        dotest(
 '''<process-definition name="equals_1" revision="0">
     <sequence>
         <equals value="a" other-value="b" />
@@ -40,7 +40,7 @@ class FlowTest3 < Test::Unit::TestCase
     end
 
     def test_if_0
-        dotest(\
+        dotest(
 '''<process-definition name="if_0" revision="0">
     <if>
         <equals value="a" other-value="a" />
@@ -50,7 +50,7 @@ class FlowTest3 < Test::Unit::TestCase
     end
 
     def test_if_1
-        dotest(\
+        dotest(
 '''<process-definition name="if_1" revision="0">
     <if>
         <equals value="a" other-value="a" />
@@ -61,7 +61,7 @@ class FlowTest3 < Test::Unit::TestCase
     end
 
     def test_if_2
-        dotest(\
+        dotest(
 '''<process-definition name="if_2" revision="0">
     <if>
         <equals value="a" other-value="b" />
@@ -71,7 +71,7 @@ class FlowTest3 < Test::Unit::TestCase
     end
 
     def test_if_3
-        dotest(\
+        dotest(
 '''<process-definition name="if_3" revision="0">
     <if>
         <equals value="a" other-value="b" />
@@ -82,7 +82,7 @@ class FlowTest3 < Test::Unit::TestCase
     end
 
     def test_equals_0
-        dotest(\
+        dotest(
 '<process-definition name="'+name_of_test+'''" revision="0">
     <sequence>
         <set field="a" value="true" />
@@ -135,29 +135,34 @@ true
     end
 
     def test_equals_3
+
+        #log_level_to_debug
+
         dotest(
 '<process-definition name="'+name_of_test+'''" revision="0">
     <sequence>
         <if test="3 > 2">
-            <print>ok</print>
+            <print>ok0</print>
         </if>
         <if test="3 > a">
             <print>bad</print>
-            <print>ok</print>
+            <print>ok1</print>
         </if>
         <if test="3>a">
             <print>bad</print>
-            <print>ok</print>
+            <print>ok2</print>
         </if>
         <if test="3 &gt; 2">
-            <print>ok</print>
+            <print>ok3</print>
+            <print>bad</print>
         </if>
         <if test="1 &lt; 2.0">
-            <print>ok</print>
+            <print>ok4</print>
+            <print>bad</print>
         </if>
     </sequence>
 </process-definition>''', 
-            ("ok\n" * 5).strip)
+            (0..4).collect { |i| "ok#{i}" }.join("\n"))
     end
 
 end

data/test/ft_44b_restore.rb

@@ -90,13 +90,9 @@ field_value
         end
     end
 
-    #def xxxx_2
     def test_2
-        dotest(
-            TestCase44b2,
-            """
-field_value
-            """.strip)
+
+        dotest TestCase44b2, "field_value"
     end