ruote 2.2.0 → 2.3.0

data/test/functional/ft_4_cancel.rb

@@ -5,7 +5,7 @@
 # Wed Jun  3 08:42:07 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 require 'ruote/participant'
 
@@ -19,22 +19,22 @@ class FtCancelTest < Test::Unit::TestCase
       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)
 
-    ps = @engine.process(wfid)
+    ps = @dashboard.process(wfid)
     assert_equal 1, alpha.size
 
     assert_not_nil ps
 
-    @engine.cancel_process(wfid)
+    @dashboard.cancel_process(wfid)
 
     wait_for(wfid)
-    ps = @engine.process(wfid)
+    ps = @dashboard.process(wfid)
 
     assert_nil ps
     assert_equal 0, alpha.size
@@ -53,19 +53,19 @@ class FtCancelTest < Test::Unit::TestCase
       end
     end
 
-    @engine.register_participant :alpha, Ruote::StorageParticipant
-    sto = @engine.register_participant :bravo, Ruote::StorageParticipant
+    @dashboard.register_participant :alpha, Ruote::StorageParticipant
+    sto = @dashboard.register_participant :bravo, Ruote::StorageParticipant
 
     #noisy
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
     wait_for(:alpha)
 
     assert_equal 1, sto.size
 
     wi = sto.first
 
-    @engine.cancel_expression(wi.fei)
+    @dashboard.cancel_expression(wi.fei)
     wait_for(:bravo)
 
     assert_equal 1, sto.size
@@ -78,21 +78,32 @@ class FtCancelTest < Test::Unit::TestCase
       alpha
     end
 
-    @engine.register_participant :alpha, Ruote::NullParticipant
+    @dashboard.register_participant :alpha, Ruote::NullParticipant
 
     #noisy
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
 
-    @engine.wait_for(:alpha)
+    @dashboard.wait_for(:alpha)
 
-    @engine.cancel(wfid)
+    @dashboard.cancel(wfid)
 
-    @engine.wait_for(wfid)
+    @dashboard.wait_for(wfid)
 
-    assert_nil @engine.process(wfid)
+    assert_nil @dashboard.process(wfid)
 
-    assert_equal 1, logger.log.select { |e| e['action'] == 'cancel_process' }.size
+    assert_equal(
+      1,
+      logger.log.select { |e| e['action'] == 'cancel_process' }.size)
+  end
+
+  def test_cancel_process_with_source
+
+    @dashboard.cancel('20111121-nada', :source => 'x')
+
+    @dashboard.wait_for(1)
+
+    assert_equal 'x', logger.log.first['source']
   end
 
   def test_cancel__expression
@@ -106,27 +117,74 @@ class FtCancelTest < Test::Unit::TestCase
       echo '2'
     end
 
-    @engine.register_participant :alpha, Ruote::NullParticipant
+    @dashboard.register_participant :alpha, Ruote::NullParticipant
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
 
-    r = @engine.wait_for(:alpha)
+    r = @dashboard.wait_for(:alpha)
 
-    @engine.cancel(r['fei']) # fei as a Hash
+    @dashboard.cancel(r['fei']) # fei as a Hash
 
-    r = @engine.wait_for(:alpha)
+    r = @dashboard.wait_for(:alpha)
 
-    @engine.cancel(Ruote.sid(r['fei'])) # fei as a String
+    @dashboard.cancel(Ruote.sid(r['fei'])) # fei as a String
 
-    r = @engine.wait_for(:alpha)
+    r = @dashboard.wait_for(:alpha)
 
-    @engine.cancel(Ruote::Workitem.new(r['workitem'])) # fei as workitem
+    @dashboard.cancel(Ruote::Workitem.new(r['workitem'])) # fei as workitem
 
-    @engine.wait_for(wfid)
+    @dashboard.wait_for(wfid)
 
     assert_equal %w[ 0 1 2 ], @tracer.to_a
 
     assert_equal 3, logger.log.select { |e| e['action'] == 'cancel' }.size
   end
