ruote 2.1.9 → 2.1.10

data/test/functional/ft_15_timeout.rb

@@ -150,6 +150,7 @@ class FtTimeoutTest < Test::Unit::TestCase
     wait_for(:alpha)
 
     assert_equal 1, alpha.size
+    assert_not_nil alpha.first.fields['__timed_out__']
   end
 
   def test_deep_on_timeout_error

data/test/functional/ft_20_storage_participant.rb

@@ -37,7 +37,6 @@ class FtStorageParticipantTest < Test::Unit::TestCase
     assert_equal Ruote::Workitem, wi.class
 
     wi = alpha[alpha.first.fei]
-
     assert_equal Ruote::Workitem, wi.class
 
     alpha.reply(wi)
@@ -131,6 +130,7 @@ class FtStorageParticipantTest < Test::Unit::TestCase
 
     assert_equal 2, @part.size
     #@part.by_participant('alpha').each { |wi| p wi }
+    assert_equal Ruote::Workitem, @part.by_participant('alpha').first.class
     assert_equal 1, @part.by_participant('alpha').size
     assert_equal 1, @part.by_participant('bravo').size
   end
@@ -140,6 +140,7 @@ class FtStorageParticipantTest < Test::Unit::TestCase
     prepare_al_bravo
 
     assert_equal 2, @part.size
+    assert_equal Ruote::Workitem, @part.by_field('place').first.class
     assert_equal 2, @part.by_field('place').size
     assert_equal 2, @part.by_field('character').size
     assert_equal 1, @part.by_field('adversary').size
@@ -174,7 +175,7 @@ class FtStorageParticipantTest < Test::Unit::TestCase
 
     assert_equal(
       1,
-      @part.query(:place => 'heiankyou', :adversary => 'B').size)
+      @part.query(:adversary => 'B', :place => 'heiankyou').size)
 
     assert_equal 2, @part.query('place' => 'heiankyou', :limit => 2).size
     assert_equal 4, @part.query('place' => 'heiankyou', :limit => 20).size
@@ -291,5 +292,22 @@ class FtStorageParticipantTest < Test::Unit::TestCase
 
     assert_equal [], pa.all
   end
+
+  def test_various_args
+
+    sp = @engine.register_participant 'alpha', Ruote::StorageParticipant
+
+    wfid = @engine.launch(Ruote.process_definition { alpha })
+
+    wait_for(:alpha)
+
+    wi = sp.first
+
+    assert_equal wi, sp[wi]
+    assert_equal wi, sp[wi.fei]
+    assert_equal wi, sp[wi.to_h]
+    assert_equal wi, sp[wi.fei.to_h]
+    assert_equal wi, sp[wi.fei.to_storage_id]
+  end
 end
 

data/test/functional/ft_21_forget.rb

@@ -7,6 +7,8 @@
 
 require File.join(File.dirname(__FILE__), 'base')
 
+require 'ruote/part/storage_participant'
+
 
 class FtForgetTest < Test::Unit::TestCase
   include FunctionalBase
@@ -38,5 +40,33 @@ class FtForgetTest < Test::Unit::TestCase
     assert_equal 1, logger.log.select { |e| e['action'] == 'ceased' }.size
     assert_equal 1, logger.log.select { |e| e['action'] == 'terminated' }.size
   end
+
+  def test_forgotten_tree
+
+    sp = @engine.register_participant :alpha, Ruote::StorageParticipant
+
+    pdef = Ruote.process_definition do
+      sequence do
+        alpha :forget => true
+      end
+    end
+
+    wfid = @engine.launch(pdef)
+
+    wait_for(wfid)
+
+    ps = @engine.process(wfid)
+
+    assert_not_nil ps
+    assert_equal 0, ps.errors.size
+    assert_equal 1, ps.expressions.size
+
+    fei = ps.expressions.first.fei
+    assert_equal fei, ps.root_expression_for(fei).fei
+
+    #puts "not sure..."
+    #p ps.original_tree
+    #p ps.current_tree
+  end
 end
 

