ruote 2.2.0 → 2.3.0

data/test/functional/ft_10_dollar.rb

@@ -5,7 +5,7 @@
 # Wed Jun 10 22:57:18 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 
 class FtDollarTest < Test::Unit::TestCase
@@ -88,14 +88,14 @@ class FtDollarTest < Test::Unit::TestCase
 
     #noisy
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
 
-    @engine.wait_for(wfid)
+    @dashboard.wait_for(wfid)
 
     assert_equal(
       "#<ArgumentError: 'ruby_eval_allowed' is set to false, cannot evaluate" +
       " >1 + 2< (http://ruote.rubyforge.org/dollar.html)>",
-      @engine.errors.first.message)
+      @dashboard.errors.first.message)
   end
 
   def test_r
@@ -108,7 +108,7 @@ class FtDollarTest < Test::Unit::TestCase
 
     #noisy
 
-    @engine.context['ruby_eval_allowed'] = true
+    @dashboard.context['ruby_eval_allowed'] = true
 
     assert_trace('>3<', pdef)
   end
@@ -118,6 +118,7 @@ class FtDollarTest < Test::Unit::TestCase
     pdef = Ruote.process_definition do
       sequence do
         set 'f:toto' => 'person'
+        echo "${r:wi['toto']}"
         echo "${r:wi.fields['toto']}"
         echo "${r:workitem.fields['toto']}"
       end
@@ -125,9 +126,9 @@ class FtDollarTest < Test::Unit::TestCase
 
     #noisy
 
-    @engine.context['ruby_eval_allowed'] = true
+    @dashboard.context['ruby_eval_allowed'] = true
 
-    assert_trace "person\nperson", pdef
+    assert_trace [ 'person' ] * 3, pdef
   end
 
   def test_r_and_d
@@ -141,7 +142,7 @@ class FtDollarTest < Test::Unit::TestCase
 
     #noisy
 
-    @engine.context['ruby_eval_allowed'] = true
+    @dashboard.context['ruby_eval_allowed'] = true
 
     assert_trace 'person', pdef
   end
@@ -170,9 +171,9 @@ class FtDollarTest < Test::Unit::TestCase
       end
     end
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
 
-    @engine.wait_for(wfid)
+    @dashboard.wait_for(wfid)
 
     assert_match /^0_0_0![^!]+!#{wfid}\n#{wfid}$/, @tracer.to_s
   end
@@ -186,7 +187,7 @@ class FtDollarTest < Test::Unit::TestCase
       end
     end
 
-    @engine.context['ruby_eval_allowed'] = true
+    @dashboard.context['ruby_eval_allowed'] = true
 
     #noisy
 
@@ -225,9 +226,9 @@ class FtDollarTest < Test::Unit::TestCase
 
     #noisy
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
 
