ruote 2.1.11 → 2.2.0

data/test/functional/ft_6_on_cancel.rb

@@ -7,7 +7,7 @@
 
 require File.join(File.dirname(__FILE__), 'base')
 
-require 'ruote/part/hash_participant'
+require 'ruote/participant'
 
 
 class FtOnCancelTest < Test::Unit::TestCase
@@ -21,7 +21,7 @@ class FtOnCancelTest < Test::Unit::TestCase
       end
     end
 
-    nemo = @engine.register_participant :nemo, Ruote::HashParticipant
+    nemo = @engine.register_participant :nemo, Ruote::StorageParticipant
 
     @engine.register_participant :catcher do
       @tracer << "caught\n"
@@ -46,7 +46,7 @@ class FtOnCancelTest < Test::Unit::TestCase
       end
     end
 
-    nemo = @engine.register_participant :nemo, Ruote::HashParticipant
+    nemo = @engine.register_participant :nemo, Ruote::StorageParticipant
 
     #noisy
 
@@ -78,7 +78,7 @@ class FtOnCancelTest < Test::Unit::TestCase
       end
     end
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant
+    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
 
     #noisy
 
@@ -108,8 +108,8 @@ class FtOnCancelTest < Test::Unit::TestCase
       end
     end
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
-    bravo = @engine.register_participant :bravo, Ruote::HashParticipant.new
+    @engine.register_participant :alpha, Ruote::StorageParticipant
+    sto = @engine.register_participant :bravo, Ruote::StorageParticipant
 
     #noisy
 
@@ -117,13 +117,15 @@ class FtOnCancelTest < Test::Unit::TestCase
 
     wait_for(:alpha)
 
-    fei = alpha.first.fei.dup
-    fei.h['expid'] = '0_1'
+    fei = @engine.process(wfid).expressions.find { |e|
+      e.fei.expid == '0_1'
+    }.fei
+
     @engine.cancel_expression(fei)
 
     wait_for(:bravo)
 
-    assert_equal 1, bravo.size
+    assert_equal 1, sto.size
   end
 
   def test_on_cancel_subprocess
@@ -137,8 +139,8 @@ class FtOnCancelTest < Test::Unit::TestCase
       end
     end
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant
-    bravo = @engine.register_participant :bravo, Ruote::HashParticipant
+    @engine.register_participant :alpha, Ruote::StorageParticipant
+    @engine.register_participant :bravo, Ruote::StorageParticipant
 
     #noisy
 
@@ -161,5 +163,58 @@ class FtOnCancelTest < Test::Unit::TestCase
         ["sequence", {"on_cancel"=>"sub0", "_triggered"=>"on_cancel"}, [["alpha", {}, []]]]]],
       @engine.process(wfid).current_tree)
   end
+
+  def test_on_cancel_participant_resume
+
+    pdef = Ruote.define do
+      sequence do
+        alpha :on_cancel => 'bail_out'
+        echo 'done.'
+      end
+      define 'bail_out' do
+        echo 'bailed'
+      end
+    end
+
+    @engine.register :alpha, Ruote::StorageParticipant
+
+    #noisy
+
+    wfid = @engine.launch(pdef)
+
+    @engine.wait_for(:alpha)
+
+    @engine.cancel(@engine.storage_participant.first)
+
+    @engine.wait_for(wfid)
+
+    assert_equal "bailed\ndone.", @tracer.to_s
+  end
+
+  def test_on_cancel_wait_resume
+
+    pdef = Ruote.define do
+      sequence do
+        #alpha :on_cancel => 'bail_out'
+        wait '1d', :on_cancel => 'bail_out'
+        echo 'done.'
+      end
+      define 'bail_out' do
+        echo 'bailed'
+      end
+    end
+
+    #noisy
+
+    wfid = @engine.launch(pdef)
+
+    @engine.wait_for(6)
+
+    @engine.cancel(@engine.process(wfid).expressions.last)
+
+    @engine.wait_for(wfid)
+
+    assert_equal "bailed\ndone.", @tracer.to_s
+  end
 end
 

data/test/functional/ft_7_tags.rb

@@ -7,7 +7,7 @@
 
 require File.join(File.dirname(__FILE__), 'base')
 
-require 'ruote/part/hash_participant'
+require 'ruote/participant'
 
 
 class FtTagsTest < Test::Unit::TestCase
@@ -21,7 +21,7 @@ class FtTagsTest < Test::Unit::TestCase
       end
     end
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
+    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
 
     #noisy
 
