ruote 2.1.11 → 2.2.0

data/test/functional/eft_13_iterator.rb

@@ -30,7 +30,7 @@ class EftIteratorTest < Test::Unit::TestCase
 
   class TraceParticipant
     include Ruote::LocalParticipant
-    def consume (wi)
+    def consume(wi)
       context.tracer << "#{wi.participant_name}/#{wi.fei.expid}\n"
       reply(wi)
     end
@@ -110,8 +110,9 @@ class EftIteratorTest < Test::Unit::TestCase
 
       @tracer << "#{workitem.participant_name}\n"
 
-      workitem.fields['__command__'] = [ 'break', nil ] \
-        if workitem.participant_name == 'bob'
+      if workitem.participant_name == 'bob'
+        workitem.fields['__command__'] = [ 'break', nil ]
+      end
     end
 
     #noisy
@@ -121,14 +122,14 @@ class EftIteratorTest < Test::Unit::TestCase
 
   def test_rewind
 
-    rewound = false
+    stash[:rewound] = false
 
     @engine.register_participant '.*' do |workitem|
 
       @tracer << "#{workitem.participant_name}\n"
 
-      if (not rewound) and workitem.participant_name == 'bob'
-        rewound = true
+      if (not stash[:rewound]) and workitem.participant_name == 'bob'
+        stash[:rewound] = true
         workitem.fields['__command__'] = [ 'rewind', nil ]
       end
     end
@@ -144,8 +145,9 @@ class EftIteratorTest < Test::Unit::TestCase
 
       @tracer << "#{workitem.participant_name}\n"
 
-      workitem.fields['__command__'] = [ 'skip', 1 ] \
-        if workitem.participant_name == 'alice'
+      if workitem.participant_name == 'alice'
+        workitem.fields['__command__'] = [ 'skip', 1 ]
+      end
     end
 
     #noisy
@@ -159,8 +161,9 @@ class EftIteratorTest < Test::Unit::TestCase
 
       @tracer << "#{workitem.participant_name}\n"
 
-      workitem.fields['__command__'] = [ 'jump', -1 ] \
-        if workitem.participant_name == 'alice'
+      if workitem.participant_name == 'alice'
+        workitem.fields['__command__'] = [ 'jump', -1 ]
+      end
     end
 
     #noisy

data/test/functional/eft_14_cursor.rb

@@ -85,6 +85,21 @@ class EftCursorTest < Test::Unit::TestCase
     assert_trace('a', pdef)
   end
 
+  def test_over
+
+    pdef = Ruote.process_definition :name => 'test' do
+      cursor do
+        echo 'a'
+        over
+        echo 'b'
+      end
+    end
+
+    #noisy
+
+    assert_trace('a', pdef)
+  end
+
   def test_jump_to_tag
 
     pdef = Ruote.process_definition :name => 'test' do
@@ -154,16 +169,14 @@ class EftCursorTest < Test::Unit::TestCase
       end
     end
 
-    count = 0
-      # closures ftw
-
     @engine.register_participant :author do |workitem|
       @tracer << "a\n"
-      count = count + 1
+      stash[:count] ||= 0
+      stash[:count] += 1
     end
     @engine.register_participant :reviewer do |workitem|
       @tracer << "r\n"
-      workitem.fields['not_ok'] = (count < 3)
+      workitem.fields['not_ok'] = (stash[:count] < 3)
     end
     @engine.register_participant :publisher do |workitem|
       @tracer << "p\n"
@@ -213,7 +226,7 @@ class EftCursorTest < Test::Unit::TestCase
       end
     end
 
-    @engine.register_participant :alpha, Ruote::NoOpParticipant.new
+    @engine.register_participant :alpha, Ruote::NoOpParticipant
 
     #noisy
 
@@ -277,15 +290,15 @@ class EftCursorTest < Test::Unit::TestCase
 
   class Alpha
     include Ruote::LocalParticipant
-    def consume (workitem)
+    def consume(workitem)
       workitem.command = 'break'
       reply_to_engine(workitem)
     end
-    def cancel (fei, flavour)
+    def cancel(fei, flavour)
     end
   end
   class Bravo < Alpha
-    def consume (workitem)
+    def consume(workitem)
       workitem.command = 'skip 1'
       reply_to_engine(workitem)
     end
@@ -313,5 +326,81 @@ class EftCursorTest < Test::Unit::TestCase
 
     assert_trace "in\ndone.", pdef
   end
