ruote 2.2.0 → 2.3.0

data/test/functional/eft_13_iterator.rb

@@ -5,7 +5,7 @@
 # Mon Jun 29 09:35:48 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 require 'ruote/participant'
 
@@ -44,7 +44,7 @@ class EftIteratorTest < Test::Unit::TestCase
       end
     end
 
-    @engine.register_participant '.*', TraceParticipant
+    @dashboard.register_participant '.*', TraceParticipant
 
     #noisy
 
@@ -59,7 +59,7 @@ class EftIteratorTest < Test::Unit::TestCase
       end
     end
 
-    @engine.register_participant '.*', TraceParticipant
+    @dashboard.register_participant '.*', TraceParticipant
 
     assert_trace(%w[ alice/0_0_0 bob/0_0_0 charly/0_0_0 ], pdef)
   end
@@ -73,11 +73,26 @@ class EftIteratorTest < Test::Unit::TestCase
       end
     end
 
-    @engine.register_participant '.*', TraceParticipant
+    @dashboard.register_participant '.*', TraceParticipant
 
     assert_trace(%w[ alice/0_1_0 bob/0_1_0 charly/0_1_0 ], pdef)
   end
 
+  def test_on_nested_f
+
+    pdef = Ruote.process_definition :name => 'test' do
+      set 'f:data' => {}
+      set 'f:data.people' => %w[ alice bob charly ]
+      iterator :on_f => 'data.people', :to_var => 'v' do
+        participant '${v:v}'
+      end
+    end
+
+    @dashboard.register_participant '.*', TraceParticipant
+
+    assert_trace(%w[ alice/0_2_0 bob/0_2_0 charly/0_2_0 ], pdef)
+  end
+
   def test_to_f
 
     pdef = Ruote.process_definition :name => 'test' do
@@ -86,8 +101,8 @@ class EftIteratorTest < Test::Unit::TestCase
       end
     end
 
-    @engine.register_participant '.*' do |workitem|
-      @tracer << "#{workitem.fields['f']}/#{workitem.fei.expid}\n"
+    @dashboard.register_participant '.*' do |workitem|
+      tracer << "#{workitem.fields['f']}/#{workitem.fei.expid}\n"
     end
 
     #noisy
@@ -95,6 +110,28 @@ class EftIteratorTest < Test::Unit::TestCase
     assert_trace(%w[ alice/0_0_0 bob/0_0_0 charly/0_0_0 ], pdef)
   end
 
+  def test_to
+
+    pdef = Ruote.process_definition :name => 'test' do
+      iterator :on_val => 'a, b', :to => 'x' do
+        echo '${f:x}'
+      end
+      iterator :on_val => 'c, d', :to => 'f:y' do
+        echo '${f:y}'
+      end
+      iterator :on_val => 'e, f', :to => 'v:z' do
+        echo '${v:z}'
+      end
+    end
+
+    #@dashboard.noisy = true
+
+    wfid = @dashboard.launch(pdef)
+    @dashboard.wait_for(wfid)
+
+    assert_equal %w[ a b c d e f ], @tracer.to_a
+  end
+
   PDEF0 = Ruote.process_definition :name => 'test' do
     sequence do
       iterator :on_val => 'alice, bob, charly', :to_var => 'v' do
@@ -106,9 +143,9 @@ class EftIteratorTest < Test::Unit::TestCase
 
   def test_break
 
-    @engine.register_participant '.*' do |workitem|
+    @dashboard.register_participant '.*' do |workitem|
 
-      @tracer << "#{workitem.participant_name}\n"
+      tracer << "#{workitem.participant_name}\n"
 
       if workitem.participant_name == 'bob'
         workitem.fields['__command__'] = [ 'break', nil ]
@@ -124,12 +161,12 @@ class EftIteratorTest < Test::Unit::TestCase
 
     stash[:rewound] = false
 
-    @engine.register_participant '.*' do |workitem|
+    @dashboard.register_participant '.*' do |workitem|
 
-      @tracer << "#{workitem.participant_name}\n"
+      tracer << "#{workitem.participant_name}\n"
 
-      if (not stash[:rewound]) and workitem.participant_name == 'bob'
-        stash[:rewound] = true
+      if (not context.stash[:rewound]) and workitem.participant_name == 'bob'
+        context.stash[:rewound] = true
         workitem.fields['__command__'] = [ 'rewind', nil ]
       end
     end
@@ -141,9 +178,9 @@ class EftIteratorTest < Test::Unit::TestCase
 
   def test_skip
 
-    @engine.register_participant '.*' do |workitem|
+    @dashboard.register_participant '.*' do |workitem|
 
