ruote 2.1.11 → 2.2.0

data/test/functional/eft_8_undo.rb

@@ -7,7 +7,7 @@
 
 require File.join(File.dirname(__FILE__), 'base')
 
-require 'ruote/part/hash_participant'
+require 'ruote/participant'
 
 
 class EftUndoTest < Test::Unit::TestCase
@@ -23,7 +23,7 @@ class EftUndoTest < Test::Unit::TestCase
       echo 'over'
     end
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
+    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
 
     #noisy
 
@@ -47,7 +47,7 @@ class EftUndoTest < Test::Unit::TestCase
       echo 'over'
     end
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
+    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
 
     #noisy
 
@@ -74,5 +74,41 @@ class EftUndoTest < Test::Unit::TestCase
 
     assert_trace '.', pdef
   end
+
+  def test_undo_missing_tag
+
+    pdef = Ruote.process_definition do
+      cancel :nada
+      echo '.'
+    end
+
+    assert_trace '.', pdef
+  end
+
+  def test_undo_tag_pointing_nowhere
+
+    pdef = Ruote.process_definition do
+      set 'v:nada' => []
+      cancel :nada
+      echo '.'
+    end
+
+    #@engine.noisy = true
+
+    assert_trace '.', pdef
+  end
+
+  def test_undo_tag_pointing_to_missing_fei
+
+    pdef = Ruote.process_definition do
+      set 'v:nada' => { 'wfid' => '${wfid}', 'expid' => '${expid}', 'engine_id' => '${engine_id}' }
+      cancel :nada
+      echo '.'
+    end
+
+    #@engine.noisy = true
+
+    assert_trace '.', pdef
+  end
 end
 

data/test/functional/eft_9_redo.rb

@@ -7,7 +7,7 @@
 
 require File.join(File.dirname(__FILE__), 'base')
 
-require 'ruote/part/hash_participant'
+require 'ruote/participant'
 
 
 class EftRedoTest < Test::Unit::TestCase
@@ -22,7 +22,7 @@ class EftRedoTest < Test::Unit::TestCase
       end
     end
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
+    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
 
     #noisy
 
@@ -42,5 +42,97 @@ class EftRedoTest < Test::Unit::TestCase
 
     assert_equal 3, logger.log.select { |e| e['action'] == 'entered_tag' }.size
   end
+
+  def test_redo_missing_tag
+
+    pdef = Ruote.process_definition do
+      _redo :nada
+      echo '.'
+    end
+
+    assert_trace '.', pdef
+  end
+
+  def test_redo_tag_pointing_nowhere
+
+    pdef = Ruote.process_definition do
+      set 'v:nada' => []
+      _redo :nada
+      echo '.'
+    end
+
+    #@engine.noisy = true
+
+    assert_trace '.', pdef
+  end
+
+  def test_redo_tag_pointing_to_missing_fei
+
+    pdef = Ruote.process_definition do
+      set 'v:nada' => { 'wfid' => '${wfid}', 'expid' => '${expid}', 'engine_id' => '${engine_id}' }
+      _redo :nada
+      echo '.'
+    end
+
+    #@engine.noisy = true
+
+    assert_trace '.', pdef
+  end
+
+  def test_forget_and_redo
+
+    pdef = Ruote.process_definition do
+      sequence :tag => 'x' do
+        alpha :forget => true
+        _redo 'x'
+      end
+    end
+
+    #noisy
+
+    @engine.register 'alpha', Ruote::StorageParticipant
+
+    wfid = @engine.launch(pdef)
+
+    while @engine.storage_participant.size < 2
+      sleep 0.350
+    end
+
+    assert_not_nil @engine.process(wfid)
+    assert_equal [], @engine.errors
+  end
+
+  class Alpha
+    include Ruote::LocalParticipant
+    @@seen = false
+    def consume(workitem)
+      (workitem.fields['alpha'] ||= []) << 'x'
+      workitem.fields['over'] = @@seen
+      @@seen = true
+      reply_to_engine(workitem)
+    end
+  end
+
+  def test_redo__blank_workitem
+
+    @engine.register do
+      alpha Alpha
+    end
+
+    pdef = Ruote.process_definition do
+      sequence :tag => 'x' do
+        alpha
+        _redo 'x', :unless => '${over}'
+      end
+    end
+
+    #noisy
+
+    wfid = @engine.launch(pdef)
+
+    r = @engine.wait_for(wfid)
+
+    assert_equal %w[ x ], r['workitem']['fields']['alpha']
+  end
 end
 

data/test/functional/ft_10_dollar.rb

