ruote 2.2.0 → 2.3.0

data/test/functional/eft_1_echo.rb

@@ -23,7 +23,7 @@
 
 #require 'profile'
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 
 class EftEchoTest < Test::Unit::TestCase

data/test/functional/eft_20_save.rb

@@ -5,7 +5,7 @@
 # Mon Aug  3 12:13:11 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 require 'ruote/participant'
 
@@ -22,15 +22,15 @@ class EftSaveTest < Test::Unit::TestCase
 
     #noisy
 
-    @engine.register_participant :alpha, Ruote::StorageParticipant
+    @dashboard.register_participant :alpha, Ruote::StorageParticipant
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
 
     wait_for(:alpha)
 
-    ps = @engine.process(wfid)
+    ps = @dashboard.process(wfid)
 
-    assert_equal Hash, ps.variables['v'].class
+    assert ps.variables['v'].kind_of?(Hash)
   end
 
   def test_save_to_field
@@ -43,9 +43,9 @@ class EftSaveTest < Test::Unit::TestCase
 
     #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)
 
@@ -63,14 +63,56 @@ class EftSaveTest < Test::Unit::TestCase
 
     #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)
 
     #p alpha.first.fields
     assert_equal 'surf', alpha.first.fields['h']['wi_as_before']['nada']
   end
+
+  # sfo -> fra
+
+  def test_save_to_f # and deep f
+
+    pdef = Ruote.process_definition do
+      set 'f:x' => 'val0'
+      set 'f:h' => {}
+      save :to => 'f:h.deep'
+      save :to => 'f:a'
+    end
+
+    #@dashboard.noisy = true
+
+    wfid = @dashboard.launch(pdef)
+
+    fields = @dashboard.wait_for(wfid)['workitem']['fields']
+    Ruote.delete_all(fields, '__result__')
+
+    assert_equal(
+      { 'deep' => { 'x' => 'val0', 'h' => {} } },
+      fields['h'])
+    assert_equal(
+      { 'x' => 'val0', 'h' => { 'deep' => { 'x' => 'val0', 'h' => { }  } } },
+      fields['a'])
+  end
+
+  def test_save_to_v
+
+    pdef = Ruote.process_definition do
+      set 'f:x' => 'val0'
+      save :to => 'v:a'
+      set 'f:y' => '$v:a'
+    end
+
+    #@dashboard.noisy = true
+
+    wfid = @dashboard.launch(pdef)
+    fields = @dashboard.wait_for(wfid)['workitem']['fields']
+
+    assert_equal({ 'x' => 'val0', '__result__' => 'val0' }, fields['y'])
+  end
 end
 

data/test/functional/eft_21_restore.rb

@@ -5,7 +5,7 @@
 # Tue Aug  4 08:53:33 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 
 class EftRestoreTest < Test::Unit::TestCase

data/test/functional/eft_22_noop.rb

@@ -5,7 +5,7 @@
 # Sun Aug 16 20:46:13 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 
 class EftNoOpTest < Test::Unit::TestCase

data/test/functional/eft_23_apply.rb

@@ -5,7 +5,7 @@
 # Thu Aug 20 13:21:54 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 
 class EftApplyTest < Test::Unit::TestCase

data/test/functional/eft_24_add_branches.rb

@@ -1,11 +1,10 @@
-
 #
 # testing ruote
 #
 # Fri Sep 11 16:09:32 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 
 class EftAddBranchesTest < Test::Unit::TestCase
@@ -25,7 +24,7 @@ class EftAddBranchesTest < Test::Unit::TestCase
 
     #noisy
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
     wait_for(wfid)
 
     assert_equal %w[ a b c d ], @tracer.to_a.sort
@@ -44,10 +43,10 @@ class EftAddBranchesTest < Test::Unit::TestCase
 
     #noisy
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
     wait_for(wfid)
 
-    assert_equal %w[ 1 2 3 4 5 ], @tracer.to_a.sort
+    assert_equal %w[ 0 1 2 3 4 ], @tracer.to_a.sort
   end
 
   def test_add_branches_times_and_whatever
@@ -63,10 +62,10 @@ class EftAddBranchesTest < Test::Unit::TestCase
 
     #noisy
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
     wait_for(wfid)
 
-    assert_equal %w[ 1 2 3 a b ], @tracer.to_a.sort
+    assert_equal %w[ 0 1 2 a b ], @tracer.to_a.sort
   end
 
   def test_add_branches_with_tag
