ruote 2.1.11 → 2.2.0

data/test/functional/ft_2_errors.rb

@@ -7,7 +7,7 @@
 
 require File.join(File.dirname(__FILE__), 'base')
 
-require 'ruote/part/hash_participant'
+require 'ruote/participant'
 
 
 class FtErrorsTest < Test::Unit::TestCase
@@ -137,12 +137,12 @@ class FtErrorsTest < Test::Unit::TestCase
       end
     end
 
-    count = 0
+    @engine.context.stash[:count] = 0
 
     @engine.register_participant :alpha do
-      count += 1
+      stash[:count] += 1
       @tracer << "alpha\n"
-      raise "something went wrong" if count == 1
+      raise "something went wrong" if stash[:count] == 1
     end
 
     #noisy
@@ -173,14 +173,15 @@ class FtErrorsTest < Test::Unit::TestCase
       end
     end
 
-    count = 0
+    @engine.context.stash[:count] = 0
 
-    alpha = @engine.register_participant :alpha do
-      count += 1
+    alpha = @engine.register_participant :alpha, 'do_not_thread' => true do
+      stash[:count] += 1
       @tracer << "alpha\n"
-      raise "something went wrong" if count == 1
+      raise "something went wrong" if stash[:count] == 1
     end
-    alpha.do_not_thread = true
+
+    #noisy
 
     wfid = @engine.launch(pdef)
 
@@ -200,15 +201,15 @@ class FtErrorsTest < Test::Unit::TestCase
   class WeakCancelParticipant
     include Ruote::LocalParticipant
 
-    def initialize (opts)
+    def initialize(opts)
     end
-    def consume (workitem)
+    def consume(workitem)
       # losing it
     end
     def do_not_thread
       true
     end
-    def cancel (fei, flavour)
+    def cancel(fei, flavour)
       raise "failure in #cancel"
     end
   end
@@ -256,14 +257,13 @@ class FtErrorsTest < Test::Unit::TestCase
       end
     end
 
-    count = 0
+    @engine.context.stash[:count] = 0
 
-    alpha = @engine.register_participant :alpha do
-      count += 1
+    alpha = @engine.register_participant :alpha, :do_not_thread => true do
+      stash[:count] += 1
       @tracer << "alpha\n"
-      raise "something went wrong" if count == 1
+      raise "something went wrong" if stash[:count] == 1
     end
-    alpha.do_not_thread = true
 
     #noisy
 
@@ -278,7 +278,7 @@ class FtErrorsTest < Test::Unit::TestCase
     err = ps.errors.first
 
     assert_equal wfid, err.fei.wfid
-    assert_not_nil err.fei.sub_wfid
+    assert_not_nil err.fei.subid
 
     @engine.replay_at_error(err)
 
@@ -337,22 +337,6 @@ class FtErrorsTest < Test::Unit::TestCase
     assert_nil @engine.process(wfid)
   end
 
-  #def test_ps_to_h
-  #  pdef = Ruote.process_definition do
-  #    error 'nada'
-  #  end
-  #  #noisy
-  #  wfid = @engine.launch(pdef)
-  #  wait_for(wfid)
-  #  ps = @engine.process(wfid)
-  #  es = ps.to_h['errors']
-  #  e = es.first
-  #  assert_equal 1, es.size
-  #  assert_equal 'reply', e['msg']['action']
-  #  assert_equal wfid, e['msg']['fei']['wfid']
-  #  assert_equal 8, e.size
-  #end
-
   def test_error_intercepted
 
     pdef = Ruote.process_definition do
@@ -363,9 +347,9 @@ class FtErrorsTest < Test::Unit::TestCase
 
     r = @engine.wait_for(wfid)
 