@@ -88,7 +88,14 @@ class FtDollarTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace('><', pdef)
+    wfid = @engine.launch(pdef)
+
+    @engine.wait_for(wfid)
+
+    assert_equal(
+      "#<ArgumentError: 'ruby_eval_allowed' is set to false, cannot evaluate" +
+      " >1 + 2< (http://ruote.rubyforge.org/dollar.html)>",
+      @engine.errors.first.message)
   end
 
   def test_r
@@ -167,7 +174,7 @@ class FtDollarTest < Test::Unit::TestCase
 
     @engine.wait_for(wfid)
 
-    assert_equal "0_0_0!!#{wfid}\n#{wfid}", @tracer.to_s
+    assert_match /^0_0_0![^!]+!#{wfid}\n#{wfid}$/, @tracer.to_s
   end
 
   def test_direct_access_to_fields
@@ -185,5 +192,77 @@ class FtDollarTest < Test::Unit::TestCase
 
     assert_trace 'alpha/bravo/charly', pdef
   end
+
+  def test_dollar_quote
+
+    pdef = Ruote.define do
+      set 'f:a' => 'alpha'
+      set 'f:b' => 'bra vo'
+      echo '${"f:a}'
+      echo "${'f:a}"
+      echo 'ok', :if => "${'f:b} == 'bra vo'"
+    end
+
+    assert_trace %w[ "alpha" "alpha" ok ], pdef
+  end
+
+  def test_literally
+
+    pdef = Ruote.define do
+      set 'f:a' => %w[ A B C ]
+      set 'f:b' => 'a'
+      set 'v:c' => %w[ venture capitalist ]
+      set 'f:A' => '$f:a'
+      set 'f:B' => '$f:${b}'
+      set 'f:C' => '$v:c'
+      set 'f:D' => '$f:nada'
+      set 'f:E' => '$v:nada'
+      set 'f:F' => '$a'
+      set 'f:G' => '$nada'
+      set 'f:H' => '$a '
+      filter :f => /^[a-c]$/, :del => true
+    end
+
+    #noisy
+
+    wfid = @engine.launch(pdef)
+
+    r = @engine.wait_for(wfid)
+
+    assert_equal(
+      {
+        'A' => %w[ A B C ],
+        'B' => %w[ A B C ],
+        'C' => %w[ venture capitalist ],
+        'D' => '$f:nada',
+        'E' => '$v:nada',
+        'F' => %w[ A B C ],
+        'G' => '$nada',
+        'H' => '$a '
+      },
+      r['workitem']['fields'])
+  end
+
+  def test_literally_and_participant_params
+
+    pdef = Ruote.define do
+      set 'f:a' => %w[ A B C ]
+      alpha :b => '$f:a'
+    end
+
+    @engine.register_participant :alpha do |wi|
+      wi.fields['parameters'] = wi.fields['params']
+    end
+
+    #noisy
+
+    wfid = @engine.launch(pdef)
+
+    r = @engine.wait_for(wfid)
+
+    assert_equal(
+      { 'b' => %w[ A B C ], 'ref' => 'alpha' },
+      r['workitem']['fields']['parameters'])
+  end
 end
 

data/test/functional/ft_11_recursion.rb

@@ -16,16 +16,10 @@ class FtRecursionTest < Test::Unit::TestCase
   class CountingParticipant
     include Ruote::LocalParticipant
 
-    attr_reader :wfids
+    def consume(workitem)
 
-    def initialize
-
-      @wfids = []
-    end
-
-    def consume (workitem)
-
-      @wfids << "#{workitem.fei.wfid}|#{workitem.fei.sub_wfid}"
+      @context.stash[:wfids] ||= []
+      @context.stash[:wfids] << "#{workitem.fei.wfid}|#{workitem.fei.subid}"
 
       workitem.fields['count'] ||= 0
       workitem.fields['count'] = workitem.fields['count'] + 1
@@ -39,12 +33,14 @@ class FtRecursionTest < Test::Unit::TestCase
       end
     end
 
-    def cancel (fei, flavour)
+    def cancel(fei, flavour)
     end
   end
 
   def test_main_recursion
 
+    @engine.context.stash[:wfids] = []
+
     pdef = Ruote.process_definition :name => 'def0' do
       sequence do
         alpha
@@ -52,19 +48,19 @@ class FtRecursionTest < Test::Unit::TestCase
       end
     end
 
-    alpha = @engine.register_participant :alpha, CountingParticipant.new
+    alpha = @engine.register_participant :alpha, CountingParticipant
 
     #noisy
 
     assert_trace(%w[ 1 2 3 4 5 6 ], pdef)
 
-    #p alpha.wfids.uniq
-
-    assert_equal 6, alpha.wfids.uniq.size
+    assert_equal 6, @engine.context.stash[:wfids].uniq.size
   end
 
   def test_sub_recursion
 
+    @engine.context.stash[:wfids] = []
+
     pdef = Ruote.process_definition do
       define 'sub0' do
         sequence do
