openwferu 0.9.16 → 0.9.17

data/test/ft_49_condition.rb

@@ -33,9 +33,11 @@ class FlowTest49 < Test::Unit::TestCase
             _print "1 ${f:__result__}"
             _if :test => "false; true"
             _print "2 ${f:__result__}"
-            _if :test => "print ''; true"
+            #_if :test => "print ''; true"
+            _if :test => "''; true"
             _print "3 ${f:__result__}"
-            _if :test => "begin print ''; end; true"
+            #_if :test => "begin print ''; end; true"
+            _if :test => "begin ''; end; true"
             _print "4 ${f:__result__}"
 
             unset :field => "__result__"

data/test/ft_4_misc.rb

@@ -100,7 +100,7 @@ class FlowTest4 < Test::Unit::TestCase
         """
     end
     def test_reval_4
-        dotest Reval4, [ "hello\n1", "hello\n0" ]
+        dotest Reval4, [ "hello\n2", "hello\n1" ]
     end
 
     class Reval5 < OpenWFE::ProcessDefinition
@@ -109,13 +109,34 @@ class FlowTest4 < Test::Unit::TestCase
                 wi.customer_name = 'dubious'
                 'surf'
             """
-            _print "${f:customer_name}"
             _print "${f:__result__}"
+            _print "${f:customer_name}"
         end
     end
 
     def test_reval_5
-        dotest Reval5, "dubious\nsurf"
+        dotest Reval5, "surf\ndubious"
+    end
+
+    class Reval6 < OpenWFE::ProcessDefinition
+        sequence do
+            set :field => "f0", :value => "3 + 2 + 2"
+            set :field => "f1" do
+                reval :field_code => "f0"
+            end
+            _print "${f:f1}"
+
+            set :variable => "v0", :value => "5 - 5"
+            set :variable => "v1" do
+                reval :variable_code => "v0"
+            end
+            _print "${v1}"
+        end
+    end
+
+    def test_reval_6
+        #log_level_to_debug
+        dotest Reval6, "7\n0"
     end
 
     #

data/test/ft_50_xml_attribute.rb

@@ -56,7 +56,6 @@ END
         end
     end
 
-    #def xxxx_0
     def test_0
 
         doc0 = nil
@@ -91,24 +90,19 @@ END
     #
     # Against bug #10150
     #
-    def test_2
-
-        workitem = OpenWFE::InFlowWorkItem.new
-        workitem.fei = new_fei
-
-        workitem.result = REXML::Document.new PAT_XML
-
-        s = OpenWFE::XmlCodec::encode workitem
-
-        #puts s
-
-        w = OpenWFE::XmlCodec::decode s
-
-        #puts workitem.to_s
-        #puts w.to_s
-
-        assert_equal workitem.to_s, w.to_s
-    end
+    #def test_2
+    #    workitem = OpenWFE::InFlowWorkItem.new
+    #    workitem.fei = new_fei
+    #    workitem.result = REXML::Document.new PAT_XML
+    #    s = OpenWFE::XmlCodec::encode workitem
+    #    #puts s
+    #    w = OpenWFE::XmlCodec::decode s
+    #    w.attributes.delete '___map_type'
+    #    #puts workitem.to_s
+    #    #puts
+    #    #puts w.to_s
+    #    assert_equal workitem.to_s, w.to_s
+    #end
 
     def test_3
 
@@ -125,14 +119,17 @@ END
         #puts s
 
         w = OpenWFE::XmlCodec::decode s
+        w.attributes.delete '___map_type'
+
+        workitem.attributes.delete '___map_type'
 
         #puts workitem.to_s
+        #puts
         #puts w.to_s
 
         assert_equal workitem.to_s, w.to_s
     end
 
-   #def xxxx_4
    def test_4
 
         doc0 = nil

data/test/ft_54_listen.rb

@@ -121,7 +121,7 @@ class FlowTest54 < Test::Unit::TestCase
 
         @engine.register_participant :channel_z, NoOperationParticipant
 
-        dotest Test2, "apply\nreply"
+        dotest Test2, [ "apply\nreply", "reply\napply" ]
     end
 
 

data/test/ft_54b_listen.rb

@@ -39,7 +39,7 @@ class FlowTest54b < Test::Unit::TestCase
 
         @engine.launch Test0
 
-        sleep 0.200
+        sleep 0.350
 
         assert_equal @tracer.to_s, ""
 
@@ -49,7 +49,7 @@ class FlowTest54b < Test::Unit::TestCase
         r = @engine.reply wi
         assert r
 
-        sleep 0.200
+        sleep 0.350
 
         #
         # "post test", checking that engine replies 'false' when