@@ -60,7 +60,7 @@ class FtTagsTest < Test::Unit::TestCase
       end
     end
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
+    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
 
     #noisy
 
@@ -70,8 +70,10 @@ class FtTagsTest < Test::Unit::TestCase
 
     assert_equal 1, @engine.process(wfid).tags.size
 
-    fei = alpha.first.fei.dup
-    fei.h['expid'] = '0_1_0'
+    fei = @engine.process(wfid).expressions.find { |e|
+      e.fei.expid == '0_1_0'
+    }.fei
+
     @engine.cancel_expression(fei)
 
     wait_for(:alpha)
@@ -84,5 +86,92 @@ class FtTagsTest < Test::Unit::TestCase
 
     assert_equal 0, @engine.process(wfid).tags.size
   end
+
+  def test_unset_tag_when_parent_gone
+
+    pdef = Ruote.process_definition do
+      concurrence :count => 1 do
+        alpha :tag => 'main'
+        sequence do
+          bravo
+          undo :ref => 'main'
+        end
+      end
+    end
+
+    #@engine.noisy = true
+
+    @engine.register :alpha, Ruote::NullParticipant
+    @engine.register :bravo, Ruote::NoOpParticipant
+
+    wfid = @engine.launch(pdef)
+
+    @engine.wait_for(23)
+
+    assert_nil @engine.process(wfid)
+  end
+
+  def test_tags_and_workitems
+
+    pdef = Ruote.define do
+      sequence :tag => 'first-stage' do
+        alpha
+      end
+      sequence :tag => 'second-stage' do
+        bravo
+        charly :tag => 'third-stage'
+      end
+      david
+    end
+
+    @engine.register { catchall }
+
+    wfid = @engine.launch(pdef)
+    @engine.wait_for(:alpha)
+    wi = @engine.storage_participant.first
+
+    assert_equal %w[ first-stage ], wi.tags
+
+    @engine.storage_participant.reply(wi)
+    @engine.wait_for(:bravo)
+    wi = @engine.storage_participant.first
+
+    assert_equal %w[ second-stage ], wi.tags
+
+    @engine.storage_participant.reply(wi)
+    @engine.wait_for(:charly)
+    wi = @engine.storage_participant.first
+
+    assert_equal %w[ second-stage third-stage ], wi.tags
+
+    @engine.storage_participant.reply(wi)
+    @engine.wait_for(:david)
+    wi = @engine.storage_participant.first
+
+    assert_equal [], wi.tags
+  end
+
+  def test_tag_and_define
+
+    pdef = Ruote.define :tag => 'nada' do
+      alpha
+    end
+
+    @engine.register 'alpha', Ruote::StorageParticipant
+
+    #noisy
+
+    wfid = @engine.launch(pdef)
+    @engine.wait_for(:alpha)
+
+    assert_equal 1, logger.log.select { |e| e['action'] == 'entered_tag' }.size
+
+    wi = @engine.storage_participant.first
+    @engine.storage_participant.reply(wi)
+
+    @engine.wait_for(wfid)
+
+    assert_equal 1, logger.log.select { |e| e['action'] == 'left_tag' }.size
+  end
 end
 

data/test/functional/ft_8_participant_consumption.rb

@@ -32,7 +32,7 @@ class FtParticipantConsumptionTest < Test::Unit::TestCase
       # as well
 
     assert_equal(
-      2, logger.log.select { |e| e['participant_name'] == 'alpha' }.size)
+      3, logger.log.select { |e| e['participant_name'] == 'alpha' }.size)
   end
 
   def test_missing_participant_name
@@ -74,20 +74,51 @@ class FtParticipantConsumptionTest < Test::Unit::TestCase
 
   def test_dispatch_time
 
-    wis = []
+    @engine.context.stash[:wis] = []
 
     pdef = Ruote.process_definition { alpha; alpha }
 
     @engine.register_participant 'alpha' do |workitem|
