ruote 2.1.6 → 2.1.7

data/test/README.rdoc

@@ -3,13 +3,13 @@
 
 running all the tests
 
-  $ ruby19 test/test.rb
+  $ ruby test/test.rb
 
 running a specific test
 
-  $ ruby19 test/functional/ft_1_process_status.rb
+  $ ruby test/functional/ft_1_process_status.rb
 
 running a test with file persistence :
 
-  $ ruby19 test/functional/eft_2_sequence.rb -- --fs
+  $ ruby test/functional/eft_2_sequence.rb -- --fs
 

data/test/functional/eft_18_concurrent_iterator.rb

@@ -252,7 +252,7 @@ class EftConcurrentIteratorTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, %w[ a b c ]
+    assert_trace pdef, *%w[ a b c ].permutation.to_a
   end
 
   def test_merge_type_isolate
@@ -264,10 +264,10 @@ class EftConcurrentIteratorTest < Test::Unit::TestCase
       bravo
     end
 
-    merged_fields = nil
+    mf = nil
 
     @engine.register_participant :bravo do |workitem|
-      merged_fields = workitem.fields
+      mf = workitem.fields
       nil
     end
 
@@ -275,12 +275,9 @@ class EftConcurrentIteratorTest < Test::Unit::TestCase
 
     assert_trace(
       pdef, %w{ . . . })
-    assert_equal(
-      {"0" => { "f" => "a" },
-       "1" => { "f" => "b" },
-       "2" => { "f" => "c" },
-       "params" => { "ref" => "bravo" }},
-      merged_fields)
+
+    mf = ('0'..'2').to_a.map { |k| mf[k]['f'] }.sort
+    assert_equal %w[ a b c ], mf
   end
 
   def test_cancel
@@ -298,13 +295,13 @@ class EftConcurrentIteratorTest < Test::Unit::TestCase
 
     a_count = 0
     @engine.register_participant(:alpha) { |wi| a_count += 1 }
-    @engine.register_participant(:bravo, Ruote::NullParticipant.new)
+    @engine.register_participant(:bravo, Ruote::NullParticipant)
 
     #noisy
 
     wfid = @engine.launch(pdef)
 
-    wait_for(2 + 77 * 5)
+    wait_for(2 + n * 5)
     #p "=" * 80
 
     assert_equal n, a_count

data/test/functional/eft_24_add_branches.rb

@@ -25,7 +25,10 @@ class EftAddBranchesTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, %w[ a b c d ]
+    wfid = @engine.launch(pdef)
+    wait_for(wfid)
+
+    assert_equal %w[ a b c d ], @tracer.to_a.sort
   end
 
   def test_add_branches_times
@@ -41,7 +44,10 @@ class EftAddBranchesTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, %w[ 1 2 3 4 5 ]
+    wfid = @engine.launch(pdef)
+    wait_for(wfid)
+
+    assert_equal %w[ 1 2 3 4 5 ], @tracer.to_a.sort
   end
 
   def test_add_branches_times_and_whatever
@@ -57,7 +63,10 @@ class EftAddBranchesTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, %w[ 1 2 3 a b ]
+    wfid = @engine.launch(pdef)
+    wait_for(wfid)
+
+    assert_equal %w[ 1 2 3 a b ], @tracer.to_a.sort
   end
 
   def test_add_branches_with_tag
@@ -78,9 +87,12 @@ class EftAddBranchesTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace(
-      pdef,
-      "<:a\n<:b\n>:0\n>:1\n>:0\n>:1\n<:c\n<:c\n>:0\n>:1\n>:0\n>:1")
+    wfid = @engine.launch(pdef)
+    wait_for(wfid)
+
+    assert_equal(
+      %w[ <:a <:b <:c <:c >:0 >:0 >:0 >:0 >:1 >:1 >:1 >:1 ],
+      @tracer.to_a.sort)
   end
 end
 

data/test/functional/eft_27_inc.rb

@@ -113,7 +113,8 @@ class EftIncTest < Test::Unit::TestCase
 
   def test_inc_array_head
 
-    @engine.context['ruby_eval_allowed'] = true
+    #@engine.context['ruby_eval_allowed'] = true
+    @engine.configure('ruby_eval_allowed', true)
 
     pdef = Ruote.process_definition do
       sequence do

data/test/functional/eft_6_concurrence.rb