+
+  def test_cancel_rebound
+
+    pdef = Ruote.define do
+      stall
+    end
+
+    wfid = @dashboard.launch(pdef)
+    @dashboard.wait_for('apply')
+
+    @dashboard.cancel(wfid)
+    r = @dashboard.wait_for('terminated')
+
+    assert_equal 'cancel', r['flavour']
+  end
+
+  def test_kill_rebound
+
+    pdef = Ruote.define do
+      stall
+    end
+
+    wfid = @dashboard.launch(pdef)
+    @dashboard.wait_for('apply')
+
+    @dashboard.kill(wfid)
+    r = @dashboard.wait_for('terminated')
+
+    assert_equal 'kill', r['flavour']
+  end
+
+  def test_cancel_limited_rebound
+
+    pdef = Ruote.define do
+      stall
+    end
+
+    wfid = @dashboard.launch(pdef)
+    @dashboard.wait_for('apply')
+
+    exp = @dashboard.process(wfid).expressions.last
+
+    @dashboard.cancel(exp)
+    r = @dashboard.wait_for('terminated')
+
+    assert_equal nil, r['flavour']
+  end
 end
 

data/test/functional/ft_50_engine_config.rb

@@ -5,7 +5,7 @@
 # Mon Dec  6 10:40:29 JST 2010
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 
 class FtEngineConfigTest < Test::Unit::TestCase
@@ -13,10 +13,10 @@ class FtEngineConfigTest < Test::Unit::TestCase
 
   def test_engine_config
 
-    @engine.configure('a', 'b')
+    @dashboard.configure('a', 'b')
 
-    assert_equal 'b', @engine.configuration('a')
-    assert_equal 'b', @engine.storage.get_configuration('engine')['a']
+    assert_equal 'b', @dashboard.configuration('a')
+    assert_equal 'b', @dashboard.storage.get_configuration('engine')['a']
   end
 end
 

data/test/functional/ft_51_misc.rb

@@ -6,7 +6,7 @@
 #
 
 require 'stringio'
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 
 class FtMiscTest < Test::Unit::TestCase
@@ -20,13 +20,13 @@ class FtMiscTest < Test::Unit::TestCase
     prev = $stdout
     $stdout = out
 
-    @engine.noisy = true
+    @dashboard.noisy = true
 