data/test/ft_56_timeout.rb

@@ -41,13 +41,20 @@ class FlowTest56 < Test::Unit::TestCase
         end
     end
 
-    #def xxxx_0
     def test_0
 
         assert_no_jobs_left
 
         dotest Test0, "ok\ndone"
 
+        sleep 0.350 # skip one scheduler beat
+
+        #s = @engine.get_scheduler
+        #class << s
+        #    attr_reader :pending_jobs
+        #end
+        #p s.pending_jobs.collect { |j| [ j.job_id, j.class.name ] }
+
         assert_no_jobs_left
     end
 

data/test/ft_57_a.rb

@@ -8,7 +8,6 @@
 require 'flowtestbase'
 require 'pending'
 require 'openwfe/def'
-#require 'openwfe/participants/participants'
 
 include OpenWFE
 
@@ -52,8 +51,8 @@ class FlowTest57 < Test::Unit::TestCase
         end
     end
 
-    #def xxxx_0
     def test_0
+
         dotest(
             Test0, 
             """
@@ -63,11 +62,11 @@ a|b|3
             """.strip)
     end
 
-    #def xxxx_1
     def test_1
+
         dotest(
             """
-<process-definition name='57_a' revision='1'>
+<process-definition name='57_b' revision='1'>
     <sequence>
         <set field='list'>
             <a>
@@ -80,15 +79,15 @@ a|b|3
         <print>${r:wi.list.join('|')}</print>
     </sequence>
 </process-definition>
-            """.strip,
+            """,
             "c|d|e")
     end
 
-    #def xxxx_2
     def test_2
+
         dotest(
             """
-<process-definition name='57_a' revision='2'>
+<process-definition name='57_c' revision='2'>
     <sequence>
         <set field='list'>
             <a>
@@ -99,10 +98,10 @@ a|b|3
             </list>
             </a>
         </set>
-        <print>${r:wi.list.join('|')}</print>
+        <print>${r:wi.list.join('|').strip}</print>
     </sequence>
 </process-definition>
-            """.strip,
+            """,
             "a|2|c")
     end
 
@@ -120,7 +119,8 @@ a|b|3
     end
 
     def test_3
-        dotest(Test3, "77")
+
+        dotest Test3, "77"
     end
 end
 

data/test/ft_59_ps.rb

@@ -32,7 +32,6 @@ class FlowTest59 < Test::Unit::TestCase
         end
     end
 
-    #def xxxx_0
     def test_0
 
         sa = @engine.register_participant("store_a", OpenWFE::HashParticipant)
@@ -40,13 +39,13 @@ class FlowTest59 < Test::Unit::TestCase
 
         fei = @engine.launch Def59
 
-        sleep 0.250
+        sleep 0.350
 
-        ps = @engine.list_process_status
+        ps = @engine.process_statuses
         #puts ps
 
-        assert_equal ps[fei.wfid].expressions.size, 2
-        assert_equal ps[fei.wfid].errors.size, 0
+        assert_equal 2, ps[fei.wfid].expressions.size
+        assert_equal 0, ps[fei.wfid].errors.size
 
         @engine.cancel_process fei
     end
@@ -61,21 +60,20 @@ class FlowTest59 < Test::Unit::TestCase
         end
     end
 
-    #def xxxx_0b
     def test_0b
 
-        a = @engine.register_participant(:alpha, OpenWFE::HashParticipant)
-        b = @engine.register_participant(:bravo, OpenWFE::HashParticipant)
+        a = @engine.register_participant :alpha, OpenWFE::HashParticipant
+        b = @engine.register_participant :bravo, OpenWFE::HashParticipant
 
         fei = @engine.launch Def59b
 
-        sleep 0.250
+        sleep 0.350
 
-        ps = @engine.list_process_status
+        ps = @engine.process_statuses
         #puts ps
 
-        assert_equal ps[fei.wfid].expressions.size, 1
-        assert_equal ps[fei.wfid].errors.size, 0
+        assert_equal 1, ps[fei.wfid].expressions.size
+        assert_equal 0, ps[fei.wfid].errors.size
 
         @engine.cancel_process fei
     end
@@ -98,14 +96,15 @@ class FlowTest59 < Test::Unit::TestCase
 
         fei = @engine.launch Def59_1
 
-        sleep 0.250
+        sleep 0.350
 
-        ps = @engine.list_process_status
+        ps = @engine.process_statuses
         #puts ps
         #puts ps[fei.wfid].errors
 
