ruote 2.1.7 → 2.1.8

data/test/functional/eft_6_concurrence.rb

@@ -28,7 +28,7 @@ class EftConcurrenceTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, %w[ alpha alpha ]
+    assert_trace %w[ alpha alpha ], pdef
   end
 
   def test_over_if
@@ -61,7 +61,7 @@ class EftConcurrenceTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace(pdef, %w[ alpha ] * 3)
+    assert_trace(%w[ alpha ] * 3, pdef)
 
     #assert_equal(
     #  {'1'=>{"seen"=>"indeed"}, '0'=>{}, "params"=>{"ref"=>"bravo"}},
@@ -105,7 +105,7 @@ class EftConcurrenceTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace(pdef, %w[ a a done. ])
+    assert_trace(%w[ a a done. ], pdef)
   end
 
   def test_remaining_forget_when_no_remains
@@ -120,7 +120,7 @@ class EftConcurrenceTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, %w[ a b done. ], %w[ b a done. ]
+    assert_trace %w[ a b done. ], %w[ b a done. ], pdef
   end
 
   # helper
@@ -188,6 +188,19 @@ class EftConcurrenceTest < Test::Unit::TestCase
     assert_equal(%w[ seen ], wi.fields['1'].keys)
   end
 
+  def test_concurrence_merge_type_stack
+
+    wi = run_concurrence({ :merge_type => :stack }, false)
+
+    assert_equal(
+      %w[ params stack stack_attributes ],
+      wi.fields.keys.collect { |k| k.to_s }.sort)
+
+    assert_equal({ 'ref' => 'alpha' }, wi.fields['params'])
+    assert_equal(%w[ seen ], wi.fields['stack'][0].keys)
+    assert_equal(%w[ seen ], wi.fields['stack'][1].keys)
+  end
+
   # helper
   #
   def run_test_count (remaining, noise)

data/test/functional/eft_7_forget.rb

@@ -55,7 +55,7 @@ class EftForgetTest < Test::Unit::TestCase
   #    echo '2_${v:a}'
   #  end
   #  noisy
-  #  assert_trace pdef, %w[ 1_1 0_0 2_1 ]
+  #  assert_trace %w[ 1_1 0_0 2_1 ], pdef
   #end
 end
 

data/test/functional/eft_8_undo.rb

@@ -27,7 +27,7 @@ class EftUndoTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, %w[ over ]
+    assert_trace %w[ over ], pdef
 
     assert_equal 0, alpha.size
 
@@ -51,7 +51,7 @@ class EftUndoTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, %w[ over ]
+    assert_trace %w[ over ], pdef
 
     assert_equal 0, alpha.size
 
@@ -72,7 +72,7 @@ class EftUndoTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, '.'
+    assert_trace '.', pdef
   end
 end
 

data/test/functional/ft_0_worker.rb

@@ -7,6 +7,8 @@
 
 require File.join(File.dirname(__FILE__), 'base')
 
+require 'ruote/part/null_participant'
+
 
 class FtWorkerTest < Test::Unit::TestCase
   include FunctionalBase
@@ -18,7 +20,7 @@ class FtWorkerTest < Test::Unit::TestCase
     pdef = Ruote.process_definition do
     end
 
-    assert_trace pdef, ''
+    assert_trace '', pdef
 
     #puts; logger.log.each { |e| p e }; puts
     assert_equal %w[ launch terminated ], logger.log.map { |e| e['action'] }
@@ -42,5 +44,19 @@ class FtWorkerTest < Test::Unit::TestCase
 
     assert_equal 1, @engine.storage.get_many('msgs').size
   end
+
+  def test_remaining_messages
+
+    @engine.register_participant :alfred, Ruote::NullParticipant
+
+    pdef = Ruote.process_definition do
+    end
+
+    assert_trace '', pdef
+
+    sleep 0.300
+
+    assert_equal [], @engine.storage.get_msgs
+  end
 end
 

data/test/functional/ft_10_dollar.rb

@@ -23,7 +23,7 @@ class FtDollarTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, 'field'
+    assert_trace 'field', pdef
   end
 
   def test_v
@@ -40,7 +40,7 @@ class FtDollarTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace(pdef, %w[ a b0 c0 d0 ])
+    assert_trace(%w[ a b0 c0 d0 ], pdef)
   end
 
   def test_nested_v
@@ -59,7 +59,7 @@ class FtDollarTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace(pdef, %w[ a:toto b:atlantic_city ])
+    assert_trace(%w[ a:toto b:atlantic_city ], pdef)
   end
 
   def test_f
@@ -75,7 +75,7 @@ class FtDollarTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace(pdef, %w[ a btoto cAsia ])
+    assert_trace(%w[ a btoto cAsia ], pdef)
   end
 
   def test_no_r