-      @tracer << "#{workitem.participant_name}\n"
+      tracer << "#{workitem.participant_name}\n"
 
       if workitem.participant_name == 'alice'
         workitem.fields['__command__'] = [ 'skip', 1 ]
@@ -157,9 +194,9 @@ class EftIteratorTest < Test::Unit::TestCase
 
   def test_jump
 
-    @engine.register_participant '.*' do |workitem|
+    @dashboard.register_participant '.*' do |workitem|
 
-      @tracer << "#{workitem.participant_name}\n"
+      tracer << "#{workitem.participant_name}\n"
 
       if workitem.participant_name == 'alice'
         workitem.fields['__command__'] = [ 'jump', -1 ]
@@ -182,8 +219,8 @@ class EftIteratorTest < 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
 
     #noisy
@@ -199,8 +236,8 @@ class EftIteratorTest < 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
 
     #noisy
@@ -217,8 +254,8 @@ class EftIteratorTest < 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
 
     #noisy
@@ -234,9 +271,9 @@ class EftIteratorTest < Test::Unit::TestCase
       end
     end
 
-    @engine.register_participant :p1 do |wi|
-      @tracer << wi.fields['f'].join(':')
-      @tracer << "\n"
+    @dashboard.register_participant :p1 do |wi|
+      tracer << wi.fields['f'].join(':')
+      tracer << "\n"
     end
 
     #noisy
@@ -252,13 +289,19 @@ class EftIteratorTest < 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
 
-    #noisy
+    #@dashboard.noisy = true
 
-    assert_trace(%w[ alice:0/0_0_0 bob:1/0_0_0 charly:2/0_0_0 ], pdef)
+    wfid = @dashboard.launch(pdef)
+    r = @dashboard.wait_for(wfid)
+
+    assert_equal %w[ alice:0/0_0_0 bob:1/0_0_0 charly:2/0_0_0 ], @tracer.to_a
+
+    assert_equal 'charly', r['variables']['i']
+    assert_equal 2, r['variables']['ii']
   end
 
   def test_nested_break
@@ -301,5 +344,28 @@ class EftIteratorTest < Test::Unit::TestCase
 
     assert_trace %w[ 1 2 ], pdef
   end
+
+  def test_implicit_sequence
+
+    pdef = Ruote.process_definition :name => 'test' do
+      iterator :on_val => 'alice, bob, charly', :to_var => 'v' do
+        echo '0:${v:v}'
+        echo '1:${v:v}'
+      end
+    end
+
+    #@dashboard.noisy = true
+
+    wfid = @dashboard.launch(pdef)
+    r = @dashboard.wait_for(wfid)
+
+    assert_equal(
+      %w[
+        0:alice 1:alice
+        0:bob 1:bob
+        0:charly 1:charly
+      ],
+      @tracer.to_a)
+  end
 end
 

data/test/functional/eft_14_cursor.rb

@@ -5,7 +5,7 @@
 # Mon Jun 29 18:34:02 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 require 'ruote/part/no_op_participant'
 
@@ -147,10 +147,10 @@ class EftCursorTest < Test::Unit::TestCase
       end
     end
 
-    @engine.register_participant :alpha do |workitem|
+    @dashboard.register_participant :alpha do |workitem|
       workitem.fields['counter'] += 1
       workitem.fields['rewind'] = workitem.fields['counter'] < 5
-      @tracer << "a\n"
+      tracer << "a\n"
     end
 
     #noisy
@@ -169,17 +169,17 @@ class EftCursorTest < Test::Unit::TestCase
       end
     end
 
-    @engine.register_participant :author do |workitem|
-      @tracer << "a\n"
-      stash[:count] ||= 0
-      stash[:count] += 1
+    @dashboard.register_participant :author do |workitem|
+      tracer << "a\n"
+      context.stash[:count] ||= 0
+      context.stash[:count] += 1
     end
-    @engine.register_participant :reviewer do |workitem|
-      @tracer << "r\n"
-      workitem.fields['not_ok'] = (stash[:count] < 3)
+    @dashboard.register_participant :reviewer do |workitem|
+      tracer << "r\n"
+      workitem.fields['not_ok'] = (context.stash[:count] < 3)
     end
-    @engine.register_participant :publisher do |workitem|
-      @tracer << "p\n"
+    @dashboard.register_participant :publisher do |workitem|
+      tracer << "p\n"
     end
 
     #noisy
@@ -202,7 +202,7 @@ class EftCursorTest < Test::Unit::TestCase
 
     #noisy
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
 
     wait_for(14)
 
@@ -226,11 +226,11 @@ class EftCursorTest < Test::Unit::TestCase
       end
     end
 
-    @engine.register_participant :alpha, Ruote::NoOpParticipant
+    @dashboard.register_participant :alpha, Ruote::NoOpParticipant
 
     #noisy
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
 
     wait_for(:alpha)
     wait_for(wfid)