-    r = @engine.wait_for(wfid)
+    r = @dashboard.wait_for(wfid)
 
     assert_equal(
       {
@@ -250,19 +251,79 @@ class FtDollarTest < Test::Unit::TestCase
       alpha :b => '$f:a'
     end
 
-    @engine.register_participant :alpha do |wi|
+    @dashboard.register_participant :alpha do |wi|
       wi.fields['parameters'] = wi.fields['params']
     end
 
     #noisy
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
 
-    r = @engine.wait_for(wfid)
+    r = @dashboard.wait_for(wfid)
 
     assert_equal(
       { 'b' => %w[ A B C ], 'ref' => 'alpha' },
       r['workitem']['fields']['parameters'])
   end
+
+  # Issue pointed out by John Le.
+  #
+  def test_not_a_number
+
+    pdef = Ruote.define do
+      echo 'a0', :if => '${a}'
+      echo 'a1', :if => '${a} is set'
+      echo 'b', :if => '${b}'
+      echo 'c'
+    end
+
+    wfid = @dashboard.launch(
+      pdef,
+      'a' => '0a')
+
+    @dashboard.wait_for(wfid)
+
+    assert_equal "a0\na1\nc", @tracer.to_s
+  end
+
+  def test_literal
+
+    pdef = Ruote.define do
+      set 'f:a' => true
+      _if '$a' do
+        echo 'a0'
+      end
+      echo 'a1', :if => '$a'
+    end
+
+    wfid = @dashboard.launch(pdef)
+    @dashboard.wait_for(wfid)
+
+    assert_equal "a0\na1", @tracer.to_s
+  end
+
+  def test_participant_params
+
+    #@dashboard.noisy = true
+
+    @dashboard.register :toto do |workitem, fexp|
+      workitem['a'] = fexp.compile_atts
+      workitem['p'] = workitem.params
+    end
+
+    pdef = Ruote.define do
+      toto "${a}", "${b}" => "${c}"
+    end
+
+    wfid = @dashboard.launch(pdef, 'a' => 'x', 'b' => 'y', 'c' => 'z')
+    r = @dashboard.wait_for(wfid)
+
+    assert_equal(
+      { 'y' => 'z', 'x' => nil, 'ref' => 'toto' },
+      r['workitem']['fields']['a'])
+    assert_equal(
+      { 'y' => 'z', 'x' => nil, 'ref' => 'toto' },
+      r['workitem']['fields']['p'])
+  end
 end
 

data/test/functional/ft_11_recursion.rb

@@ -5,7 +5,7 @@
 # Sat Jun 13 22:43:16 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 require 'ruote/part/local_participant'
 
@@ -39,7 +39,7 @@ class FtRecursionTest < Test::Unit::TestCase
 
   def test_main_recursion
 
-    @engine.context.stash[:wfids] = []
+    @dashboard.context.stash[:wfids] = []
 
     pdef = Ruote.process_definition :name => 'def0' do
       sequence do
@@ -48,18 +48,18 @@ class FtRecursionTest < Test::Unit::TestCase
       end
     end
 
-    alpha = @engine.register_participant :alpha, CountingParticipant
+    alpha = @dashboard.register_participant :alpha, CountingParticipant
 
     #noisy
 
     assert_trace(%w[ 1 2 3 4 5 6 ], pdef)
 
-    assert_equal 6, @engine.context.stash[:wfids].uniq.size
+    assert_equal 6, @dashboard.context.stash[:wfids].uniq.size
   end
 
   def test_sub_recursion
 
-    @engine.context.stash[:wfids] = []
+    @dashboard.context.stash[:wfids] = []
 
     pdef = Ruote.process_definition do
       define 'sub0' do
@@ -71,7 +71,7 @@ class FtRecursionTest < Test::Unit::TestCase
       sub0
     end
 
-    alpha = @engine.register_participant :alpha, CountingParticipant
+    alpha = @dashboard.register_participant :alpha, CountingParticipant
 
     #noisy
 
@@ -79,7 +79,7 @@ class FtRecursionTest < Test::Unit::TestCase
 
     #p alpha.wfids.uniq
 
-    assert_equal 6, @engine.context.stash[:wfids].uniq.size
+    assert_equal 6, @dashboard.context.stash[:wfids].uniq.size
   end
 
   def test_forgotten_main_recursion
@@ -93,11 +93,11 @@ class FtRecursionTest < Test::Unit::TestCase
       end
     end
 
-    alpha = @engine.register_participant :alpha, CountingParticipant
+    alpha = @dashboard.register_participant :alpha, CountingParticipant
 
     #noisy
 
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
 
     6.times { wait_for(:alpha) }
 

data/test/functional/ft_12_launchitem.rb

@@ -5,7 +5,7 @@
 # Tue Jun 23 10:55:16 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 
 class FtLaunchitemTest < Test::Unit::TestCase
@@ -17,27 +17,25 @@ class FtLaunchitemTest < Test::Unit::TestCase
       alpha
     end
 
-    @engine.register_participant :alpha do |workitem|
+    @dashboard.register_participant :alpha do |workitem|
       stash[:fields] = workitem.fields
-      @tracer << 'a'
+      tracer << 'a'
       nil
     end
 
-    #noisy
-
-    wfid = @engine.launch(pdef, 'a' => 0, 'b' => 1)
+    wfid = @dashboard.launch(pdef, 'a' => 0, 'b' => 1)
     wait_for(wfid)
 
     assert_equal('a', @tracer.to_s)
 
-    @engine.context.stash[:fields].delete('__result__')
+    @dashboard.context.stash[:fields].delete('__result__')
 
     assert_not_nil(
-      @engine.context.stash[:fields].delete('dispatched_at'))
+      @dashboard.context.stash[:fields].delete('dispatched_at'))
 
     assert_equal(
       {"a"=>0, "b"=>1, "params"=>{"ref"=>"alpha"}},
-      @engine.context.stash[:fields])
+      @dashboard.context.stash[:fields])
   end
 end
 