@@ -87,7 +86,7 @@ class EftAddBranchesTest < Test::Unit::TestCase
 
     #noisy
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
     wait_for(wfid)
 
     assert_equal(

data/test/functional/eft_25_command.rb

@@ -5,7 +5,7 @@
 # Mon Sep 14 08:39:35 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 
 class EftCommandTest < Test::Unit::TestCase

data/test/functional/eft_26_error.rb

@@ -5,7 +5,7 @@
 # Tue Sep 15 19:26:33 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 
 class EftErrorTest < Test::Unit::TestCase
@@ -23,11 +23,11 @@ class EftErrorTest < Test::Unit::TestCase
 
     #noisy
 
-    wfid = @engine.launch(PDEF0)
+    wfid = @dashboard.launch(PDEF0)
 
     wait_for(wfid)
 
-    ps = @engine.process(wfid)
+    ps = @dashboard.process(wfid)
 
     assert_equal(
       'a', @tracer.to_s)
@@ -42,35 +42,35 @@ class EftErrorTest < Test::Unit::TestCase
 
     #noisy
 
-    wfid = @engine.launch(PDEF0)
+    wfid = @dashboard.launch(PDEF0)
 
     wait_for(wfid)
 
-    ps = @engine.process(wfid)
+    ps = @dashboard.process(wfid)
 
-    @engine.replay_at_error(ps.errors.first)
+    @dashboard.replay_at_error(ps.errors.first)
 
     wait_for(wfid)
 
-    assert_nil @engine.process(wfid)
+    assert_nil @dashboard.process(wfid)
     assert_equal "a\nb", @tracer.to_s
   end
 
   def test_error_cancel
 
-    wfid = @engine.launch(PDEF0)
+    wfid = @dashboard.launch(PDEF0)
 
     wait_for(wfid)
 
-    ps = @engine.process(wfid)
+    ps = @dashboard.process(wfid)
 
     sequence = ps.expressions.find { |fe| fe.fei.expid == '0_0' }
 
-    @engine.cancel_expression(sequence.fei)
+    @dashboard.cancel_expression(sequence.fei)
 
     wait_for(wfid)
 
-    assert_nil @engine.process(wfid)
+    assert_nil @dashboard.process(wfid)
     assert_equal 'a', @tracer.to_s
   end
 end

data/test/functional/eft_27_inc.rb

@@ -5,7 +5,7 @@
 # Sat Sep 19 12:56:16 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 
 class EftIncTest < Test::Unit::TestCase
@@ -28,8 +28,6 @@ class EftIncTest < Test::Unit::TestCase
       end
     end
 
-    #noisy
-
     assert_trace '2|2', pdef
   end
 
@@ -47,8 +45,6 @@ class EftIncTest < Test::Unit::TestCase
       end
     end
 
-    #noisy
-
     assert_trace '2|2', pdef
   end
 
@@ -60,17 +56,20 @@ class EftIncTest < Test::Unit::TestCase
         inc 'v:x', :val => 2
         inc 'f:y', :val => 3
         inc 'v:z', :val => 1.0
+
         inc :var => 'x', :val => '4'
         inc :field => 'y', :val => 5
         inc 'v:z', :val => '2.0'
 
+        inc 'v:x' => 2
+        inc 'y' => 2
+        inc 'v:z' => 0.5
+
         echo '${v:x}|${f:y}|${v:z}'
       end
     end
 
-    #noisy
-
-    assert_trace '6|8|3.0', pdef
+    assert_trace '8|10|3.5', pdef
   end
 
   def test_inc_v_val
@@ -86,14 +85,12 @@ class EftIncTest < Test::Unit::TestCase
       end
     end
 
-    #noisy
-
     assert_trace '4', pdef
   end
 
   def test_inc_array
 
-    @engine.context['ruby_eval_allowed'] = true
+    @dashboard.context['ruby_eval_allowed'] = true
 
     pdef = Ruote.process_definition do
       sequence do
@@ -106,15 +103,13 @@ class EftIncTest < Test::Unit::TestCase
       end
     end
 
-    #noisy
-
     assert_trace %w[ alpha bravo charly ], pdef
   end
 
   def test_inc_array_head
 
-    #@engine.context['ruby_eval_allowed'] = true
-    @engine.configure('ruby_eval_allowed', true)
+    #@dashboard.context['ruby_eval_allowed'] = true
+    @dashboard.configure('ruby_eval_allowed', true)
 
     pdef = Ruote.process_definition do
       sequence do
@@ -127,14 +122,12 @@ class EftIncTest < Test::Unit::TestCase
       end
     end
 
-    #noisy
-
     assert_trace %w[ charly alpha bravo ], pdef
   end
 
   def test_inc_array_missing
 
-    @engine.context['ruby_eval_allowed'] = true
+    @dashboard.context['ruby_eval_allowed'] = true
 
     pdef = Ruote.process_definition do
       sequence do
@@ -147,8 +140,6 @@ class EftIncTest < Test::Unit::TestCase
       end
     end
 
-    #noisy
-
     assert_trace %w[ charly charly ], pdef
   end
 
@@ -168,74 +159,60 @@ class EftIncTest < Test::Unit::TestCase
       end
     end
 
-    #noisy
-
     assert_trace '3|3|-1', pdef
   end
 
   def test_dec_array
 
-    @engine.context['ruby_eval_allowed'] = true
+    @dashboard.context['ruby_eval_allowed'] = true
 
-    pdef = Ruote.process_definition do
-      sequence do
+    pdef = Ruote.define do
 
-        set 'v:x' => %w[ a b c ]
-        set 'v:y' => %w[ a b c ]
+      set 'v:x' => %w[ a b c ]
+      set 'v:y' => %w[ d e f ]
 
-        dec 'v:x'
-        dec 'v:y', :position => :head
+      dec 'v:x'
+      dec 'v:y', :position => :head
 
-        echo '${r:fe.lv("x").join(".")}'
-        echo '${r:fe.lv("y").join(".")}'
-        echo '${v:d}'
-      end
+      echo '${r:fe.lv("x").join(".")}'
+      echo '${r:fe.lv("y").join(".")}'
+      echo '${__result__}'
     end
 
-    #noisy
-
-    assert_trace %w[ a.b b.c a ], pdef
+    assert_trace %w[ a.b e.f d ], pdef
   end
 
-  def test_dec_to
+  def test_dec_val
 
-    @engine.context['ruby_eval_allowed'] = true
+    @dashboard.context['ruby_eval_allowed'] = true
 
-    pdef = Ruote.process_definition do
-      sequence do
+    pdef = Ruote.define do
 
-        set 'v:x' => %w[ a b c ]
+      set 'v:x' => %w[ a b c ]
 
-        dec 'v:x', :to_var => 'y'
+      dec 'v:x', :val => 'b'
 
-        echo '${r:fe.lv("x").join(".")}'
-        echo '${v:y}'
-      end
+      echo '${r:fe.lv("x").join(".")}'
+      echo '${__result__}'
     end
 
-    #noisy
-
-    assert_trace %w[ a.b c ], pdef
+    assert_trace %w[ a.c b ], pdef
   end
 
-  def test_dec_val
+  def test_dec_val_to_d
 
-    @engine.context['ruby_eval_allowed'] = true
+    @dashboard.context['ruby_eval_allowed'] = true
 
-    pdef = Ruote.process_definition do
-      sequence do
+    pdef = Ruote.define do
 
-        set 'v:x' => %w[ a b c ]
+      set 'v:x' => %w[ a b c ]
 
-        dec 'v:x', :val => 'b'
+      dec 'v:x', :val => 'b', :to_v => 'd'
 
-        echo '${r:fe.lv("x").join(".")}'
-        echo '${v:d}'
-      end
+      echo '${r:fe.lv("x").join(".")}'
+      echo '${v:d}'
     end
 
-    #noisy
-
     assert_trace %w[ a.c b ], pdef
   end
 
@@ -246,14 +223,12 @@ class EftIncTest < Test::Unit::TestCase
         set 'v:x' => %w[ a b c d ]
         repeat do
           dec 'v:x', :pos => :head
-          _break :unless => '${v:d}'
-          echo '${v:d}'
+          echo '${__result__}'
+          _break :unless => '${__result__}'
         end
       end
     end
 
-    #noisy
-
     assert_trace %w[ a b c d ], pdef
   end
 
@@ -266,15 +241,84 @@ class EftIncTest < Test::Unit::TestCase
       end
     end
 
-    #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
   end
+
+  def test_nested_inc
+
+    pdef = Ruote.define do
+
+      set :var => 'x', :value => 1
+
+      inc 'v:x' do
+        set '__result__' => 2
+      end
+
+      echo '${v:x}'
+    end
+
+    wfid = @dashboard.launch(pdef)
+    r = @dashboard.wait_for(wfid)
+
+    assert_equal 'terminated', r['action']
+    assert_equal '3', @tracer.to_s
+  end
+
+  def test_push
+
+    pdef = Ruote.define do
+      push 'v:x' => 1
+      push 'v:x' => 2
+    end
+
+    wfid = @dashboard.launch(pdef)
+    r = @dashboard.wait_for(wfid)
+
+    assert_equal 'terminated', r['action']
+    assert_equal [ 1, 2 ], r['variables']['x']
+  end
+
+  def test_pop
+
+    pdef = Ruote.define do
+      pop 'v:x'
+      push 'v:x' => false
+      push 'v:x' => 1
+      push 'v:x' => 2
+      pop 'v:x'
+    end
+
+    wfid = @dashboard.launch(pdef)
+    r = @dashboard.wait_for(wfid)
+
+    assert_equal 'terminated', r['action']
+    assert_equal [ false, 1 ], r['variables']['x']
+    assert_equal 2, r['workitem']['fields']['__result__']
+  end
+
+  def test_pop_2
+
+    pdef = Ruote.define do
+
+      set 'v:x' => 12
+      push 'v:x' => 4
+      pop 'v:x'
+
+      pop 'v:y'
+    end
+
+    wfid = @dashboard.launch(pdef)
+    r = @dashboard.wait_for(wfid)
+
+    assert_equal 'terminated', r['action']
+    assert_equal [ 12 ], r['variables']['x']
+    assert_equal [], r['variables']['y']
+  end
 end