@@ -88,7 +88,7 @@ class FtDollarTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace(pdef, '><')
+    assert_trace('><', pdef)
   end
 
   def test_r
@@ -103,7 +103,7 @@ class FtDollarTest < Test::Unit::TestCase
 
     @engine.context['ruby_eval_allowed'] = true
 
-    assert_trace(pdef, '>3<')
+    assert_trace('>3<', pdef)
   end
 
   def test_r_and_wi
@@ -120,7 +120,7 @@ class FtDollarTest < Test::Unit::TestCase
 
     @engine.context['ruby_eval_allowed'] = true
 
-    assert_trace pdef, "person\nperson"
+    assert_trace "person\nperson", pdef
   end
 
   def test_r_and_d
@@ -136,7 +136,7 @@ class FtDollarTest < Test::Unit::TestCase
 
     @engine.context['ruby_eval_allowed'] = true
 
-    assert_trace pdef, 'person'
+    assert_trace 'person', pdef
   end
 
   def test_nested
@@ -151,7 +151,7 @@ class FtDollarTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, 'AA'
+    assert_trace 'AA', pdef
   end
 
   def test_wfid

data/test/functional/ft_11_recursion.rb

@@ -56,7 +56,7 @@ class FtRecursionTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace(pdef, %w[ 1 2 3 4 5 6 ])
+    assert_trace(%w[ 1 2 3 4 5 6 ], pdef)
 
     #p alpha.wfids.uniq
 
@@ -79,7 +79,7 @@ class FtRecursionTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, %w[ 1 2 3 4 5 6 ]
+    assert_trace %w[ 1 2 3 4 5 6 ], pdef
 
     #p alpha.wfids.uniq
 

data/test/functional/ft_13_variables.rb

@@ -37,7 +37,7 @@ class FtVariablesTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace(pdef, 'done.')
+    assert_trace('done.', pdef)
 
     #logger.log.each { |e| p e }
 
@@ -66,7 +66,7 @@ class FtVariablesTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace(pdef, %w[ a0:b0:a0:b0 a1:b1:a0:b1 a0:b1:a0:b1 ])
+    assert_trace(%w[ a0:b0:a0:b0 a1:b1:a0:b1 a0:b1:a0:b1 ], pdef)
   end
 
   def test_engine_variables
@@ -84,7 +84,7 @@ class FtVariablesTest < Test::Unit::TestCase
 
     @engine.variables['vb'] = 'b0'
 
-    assert_trace(pdef, %w[ a0: b0:b0 done. ])
+    assert_trace(%w[ a0: b0:b0 done. ], pdef)
 
     assert_equal(
       1, logger.log.select { |e| e['action'] == 'variable_set' }.size)
@@ -119,7 +119,7 @@ class FtVariablesTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, 'done.'
+    assert_trace 'done.', pdef
 
     #p results
 

data/test/functional/ft_17_conditional.rb

@@ -29,7 +29,7 @@ class FtConditionalTest < Test::Unit::TestCase
       end
     end
 
-    assert_trace(pdef, %w[ 2 a b d ])
+    assert_trace(%w[ 2 a b d ], pdef)
   end
 
   def test_string_equality_when_space
@@ -49,7 +49,7 @@ class FtConditionalTest < Test::Unit::TestCase
       end
     end
 
-    assert_trace(pdef, "some dude\na\nb\nd")
+    assert_trace("some dude\na\nb\nd", pdef)
   end
 
   def test_unless
@@ -62,15 +62,15 @@ class FtConditionalTest < Test::Unit::TestCase
       echo '.'
     end
 
-    assert_trace(pdef, { 'f' => 2000 }, %w[ 2000 i . ])
+    assert_trace(%w[ 2000 i . ], { 'f' => 2000 }, pdef)
 
     @tracer.clear
 
-    assert_trace(pdef, { 'f' => '2000' }, %w[ 2000 i . ])
+    assert_trace(%w[ 2000 i . ], { 'f' => '2000' }, pdef)
 
     @tracer.clear
 
-    assert_trace(pdef, { 'f' => 'other' }, %w[ other u . ])
+    assert_trace(%w[ other u . ], { 'f' => 'other' }, pdef)
   end
 end
 

data/test/functional/ft_19_alias.rb

@@ -27,7 +27,7 @@ class FtAliasTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace(pdef, %w[ b:alpha b: ])
+    assert_trace(%w[ b:alpha b: ], pdef)
   end
 end
 

data/test/functional/ft_1_process_status.rb