-        assert_equal ps[fei.wfid].expressions.size, 1
-        assert_equal ps[fei.wfid].errors.size, 1
+        assert_equal 1, ps[fei.wfid].expressions.size
+        assert_equal 1, ps[fei.wfid].branches
+        assert_equal 1, ps[fei.wfid].errors.size
 
         #puts
         #puts ps.to_s
@@ -113,5 +112,39 @@ class FlowTest59 < Test::Unit::TestCase
         @engine.cancel_process fei.wfid
     end
 
+    #
+    # TEST 2
+
+    class Def59c < ProcessDefinition
+        sequence do
+            bravo
+            alpha
+        end
+    end
+
+    def test_2
+
+        a = @engine.register_participant :alpha, OpenWFE::HashParticipant
+        b = @engine.register_participant :bravo, OpenWFE::HashParticipant
+
+        feis = []
+        feis << @engine.launch(Def59b)
+        feis << @engine.launch(Def59b)
+        feis << @engine.launch(Def59c)
+
+        sleep 0.350
+
+        assert_equal 3, @engine.list_processes(:wfname => "Def").size
+        assert_equal 2, @engine.list_processes(:wfrevision => "59b").size
+        assert_equal 1, @engine.list_processes(:wfrevision => "59c").size
+        assert_equal 2, @engine.list_processes(:wfname => "Def", :wfrevision => "59b").size
+
+        feis.each do |fei|
+            @engine.cancel_process fei
+        end
+
+        sleep 0.350
+    end
+
 end
 

data/test/ft_60_ecancel.rb

@@ -14,10 +14,11 @@ require 'flowtestbase'
 class FlowTest60 < Test::Unit::TestCase
     include FlowTestBase
 
-    #def teardown
+    #def setup
     #end
 
-    #def setup
+    #def teardown
+    #    $OWFE_LOG.level = Logger::INFO # done in FlowTestBase !
     #end
 
     #
@@ -41,7 +42,7 @@ class FlowTest60 < Test::Unit::TestCase
 
         fei = @engine.launch TestDefinition0
 
-        sleep 0.300
+        sleep 0.350
 
         #puts
         #puts @engine.get_process_stack fei.wfid
@@ -51,13 +52,12 @@ class FlowTest60 < Test::Unit::TestCase
         fei.expression_name = "sequence"
         @engine.cancel_expression fei
 
-        sleep 0.300
+        sleep 0.350
 
         assert_equal "a\nb.0\nc", @tracer.to_s
 
-        assert_equal 0, @engine.get_process_stack(fei.wfid).size
-
-        #$OWFE_LOG.level = Logger::INFO
+        assert_equal 0, @engine.process_stack(fei.wfid).size
+        assert_equal 1, @engine.get_expression_storage.size
     end
 
     def test_1
@@ -66,7 +66,7 @@ class FlowTest60 < Test::Unit::TestCase
 
         fei = @engine.launch TestDefinition0
 
-        sleep 0.300
+        sleep 0.350
 
         fei.expression_id = "0.0.1.2"
         fei.expression_name = "print"
@@ -76,9 +76,51 @@ class FlowTest60 < Test::Unit::TestCase
 
         assert_equal "a\nb.0\nc", @tracer.to_s
 
-        assert_equal 0, @engine.get_process_stack(fei.wfid).size
+        assert_equal 0, @engine.process_stack(fei.wfid).size
+        assert_equal 1, @engine.get_expression_storage.size
+    end
+
+    def test_2
+
+        #$OWFE_LOG.level = Logger::DEBUG
+
+        fei = @engine.launch TestDefinition0
+
+        sleep 0.350
+
+        fei.expression_id = "0"
+        fei.expression_name = "process-definition"
+        @engine.cancel_expression fei
+
+        sleep 0.350
+        #puts @engine.get_error_journal.get_error_log(fei.wfid).to_s
+
+        assert_equal "a\nb.0", @tracer.to_s
+
+        assert_equal 0, @engine.process_stack(fei.wfid).size
+        assert_equal 1, @engine.get_expression_storage.size
+    end
+
+    def test_3
+
+        #$OWFE_LOG.level = Logger::DEBUG
+
+        fei = @engine.launch TestDefinition0
+
+        sleep 0.350
+
+        fei.expression_id = "0.0"
+        fei.expression_name = "sequence"
+        @engine.cancel_expression fei
+
+        @engine.wait_for(fei.wfid)
+        #sleep 0.350
+        #puts @engine.get_error_journal.get_error_log(fei.wfid).to_s
+
+        assert_equal "a\nb.0", @tracer.to_s
 
-        #$OWFE_LOG.level = Logger::INFO
+        assert_equal 0, @engine.process_stack(fei.wfid).size
+        assert_equal 1, @engine.get_expression_storage.size
     end
 
 end