@@ -63,9 +63,14 @@ class EftConcurrenceTest < Test::Unit::TestCase
 
     assert_trace(pdef, %w[ alpha ] * 3)
 
-    assert_equal(
-      {'1'=>{"seen"=>"indeed"}, '0'=>{}, "params"=>{"ref"=>"bravo"}},
-      fields)
+    #assert_equal(
+    #  {'1'=>{"seen"=>"indeed"}, '0'=>{}, "params"=>{"ref"=>"bravo"}},
+    #  fields)
+
+    params = fields.delete('params')
+
+    assert_equal({ 'ref' => 'bravo' }, params)
+    assert_match /seen/, fields.inspect
   end
 
   def test_over_unless
@@ -115,7 +120,7 @@ class EftConcurrenceTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, %w[ a b done.]
+    assert_trace pdef, %w[ a b done. ], %w[ b a done. ]
   end
 
   # helper

data/test/functional/ft_20_storage_participant.rb

@@ -112,58 +112,85 @@ class FtStorageParticipantTest < Test::Unit::TestCase
     end
   end
 
-  def test_by_participant
+  def prepare_al_bravo
 
     @engine.register_participant :alpha, Ruote::StorageParticipant
     @engine.register_participant :bravo, Ruote::StorageParticipant
 
-    wfid = @engine.launch(CON_AL_BRAVO)
+    @wfid = @engine.launch(CON_AL_BRAVO)
 
     wait_for(:bravo)
 
-    part = Ruote::StorageParticipant.new
-    part.context = @engine.context
-
-    assert_equal 2, part.size
-    #part.by_participant('alpha').each { |wi| p wi }
-    assert_equal 1, part.by_participant('alpha').size
-    assert_equal 1, part.by_participant('bravo').size
+    @part = Ruote::StorageParticipant.new
+    @part.context = @engine.context
   end
 
-  def test_by_field
+  def test_by_participant
 
-    @engine.register_participant :alpha, Ruote::StorageParticipant
-    @engine.register_participant :bravo, Ruote::StorageParticipant
+    prepare_al_bravo
 
-    wfid = @engine.launch(CON_AL_BRAVO)
+    assert_equal 2, @part.size
+    #@part.by_participant('alpha').each { |wi| p wi }
+    assert_equal 1, @part.by_participant('alpha').size
+    assert_equal 1, @part.by_participant('bravo').size
+  end
 
-    wait_for(:bravo)
+  def test_by_field
 
-    part = Ruote::StorageParticipant.new
-    part.context = @engine.context
+    prepare_al_bravo
 
-    assert_equal 2, part.size
-    assert_equal 2, part.by_field('place').size
-    assert_equal 2, part.by_field('character').size
-    assert_equal 1, part.by_field('adversary').size
+    assert_equal 2, @part.size
+    assert_equal 2, @part.by_field('place').size
+    assert_equal 2, @part.by_field('character').size
+    assert_equal 1, @part.by_field('adversary').size
   end
 
   def test_by_field_and_value
 
-    @engine.register_participant :alpha, Ruote::StorageParticipant
-    @engine.register_participant :bravo, Ruote::StorageParticipant
+    prepare_al_bravo
 
-    wfid = @engine.launch(CON_AL_BRAVO)
+    assert_equal 2, @part.size
+    assert_equal 0, @part.by_field('place', 'nara').size
+    assert_equal 2, @part.by_field('place', 'heiankyou').size
+    assert_equal 1, @part.by_field('character', 'minamoto no hirosama').size
+  end
 
+  def test_query
+
+    prepare_al_bravo
+
+    wfid2 = @engine.launch(CON_AL_BRAVO, 'adversary' => 'B')
     wait_for(:bravo)
 
-    part = Ruote::StorageParticipant.new
-    part.context = @engine.context
+    #@part.query({}).each { |wi| puts '-' * 80; p wi }
+
+    assert_equal 4, @part.size
+    assert_equal 4, @part.query({}).size
+    assert_equal Ruote::Workitem, @part.query({}).first.class
+    assert_equal 2, @part.query(:wfid => @wfid).size
+    assert_equal 0, @part.query('place' => 'nara').size
+    assert_equal 4, @part.query('place' => 'heiankyou').size
+    assert_equal 2, @part.query(:wfid => @wfid, :place => 'heiankyou').size
+
+    assert_equal(
+      1,
+      @part.query(:place => 'heiankyou', :adversary => 'B').size)
+
+    assert_equal 2, @part.query('place' => 'heiankyou', :limit => 2).size
+    assert_equal 4, @part.query('place' => 'heiankyou', :limit => 20).size
+
+    page0 =
+      @part.query('place' => 'heiankyou', :limit => 2).collect { |wi|
+        "#{wi.fei.wfid}-#{wi.participant_name}" }
+    page1 =
+      @part.query('place' => 'heiankyou', :offset => 2, :limit => 2).collect { |wi|
+        "#{wi.fei.wfid}-#{wi.participant_name}" }
 