+
+  def test_cursor_with_lonely_rewind
+
+    pdef = Ruote.define do
+      cursor do
+        rewind
+      end
+    end
+
+    #@engine.noisy = true
+
+    wfid = @engine.launch(pdef)
+
+    @engine.wait_for(9)
+
+    assert_not_nil @engine.process(wfid)
+  end
+
+  class Charly
+    include Ruote::LocalParticipant
+    def initialize(opts)
+      @opts = opts
+    end
+    def consume(workitem)
+      workitem.command = @opts['command']
+      reply_to_engine(workitem)
+    end
+    def cancel(fei, flavour)
+    end
+  end
+
+  JUMP_DEF = Ruote.process_definition do
+    cursor do
+      echo 'top'
+      charly
+      echo 'middle'
+      delta
+      echo 'bottom'
+    end
+  end
+
+  def test_workitem_command_and_jump_array
+
+    #noisy
+
+    @engine.register do
+      charly EftCursorTest::Charly, 'command' => [ 'jump', 'delta' ]
+      catchall Ruote::NoOpParticipant
+    end
+
+    assert_trace "top\nbottom", JUMP_DEF
+  end
+
+  def test_workitem_command_and_jump_string
+
+    #noisy
+
+    @engine.register do
+      charly EftCursorTest::Charly, 'command' => 'jump delta'
+      catchall Ruote::NoOpParticipant
+    end
+
+    assert_trace "top\nbottom", JUMP_DEF
+  end
+
+  def test_workitem_command_and_jump_to_string
+
+    #noisy
+
+    @engine.register do
+      charly EftCursorTest::Charly, 'command' => 'jump to delta'
+      catchall Ruote::NoOpParticipant
+    end
+
+    assert_trace "top\nbottom", JUMP_DEF
+  end
 end
 

data/test/functional/eft_15_loop.rb

@@ -34,8 +34,9 @@ class EftLoopTest < Test::Unit::TestCase
       @tracer << "b\n"
       workitem.fields['count'] += 1
 
-      workitem.fields['__command__'] = [ 'break', nil ] \
-        if workitem.fields['count'] > 5
+      if workitem.fields['count'] > 5
+        workitem.fields['__command__'] = [ 'break', nil ]
+      end
     end
 
     assert_trace(%w[ a b a b a b ], pdef)
@@ -57,8 +58,9 @@ class EftLoopTest < Test::Unit::TestCase
       (workitem.fields['count'] ||= 0)
       workitem.fields['count'] += 1
 
-      workitem.fields['__command__'] = [ 'break', nil ] \
-        if workitem.fields['count'] > 5
+      if workitem.fields['count'] > 5
+        workitem.fields['__command__'] = [ 'break', nil ]
+      end
     end
 
     assert_trace(%w[ a a a a a a ], pdef)

data/test/functional/eft_16_if.rb

@@ -167,5 +167,17 @@ class EftIfTest < Test::Unit::TestCase
 
     assert_trace('alpha', { :state => 'A' }, pdef)
   end
+
+  def test_t
+
+    pdef = Ruote.define do
+      _if :t => 'true' do
+        echo 'then'
+      end
+      echo 'done.'
+    end
+
+    assert_trace("then\ndone.", pdef)
+  end
 end
 

data/test/functional/eft_18_concurrent_iterator.rb

@@ -7,9 +7,6 @@
 
 require File.join(File.dirname(__FILE__), 'base')
 
-require 'ruote/part/hash_participant'
-require 'ruote/part/null_participant'
-
 
 class EftConcurrentIteratorTest < Test::Unit::TestCase
   include FunctionalBase
@@ -33,7 +30,7 @@ class EftConcurrentIteratorTest < Test::Unit::TestCase
 
     pdef = Ruote.process_definition :name => 'test' do
       sequence do
-        concurrent_iterator :on_val => '', :to_var => 'v' do
+        citerator :on_val => '', :to_var => 'v' do
           echo 'x'
         end
         echo 'done.'
@@ -146,33 +143,36 @@ class EftConcurrentIteratorTest < Test::Unit::TestCase
       end
     end
 
-    p1 = @engine.register_participant :participant_1, Ruote::HashParticipant.new
-    p2 = @engine.register_participant :participant_2, Ruote::HashParticipant.new
-    p3 = @engine.register_participant :participant_3, Ruote::HashParticipant.new
+    sto = @engine.register_participant '.+', Ruote::StorageParticipant
+
+    assert_equal 0, sto.size # just to be sure
 
     #noisy
 
     wfid = @engine.launch(pdef)
 
+    wait_for(:participant_1)
     wait_for(:participant_1)
 
-    assert_equal 0, p2.size
-    assert_equal 0, p3.size
+    assert_equal(
+      { 'participant_1' => 2 },
+      sto.per_participant_count)
 
-    p1.reply(p1.first)
+    sto.reply(sto.first)
 
     wait_for(:participant_2)
+    wait_for(1)
 
-    assert_equal 1, p2.size
-    assert_equal 0, p3.size
+    assert_equal(
+      { 'participant_1' => 1, 'participant_2' => 1 },
+      sto.per_participant_count)
 