@@ -75,7 +71,7 @@ class FtRecursionTest < Test::Unit::TestCase
       sub0
     end
 
-    alpha = @engine.register_participant :alpha, CountingParticipant.new
+    alpha = @engine.register_participant :alpha, CountingParticipant
 
     #noisy
 
@@ -83,7 +79,7 @@ class FtRecursionTest < Test::Unit::TestCase
 
     #p alpha.wfids.uniq
 
-    assert_equal 6, alpha.wfids.uniq.size
+    assert_equal 6, @engine.context.stash[:wfids].uniq.size
   end
 
   def test_forgotten_main_recursion
@@ -97,7 +93,7 @@ class FtRecursionTest < Test::Unit::TestCase
       end
     end
 
-    alpha = @engine.register_participant :alpha, CountingParticipant.new
+    alpha = @engine.register_participant :alpha, CountingParticipant
 
     #noisy
 

data/test/functional/ft_12_launchitem.rb

@@ -17,10 +17,8 @@ class FtLaunchitemTest < Test::Unit::TestCase
       alpha
     end
 
-    fields = nil
-
     @engine.register_participant :alpha do |workitem|
-      fields = workitem.fields
+      stash[:fields] = workitem.fields
       @tracer << 'a'
       nil
     end
@@ -32,8 +30,14 @@ class FtLaunchitemTest < Test::Unit::TestCase
 
     assert_equal('a', @tracer.to_s)
 
-    assert_not_nil(fields.delete('dispatched_at'))
-    assert_equal({"a"=>0, "b"=>1, "params"=>{"ref"=>"alpha"}}, fields)
+    @engine.context.stash[:fields].delete('__result__')
+
+    assert_not_nil(
+      @engine.context.stash[:fields].delete('dispatched_at'))
+
+    assert_equal(
+      {"a"=>0, "b"=>1, "params"=>{"ref"=>"alpha"}},
+      @engine.context.stash[:fields])
   end
 end
 

data/test/functional/ft_13_variables.rb

@@ -104,7 +104,7 @@ class FtVariablesTest < Test::Unit::TestCase
       end
     end
 
-    results = []
+    @engine.context.stash[:results] = []
 
     @engine.register_participant :alpha do |workitem, fexp|
 
@@ -112,20 +112,18 @@ class FtVariablesTest < Test::Unit::TestCase
         public :locate_var
       end
 
-      results << fexp.locate_var('//a')
-      results << fexp.locate_var('/a').first.fei.to_storage_id
-      results << fexp.locate_var('a').first.fei.to_storage_id
+      stash[:results] << fexp.locate_var('//a')
+      stash[:results] << fexp.locate_var('/a').first.fei.to_storage_id
+      stash[:results] << fexp.locate_var('a').first.fei.to_storage_id
     end
 
     #noisy
 
     assert_trace 'done.', pdef
 
-    #p results
-
-    assert_equal(nil, results[0])
-    assert_match(/^0||\d+_\d+$/, results[1])
-    assert_match(/^0\_0|\d+|\d+_\d+$/, results[2])
+    assert_equal(nil, @engine.context.stash[:results][0])
+    assert_match(/^0||\d+_\d+$/, @engine.context.stash[:results][1])
+    assert_match(/^0\_0|\d+|\d+_\d+$/, @engine.context.stash[:results][2])
   end
 
   def test_lookup_in_var

data/test/functional/ft_14_re_apply.rb

@@ -7,9 +7,6 @@
 
 require File.join(File.dirname(__FILE__), 'base')
 
-require 'ruote/part/hash_participant'
-require 'ruote/part/storage_participant'
-
 
 class FtReApplyTest < Test::Unit::TestCase
   include FunctionalBase
@@ -23,7 +20,7 @@ class FtReApplyTest < Test::Unit::TestCase
 
   def test_re_apply
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
+    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
 
     #noisy
 
@@ -54,7 +51,7 @@ class FtReApplyTest < Test::Unit::TestCase
 
   def test_cancel_and_re_apply
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
+    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
 
     #noisy
 
@@ -85,7 +82,7 @@ class FtReApplyTest < Test::Unit::TestCase
 
   def test_update_expression_and_re_apply
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
+    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
 
     #noisy
 
@@ -129,7 +126,7 @@ class FtReApplyTest < Test::Unit::TestCase
       end
     end
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
+    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
 
     #noisy
 
@@ -167,7 +164,7 @@ class FtReApplyTest < Test::Unit::TestCase
       end
     end
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
+    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
 
     #noisy
 
@@ -198,7 +195,7 @@ class FtReApplyTest < Test::Unit::TestCase
 
   def test_re_apply_with_new_tree
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
+    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
 
     #noisy