data/test/functional/ft_22_process_definitions.rb

@@ -51,7 +51,8 @@ class FtProcessDefinitionTest < Test::Unit::TestCase
 
     prev = Rufus::Json.backend
 
-    require 'json'
+    #require 'json' # json 1.4.3 being buggy...
+    require 'json/pure'
     Rufus::Json.backend = :json
 
     #pdef = Ruote.process_definition :name => 'test' do

data/test/functional/ft_24_block_participants.rb

@@ -75,7 +75,7 @@ class FtBlockParticipantTest < Test::Unit::TestCase
     #assert_trace TEST_BLOCK, Ruote.time_to_utc_s(t)
 
     expected = if defined?(DataMapper)
-      ''
+      DataMapper::VERSION >= '1.0.0' ? t.to_s : ''
     elsif Ruote::JAVA
       ''
     else

data/test/functional/ft_25_receiver.rb

@@ -49,11 +49,38 @@ class FtReceiverTest < Test::Unit::TestCase
   end
 
   class MyReceiver < Ruote::Receiver
+    attr_reader :context
   end
 
-  def test_my_receiver
+  def test_my_receiver_init
+
+    cid = @engine.context.object_id
+
+    receiver = MyReceiver.new(@engine)
+    assert_equal cid, receiver.context.object_id
+    assert_not_nil receiver.context.storage
+
+    receiver = MyReceiver.new(@engine.context)
+    assert_equal cid, receiver.context.object_id
+    assert_not_nil receiver.context.storage
+
+    receiver = MyReceiver.new(@engine.worker)
+    assert_equal cid, receiver.context.object_id
+    assert_not_nil receiver.context.storage
 
     receiver = MyReceiver.new(@engine.storage)
+    assert_equal cid, receiver.context.object_id
+    assert_not_nil receiver.context.storage
+
+    @engine.storage.instance_variable_set(:@context, nil)
+    receiver = MyReceiver.new(@engine.storage)
+    assert_not_equal cid, receiver.context.object_id
+    assert_not_nil receiver.context.storage
+  end
+
+  def test_my_receiver
+
+    receiver = MyReceiver.new(@engine.context)
 
     #noisy
 
@@ -91,5 +118,60 @@ class FtReceiverTest < Test::Unit::TestCase
     rcv = logger.log.select { |e| e['action'] == 'receive' }.first
     assert_equal 'Ruote::Engine', rcv['receiver']
   end
+
+  class MyOtherParticipant
+    def initialize (receiver)
+      @receiver = receiver
+    end
+    def consume (workitem)
+      @receiver.pass(workitem.to_h)
+    end
+  end
+  class MyOtherReceiver < Ruote::Receiver
+    def initialize (context, opts={})
+      super(context, opts)
+      @count = 0
+    end
+    def pass (workitem)
+      if @count < 1
+        @context.error_handler.action_handle(
+          'dispatch', workitem['fei'], RuntimeError.new('something went wrong'))
+      else
+        reply(workitem)
+      end
+      @count = @count + 1
+    end
+  end
+
+  def test_receiver_triggered_dispatch_error
+
+    receiver = MyOtherReceiver.new(@engine)
+
+    @engine.register_participant :alpha, MyOtherParticipant.new(receiver)
+
+    pdef = Ruote.process_definition do
+      alpha
+    end
+
+    #noisy
+
+    wfid = @engine.launch(pdef)
+
+    wait_for(wfid)
+
+    ps = @engine.process(wfid)
+    err = ps.errors.first
+
+    assert_equal 1, ps.errors.size
+    assert_equal '#<RuntimeError: something went wrong>', err.message
+
+    @engine.replay_at_error(err)
+
+    wait_for(wfid)
+
+    ps = @engine.process(wfid)
+
+    assert_nil ps
+  end
 end
 

data/test/functional/ft_26_participant_timeout.rb

@@ -34,7 +34,7 @@ class FtParticipantTimeoutTest < Test::Unit::TestCase
     #noisy
 
     wfid = @engine.launch(pdef)
