ruote 2.2.0 → 2.3.0

data/test/functional/ft_31_part_blocking.rb

@@ -7,7 +7,7 @@
 # By David Goldhirsch
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 class FtPartBlockingTest < Test::Unit::TestCase
  include FunctionalBase
@@ -32,11 +32,11 @@ class FtPartBlockingTest < Test::Unit::TestCase
 
  def run_engine(options={})
 
-   @engine.context.stash[:first_time] = options[:first_time] || 0.0
-   @engine.context.stash[:second_time] = options[:second_time] || 0.0
+   @dashboard.context.stash[:first_time] = options[:first_time] || 0.0
+   @dashboard.context.stash[:second_time] = options[:second_time] || 0.0
 
-   if @engine.context.stash[:first_time] == @engine.context.stash[:second_time]
-     @engine.context.stash[:second_time] = @engine.context.stash[:first_time] + 0.1
+   if @dashboard.context.stash[:first_time] == @dashboard.context.stash[:second_time]
+     @dashboard.context.stash[:second_time] = @dashboard.context.stash[:first_time] + 0.1
    end
 
    pdef = Ruote.process_definition :name => 'simple' do
@@ -49,22 +49,22 @@ class FtPartBlockingTest < Test::Unit::TestCase
      end
    end
 
-   @engine.register_participant :first do |wi|
+   @dashboard.register_participant :first do |wi|
      sleep stash[:first_time]
      wi.fields['result'] = 'first'
    end
 
-   @engine.register_participant :second do |wi|
+   @dashboard.register_participant :second do |wi|
      sleep stash[:second_time]
      wi.fields['result'] = 'second'
    end
 
-   @engine.register_participant :trace do |wi|
-     @tracer << "#{wi.fields['result']}"
+   @dashboard.register_participant :trace do |wi|
+     tracer << "#{wi.fields['result']}"
    end
 
-   wfid = @engine.launch(pdef)
-   @engine.wait_for(wfid)
+   wfid = @dashboard.launch(pdef)
+   @dashboard.wait_for(wfid)
 
    wfid
  end

data/test/functional/ft_32_scope.rb

@@ -0,0 +1,50 @@
+
+#
+# testing ruote
+#
+# Fri Dec 23 14:11:13 JST 2011
+#
+
+require File.expand_path('../base', __FILE__)
+
+
+class FtScopeTest < Test::Unit::TestCase
+  include FunctionalBase
+
+  def test_let_like
+
+    pdef = Ruote.process_definition do
+      set 'v:var' => 'val'
+      echo "out:${v:var}"
+      sequence :scope => true do
+        set 'v:var' => 'val1'
+        echo "in:${v:var}"
+      end
+      echo "out:${v:var}"
+    end
+
+    #noisy
+
+    assert_trace %w[ out:val in:val1 out:val ], pdef
+  end
+
+  def test_vars_to_f
+
+    pdef = Ruote.define do
+      sequence :vars_to_f => 'f0' do
+        set 'v:v0' => 'x'
+      end
+      sequence :vars_to_f => 'f1', :scope => true do
+        set 'v:v1' => 'y'
+      end
+    end
+
+    wfid = @dashboard.launch(pdef)
+    r = @dashboard.wait_for(wfid)
+
+    assert_equal(
+      { 'f0' => nil, 'f1' => { 'v1' => 'y' }, '__result__' => 'y' },
+      r['workitem']['fields'])
+  end
+end
+

data/test/functional/ft_33_participant_subprocess_priority.rb

@@ -5,7 +5,7 @@
 # Wed Oct 21 05:35:29 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 
 class FtParticipantSubprocessPriorityTest < Test::Unit::TestCase
@@ -20,8 +20,8 @@ class FtParticipantSubprocessPriorityTest < Test::Unit::TestCase
       end
     end
 
-    @engine.register_participant '.+' do
-      @tracer << 'participant'
+    @dashboard.register_participant '.+' do
+      tracer << 'participant'
     end
 
     #noisy

data/test/functional/ft_34_cursor_rewind.rb