data/test/functional/ft_13_variables.rb

@@ -5,7 +5,7 @@
 # Tue Jun 23 11:16:39 JST 2009
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 
 
 class FtVariablesTest < Test::Unit::TestCase
@@ -17,14 +17,46 @@ class FtVariablesTest < Test::Unit::TestCase
       echo 'at:${wfid}:${expid}'
     end
 
-    #noisy
-
-    wfid = @engine.launch(pdef)
-    wait_for(wfid)
+    wfid = @dashboard.launch(pdef)
+    r = @dashboard.wait_for(wfid)
 
+    assert_equal 'terminated', r['action']
     assert_equal "at:#{wfid}:0_0", @tracer.to_s
   end
 
+  def test_mnemo_id
+
+    pdef = Ruote.process_definition do
+      echo '>${mnemo_id}<'
+    end
+
+    wfid = @dashboard.launch(pdef)
+    r = @dashboard.wait_for(wfid)
+
+    assert_equal 'terminated', r['action']
+    assert_match /^>[a-z]+<$/, @tracer.to_s
+  end
+
+  def test_tags
+
+    pdef = Ruote.define do
+      sequence :tag => 'a' do
+        sequence :tag => 'b' do
+          sequence :tag => 'c' do
+            echo '>${tags}<'
+            echo '>${tag}<'
+            echo '>${full_tag}<'
+          end
+        end
+      end
+    end
+
+    wfid = @dashboard.launch(pdef); r = @dashboard.wait_for(wfid)
+
+    assert_equal 'terminated', r['action']
+    assert_equal [ ">[\"a\", \"b\", \"c\"]<", ">c<", ">a/b/c<" ], @tracer.to_a
+  end
+
   def test_variables_event
 
     pdef = Ruote.process_definition do
@@ -35,8 +67,6 @@ class FtVariablesTest < Test::Unit::TestCase
       end
     end
 
-    #noisy
-
     assert_trace('done.', pdef)
 
     #logger.log.each { |e| p e }
@@ -64,8 +94,6 @@ class FtVariablesTest < Test::Unit::TestCase
       end
     end
 
-    #noisy
-
     assert_trace(%w[ a0:b0:a0:b0 a1:b1:a0:b1 a0:b1:a0:b1 ], pdef)
   end
 
@@ -80,9 +108,7 @@ class FtVariablesTest < Test::Unit::TestCase
       end
     end
 
-    #noisy
-
-    @engine.variables['vb'] = 'b0'
+    @dashboard.variables['vb'] = 'b0'
 
     assert_trace(%w[ a0: b0:b0 done. ], pdef)
 
@@ -104,9 +130,9 @@ class FtVariablesTest < Test::Unit::TestCase
       end
     end
 
-    @engine.context.stash[:results] = []
+    @dashboard.context.stash[:results] = []
 
