ruote 2.2.0 → 2.3.0

data/test/functional/ft_8_participant_consumption.rb

@@ -5,7 +5,7 @@
 # Wed Jun 10 11:03:26 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 
 class FtParticipantConsumptionTest < Test::Unit::TestCase
@@ -19,20 +19,26 @@ class FtParticipantConsumptionTest < Test::Unit::TestCase
       end
     end
 
-    @engine.register_participant :alpha do |workitem|
-      @tracer << "#{workitem.participant_name}\n"
+    @dashboard.register_participant :alpha do |workitem|
+      tracer << "#{workitem.participant_name}\n"
     end
 
-    #noisy
+    #@dashboard.noisy = true
 
-    assert_trace('alpha', pdef)
+    wfid = @dashboard.launch(pdef)
+    @dashboard.wait_for('dispatched', 'receive', 'terminated')
 
-    Thread.pass
-      # making sure the reply to the participant expression is intercepted
-      # as well
+    assert_equal(
+      'alpha',
+      @tracer.to_s)
 
     assert_equal(
-      3, logger.log.select { |e| e['participant_name'] == 'alpha' }.size)
+      %w[ dispatch dispatched receive ],
+      logger.log.select { |e|
+        e['participant_name'] == 'alpha'
+      }.collect { |e|
+        e['action']
+      }.sort)
   end
 
   def test_missing_participant_name
@@ -45,11 +51,11 @@ class FtParticipantConsumptionTest < Test::Unit::TestCase
 
     #noisy
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
 
     wait_for(wfid)
 
-    ps = @engine.process(wfid)
+    ps = @dashboard.process(wfid)
 
     assert_equal(
       1, ps.errors.size)
@@ -65,8 +71,8 @@ class FtParticipantConsumptionTest < Test::Unit::TestCase
       end
     end
 
-    @engine.register_participant '.*' do |workitem|
-      @tracer << "#{workitem.participant_name} #{workitem.fei.expid}\n"
+    @dashboard.register_participant '.*' do |workitem|
+      tracer << "#{workitem.participant_name} #{workitem.fei.expid}\n"
     end
 
     assert_trace('alpha 0_0_0', pdef)
@@ -74,11 +80,11 @@ class FtParticipantConsumptionTest < Test::Unit::TestCase
 
   def test_dispatch_time
 
-    @engine.context.stash[:wis] = []
+    @dashboard.context.stash[:wis] = []
 
     pdef = Ruote.process_definition { alpha; alpha }
 
-    @engine.register_participant 'alpha' do |workitem|
+    @dashboard.register_participant 'alpha' do |workitem|
       stash[:wis] << workitem.to_h.dup
     end
 
@@ -86,11 +92,11 @@ class FtParticipantConsumptionTest < Test::Unit::TestCase
 
     assert_equal(
       String,
-      @engine.context.stash[:wis].first['fields']['dispatched_at'].class)
+      @dashboard.context.stash[:wis].first['fields']['dispatched_at'].class)
 
     assert_not_equal(
-      @engine.context.stash[:wis].first['fields']['dispathed_at'],
-      @engine.context.stash[:wis].last['fields']['dispatched_at'])
+      @dashboard.context.stash[:wis].first['fields']['dispathed_at'],
+      @dashboard.context.stash[:wis].last['fields']['dispatched_at'])
   end
 
   class MyParticipant
@@ -112,11 +118,11 @@ class FtParticipantConsumptionTest < Test::Unit::TestCase
       alpha
     end
 
-    @engine.register_participant :alpha, MyParticipant
+    @dashboard.register_participant :alpha, MyParticipant
 
-    wfid = @engine.launch(pdef, 'msg' => 'kilroy')
+    wfid = @dashboard.launch(pdef, 'msg' => 'kilroy')
 
-    @engine.wait_for(wfid)
+    @dashboard.wait_for(wfid)
 
     assert_equal 'kilroy', @tracer.to_s
   end

data/test/functional/ft_9_subprocesses.rb

@@ -5,7 +5,7 @@
 # Wed Jun 10 17:41:23 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 require 'ruote/participant'
 
@@ -26,26 +26,26 @@ class FtSubprocessesTest < Test::Unit::TestCase
       end
     end
 
-    bravo = @engine.register_participant :bravo, Ruote::StorageParticipant
+    bravo = @dashboard.register_participant :bravo, Ruote::StorageParticipant
 
     #noisy
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
     wait_for(:bravo)
 
     fexp = Ruote::Exp::FlowExpression.fetch(
-      @engine.context, bravo.first.fei.to_h)
+      @dashboard.context, bravo.first.fei.to_h)
 
     assert_equal(
       [ '0_0',
         ['define', {'sub0'=>nil}, [['bravo', {}, []], ['echo', {'result : ${v:nada}'=>nil}, []]]] ],
       fexp.lookup_variable('sub0'))
 