-    assert_equal 'RuntimeError', r['error_class']
-    assert_equal "unknown participant or subprocess 'nada'", r['error_message']
-    assert_equal Array, r['error_backtrace'].class
+    assert_equal 'RuntimeError', r['error']['class']
+    assert_equal "unknown participant or subprocess 'nada'", r['error']['message']
+    assert_equal Array, r['error']['trace'].class
   end
 end
 

data/test/functional/ft_30_smtp_participant.rb

@@ -18,7 +18,7 @@ class NftSmtpParticipantTest < Test::Unit::TestCase
     require 'mailtrap' # sudo gem install mailtrap
 
     class Trap < ::Mailtrap
-      def puts (s)
+      def puts(s)
         # silent night...
       end
     end

data/test/functional/ft_31_part_blocking.rb

@@ -30,12 +30,14 @@ class FtPartBlockingTest < Test::Unit::TestCase
 
  protected
 
- def run_engine (options={})
+ def run_engine(options={})
 
-   first_time = options[:first_time] || 0.0
-   second_time = options[:second_time] || 0.0
+   @engine.context.stash[:first_time] = options[:first_time] || 0.0
+   @engine.context.stash[:second_time] = options[:second_time] || 0.0
 
-   second_time = first_time + 0.1 if first_time == second_time
+   if @engine.context.stash[:first_time] == @engine.context.stash[:second_time]
+     @engine.context.stash[:second_time] = @engine.context.stash[:first_time] + 0.1
+   end
 
    pdef = Ruote.process_definition :name => 'simple' do
      sequence do
@@ -48,12 +50,12 @@ class FtPartBlockingTest < Test::Unit::TestCase
    end
 
    @engine.register_participant :first do |wi|
-     sleep first_time
+     sleep stash[:first_time]
      wi.fields['result'] = 'first'
    end
 
    @engine.register_participant :second do |wi|
-     sleep second_time
+     sleep stash[:second_time]
      wi.fields['result'] = 'second'
    end
 

data/test/functional/ft_34_cursor_rewind.rb

@@ -7,7 +7,7 @@
 
 require File.join(File.dirname(__FILE__), 'base')
 
-require 'ruote/part/hash_participant'
+require 'ruote/participant'
 
 #
 # testing forced rewinding
@@ -25,9 +25,9 @@ class FtCursorRewindTest < Test::Unit::TestCase
       end
     end
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
-    bravo = @engine.register_participant :bravo, Ruote::HashParticipant.new
-    charly = @engine.register_participant :charly, Ruote::HashParticipant.new
+    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
+    bravo = @engine.register_participant :bravo, Ruote::StorageParticipant
+    charly = @engine.register_participant :charly, Ruote::StorageParticipant
 
     #noisy
 
@@ -64,9 +64,9 @@ class FtCursorRewindTest < Test::Unit::TestCase
       end
     end
 
-    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
-    bravo = @engine.register_participant :bravo, Ruote::HashParticipant.new
-    charly = @engine.register_participant :charly, Ruote::HashParticipant.new
+    @engine.register_participant :alpha, Ruote::StorageParticipant
+    @engine.register_participant :bravo, Ruote::StorageParticipant
+    sto = @engine.register_participant :charly, Ruote::StorageParticipant
 
     #noisy
 
@@ -76,16 +76,19 @@ class FtCursorRewindTest < Test::Unit::TestCase
     wfid = @engine.launch(pdef)
     wait_for(:alpha)
 
-    alpha.reply(alpha.first)
+    sto.reply(sto.first)
     wait_for(:bravo)
 
     #
     # rewinding...
 
-    wi = bravo.first
+    wi = sto.first
 
-    wi.h['fei']['expid'] = wi.h['fei']['expid'][0..-3] # parent wfid
+    exp = @engine.process(wfid).expressions.find { |e| e.name == 'cursor' }
+    wi.h['fei'] = exp.h.fei
     wi.fields['__command__'] = [ 'jump', 'alpha' ]
+      #
+      # passing the "jump alpha" command to the cursor directly
 
     @engine.reply(wi)
 