@@ -5,7 +5,7 @@
 # Fri Nov 13 10:30:32 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 require 'ruote/participant'
 
@@ -25,19 +25,19 @@ class FtCursorRewindTest < Test::Unit::TestCase
       end
     end
 
-    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
-    bravo = @engine.register_participant :bravo, Ruote::StorageParticipant
-    charly = @engine.register_participant :charly, Ruote::StorageParticipant
+    alpha = @dashboard.register_participant :alpha, Ruote::StorageParticipant
+    bravo = @dashboard.register_participant :bravo, Ruote::StorageParticipant
+    charly = @dashboard.register_participant :charly, Ruote::StorageParticipant
 
     #noisy
 
     #
     # reaching initial situation...
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
     wait_for(:alpha)
 
-    alpha.reply(alpha.first)
+    alpha.proceed(alpha.first)
     wait_for(:bravo)
 
     #
@@ -46,7 +46,7 @@ class FtCursorRewindTest < Test::Unit::TestCase
     wi = bravo.first
     wi.fields['__command__'] = [ 'back', 2 ]
 
-    @engine.reply(wi)
+    @dashboard.reply(wi)
 
     #
     # workitem is back to alpha
@@ -64,19 +64,19 @@ class FtCursorRewindTest < Test::Unit::TestCase
       end
     end
 
-    @engine.register_participant :alpha, Ruote::StorageParticipant
-    @engine.register_participant :bravo, Ruote::StorageParticipant
-    sto = @engine.register_participant :charly, Ruote::StorageParticipant
+    @dashboard.register_participant :alpha, Ruote::StorageParticipant
+    @dashboard.register_participant :bravo, Ruote::StorageParticipant
+    sto = @dashboard.register_participant :charly, Ruote::StorageParticipant
 
     #noisy
 
     #
     # reaching initial situation...
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
     wait_for(:alpha)
 
-    sto.reply(sto.first)
+    sto.proceed(sto.first)
     wait_for(:bravo)
 
     #
@@ -84,13 +84,13 @@ class FtCursorRewindTest < Test::Unit::TestCase
 
     wi = sto.first
 
-    exp = @engine.process(wfid).expressions.find { |e| e.name == 'cursor' }
+    exp = @dashboard.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)
+    @dashboard.reply(wi)
 
     #
     # workitem is back to alpha

data/test/functional/ft_35_add_service.rb

@@ -5,7 +5,7 @@
 # Thu Dec 24 18:05:39 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 
 class FtAddServiceTest < Test::Unit::TestCase
@@ -24,33 +24,91 @@ class FtAddServiceTest < Test::Unit::TestCase
 
   def test_as_path_class
 
-    @engine.add_service('toto', 'ruote', 'FtAddServiceTest::MyService')
+    @dashboard.add_service('toto', 'ruote', 'FtAddServiceTest::MyService')
 
-    assert_equal MyService, @engine.context.toto.class
+    assert_equal MyService, @dashboard.context.toto.class
   end
 
   def test_as_instance
 
-    @engine.add_service('toto', MyService.new(nil))
+    @dashboard.add_service('toto', MyService.new(nil))
 
-    assert_equal MyService, @engine.context.toto.class
+    assert_equal MyService, @dashboard.context.toto.class
+  end
+
+  def test_as_class
+
+    @dashboard.add_service('toto', MyService)
+
+    assert_equal MyService, @dashboard.context.toto.class
   end
 
   def test_as_path_class_options
 