-    bravo.reply(bravo.first)
+    bravo.proceed(bravo.first)
     wait_for(:bravo)
 
     fexp = Ruote::Exp::FlowExpression.fetch(
-      @engine.context, bravo.first.fei.to_h)
+      @dashboard.context, bravo.first.fei.to_h)
 
     assert_equal(
       ['define', {'sub0'=>nil}, [['bravo', {}, []], ['echo', {'result : ${v:nada}'=>nil}, []]]],
@@ -70,22 +70,22 @@ class FtSubprocessesTest < Test::Unit::TestCase
       end
     end
 
-    @engine.context.stash[:wfids] = []
+    @dashboard.context.stash[:wfids] = []
 
-    @engine.register_participant :alpha do |workitem|
+    @dashboard.register_participant :alpha do |workitem|
       stash[:wfids] << workitem.fei.subid
     end
 
     #noisy
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
 
     wait_for(:alpha)
     wait_for(:alpha)
     wait_for(6)
 
-    assert_equal 2, @engine.context.stash[:wfids].size
-    assert_equal 2, @engine.context.stash[:wfids].sort.uniq.size
+    assert_equal 2, @dashboard.context.stash[:wfids].size
+    assert_equal 2, @dashboard.context.stash[:wfids].sort.uniq.size
   end
 
   def test_cancel_and_subprocess
@@ -99,15 +99,17 @@ class FtSubprocessesTest < Test::Unit::TestCase
       end
     end
 
-    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
+    alpha = @dashboard.register_participant :alpha, Ruote::StorageParticipant
 
-    wfid = @engine.launch(pdef)
+    #@dashboard.noisy = true
+
+    wfid = @dashboard.launch(pdef)
 
     wait_for(:alpha)
 
     assert_equal 1, alpha.size
 
-    @engine.cancel_process(wfid)
+    @dashboard.cancel_process(wfid)
 
     wait_for(wfid)
 
@@ -122,25 +124,53 @@ class FtSubprocessesTest < Test::Unit::TestCase
       end
     end
 
-    @engine.variables['sub0'] = Ruote.process_definition do
+    @dashboard.variables['sub0'] = Ruote.process_definition do
       alpha
     end
 
-    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
+    alpha = @dashboard.register_participant :alpha, Ruote::StorageParticipant
 
     #noisy
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
 
     wait_for(:alpha)
 
     assert_equal 1, alpha.size
 
-    @engine.cancel_process(wfid)
+    @dashboard.cancel_process(wfid)
 
     wait_for(wfid)
 
     assert_equal 0, alpha.size
   end
+
+  # testing noisy and process definition output...
+  #
+  def test_sub_subprocess
+
+    pdef = Ruote.process_definition do
+      sequence do
+        sub0
+      end
+      define 'sub0' do
+        echo 'a'
+        sub1
+        define 'sub1' do
+          echo 'b'
+        end
+      end
+    end
+
+    alpha = @dashboard.register_participant :alpha, Ruote::StorageParticipant
+
+    #@dashboard.noisy = true
+
+    wfid = @dashboard.launch(pdef)
+    r = @dashboard.wait_for(wfid)
+
+    assert_equal 'terminated', r['action']
+    assert_equal %w[ a b ], @tracer.to_a
+  end
 end
 

data/test/functional/restart_base.rb

@@ -12,7 +12,7 @@ module RestartBase
   end
 
   def teardown
-    @engine.shutdown
+    @dashboard.shutdown
     @storage.purge!
   end
 
@@ -20,15 +20,13 @@ module RestartBase
 
   def start_new_engine
 
-    @storage = determine_storage(
-      's_logger' => [ 'ruote/log/test_logger', 'Ruote::TestLogger' ],
-      :persistent => true)
+    @storage = determine_storage(:persistent => true)
 
-    @engine = Ruote::Engine.new(Ruote::Worker.new(@storage))
+    @dashboard = Ruote::Engine.new(Ruote::Worker.new(@storage))
 
     #@tracer.clear
 
-    @engine.add_service('tracer', @tracer)
+    @dashboard.add_service('tracer', @tracer)
   end
 end
 

data/test/functional/rt_0_wait.rb

@@ -5,8 +5,8 @@
 # Wed Jul  1 23:22:26 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
-require File.join(File.dirname(__FILE__), 'restart_base')
+require File.expand_path('../base', __FILE__)
+require File.expand_path('../restart_base', __FILE__)
 
 
 class RtWaitTest < Test::Unit::TestCase
@@ -27,14 +27,14 @@ class RtWaitTest < Test::Unit::TestCase
 
     #noisy
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
 
     wait_for(5)
 
-    assert_equal 1, @engine.processes.size
-    assert_equal 1, @engine.storage.get_many('schedules').size
+    assert_equal 1, @dashboard.processes.size
+    assert_equal 1, @dashboard.storage.get_many('schedules').size
 
-    @engine.shutdown
+    @dashboard.shutdown
 
     # restart...
 
@@ -42,14 +42,14 @@ class RtWaitTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_equal 1, @engine.processes.size
-    assert_equal 1, @engine.storage.get_many('schedules').size
+    assert_equal 1, @dashboard.processes.size
+    assert_equal 1, @dashboard.storage.get_many('schedules').size
 
-    @engine.cancel_process(wfid)
+    @dashboard.cancel_process(wfid)
 
     wait_for(wfid)
 
-    assert_equal 0, @engine.processes.size
+    assert_equal 0, @dashboard.processes.size
   end
 end
 

data/test/functional/rt_1_listen.rb

@@ -5,8 +5,8 @@
 # Thu Jul  2 12:51:54 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
-require File.join(File.dirname(__FILE__), 'restart_base')
+require File.expand_path('../base', __FILE__)
+require File.expand_path('../restart_base', __FILE__)
 
 
 require 'ruote/participant'
@@ -32,21 +32,21 @@ class RtListenTest < Test::Unit::TestCase
 
     #puts; noisy
 
-    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
+    alpha = @dashboard.register_participant :alpha, Ruote::StorageParticipant
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
 
     wait_for(:alpha)
 
     assert_equal '', @tracer.to_s
 
-    @engine.shutdown
+    @dashboard.shutdown
 
     start_new_engine
 
     #puts; noisy
 
-    @engine.reply(alpha.first)
+    @dashboard.reply(alpha.first)
 
     wait_for(wfid)
 

data/test/functional/rt_2_errors.rb

@@ -5,8 +5,8 @@
 # Thu Jul 16 13:49:09 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
-require File.join(File.dirname(__FILE__), 'restart_base')
+require File.expand_path('../base', __FILE__)
+require File.expand_path('../restart_base', __FILE__)
 
 
 class RtErrorsTest < Test::Unit::TestCase
@@ -23,34 +23,34 @@ class RtErrorsTest < Test::Unit::TestCase
       end
     end
 
-    #noisy
+    #@dashboard.noisy = true
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
 
-    wait_for(3)
+    wait_for(wfid)
 
-    ps = @engine.process(wfid)
+    ps = @dashboard.process(wfid)
 
     assert_equal 1, ps.errors.size
 
-    @engine.shutdown
+    @dashboard.shutdown
 
     # restart...
 
     start_new_engine
 
-    #noisy
+    #@dashboard.noisy = true
 
-    assert_equal 1, @engine.processes.size
+    assert_equal 1, @dashboard.processes.size
 
-    ps = @engine.process(wfid)
+    ps = @dashboard.process(wfid)
     assert_equal 1, ps.errors.size
 
-    @engine.cancel_process(wfid)
+    @dashboard.cancel_process(wfid)
 
     wait_for(wfid)
 
-    assert_nil @engine.process(wfid)
+    assert_nil @dashboard.process(wfid)
   end
 end
 

data/test/functional/rt_3_once.rb

@@ -5,8 +5,8 @@
 # Tue Oct 27 01:36:52 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
-require File.join(File.dirname(__FILE__), 'restart_base')
+require File.expand_path('../base', __FILE__)
+require File.expand_path('../restart_base', __FILE__)
 
 
 class RtWhenTest < Test::Unit::TestCase
@@ -37,34 +37,39 @@ class RtWhenTest < Test::Unit::TestCase
       end
     end
 
-    #noisy
+    #@dashboard.noisy = true
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
 
     wait_for(5)
 
-    assert_equal 1, @engine.processes.size
-    assert_equal 1, @engine.storage.get_many('schedules').size
+    sleep 0.300
+      # give it some time to register the schedule
+
+    assert_equal 1, @dashboard.processes.size
+    assert_equal 1, @dashboard.storage.get_many('schedules').size
 
-    @engine.shutdown
+    @dashboard.shutdown
 
     # restart...
 
     start_new_engine
 
+    sleep 0.500
+
     #noisy
 
-    assert_equal 1, @engine.processes.size
-    assert_equal 1, @engine.storage.get_many('schedules').size
+    assert_equal 1, @dashboard.processes.size
+    assert_equal 1, @dashboard.storage.get_many('schedules').size
 
-    @engine.variables['resume'] = true
+    @dashboard.variables['resume'] = true
 
     wait_for(wfid)
 
     assert_equal "in\nout.", @tracer.to_s
 
-    assert_equal 0, @engine.processes.size
-    assert_equal 0, @engine.storage.get_many('schedules').size
+    assert_equal 0, @dashboard.processes.size
+    assert_equal 0, @dashboard.storage.get_many('schedules').size
   end
 end