ft_27_getflowpos.rb in openwferu-0.9.17

- old
+ new

@@ -33,42 +33,40 @@
                 end
             end
         end
     end
 
-    #def xxxx_gfp_0
     def test_gfp_0
 
         #sp = @engine.register_participant("store_p", OpenWFE::YamlParticipant)
         sp = @engine.register_participant("store_p", OpenWFE::HashParticipant)
 
         fei = @engine.launch(TestDefinition0)
 
-        sleep 0.200
+        sleep 0.350
 
-        l = @engine.get_process_stack(fei.wfid)
+        l = @engine.process_stack fei.wfid
 
         #print_exp_list l
 
-        assert_equal \
-            3, l.size, "get_process_stack() returned #{l.size} elements"
+        assert_equal 3, l.size
 
         ps = @engine.list_process_status
         #puts
         #puts ps[fei.parent_wfid].to_s
         #puts
 
-        assert_equal ps[fei.parent_wfid].errors.size, 0
-        assert_equal ps[fei.parent_wfid].expressions.size, 1
+        assert_equal 0, ps[fei.parent_wfid].errors.size
+        assert_equal 1, ps[fei.parent_wfid].expressions.size
         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
-        assert_equal ps[fei.parent_wfid].expressions.size, 1
+        assert_equal 0, ps[fei.parent_wfid].errors.size
+        assert_equal 1, ps[fei.parent_wfid].expressions.size
         assert_kind_of ParticipantExpression, ps[fei.parent_wfid].expressions[0]
 
         #
         # resume process
 
@@ -76,20 +74,21 @@
 
         sp.forward(wi)
 
         @engine.wait_for fei
 
-        assert_equal sp.size, 0
+        assert_equal 0, sp.size
     end
 
 
     #
     # TEST 0b
 
     class Gfp27b < ProcessDefinition
         sequence do
             store_p
+            _print "pass"
         end
     end
 
     def test_gfp_0b
 
@@ -98,37 +97,43 @@
         sp = @engine.register_participant "store_p", OpenWFE::YamlParticipant
 
         #fei = @engine.launch TestDefinition0
         fei = @engine.launch Gfp27b
 
-        sleep 0.200
+        sleep 0.350
 
         #l = @engine.get_process_stack(fei.wfid)
-        l = @engine.get_process_stack(fei)
+        l = @engine.process_stack fei
             #
             # shortcut version
 
         #print_exp_list l
 
         assert_equal 3, l.size
 
-        l = @engine.list_processes()
+        l = @engine.list_processes
         assert_equal 1, l.size
 
-        l = @engine.list_processes(false, "nada")
+        l = @engine.list_processes(
+            :consider_subprocesses => false, :wfid_prefix => "nada")
         assert_equal 0, l.size
 
-        l = @engine.list_workflows(false, fei.wfid[0, 3])
+        l = @engine.list_workflows(
+            :consider_subprocesses => false, :wfid_prefix => fei.wfid[0, 3])
         assert_equal 1, l.size
 
+        l = @engine.process_stack fei, true # unapplied exps as well
+        #print_exp_list l
+        assert_equal 5, l.size
+
         #
         # resume flow and terminate it
 
         wi = sp.first_workitem
 
-        assert wi
+        assert_not_nil wi
 
-        sp.forward(wi)
+        sp.forward wi
 
         @engine.wait_for fei
 
         assert_equal 0, sp.size
     end