-    wait_for(12)
+    wait_for(13)
 
     assert_equal 0, alpha.size
     assert_equal 1, bravo.size

data/test/functional/ft_2_errors.rb

@@ -153,15 +153,12 @@ class FtErrorsTest < Test::Unit::TestCase
 
     wait_for(wfid)
 
+    sleep 0.250 # grrr...
+
     ps = @engine.process(wfid)
 
     assert_equal 1, ps.errors.size
 
-    #p ps.expressions.size
-    #ps.expressions.each do |e|
-    #  p [ e.fei.to_s, e.class, e.state ]
-    #end
-
     @engine.replay_at_error(ps.errors.first)
 
     wait_for(wfid)

data/test/functional/ft_30_smtp_participant.rb

@@ -24,49 +24,50 @@ class NftSmtpParticipantTest < Test::Unit::TestCase
     end
   end
 
-  def _test_smtp
-
-    return if Ruote::JAVA
-
-    pdef = Ruote.process_definition :name => 'test' do
-      sequence do
-        set 'f:item' => 'cat food'
-        alpha
-      end
-    end
-
-    trapfile = Ruote::WIN ? 'ruote_mailtrap.txt' : '/tmp/ruote_mailtrap.txt'
-    FileUtils.rm_f(trapfile)
-
-    t = Thread.new do
-      Trap.new('127.0.0.1', 2525, true, trapfile)
-    end
-    sleep 0.040
-      # give it some time to start listening
-
-    @engine.register_participant(
-      :alpha,
-      Ruote::SmtpParticipant.new(
-        :server => '127.0.0.1',
-        :port => 2525,
-        :to => 'toto@cloudwhatever.ch',
-        :from => 'john@outoftheblue.ch',
-        :notification => true,
-        :template => %{
-  Hello, do you want ${f:item} ?
-        }))
-
-    #noisy
-
-    wfid = @engine.launch(pdef)
-
-    sleep 0.450
-
-    assert_match(/cat food/, File.read(trapfile))
-    assert_nil @engine.process(wfid)
-
-    t.kill
-  end
+#  def test_smtp
+#
+#    return if Ruote::JAVA
+#
+#    pdef = Ruote.process_definition :name => 'test' do
+#      sequence do
+#        set 'f:item' => 'cat food'
+#        alpha
+#      end
+#    end
+#
+#    trapfile = Ruote::WIN ? 'ruote_mailtrap.txt' : '/tmp/ruote_mailtrap.txt'
+#    FileUtils.rm_f(trapfile)
+#
+#    t = Thread.new do
+#      Trap.new('127.0.0.1', 2525, true, trapfile)
+#    end
+#    sleep 0.040
+#      # give it some time to start listening
+#
+#    @engine.register_participant(
+#      :alpha,
+#      Ruote::SmtpParticipant.new(
+#        :server => '127.0.0.1',
+#        :port => 2525,
+#        :to => 'toto@cloudwhatever.ch',
+#        :from => 'john@outoftheblue.ch',
+#        :notification => true,
+#        :template => %{
+#  Hello, do you want ${f:item} ?
+#        }))
+#
+#    #noisy
+#
+#    wfid = @engine.launch(pdef)
+#
+#    #sleep 0.450
+#    wait_for(wfid)
+#
+#    assert_match(/cat food/, File.read(trapfile))
+#    assert_nil @engine.process(wfid)
+#
+#    t.kill
+#  end
 
   def test_smtp_non_instance_participant
 
@@ -104,9 +105,10 @@ class NftSmtpParticipantTest < Test::Unit::TestCase
 
     wfid = @engine.launch(pdef)
 
-    sleep 0.450
+    #sleep 0.450
+    wait_for(wfid)
 
-    assert_match(/cat food/, File.read(trapfile))
+    assert_match(/want cat food/, File.read(trapfile))
     assert_nil @engine.process(wfid)
 
     t.kill