-      wis << workitem.to_h.dup
+      stash[:wis] << workitem.to_h.dup
     end
 
     assert_trace('', pdef)
 
     assert_equal(
-      String, wis.first['fields']['dispatched_at'].class)
+      String,
+      @engine.context.stash[:wis].first['fields']['dispatched_at'].class)
+
     assert_not_equal(
-      wis.first['fields']['dispathed_at'], wis.last['fields']['dispatched_at'])
+      @engine.context.stash[:wis].first['fields']['dispathed_at'],
+      @engine.context.stash[:wis].last['fields']['dispatched_at'])
+  end
+
+  class MyParticipant
+    include Ruote::LocalParticipant
+
+    def consume(workitem)
+      reply_to_engine(workitem)
+    end
+
+    def do_not_thread(workitem)
+      @context.tracer << workitem.fields['msg']
+      true
+    end
+  end
+
+  def test_do_not_thread_and_workitem
+
+    pdef = Ruote.define do
+      alpha
+    end
+
+    @engine.register_participant :alpha, MyParticipant
+
+    wfid = @engine.launch(pdef, 'msg' => 'kilroy')
+
+    @engine.wait_for(wfid)
+
+    assert_equal 'kilroy', @tracer.to_s
   end
 end
 

data/test/functional/ft_9_subprocesses.rb

@@ -7,7 +7,7 @@
 
 require File.join(File.dirname(__FILE__), 'base')
 
-require 'ruote/part/hash_participant'
+require 'ruote/participant'
 
 
 class FtSubprocessesTest < Test::Unit::TestCase
@@ -26,7 +26,7 @@ class FtSubprocessesTest < Test::Unit::TestCase
       end
     end
 
-    bravo = @engine.register_participant :bravo, Ruote::HashParticipant.new
+    bravo = @engine.register_participant :bravo, Ruote::StorageParticipant
 
     #noisy
 
@@ -55,7 +55,7 @@ class FtSubprocessesTest < Test::Unit::TestCase
     assert_equal 2, logger.log.select { |e| e['action'] == 'launch' }.size
   end
 
-  def test_next_sub_wfid
+  def test_subid
 
     pdef = Ruote.process_definition do
       sequence do
@@ -70,10 +70,10 @@ class FtSubprocessesTest < Test::Unit::TestCase
       end
     end
 
-    wfids = []
+    @engine.context.stash[:wfids] = []
 
     @engine.register_participant :alpha do |workitem|
-      wfids << workitem.fei.sub_wfid
+      stash[:wfids] << workitem.fei.subid
     end
 
     #noisy
@@ -82,10 +82,10 @@ class FtSubprocessesTest < Test::Unit::TestCase
 
     wait_for(:alpha)
     wait_for(:alpha)
-    wait_for(3)
+    wait_for(6)
 
-    assert_equal 2, wfids.size
-    assert_equal 2, wfids.sort.uniq.size
+    assert_equal 2, @engine.context.stash[:wfids].size
+    assert_equal 2, @engine.context.stash[:wfids].sort.uniq.size
   end
 
   def test_cancel_and_subprocess
@@ -99,7 +99,7 @@ class FtSubprocessesTest < Test::Unit::TestCase
       end
     end
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
+    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
 
     wfid = @engine.launch(pdef)
 
@@ -126,7 +126,7 @@ class FtSubprocessesTest < Test::Unit::TestCase
       alpha
     end
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
+    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
 
     #noisy
 

data/test/functional/rt_1_listen.rb

@@ -9,7 +9,7 @@ require File.join(File.dirname(__FILE__), 'base')
 require File.join(File.dirname(__FILE__), 'restart_base')
 
 
-require 'ruote/part/hash_participant'
+require 'ruote/participant'
 
 
 class RtListenTest < Test::Unit::TestCase
@@ -23,7 +23,7 @@ class RtListenTest < Test::Unit::TestCase
     pdef = Ruote.process_definition do
       concurrence do
         sequence do
-          listen :to => '^al.*', :upon => 'reply'
+          listen :to => '/^al.*/', :upon => 'reply'
           echo 'done.'
         end
         alpha
@@ -32,7 +32,7 @@ class RtListenTest < Test::Unit::TestCase
 
     #puts; noisy
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
+    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
 
     wfid = @engine.launch(pdef)
 

data/test/functional/{rt_3_when.rb → rt_3_once.rb}

@@ -13,26 +13,26 @@ class RtWhenTest < Test::Unit::TestCase
   include FunctionalBase
   include RestartBase
 
-  def test_when_and_restart
+  def test_once_and_restart
 
     do_test('1s')
   end
 
-  def test_when_cron_and_restart
+  def test_once_cron_and_restart
 
     do_test('* * * * * *')
   end
 
   protected
 
-  def do_test (freq)
+  def do_test(freq)
 
     start_new_engine
 
     pdef = Ruote.process_definition :name => 'test' do
       sequence do
         echo 'in'
-        _when '${v:resume}', :freq => freq
+        once '${v:resume}', :freq => freq
         echo 'out.'
       end
     end