@@ -353,7 +353,7 @@ class FtProcessStatusTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, %w[ a c c d ]
+    assert_trace %w[ a c c d ], pdef
 
     assert_equal(
       ["define", {"name"=>"test"}, [["sequence", {}, [["alpha", {}, []], ["charly", {}, []], ["participant", {"ref"=>"charly"}, []]]], ["delta", {}, []]]],

data/test/functional/ft_20_storage_participant.rb

@@ -288,6 +288,8 @@ class FtStorageParticipantTest < Test::Unit::TestCase
     pa = @engine.register_participant 'alpha', Ruote::StorageParticipant
 
     assert_equal Ruote::StorageParticipant, pa.class
+
+    assert_equal [], pa.all
   end
 end
 

data/test/functional/ft_22_process_definitions.rb

@@ -26,7 +26,7 @@ class FtProcessDefinitionTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace(pdef, %w[ a b ])
+    assert_trace(%w[ a b ], pdef)
   end
 
   def test_remote_definitions_not_allowed
@@ -63,8 +63,8 @@ class FtProcessDefinitionTest < Test::Unit::TestCase
     #p pdef.to_json
 
     assert_trace(
-      "[\"define\",{\"name\":\"test\"},[[\"sequence\",{},[[\"echo\",{\"a\":null},[]],[\"echo\",{\"b\":null},[]]]]]]",
-      %w[ a b ])
+      %w[ a b ],
+      "[\"define\",{\"name\":\"test\"},[[\"sequence\",{},[[\"echo\",{\"a\":null},[]],[\"echo\",{\"b\":null},[]]]]]]")
 
     Rufus::Json.backend = prev
       # back to initial state
@@ -74,7 +74,14 @@ class FtProcessDefinitionTest < Test::Unit::TestCase
 
     path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'pdef.xml'))
 
-    assert_trace(path, %w[ a b ])
+    assert_trace(%w[ a b ], path)
+  end
+
+  def test_local_unexpanded_definition
+
+    path = File.join(File.dirname(__FILE__), '..', 'pdef.xml')
+
+    assert_trace(%w[ a b ], path)
   end
 end
 

data/test/functional/ft_24_block_participants.rb

@@ -35,7 +35,7 @@ class FtBlockParticipantTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, "a\nb:f0:f0val\nc:f0:f0val:v0val"
+    assert_trace "a\nb:f0:f0val\nc:f0:f0val:v0val", pdef
   end
 
   TEST_BLOCK = Ruote.process_definition do
@@ -47,7 +47,7 @@ class FtBlockParticipantTest < Test::Unit::TestCase
 
   def test_block_result
 
-    return if Ruote::WIN
+    return if Ruote::WIN or Ruote::JAVA
       # defective 'json' lib on windows render this test useless
 
     @engine.register_participant :alpha do |workitem|
@@ -56,7 +56,7 @@ class FtBlockParticipantTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace TEST_BLOCK, 'seen'
+    assert_trace 'seen', TEST_BLOCK
   end
 
   def test_non_jsonfiable_result
@@ -73,7 +73,16 @@ class FtBlockParticipantTest < Test::Unit::TestCase
     #noisy
 
     #assert_trace TEST_BLOCK, Ruote.time_to_utc_s(t)
-    assert_trace TEST_BLOCK, defined?(DataMapper) ? '' : t.to_s
+
+    expected = if defined?(DataMapper)
+      ''
+    elsif Ruote::JAVA
+      ''
+    else
+      t.to_s
+    end
+
+    assert_trace expected, TEST_BLOCK
   end
 end
 

data/test/functional/ft_27_var_indirection.rb

@@ -27,7 +27,7 @@ class FtVarIndirectionTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, 'alpha'
+    assert_trace 'alpha', pdef
   end
 
   def test_subprocess_indirection
@@ -45,7 +45,7 @@ class FtVarIndirectionTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, 'a'
+    assert_trace 'a', pdef
   end
 
   def test_subprocess_indirection_uri
@@ -60,7 +60,7 @@ class FtVarIndirectionTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, %w[ a b ]
+    assert_trace %w[ a b ], pdef
   end
 
   def test_subprocess_uri_set_as_engine_variable
@@ -73,7 +73,7 @@ class FtVarIndirectionTest < Test::Unit::TestCase
 
     @engine.variables['v'] = File.join(File.dirname(__FILE__), '..', 'pdef.xml')
 
-    assert_trace pdef, %w[ a b ]
+    assert_trace %w[ a b ], pdef
   end
 
   def test_subprocess_uri_set_as_engine_variable__absolute
@@ -87,7 +87,7 @@ class FtVarIndirectionTest < Test::Unit::TestCase
     @engine.variables['v'] = File.expand_path(
       File.join(File.dirname(__FILE__), '..', 'pdef.xml'))
 
-    assert_trace pdef, %w[ a b ]
+    assert_trace %w[ a b ], pdef
   end
 end