data/test/functional/ft_35_add_service.rb

@@ -15,7 +15,7 @@ class FtAddServiceTest < Test::Unit::TestCase
 
     attr_reader :context, :options
 
-    def initialize (context, options={})
+    def initialize(context, options={})
 
       @context = context
       @options = options

data/test/functional/ft_36_storage_history.rb

@@ -28,7 +28,7 @@ class FtStorageHistoryTest < Test::Unit::TestCase
 
     #noisy
 
-    wfid0 = assert_trace("done.", pdef)
+    wfid0 = assert_trace('done.', pdef)
     wfid1 = assert_trace("done.\ndone.", pdef)
 
     sleep 0.100
@@ -87,5 +87,28 @@ class FtStorageHistoryTest < Test::Unit::TestCase
         Time.parse('2010-01-08 00:00:00 UTC') ],
       @engine.context.history.range)
   end
+
+  def test_engine_dot_history
+
+    @engine.add_service(
+      'history', 'ruote/log/storage_history', 'Ruote::StorageHistory')
+
+    assert_equal Ruote::StorageHistory, @engine.history.class
+  end
+
+  def test_wfids
+
+    @engine.add_service(
+      'history', 'ruote/log/storage_history', 'Ruote::StorageHistory')
+
+    @engine.register_participant 'alpha', Ruote::NullParticipant
+
+    3.times do
+      @engine.launch(Ruote.define { alpha })
+      @engine.wait_for(:alpha)
+    end
+
+    assert_equal 3, @engine.history.wfids.size
+  end
 end
 

data/test/functional/ft_37_default_history.rb

@@ -0,0 +1,109 @@
+
+#
+# testing ruote
+#
+# Mon Jan 24 11:11:43 JST 2011
+#
+
+require File.join(File.dirname(__FILE__), 'base')
+
+
+class FtDefaultHistoryTest < Test::Unit::TestCase
+  include FunctionalBase
+
+  def test_engine_has_history
+
+    assert_not_nil @engine.context.history
+    assert_not_nil @engine.history
+  end
+
+  def launch_processes(clear=true)
+
+    @engine.history.clear! if clear
+
+    @engine.register_participant 'alpha', Ruote::NullParticipant
+
+    pdef = Ruote.define do
+      alpha
+    end
+
+    wfids = 2.times.collect { @engine.launch(pdef) }
+
+    @engine.wait_for(:alpha)
+    @engine.wait_for(:alpha)
+    sleep 0.700
+
+    wfids
+  end
+
+  def test_all
+
+    #noisy
+
+    wfids = launch_processes
+
+    assert_equal 9, @engine.history.all.size
+  end
+
+  def test_by_wfid
+
+    wfids = launch_processes
+
+    assert_equal 4, @engine.history.by_wfid(wfids[0]).size
+    assert_not_nil @engine.history.by_wfid(wfids[0]).first['seen_at']
+
+    assert_equal 4, @engine.history.by_wfid(wfids[1]).size
+  end
+
+  def test_clear!
+
+    launch_processes
+
+    assert_equal 9, @engine.history.all.size
+
+    @engine.history.clear!
+
+    assert_equal 0, @engine.history.all.size
+  end
+
+  def test_default_range
+
+    range = @engine.history.range
+
+    assert_equal Time, range[0].class
+    assert_equal range[0], range[1]
+  end
+
+  def test_range
+
+    launch_processes
+    sleep 1
+    launch_processes(false)
+
+    range = @engine.history.range
+
+    assert_not_equal range[0], range[1]
+    assert range[0] < range[1]
+  end
+
+  def test_by_date
+
+    launch_processes
+
+    @engine.history.all.each { |msg| msg['seen_at'] = '1970-12-25' }
+
+    launch_processes(false)
+
+    assert_equal 18, @engine.history.all.size
+
+    assert_equal 9, @engine.history.by_date(Time.now).size
+  end
+
+  def test_wfids
+
+    wfids = launch_processes
+
+    assert_equal wfids.sort, @engine.history.wfids
+  end
+end
+