-    wfid = @engine.launch(Ruote.define do
+    wfid = @dashboard.launch(Ruote.define do
       echo 'nada'
     end)
 
-    @engine.wait_for(wfid)
+    @dashboard.wait_for(wfid)
 
     out.close
     $stdout = prev
@@ -47,21 +47,21 @@ class FtMiscTest < Test::Unit::TestCase
       participant 'no_cancel'
     end
 
-    @engine.register 'no_cancel', NoCancel
+    @dashboard.register 'no_cancel', NoCancel
 
-    #noisy
+    #@dashboard.noisy = true
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
 
-    @engine.wait_for(:no_cancel)
+    @dashboard.wait_for(:no_cancel)
 
-    @engine.cancel(wfid)
+    @dashboard.cancel(wfid)
 
-    @engine.wait_for(wfid)
+    @dashboard.wait_for(wfid)
 
     assert_match(
-      /undefined method `cancel' for/,
-      @engine.ps(wfid).errors.first.message)
+      /undefined method `on_cancel' for/,
+      @dashboard.ps(wfid).errors.first.message)
   end
 end
 

data/test/functional/ft_52_case.rb

@@ -5,7 +5,7 @@
 # Fri Dec 24 14:53:30 JST 2010
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 
 #
@@ -30,12 +30,12 @@ class FtCaseTest < Test::Unit::TestCase
       subprocess '${the_case}'
     end
 
-    wfid = @engine.launch(pdef, 'the_case' => 'a')
-    r = @engine.wait_for(wfid)
+    wfid = @dashboard.launch(pdef, 'the_case' => 'a')
+    r = @dashboard.wait_for(wfid)
     assert_equal 'a', r['workitem']['fields']['result']
 
-    wfid = @engine.launch(pdef, 'the_case' => 'b')
-    r = @engine.wait_for(wfid)
+    wfid = @dashboard.launch(pdef, 'the_case' => 'b')
+    r = @dashboard.wait_for(wfid)
     assert_equal 'b', r['workitem']['fields']['result']
   end
 
@@ -58,12 +58,12 @@ class FtCaseTest < Test::Unit::TestCase
       subprocess 'case'
     end
 
-    wfid = @engine.launch(pdef, 'the_case' => 'a')
-    r = @engine.wait_for(wfid)
+    wfid = @dashboard.launch(pdef, 'the_case' => 'a')
+    r = @dashboard.wait_for(wfid)
     assert_equal 'a', r['workitem']['fields']['result']
 
-    wfid = @engine.launch(pdef, 'the_case' => 'b')
-    r = @engine.wait_for(wfid)
+    wfid = @dashboard.launch(pdef, 'the_case' => 'b')
+    r = @dashboard.wait_for(wfid)
     assert_equal 'b', r['workitem']['fields']['result']
   end
 
@@ -88,12 +88,12 @@ class FtCaseTest < Test::Unit::TestCase
       subprocess 'a' # /!\
     end
 
-    wfid = @engine.launch(pdef, 'the_case' => 'a')
-    r = @engine.wait_for(wfid)
+    wfid = @dashboard.launch(pdef, 'the_case' => 'a')
+    r = @dashboard.wait_for(wfid)
     assert_equal 'a', r['workitem']['fields']['result']
 
-    wfid = @engine.launch(pdef, 'the_case' => 'b')
-    r = @engine.wait_for(wfid)
+    wfid = @dashboard.launch(pdef, 'the_case' => 'b')
+    r = @dashboard.wait_for(wfid)
     assert_equal 'a', r['workitem']['fields']['result']
   end
 
@@ -120,14 +120,14 @@ class FtCaseTest < Test::Unit::TestCase
       subprocess 'a'
     end
 
-    wfid = @engine.launch(pdef, 'the_case' => 'a')
-    @engine.wait_for(wfid)
+    wfid = @dashboard.launch(pdef, 'the_case' => 'a')
+    @dashboard.wait_for(wfid)
     assert_equal %w[ a global_a ], @tracer.to_a
 
     @tracer.clear
 
-    wfid = @engine.launch(pdef, 'the_case' => 'b')
-    @engine.wait_for(wfid)
+    wfid = @dashboard.launch(pdef, 'the_case' => 'b')
+    @dashboard.wait_for(wfid)
     assert_equal %w[ b global_a ], @tracer.to_a
   end
 end

data/test/functional/ft_53_engine_on_terminate.rb

@@ -5,7 +5,7 @@
 # Thu Jan  6 21:49:01 JST 2011
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 #require 'ruote/participant'
 
@@ -15,32 +15,31 @@ class FtEngineOnTerminateTest < Test::Unit::TestCase
 
   def test_no_on_terminate
 
-    assert_nil @engine.on_terminate
+    assert_nil @dashboard.on_terminate
   end
 
   def test_on_terminate
 
-    @engine.on_terminate = 'supervisor'
+    @dashboard.on_terminate = 'supervisor'
 
     assert_equal(
       [ 'define', {}, [ [ 'supervisor', {}, [] ] ] ],
-      @engine.on_terminate)
+      @dashboard.on_terminate)
   end
 
   def test_on_terminate_tree
 
-    @engine.on_terminate = Ruote.define do
+    @dashboard.on_terminate = Ruote.define do
       echo '${__terminate__.wfid} terminated'
     end
 
-    #@engine.noisy = true
+    #@dashboard.noisy = true
 