-    @engine.add_service(
+    @dashboard.add_service(
       'toto', 'ruote', 'FtAddServiceTest::MyService', 'colour' => 'blue')
 
-    assert_equal MyService, @engine.context.toto.class
-    assert_equal 'blue', @engine.context.toto.options['colour']
+    assert_equal MyService, @dashboard.context.toto.class
+    assert_equal 'blue', @dashboard.context.toto.options['colour']
   end
 
   def test_add_service_returns_service
 
-    toto = @engine.add_service(
+    toto = @dashboard.add_service(
       'toto', 'ruote', 'FtAddServiceTest::MyService', 'colour' => 'blue')
 
     assert_equal MyService, toto.class
   end
+
+  # Fighting https://github.com/jmettraux/ruote/issues/28
+  #
+  def test_add_history
+
+    assert_equal Ruote::DefaultHistory, @dashboard.context.history.class
+
+    @dashboard.add_service(
+      'history', 'ruote/log/storage_history', 'Ruote::StorageHistory')
+
+    assert_equal Ruote::StorageHistory, @dashboard.context.history.class
+
+    engine = Ruote::Engine.new(@dashboard.storage)
+
+    assert_equal Ruote::StorageHistory, engine.context.history.class
+  end
+
+  # Fighting https://github.com/jmettraux/ruote/issues/28
+  #
+  def test_add_history
+
+    assert_equal Ruote::DefaultHistory, @dashboard.history.class
+
+    @dashboard.add_service(
+      'history', 'ruote/log/storage_history', 'Ruote::StorageHistory')
+
+    assert_equal Ruote::StorageHistory, @dashboard.history.class
+
+    engine = Ruote::Engine.new(@dashboard.storage)
+
+    assert_equal Ruote::StorageHistory, engine.history.class
+  end
+
+  # Fighting https://github.com/jmettraux/ruote/issues/28
+  #
+  def test_add_history_and_log
+
+    #@dashboard.noisy = true
+
+    #previous_history = @dashboard.history
+
+    @dashboard.add_service(
+      'history', 'ruote/log/storage_history', 'Ruote::StorageHistory')
+
+    @dashboard.storage.put_msg('noop', 'nada' => true)
+
+    sleep 0.500
+
+    assert_equal(
+      'noop', @dashboard.history.by_date(Time.now.utc.to_s).first['action'])
+  end
 end
 

data/test/functional/ft_36_storage_history.rb

@@ -5,9 +5,9 @@
 # Tue Jan  5 17:51:10 JST 2010
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
-#require 'ruote/log/fs_history'
+require 'ruote/log/storage_history'
 require 'ruote/part/no_op_participant'
 
 
@@ -21,10 +21,10 @@ class FtStorageHistoryTest < Test::Unit::TestCase
       echo 'done.'
     end
 
-    history = @engine.add_service(
+    history = @dashboard.add_service(
       'history', 'ruote/log/storage_history', 'Ruote::StorageHistory')
 
-    @engine.register_participant :alpha, Ruote::NoOpParticipant
+    @dashboard.register_participant :alpha, Ruote::NoOpParticipant
 
     #noisy
 
@@ -33,51 +33,51 @@ class FtStorageHistoryTest < Test::Unit::TestCase
 
     sleep 0.100
 
-    assert_equal 19, @engine.storage.get_many('history').size
+    assert_equal 19, @dashboard.storage.get_many('history').size
 
-    h = @engine.context.history.by_process(wfid0)
+    h = @dashboard.context.history.by_process(wfid0)
     #h.each { |r| p r }
     assert_equal 9, h.size
 
     # testing record.to_h
 
-    h = @engine.context.history.by_process(wfid1)
+    h = @dashboard.context.history.by_process(wfid1)
     #h.each { |r| p r }
     assert_equal 9, h.size
 
     history.clear!
 
-    assert_equal 0, @engine.storage.get_many('history').size
+    assert_equal 0, @dashboard.storage.get_many('history').size
   end
 
   def test_by_date
 
-    @engine.add_service(
+    @dashboard.add_service(
       'history', 'ruote/log/storage_history', 'Ruote::StorageHistory')
 
     6.times do |i|
-      @engine.storage.put(
-        '_id' => "!2010-01-06!11414#{i}!0!!20100106-bichisosupo",
+      @dashboard.storage.put(
+        '_id' => "!2010-01-06!11414#{i}!0!!20100106-bichisosupa",
         'type' => 'history')
     end
     7.times do |i|
-      @engine.storage.put(
+      @dashboard.storage.put(
         '_id' => "!2010-01-07!11414#{i}!0!!20100107-bichitehoni",
         'type' => 'history')
     end
 
-    assert_equal 6, @engine.context.history.by_date('2010-01-06').size
-    assert_equal 7, @engine.context.history.by_date('2010-01-07').size
+    assert_equal 6, @dashboard.context.history.by_date('2010-01-06').size
+    assert_equal 7, @dashboard.context.history.by_date('2010-01-07').size
   end
 
   def test_range
 
-    @engine.add_service(
+    @dashboard.add_service(
       'history', 'ruote/log/storage_history', 'Ruote::StorageHistory')
 
     7.times do |i|
       i = i + 1
-      @engine.storage.put(
+      @dashboard.storage.put(
         '_id' => "!2010-01-0#{i}!114147!0!!2010010#{i}-bichisosupo",
         'type' => 'history')
     end
@@ -85,30 +85,98 @@ class FtStorageHistoryTest < Test::Unit::TestCase
     assert_equal(
       [ Time.parse('2010-01-01 00:00:00 UTC'),
         Time.parse('2010-01-08 00:00:00 UTC') ],
-      @engine.context.history.range)
+      @dashboard.context.history.range)
   end
 
   def test_engine_dot_history
 
-    @engine.add_service(
+    @dashboard.add_service(
       'history', 'ruote/log/storage_history', 'Ruote::StorageHistory')
 
-    assert_equal Ruote::StorageHistory, @engine.history.class
+    assert_equal Ruote::StorageHistory, @dashboard.history.class
   end
 
   def test_wfids
 
-    @engine.add_service(
+    @dashboard.add_service(
       'history', 'ruote/log/storage_history', 'Ruote::StorageHistory')
 
-    @engine.register_participant 'alpha', Ruote::NullParticipant
+    @dashboard.register_participant 'alpha', Ruote::NullParticipant
 
     3.times do
-      @engine.launch(Ruote.define { alpha })
-      @engine.wait_for(:alpha)
+      @dashboard.launch(Ruote.define { alpha })
+      @dashboard.wait_for(:alpha)
     end
 
-    assert_equal 3, @engine.history.wfids.size
+    assert_equal 3, @dashboard.history.wfids.size
+  end
+
+  # Cf
+  #   https://github.com/jmettraux/ruote/issues/29
+  #   http://ruote-irclogs.s3.amazonaws.com/log_2011-06-06.html
+  #
+  def test_concurrence_replies
+
+    @dashboard.add_service(
+      'history', 'ruote/log/storage_history', 'Ruote::StorageHistory')
+
+    pdef = Ruote.define do
+      concurrence :count => 1 do
+        alpha
+        bravo
+      end
+    end
+
+    @dashboard.register_participant :alpha, Ruote::NullParticipant
+    @dashboard.register_participant :bravo, Ruote::NoOpParticipant
+
+    #@dashboard.noisy = true
+
+    wfid = @dashboard.launch(pdef)
+    @dashboard.wait_for(wfid)
+
+    repliers = []
+
+    @dashboard.context.history.by_wfid(wfid).each do |record|
+      if record['action'] == 'reply'
+        wi = record['workitem']
+        repliers << [ wi['fei']['expid'], wi['participant_name'] ]
+      end
+    end
+
+    assert_equal [ %w[ 0_0_1 bravo ], %w[ 0_0 bravo ] ], repliers[0, 2]
+  end
+
+  class MyStorageHistory < Ruote::StorageHistory
+
+    # Only accept 'dispatched' messages.
+    #
+    def accept?(msg)
+
+      msg['action'] == 'dispatched'
+    end
+  end
+
+  def test_accept
+
+    @dashboard.add_service('history', MyStorageHistory)
+
+    @dashboard.register_participant '.+', Ruote::NoOpParticipant
+
+    pdef = Ruote.define do
+      alpha
+      bravo
+      charly
+    end
+
+    wfid = @dashboard.launch(pdef)
+    r = @dashboard.wait_for(wfid)
+
+    assert_equal 'terminated', r['action']
+
+    msgs = @dashboard.history.by_process(wfid)
+
+    assert_equal %w[ dispatched ] * 3, msgs.collect { |m| m['action'] }
   end
 end