@@ -238,7 +238,7 @@ class EftCursorTest < Test::Unit::TestCase
     #p @tracer.to_s
     assert_equal %w[ a a a ], @tracer.to_a[0, 3]
 
-    assert_nil @engine.process(wfid)
+    assert_nil @dashboard.process(wfid)
   end
 
   def test_nested_break
@@ -319,7 +319,7 @@ class EftCursorTest < Test::Unit::TestCase
 
     #noisy
 
-    @engine.register do
+    @dashboard.register do
       alpha EftCursorTest::Alpha
       bravo EftCursorTest::Bravo
     end
@@ -335,13 +335,13 @@ class EftCursorTest < Test::Unit::TestCase
       end
     end
 
-    #@engine.noisy = true
+    #@dashboard.noisy = true
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
 
-    @engine.wait_for(9)
+    @dashboard.wait_for(9)
 
-    assert_not_nil @engine.process(wfid)
+    assert_not_nil @dashboard.process(wfid)
   end
 
   class Charly
@@ -371,7 +371,7 @@ class EftCursorTest < Test::Unit::TestCase
 
     #noisy
 
-    @engine.register do
+    @dashboard.register do
       charly EftCursorTest::Charly, 'command' => [ 'jump', 'delta' ]
       catchall Ruote::NoOpParticipant
     end
@@ -383,7 +383,7 @@ class EftCursorTest < Test::Unit::TestCase
 
     #noisy
 
-    @engine.register do
+    @dashboard.register do
       charly EftCursorTest::Charly, 'command' => 'jump delta'
       catchall Ruote::NoOpParticipant
     end
@@ -395,12 +395,62 @@ class EftCursorTest < Test::Unit::TestCase
 
     #noisy
 
-    @engine.register do
+    @dashboard.register do
       charly EftCursorTest::Charly, 'command' => 'jump to delta'
       catchall Ruote::NoOpParticipant
     end
 
     assert_trace "top\nbottom", JUMP_DEF
   end
+
+  def test_reset
+
+    pdef = Ruote.define do
+      cursor do
+        alpha
+        set 'f:toto' => 'oops'
+        reset
+      end
+    end
+
+    @dashboard.register { catchall }
+
+    #@dashboard.noisy = true
+
+    wfid = @dashboard.launch(pdef)
+    @dashboard.wait_for(:alpha)
+
+    assert_nil @dashboard.storage_participant.first.fields['toto']
+
+    @dashboard.storage_participant.proceed(@dashboard.storage_participant.first)
+    @dashboard.wait_for(:alpha)
+
+    assert_nil @dashboard.storage_participant.first.fields['toto']
+  end
+
+  def test_reset_if
+
+    pdef = Ruote.define do
+      cursor :reset_if => '${f:reset} == true' do
+        alpha
+        set 'f:toto' => 'oops'
+        set 'f:reset' => true
+      end
+    end
+
+    @dashboard.register { catchall }
+
+    #@dashboard.noisy = true
+
+    wfid = @dashboard.launch(pdef)
+    @dashboard.wait_for(:alpha)
+
+    assert_nil @dashboard.storage_participant.first.fields['toto']
+
+    @dashboard.storage_participant.proceed(@dashboard.storage_participant.first)
+    @dashboard.wait_for(:alpha)
+
+    assert_nil @dashboard.storage_participant.first.fields['toto']
+  end
 end
 

data/test/functional/eft_15_loop.rb

@@ -5,7 +5,7 @@
 # Mon Jun 29 22:29:15 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 
 class EftLoopTest < Test::Unit::TestCase
@@ -22,16 +22,16 @@ class EftLoopTest < Test::Unit::TestCase
 
     #noisy
 
-    @engine.register_participant :alpha do |workitem|
+    @dashboard.register_participant :alpha do |workitem|
 
-      @tracer << "a\n"
+      tracer << "a\n"
       (workitem.fields['count'] ||= 0)
       workitem.fields['count'] += 1
     end
 
-    @engine.register_participant :bravo do |workitem|
+    @dashboard.register_participant :bravo do |workitem|
 
-      @tracer << "b\n"
+      tracer << "b\n"
       workitem.fields['count'] += 1
 
       if workitem.fields['count'] > 5
@@ -52,9 +52,9 @@ class EftLoopTest < Test::Unit::TestCase
 
     #noisy
 
-    @engine.register_participant :alpha do |workitem|
+    @dashboard.register_participant :alpha do |workitem|
 
-      @tracer << "a\n"
+      tracer << "a\n"
       (workitem.fields['count'] ||= 0)
       workitem.fields['count'] += 1