-    wfid = @engine.launch(Ruote.define do
+    wfid = @dashboard.launch(Ruote.define do
       echo 'main'
     end)
 
-    @engine.wait_for(wfid)
-    sleep 1
+    @dashboard.wait_for(8)
 
     assert_equal [ 'main', "#{wfid} terminated" ], @tracer.to_a
   end
@@ -49,22 +48,21 @@ class FtEngineOnTerminateTest < Test::Unit::TestCase
   #
   def test_no_on_terminate_when_on_error
 
-    @engine.on_error = Ruote.define do
+    @dashboard.on_error = Ruote.define do
       echo 'on_error'
     end
-    @engine.on_terminate = Ruote.define do
+    @dashboard.on_terminate = Ruote.define do
       echo 'on_terminate'
     end
 
-    #noisy
+    #@dashboard.noisy = true
 
-    wfid = @engine.launch(Ruote.define do
+    wfid = @dashboard.launch(Ruote.define do
       echo 'main'
       error 'in main'
     end)
 
-    @engine.wait_for(wfid)
-    sleep 1
+    @dashboard.wait_for(9)
 
     assert_equal [ 'main', 'on_error' ], @tracer.to_a
   end
@@ -73,21 +71,20 @@ class FtEngineOnTerminateTest < Test::Unit::TestCase
   #
   def test_on_error_when_on_terminate
 
-    @engine.on_error = Ruote.define do
+    @dashboard.on_error = Ruote.define do
       echo 'on_error'
     end
-    @engine.on_terminate = Ruote.define do
+    @dashboard.on_terminate = Ruote.define do
       error 'in on_terminate'
     end
 
-    #noisy
+    #@dashboard.noisy = true
 
-    wfid = @engine.launch(Ruote.define do
+    wfid = @dashboard.launch(Ruote.define do
       echo 'main'
     end)
 
-    @engine.wait_for(wfid)
-    sleep 1
+    @dashboard.wait_for(11)
 
     assert_equal [ 'main', 'on_error' ], @tracer.to_a
   end

data/test/functional/ft_54_patterns.rb

@@ -5,7 +5,7 @@
 # Fri Jan  7 15:13:28 JST 2011
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 #require 'ruote/participant'
 
@@ -71,34 +71,36 @@ class FtPatternsTest < Test::Unit::TestCase
 
   def test_18_milestone
 
-    @engine.register do
+    @dashboard.register do
       catchall Ruote::StorageParticipant
     end
 
-    #@engine.noisy = true
+    #@dashboard.noisy = true
 
-    wfid = @engine.launch(MILESTONE)
+    wfid = @dashboard.launch(MILESTONE)
 
-    @engine.wait_for(:a)
+    @dashboard.wait_for(:a)
 
-    assert_equal({}, @engine.ps(wfid).tags)
+    assert_equal({}, @dashboard.ps(wfid).tags)
 
-    @engine.storage_participant.reply(@engine.storage_participant.first)
+    @dashboard.storage_participant.proceed(@dashboard.storage_participant.first)
 
-    @engine.wait_for(:d)
+    @dashboard.wait_for(:d)
 
-    assert_equal %w[ milestone ], @engine.ps(wfid).tags.collect { |t| t.first }
-    assert_equal %w[ b d ], @engine.ps(wfid).position.collect { |pos| pos[1] }
+    assert_equal %w[ milestone ], @dashboard.ps(wfid).tags.collect { |t| t.first }
+    assert_equal %w[ b d ], @dashboard.ps(wfid).position.collect { |pos| pos[1] }
 
-    wi = @engine.storage_participant.by_participant('b').first
-    @engine.storage_participant.reply(wi)
+    wi = @dashboard.storage_participant.by_participant('b').first
+    @dashboard.storage_participant.proceed(wi)
 
-    @engine.wait_for(:c)
+    @dashboard.wait_for(:c)
 
-    sleep 0.7 # give some time for the task d to get removed
+    @dashboard.wait_for('dispatch_cancel')
+    @dashboard.wait_for(1)
+      # give some time for the task d to get removed
 
-    assert_equal({}, @engine.ps(wfid).tags)
-    assert_equal %w[ c ], @engine.ps(wfid).position.collect { |pos| pos[1] }
+    assert_equal({}, @dashboard.ps(wfid).tags)
+    assert_equal %w[ c ], @dashboard.ps(wfid).position.collect { |pos| pos[1] }
   end
 end