data/test/functional/ft_38_participant_more.rb

@@ -17,9 +17,9 @@ class FtParticipantMoreTest < Test::Unit::TestCase
 
   class DifficultParticipant
     include Ruote::LocalParticipant
-    def initialize (opts)
+    def initialize(opts)
     end
-    def consume (workitem)
+    def consume(workitem)
       context.tracer << "diff\n"
       if workitem.fields['rejected'].nil?
         workitem.fields['rejected'] = true
@@ -47,9 +47,9 @@ class FtParticipantMoreTest < Test::Unit::TestCase
 
   class FightingParticipant
     include Ruote::LocalParticipant
-    def initialize (opts)
+    def initialize(opts)
     end
-    def consume (workitem)
+    def consume(workitem)
       try = workitem.fields['try'] || 0
       context.tracer << "try#{try}\n"
       workitem.fields['try'] = try + 1
@@ -78,10 +78,10 @@ class FtParticipantMoreTest < Test::Unit::TestCase
 
   class RetryParticipant
     include Ruote::LocalParticipant
-    def initialize (opts)
+    def initialize(opts)
       @opts = opts
     end
-    def consume (workitem)
+    def consume(workitem)
       try = workitem.fields['try'] || 0
       context.tracer << "#{Time.now.to_f}\n"
       workitem.fields['try'] = try + 1
@@ -91,7 +91,7 @@ class FtParticipantMoreTest < Test::Unit::TestCase
         reply(workitem)
       end
     end
-    def cancel (fei, flavour)
+    def cancel(fei, flavour)
       unschedule_re_dispatch(fei)
     end
   end
@@ -147,12 +147,12 @@ class FtParticipantMoreTest < Test::Unit::TestCase
 
   class StashingParticipant
     include Ruote::LocalParticipant
-    def initialize (opts)
+    def initialize(opts)
     end
-    def consume (workitem)
+    def consume(workitem)
       put(workitem.fei, 'token' => workitem.params['token'])
     end
-    def cancel (fei, flavour)
+    def cancel(fei, flavour)
       BLACKBOARD['token'] = get(fei, 'token')
       BLACKBOARD['all'] = get(fei)
     end

data/test/functional/ft_39_wait_for.rb

@@ -25,16 +25,18 @@ class FtWaitForTest < Test::Unit::TestCase
 
     wfid = @engine.launch(pdef)
 
-    wait_for(:alpha)
+    r = wait_for(:alpha)
 
-    assert_equal Ruote::Workitem, @engine.workitem("0_0!!#{wfid}").class
+    assert_equal(
+      Ruote::Workitem,
+      @engine.workitem(Ruote.sid(r['fei'])).class)
   end
 
   class MyParticipant
     include Ruote::LocalParticipant
-    def initialize (opts)
+    def initialize(opts)
     end
-    def consume (workitem)
+    def consume(workitem)
       sleep rand * 2
       reply_to_engine(workitem)
     end
@@ -108,12 +110,13 @@ class FtWaitForTest < Test::Unit::TestCase
     wfid = @engine.launch(pdef)
 
     seen = []
+    threads = []
 
-    Thread.new do
+    threads << Thread.new do
       @engine.wait_for(wfid)
       seen << 'this'
     end
-    Thread.new do
+    threads << Thread.new do
       @engine.wait_for(wfid)
       seen << 'that'
     end
@@ -122,9 +125,9 @@ class FtWaitForTest < Test::Unit::TestCase
 
     sp.reply(sp.first)
 
-    @engine.wait_for(wfid)
-
-    sleep 0.100
+    threads.each do |t|
+      t.join
+    end
 
     assert_equal %w[ that this ], seen.sort
     assert_equal [], @engine.context.logger.instance_variable_get(:@waiting)