-    p2.reply(p2.first)
+    sto.reply(sto.per_participant['participant_2'].first)
 
     wait_for(3)
 
-    assert_equal 0, p3.size
-    assert_equal 1, p1.size
-    assert_equal 0, p2.size
+    assert_equal 1, sto.size
+    assert_equal 'participant_1', sto.first.participant_name
   end
 
   def test_passing_non_array_as_thing_to_iterate
@@ -269,10 +269,8 @@ class EftConcurrentIteratorTest < Test::Unit::TestCase
       bravo
     end
 
-    mf = nil
-
     @engine.register_participant :bravo do |workitem|
-      mf = workitem.fields
+      stash[:mf] = workitem.fields
       nil
     end
 
@@ -280,7 +278,7 @@ class EftConcurrentIteratorTest < Test::Unit::TestCase
 
     assert_trace(%w[ . . . ], pdef)
 
-    mf = ('0'..'2').to_a.map { |k| mf[k]['f'] }.sort
+    mf = ('0'..'2').to_a.map { |k| @engine.context.stash[:mf][k]['f'] }.sort
     assert_equal %w[ a b c ], mf
   end
 
@@ -293,10 +291,8 @@ class EftConcurrentIteratorTest < Test::Unit::TestCase
       bravo
     end
 
-    mf = nil
-
     @engine.register_participant :bravo do |workitem|
-      mf = workitem.fields
+      stash[:mf] = workitem.fields
       nil
     end
 
@@ -306,10 +302,10 @@ class EftConcurrentIteratorTest < Test::Unit::TestCase
 
     assert_equal(
       [["a"], ["b"]],
-      mf['stack'].collect { |f| f.values }.sort)
+      @engine.context.stash[:mf]['stack'].collect { |f| f.values }.sort)
     assert_equal(
       {"on"=>"a, b", "to_f"=>"f", "merge_type"=>"stack"},
-      mf['stack_attributes'])
+      @engine.context.stash[:mf]['stack_attributes'])
   end
 
   def test_cancel
@@ -326,8 +322,8 @@ class EftConcurrentIteratorTest < Test::Unit::TestCase
       end
     end
 
-    a_count = 0
-    @engine.register_participant(:alpha) { |wi| a_count += 1 }
+    @engine.context.stash[:a_count] = 0
+    @engine.register_participant(:alpha) { |wi| stash[:a_count] += 1 }
     @engine.register_participant(:bravo, Ruote::NullParticipant)
 
     #noisy
@@ -337,7 +333,7 @@ class EftConcurrentIteratorTest < Test::Unit::TestCase
     wait_for(2 + n * 5)
     #p "=" * 80
 
-    assert_equal n, a_count
+    assert_equal n, @engine.context.stash[:a_count]
 
     @engine.cancel_process(wfid)
     wait_for(wfid)
@@ -356,12 +352,11 @@ class EftConcurrentIteratorTest < Test::Unit::TestCase
       end
     end
 
-    @engine.register_participant 'alpha' do |workitem|
+    @engine.register_participant 'alpha' do |wi|
 
       @tracer << "#{workitem.fields['f']}\n"
 
-      workitem.fields['__add_branches__'] = %w[ a b ] \
-        if workitem.fields['f'] == 2
+      wi.fields['__add_branches__'] = %w[ a b ] if wi.fields['f'] == 2
     end
 
     #noisy
@@ -377,10 +372,14 @@ class EftConcurrentIteratorTest < Test::Unit::TestCase
   def register_catchall_participant
 
     @subs = []
+    subs = @subs
+    @engine.context.instance_eval do
+      @subs = subs
+    end
 
     @engine.register_participant '.*' do |workitem|
 
-      @subs << workitem.fei.sub_wfid
+      @subs << workitem.fei.subid
 
       @tracer << [
         workitem.participant_name, workitem.fei.expid

data/test/functional/eft_19_reserve.rb

@@ -7,7 +7,7 @@
 
 require File.join(File.dirname(__FILE__), 'base')
 
-require 'ruote/part/hash_participant'
+require 'ruote/participant'
 
 
 class EftReserveTest < Test::Unit::TestCase
@@ -28,7 +28,7 @@ class EftReserveTest < Test::Unit::TestCase
 
     #noisy
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
+    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
 
     wfid = @engine.launch(pdef)
 
@@ -74,7 +74,7 @@ class EftReserveTest < Test::Unit::TestCase
 
     #noisy
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
+    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
 
     wfid = @engine.launch(pdef)
 
@@ -112,7 +112,7 @@ class EftReserveTest < Test::Unit::TestCase
 
     #noisy
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
+    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
 
     wfid = @engine.launch(pdef)