-    @engine.register_participant :alpha do |workitem, fexp|
+    @dashboard.register_participant :alpha do |workitem, fexp|
 
       class << fexp
         public :locate_var
@@ -117,20 +143,87 @@ class FtVariablesTest < Test::Unit::TestCase
       stash[:results] << fexp.locate_var('a').first.fei.to_storage_id
     end
 
-    #noisy
-
     assert_trace 'done.', pdef
 
-    assert_equal(nil, @engine.context.stash[:results][0])
-    assert_match(/^0||\d+_\d+$/, @engine.context.stash[:results][1])
-    assert_match(/^0\_0|\d+|\d+_\d+$/, @engine.context.stash[:results][2])
+    assert_equal(nil, @dashboard.context.stash[:results][0])
+    assert_match(/^0||\d+_\d+$/, @dashboard.context.stash[:results][1])
+    assert_match(/^0\_0|\d+|\d+_\d+$/, @dashboard.context.stash[:results][2])
+  end
+
+  def test_lookup_var
+
+    pdef = Ruote.define do
+      set 'v:v0' => 'a'
+      sequence :scope => true do
+        echo 'v0:${v:v0}'
+        set 'v:v0' => nil
+        echo 'v0:${v:v0}'
+      end
+      echo 'v0:${v:v0}'
+    end
+
+    wfid = @dashboard.launch(pdef)
+    r = @dashboard.wait_for(wfid)
+
+    assert_equal %w[ v0:a v0: v0:a ], @tracer.to_a
+  end
+
+  def test_set_var_override
+
+    pdef = Ruote.define do
+      set 'v:v0' => 'a'
+      sequence :scope => true do
+        set 'v:v0' => 'b', :over => true
+        set 'v:v1' => 'b', :over => true
+        set 'v:/v2' => 'b', :over => true
+      end
+    end
+
+    wfid = @dashboard.launch(pdef)
+    r = @dashboard.wait_for(wfid)
+
+    assert_equal(
+      { 'v0' => 'b', 'v2' => 'b' },
+      r['variables'])
+  end
+
+  def test_set_var_override_sub
+
+    pdef = Ruote.define do
+
+      set 'v:v0' => 'a'
+      set 'v:v1' => 'a'
+      set 'v:v2' => 'a'
+      set 'v:v3' => 'a'
+      sub0
+      sequence :scope => true do
+        set 'v:v4' => 'a', :over => 'sub'
+      end
+
+      define 'sub0' do
+        set 'v:v0' => 'b'
+        set 'v:v1' => 'b', :over => true
+        set 'v:v3' => 'b'
+        sequence :scope => true do
+          set 'v:v2' => 'c', :over => 'sub'
+          set 'v:v3' => 'c', :over => 'sub'
+        end
+        set 'v:/v3' => '${v:v3}'
+      end
+    end
+
+    wfid = @dashboard.launch(pdef)
+    r = @dashboard.wait_for(wfid)
+
+    assert_equal(
+      [ 'a', 'b', 'a', 'c', nil ],
+      r['variables'].values_at(*%w[ v0 v1 v2 v3 v4 ]))
   end
 
   def test_lookup_in_var
 
-    @engine.register_participant :echo_toto do |wi, fexp|
-      @tracer << fexp.lookup_variable('toto').join
-      @tracer << "\n"
+    @dashboard.register_participant :echo_toto do |wi, fexp|
+      tracer << fexp.lookup_variable('toto').join + "\n"
     end
 
     pdef = Ruote.process_definition do
@@ -147,5 +240,15 @@ class FtVariablesTest < Test::Unit::TestCase
 
     assert_trace(%w[ b abC aC ], pdef)
   end
+
+  def test_terminated_and_variables
+
+    pdef = Ruote.define {}
+
+    wfid = @engine.launch(pdef, {}, { 'a' => 'b' })
+    r = @engine.wait_for(wfid)
+
+    assert_equal({ 'a' => 'b' }, r['variables'])
+  end
 end