-    assert_equal 2, part.size
-    assert_equal 0, part.by_field('place', 'nara').size
-    assert_equal 2, part.by_field('place', 'heiankyou').size
-    assert_equal 1, part.by_field('character', 'minamoto no hirosama').size
+    #p page0, page1
+    assert_equal 4, (page0 + page1).sort.uniq.size
+
+    assert_equal(
+      2, @part.query('place' => 'heiankyou', :participant => 'alpha').size)
   end
 
   def test_initialize_engine_then_opts
@@ -255,5 +282,12 @@ class FtStorageParticipantTest < Test::Unit::TestCase
 
     assert_equal 'heian', alpha.first.fields['jidai']
   end
+
+  def test_registration
+
+    pa = @engine.register_participant 'alpha', Ruote::StorageParticipant
+
+    assert_equal Ruote::StorageParticipant, pa.class
+  end
 end
 

data/test/functional/ft_24_block_participants.rb

@@ -47,6 +47,9 @@ class FtBlockParticipantTest < Test::Unit::TestCase
 
   def test_block_result
 
+    return if Ruote::WIN
+      # defective 'json' lib on windows render this test useless
+
     @engine.register_participant :alpha do |workitem|
       'seen'
     end
@@ -58,6 +61,9 @@ class FtBlockParticipantTest < Test::Unit::TestCase
 
   def test_non_jsonfiable_result
 
+    return if Ruote::WIN
+      # defective 'json' lib on windows render this test useless
+
     t = Time.now
 
     @engine.register_participant :alpha do |workitem|

data/test/functional/ft_30_smtp_participant.rb

@@ -35,8 +35,8 @@ class NftSmtpParticipantTest < Test::Unit::TestCase
       end
     end
 
-    trapfile = '/tmp/ruote_mailtrap.txt'
-    FileUtils.rm(trapfile) rescue nil
+    trapfile = Ruote::WIN ? 'ruote_mailtrap.txt' : '/tmp/ruote_mailtrap.txt'
+    FileUtils.rm_f(trapfile)
 
     Thread.new do
       Trap.new('127.0.0.1', 2525, true, trapfile)

data/test/functional/ft_32_fs_history.rb

@@ -5,6 +5,8 @@
 # Sun Oct  4 00:14:27 JST 2009
 #
 
+require File.join(File.dirname(__FILE__), 'base')
+
 begin
   require 'yajl'
 rescue LoadError
@@ -12,8 +14,6 @@ rescue LoadError
 end
 Rufus::Json.detect_backend rescue nil
 
-require File.join(File.dirname(__FILE__), 'base')
-
 require 'ruote/log/fs_history'
 require 'ruote/part/no_op_participant'
 
@@ -57,6 +57,7 @@ class FtFsHistoryTest < Test::Unit::TestCase
 
   ensure
 
+    @engine.context.history.shutdown
     Dir['work/log/*'].each { |fn| FileUtils.rm(fn) }
   end
 
@@ -90,6 +91,7 @@ class FtFsHistoryTest < Test::Unit::TestCase
 
   ensure
 
+    @engine.context.history.shutdown
     Dir['work/log2/*'].each { |fn| FileUtils.rm(fn) }
   end
 
@@ -115,6 +117,7 @@ class FtFsHistoryTest < Test::Unit::TestCase
 
   ensure
 
+    @engine.context.history.shutdown
     Dir['work/log/*'].each { |fn| FileUtils.rm(fn) }
   end
 
@@ -145,6 +148,7 @@ class FtFsHistoryTest < Test::Unit::TestCase
 
   ensure
 
+    @engine.context.history.shutdown
     Dir['work/log/*'].each { |fn| FileUtils.rm(fn) }
   end
 