data/test/functional/ft_36_storage_history.rb

@@ -7,7 +7,7 @@
 
 require File.join(File.dirname(__FILE__), 'base')
 
-require 'ruote/log/fs_history'
+#require 'ruote/log/fs_history'
 require 'ruote/part/no_op_participant'
 
 
@@ -33,17 +33,17 @@ class FtStorageHistoryTest < Test::Unit::TestCase
 
     sleep 0.100
 
-    assert_equal 17, @engine.storage.get_many('history').size
+    assert_equal 19, @engine.storage.get_many('history').size
 
     h = @engine.context.history.by_process(wfid0)
     #h.each { |r| p r }
-    assert_equal 8, h.size
+    assert_equal 9, h.size
 
     # testing record.to_h
 
     h = @engine.context.history.by_process(wfid1)
     #h.each { |r| p r }
-    assert_equal 8, h.size
+    assert_equal 9, h.size
 
     history.clear!
 

data/test/functional/ft_37_engine_participant.rb

@@ -20,18 +20,21 @@ class FtEngineParticipantTest < Test::Unit::TestCase
 
   def setup
 
+    @dir0 = "work0_#{$$}_#{self.object_id}_#{Time.now.to_f}"
+    @dir1 = "work1_#{$$}_#{self.object_id}_#{Time.now.to_f}"
+
     @engine0 =
       Ruote::Engine.new(
         Ruote::Worker.new(
           Ruote::FsStorage.new(
-            'work0',
+            @dir0,
             'engine_id' => 'engine0',
             's_logger' => [ 'ruote/log/test_logger', 'Ruote::TestLogger' ])))
     @engine1 =
       Ruote::Engine.new(
         Ruote::Worker.new(
           Ruote::FsStorage.new(
-            'work1',
+            @dir1,
             'engine_id' => 'engine1',
             's_logger' => [ 'ruote/log/test_logger', 'Ruote::TestLogger' ])))
 
@@ -46,13 +49,13 @@ class FtEngineParticipantTest < Test::Unit::TestCase
       Ruote::EngineParticipant,
       'storage_class' => Ruote::FsStorage,
       'storage_path' => 'ruote/storage/fs_storage',
-      'storage_args' => 'work1')
+      'storage_args' => @dir1)
     @engine1.register_participant(
       'engine0',
       Ruote::EngineParticipant,
       'storage_class' => Ruote::FsStorage,
       'storage_path' => 'ruote/storage/fs_storage',
-      'storage_args' => 'work0')
+      'storage_args' => @dir0)
   end
 
   def teardown
@@ -60,8 +63,8 @@ class FtEngineParticipantTest < Test::Unit::TestCase
     @engine0.shutdown
     @engine1.shutdown
 
-    FileUtils.rm_rf('work0')
-    FileUtils.rm_rf('work1')
+    FileUtils.rm_rf(@dir0)
+    FileUtils.rm_rf(@dir1)
   end
 
   def noisy
@@ -164,12 +167,13 @@ class FtEngineParticipantTest < Test::Unit::TestCase
     @engine0.cancel_process(wfid)
     @engine0.wait_for(wfid)
 
-    sleep 0.350 # since dispatch_cancel is asyncrhonous now
+    #@engine0.wait_for(1) # since dispatch_cancel is asynchronous now
+    sleep 0.777 # but well sometimes the dispatch is too fast
 
     assert_equal 0, alpha.size
 
-    assert_equal "a", @tracer0.to_s
-    assert_equal "", @tracer1.to_s
+    assert_equal 'a', @tracer0.to_s
+    assert_equal '', @tracer1.to_s
   end
 
   def test_with_variables
@@ -282,7 +286,7 @@ class FtEngineParticipantTest < Test::Unit::TestCase
       Ruote::EngineParticipant,
       'storage_class' => Ruote::FsStorage,
       'storage_path' => 'ruote/storage/fs_storage',
-      'storage_args' => 'work0')
+      'storage_args' => @dir0)
 
     # replay