@@ -157,18 +161,18 @@ class FtFsHistoryTest < Test::Unit::TestCase
 
     File.open(File.join('work', 'log', 'history_2009-10-08.json'), 'w') do |f|
       f.puts(%{
-["2009-10-08 12:33:27.835469",{"wfid":"20091224-beretsureto","tree":["define",{},[["alpha",{},[]],["echo",{"done.":null},[]]]],"workitem":{"fields":{},"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0"}},"variables":{},"type":"msgs","_id":"17619-2151883888-1261658007.83374","action":"launch","_rev":0,"put_at":"2009/12/24 12:33:27.833769 UTC"}]
-["2009-10-08 12:33:27.836787",{"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0_0"},"tree":["participant",{"ref":"alpha"},[]],"parent_id":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0"},"variables":null,"workitem":{"fields":{"params":{"ref":"alpha"}},"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0_0"},"participant_name":"alpha"},"type":"msgs","_id":"17619-2157823640-1261658007.83534","action":"apply","_rev":0,"put_at":"2009/12/24 12:33:27.835369 UTC"}]
-["2009-10-08 12:33:27.837098",{"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0_0"},"participant_name":"alpha","workitem":{"fields":{"params":{"ref":"alpha"}},"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0_0"},"participant_name":"alpha"},"for_engine_worker?":false,"type":"msgs","_id":"17619-2157823640-1261658007.83666","action":"dispatch","_rev":0,"put_at":"2009/12/24 12:33:27.836690 UTC"}]
+["!2009-10-08!12:33:27.835469",{"wfid":"20091224-beretsureto","tree":["define",{},[["alpha",{},[]],["echo",{"done.":null},[]]]],"workitem":{"fields":{},"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0"}},"variables":{},"type":"msgs","_id":"17619-2151883888-1261658007.83374","action":"launch","_rev":0,"put_at":"2009/12/24 12:33:27.833769 UTC"}]
+["!2009-10-08!12:33:27.836787",{"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0_0"},"tree":["participant",{"ref":"alpha"},[]],"parent_id":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0"},"variables":null,"workitem":{"fields":{"params":{"ref":"alpha"}},"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0_0"},"participant_name":"alpha"},"type":"msgs","_id":"17619-2157823640-1261658007.83534","action":"apply","_rev":0,"put_at":"2009/12/24 12:33:27.835369 UTC"}]
+["!2009-10-08!12:33:27.837098",{"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0_0"},"participant_name":"alpha","workitem":{"fields":{"params":{"ref":"alpha"}},"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0_0"},"participant_name":"alpha"},"for_engine_worker?":false,"type":"msgs","_id":"17619-2157823640-1261658007.83666","action":"dispatch","_rev":0,"put_at":"2009/12/24 12:33:27.836690 UTC"}]
       }.strip)
     end
 
     File.open(File.join('work', 'log', 'history_2009-10-31.json'), 'w') do |f|
       f.puts(%{
-["2009-10-31 12:33:27.835469",{"wfid":"20091224-beretsureto","tree":["define",{},[["alpha",{},[]],["echo",{"done.":null},[]]]],"workitem":{"fields":{},"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0"}},"variables":{},"type":"msgs","_id":"17619-2151883888-1261658007.83374","action":"launch","_rev":0,"put_at":"2009/12/24 12:33:27.833769 UTC"}]
-["2009-10-31 12:33:27.836787",{"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0_0"},"tree":["participant",{"ref":"alpha"},[]],"parent_id":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0"},"variables":null,"workitem":{"fields":{"params":{"ref":"alpha"}},"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0_0"},"participant_name":"alpha"},"type":"msgs","_id":"17619-2157823640-1261658007.83534","action":"apply","_rev":0,"put_at":"2009/12/24 12:33:27.835369 UTC"}]
-["2009-10-31 12:33:27.837098",{"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0_0"},"participant_name":"alpha","workitem":{"fields":{"params":{"ref":"alpha"}},"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0_0"},"participant_name":"alpha"},"for_engine_worker?":false,"type":"msgs","_id":"17619-2157823640-1261658007.83666","action":"dispatch","_rev":0,"put_at":"2009/12/24 12:33:27.836690 UTC"}]
-["2009-10-31 12:33:27.837961",{"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0_0"},"workitem":{"fields":{},"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0_0"},"participant_name":"alpha"},"participant_name":"alpha","type":"msgs","_id":"17619-2159486252-1261658007.83719","action":"receive","_rev":0,"put_at":"2009/12/24 12:33:27.837235 UTC"}]
+["!2009-10-31!12:33:27.835469",{"wfid":"20091224-beretsureto","tree":["define",{},[["alpha",{},[]],["echo",{"done.":null},[]]]],"workitem":{"fields":{},"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0"}},"variables":{},"type":"msgs","_id":"17619-2151883888-1261658007.83374","action":"launch","_rev":0,"put_at":"2009/12/24 12:33:27.833769 UTC"}]
+["!2009-10-31!12:33:27.836787",{"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0_0"},"tree":["participant",{"ref":"alpha"},[]],"parent_id":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0"},"variables":null,"workitem":{"fields":{"params":{"ref":"alpha"}},"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0_0"},"participant_name":"alpha"},"type":"msgs","_id":"17619-2157823640-1261658007.83534","action":"apply","_rev":0,"put_at":"2009/12/24 12:33:27.835369 UTC"}]
+["!2009-10-31!12:33:27.837098",{"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0_0"},"participant_name":"alpha","workitem":{"fields":{"params":{"ref":"alpha"}},"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0_0"},"participant_name":"alpha"},"for_engine_worker?":false,"type":"msgs","_id":"17619-2157823640-1261658007.83666","action":"dispatch","_rev":0,"put_at":"2009/12/24 12:33:27.836690 UTC"}]
+["!2009-10-31!12:33:27.837961",{"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0_0"},"workitem":{"fields":{},"fei":{"engine_id":"engine","wfid":"20091224-beretsureto","expid":"0_0"},"participant_name":"alpha"},"participant_name":"alpha","type":"msgs","_id":"17619-2159486252-1261658007.83719","action":"receive","_rev":0,"put_at":"2009/12/24 12:33:27.837235 UTC"}]
       }.strip)
     end
 
@@ -176,11 +180,12 @@ class FtFsHistoryTest < Test::Unit::TestCase
     assert_equal 4, @engine.context.history.by_date('2009-10-31').size
 
     assert_equal(
-      [ Time.parse(Time.now.strftime('%F')), Time.parse('2009-10-08') ],
+      [ Time.parse(Time.now.strftime('%Y-%m-%d')), Time.parse('2009-10-08') ],
       @engine.context.history.range)
 
   ensure
 
+    @engine.context.history.shutdown
     Dir['work/log/*'].each { |fn| FileUtils.rm(fn) }
   end
 end

data/test/functional/ft_36_storage_history.rb

@@ -57,12 +57,12 @@ class FtStorageHistoryTest < Test::Unit::TestCase
 
     6.times do |i|
       @engine.storage.put(
-        '_id' => "2010-01-06!11414#{i}!0!!20100106-bichisosupo",
+        '_id' => "!2010-01-06!11414#{i}!0!!20100106-bichisosupo",
         'type' => 'history')
     end
     7.times do |i|
       @engine.storage.put(
-        '_id' => "2010-01-07!11414#{i}!0!!20100107-bichitehoni",
+        '_id' => "!2010-01-07!11414#{i}!0!!20100107-bichitehoni",
         'type' => 'history')
     end
 
@@ -78,7 +78,7 @@ class FtStorageHistoryTest < Test::Unit::TestCase
     7.times do |i|
       i = i + 1
       @engine.storage.put(
-        '_id' => "2010-01-0#{i}!114147!0!!2010010#{i}-bichisosupo",
+        '_id' => "!2010-01-0#{i}!114147!0!!2010010#{i}-bichisosupo",
         'type' => 'history')
     end
 

data/test/functional/ft_3_participant_registration.rb

@@ -103,5 +103,13 @@ class FtParticipantRegistrationTest < Test::Unit::TestCase
 
     assert_equal true, alpha.down
   end
+
+  def test_participant_list_of_names
+
+    pa = @engine.register_participant :alpha do |workitem|
+    end
+
+    assert_equal ['^alpha$'], @engine.context.plist.names
+  end
 end
 

data/test/functional/storage_helper.rb

@@ -38,6 +38,8 @@ else uses the in-memory Ruote::Engine (fastest, but no persistence at all)
   end
 
   ps = ARGV.select { |a| a.match(/^--/) }
+  ps.delete('--split')
+
   persistent = opts.delete(:persistent)
 
   if ps.include?('--fs')