ruote 2.1.7 → 2.1.8

data/test/functional/ft_28_null_noop_participants.rb

@@ -45,7 +45,7 @@ class FtNullNoopParticipantsTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, "done."
+    assert_trace "done.", pdef
   end
 end
 

data/test/functional/ft_29_part_template.rb

@@ -20,14 +20,15 @@ class FtPartTemplateTest < Test::Unit::TestCase
 
     def initialize (opts={}, &block)
 
-      @block_template = block
       @template = opts[:template]
     end
 
     def consume (workitem)
 
       @context['s_tracer'] << render_template(
-        Ruote::Exp::FlowExpression.fetch(@context, workitem.fei.to_h), workitem)
+        @template,
+        Ruote::Exp::FlowExpression.fetch(@context, workitem.fei.to_h),
+        workitem)
       @context['s_tracer'] << "\n"
 
       reply_to_engine(workitem)
@@ -52,27 +53,7 @@ class FtPartTemplateTest < Test::Unit::TestCase
       :alpha,
       MyParticipant.new(:template => "0:${v:var0}\n1:${f:field0}"))
 
-    assert_trace pdef, %w[ 0:v_value 1:f_value done. ]
-  end
-
-  def test_block_template
-
-    pdef = Ruote.process_definition :name => 'def0' do
-      set 'v:var0' => 'v_value'
-      set 'f:field0' => 'f_value'
-      alpha
-      echo 'done.'
-    end
-
-    #noisy
-
-    @engine.register_participant(
-      :alpha,
-      MyParticipant.new {
-        "0:${v:var0}\n1:${f:field0}"
-      })
-
-    assert_trace pdef, %w[ 0:v_value 1:f_value done. ]
+    assert_trace %w[ 0:v_value 1:f_value done. ], pdef
   end
 end
 

data/test/functional/ft_30_smtp_participant.rb

@@ -13,7 +13,7 @@ require 'ruote/part/smtp_participant'
 class NftSmtpParticipantTest < Test::Unit::TestCase
   include FunctionalBase
 
-  if RUBY_PLATFORM != 'java'
+  unless Ruote::JAVA
 
     require 'mailtrap' # sudo gem install mailtrap
 
@@ -24,9 +24,9 @@ class NftSmtpParticipantTest < Test::Unit::TestCase
     end
   end
 
-  def test_smtp
+  def _test_smtp
 
-    return if RUBY_PLATFORM == 'java'
+    return if Ruote::JAVA
 
     pdef = Ruote.process_definition :name => 'test' do
       sequence do
@@ -38,7 +38,7 @@ class NftSmtpParticipantTest < Test::Unit::TestCase
     trapfile = Ruote::WIN ? 'ruote_mailtrap.txt' : '/tmp/ruote_mailtrap.txt'
     FileUtils.rm_f(trapfile)
 
-    Thread.new do
+    t = Thread.new do
       Trap.new('127.0.0.1', 2525, true, trapfile)
     end
     sleep 0.040
@@ -64,6 +64,52 @@ class NftSmtpParticipantTest < Test::Unit::TestCase
 
     assert_match(/cat food/, File.read(trapfile))
     assert_nil @engine.process(wfid)
+
+    t.kill
+  end
+
+  def test_smtp_non_instance_participant
+
+    return if Ruote::JAVA
+
+    pdef = Ruote.process_definition :name => 'test' do
+      sequence do
+        set 'f:item' => 'cat food'
+        alpha
+      end
+    end
+
+    trapfile = Ruote::WIN ? 'ruote_mailtrap.txt' : '/tmp/ruote_mailtrap.txt'
+    FileUtils.rm_f(trapfile)
+
+    t = Thread.new do
+      Trap.new('127.0.0.1', 2525, true, trapfile)
+    end
+    sleep 0.040
+      # give it some time to start listening
+
+    @engine.register_participant(
+      :alpha,
+      Ruote::SmtpParticipant,
+      :server => '127.0.0.1',
+      :port => 2525,
+      :to => 'toto@cloudwhatever.ch',
+      :from => 'john@outoftheblue.ch',
+      :notification => true,
+      :template => %{
+  Hello, do you want ${f:item} ?
+      })
+
+    #noisy
+
+    wfid = @engine.launch(pdef)
+
+    sleep 0.450
+
+    assert_match(/cat food/, File.read(trapfile))
+    assert_nil @engine.process(wfid)
+
+    t.kill
   end
 end
 

data/test/functional/ft_32_fs_history.rb

@@ -7,11 +7,7 @@
 
 require File.join(File.dirname(__FILE__), 'base')
 
-begin
-  require 'yajl'
-rescue LoadError
-  require 'json'
-end
+require_json
 Rufus::Json.detect_backend rescue nil
 
 require 'ruote/log/fs_history'
@@ -35,8 +31,8 @@ class FtFsHistoryTest < Test::Unit::TestCase
 
     #noisy
 
-    wfid0 = assert_trace(pdef, "done.")
-    wfid1 = assert_trace(pdef, "done.\ndone.")
+    wfid0 = assert_trace("done.", pdef)
+    wfid1 = assert_trace("done.\ndone.", pdef)
 
     sleep 0.100
 
@@ -81,7 +77,7 @@ class FtFsHistoryTest < Test::Unit::TestCase
 
     #noisy
 
-    wfid0 = assert_trace(pdef, "done.")
+    wfid0 = assert_trace("done.", pdef)
 
     sleep 0.100
 

data/test/functional/ft_33_participant_subprocess_priority.rb

@@ -26,7 +26,7 @@ class FtParticipantSubprocessPriorityTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, 'sub0'
+    assert_trace 'sub0', pdef
   end
 end
 

data/test/functional/ft_36_storage_history.rb

@@ -28,8 +28,8 @@ class FtStorageHistoryTest < Test::Unit::TestCase
 
     #noisy
 
-    wfid0 = assert_trace(pdef, "done.")
-    wfid1 = assert_trace(pdef, "done.\ndone.")
+    wfid0 = assert_trace("done.", pdef)
+    wfid1 = assert_trace("done.\ndone.", pdef)
 
     sleep 0.100
 

data/test/functional/ft_5_on_error.rb

@@ -25,7 +25,7 @@ class FtOnErrorTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace(pdef, 'caught')
+    assert_trace('caught', pdef)
 
     assert_equal 1, logger.log.select { |e| e['action'] == 'fail' }.size
   end
@@ -72,7 +72,7 @@ class FtOnErrorTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace(pdef, %w[ 1 2 done. ])
+    assert_trace(%w[ 1 2 done. ], pdef)
   end
 
   def test_on_error_undo
@@ -91,7 +91,7 @@ class FtOnErrorTest < Test::Unit::TestCase
 
     #noisy
 
-    wfid = assert_trace(pdef, %w[ a b d ])
+    wfid = assert_trace(%w[ a b d ], pdef)
 
     assert_nil @engine.process(wfid)
   end
@@ -124,7 +124,7 @@ class FtOnErrorTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace(pdef, 'failed.')
+    assert_trace('failed.', pdef)
   end
 
   def test_with_concurrence
@@ -147,7 +147,7 @@ class FtOnErrorTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace pdef, 'done.'
+    assert_trace 'done.', pdef
     assert_equal 1, a_count
     assert_equal 1, e_count
   end

data/test/functional/ft_8_participant_consumption.rb

@@ -25,7 +25,7 @@ class FtParticipantConsumptionTest < Test::Unit::TestCase
 
     #noisy
 
-    assert_trace(pdef, 'alpha')
+    assert_trace('alpha', pdef)
 
     Thread.pass
       # making sure the reply to the participant expression is intercepted
@@ -69,7 +69,7 @@ class FtParticipantConsumptionTest < Test::Unit::TestCase
       @tracer << "#{workitem.participant_name} #{workitem.fei.expid}\n"
     end
 
-    assert_trace(pdef, 'alpha 0_0_0')
+    assert_trace('alpha 0_0_0', pdef)
   end
 end
 

data/test/path_helper.rb

@@ -7,7 +7,7 @@
 
 # making sure the tests see ruote
 
-puts "ruby #{RUBY_VERSION} #{RUBY_PLATFORM}"
+puts `ruby -v`
 
 ruotelib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 $:.unshift(ruotelib) unless $:.include?(ruotelib)

data/test/test_helper.rb

@@ -10,3 +10,20 @@ require File.join(File.dirname(__FILE__), 'path_helper')
 require 'test/unit'
 require 'rubygems'
 
+
+def require_json
+  begin
+    require 'yajl'
+  rescue LoadError
+    require 'json'
+  end
+end
+
+def require_patron
+  begin
+    require 'patron'
+  rescue LoadError
+    # stick with net/http
+  end
+end
+

data/test/unit/storage.rb

@@ -7,16 +7,8 @@
 
 require File.join(File.dirname(__FILE__), %w[ .. test_helper.rb ])
 
-begin
-  require 'yajl'
-rescue LoadError
-  require 'json'
-end
-begin
-  require 'patron'
-rescue LoadError
-  # stick with net/http
-end
+require_json
+require_patron
 
 require File.join(File.dirname(__FILE__), %w[ .. functional storage_helper.rb ])
 
@@ -125,13 +117,6 @@ class UtStorage < Test::Unit::TestCase
 
   def test_keys_should_be_string
 
-    #begin
-    #  require 'yajl'
-    #rescue LoadError
-    #  require 'json'
-    #end
-    #Rufus::Json.detect_backend
-
     doc = { '_id' => 'h0', 'type' => 'dogfood', :m0 => :z, :m1 => [ :a, :b ] }
 
     @s.put(doc)

data/test/unit/ut_19_part_template.rb

@@ -0,0 +1,76 @@
+
+#
+# testing ruote
+#
+# Thu Mar  4 10:24:30 JST 2010
+#
+
+require File.join(File.dirname(__FILE__), '..', 'test_helper.rb')
+
+require_json
+require 'ruote/part/template'
+
+
+class UtPartTemplateTest < Test::Unit::TestCase
+
+  class MyParticipant
+    include ::Ruote::TemplateMixin
+  end
+
+  DEFAULT = %{
+workitem for gonzalo
+
+{"wfid":"20100304-bidehachina","expid":"0_0_1"}
+
+ - 'car'  ==>  "BMW"
+ - 'model'  ==>  "BMW 328 Mille Miglia"
+  }.strip
+
+  def setup
+
+    @workitem = {
+      'fei'=> { 'wfid' => '20100304-bidehachina', 'expid' => '0_0_1' },
+      'participant_name' => 'gonzalo',
+      'fields' => {
+        'car' => 'BMW',
+        'model' => 'BMW 328 Mille Miglia'
+      }
+    }
+  end
+
+  def test_default_template
+
+    assert_equal(
+      DEFAULT,
+      MyParticipant.new.render_default_template(@workitem))
+
+    assert_equal(
+      DEFAULT,
+      MyParticipant.new.render_template(nil, nil, @workitem))
+  end
+
+  def test_file_template
+
+    fn = "#{__FILE__}.template"
+
+    File.open(fn, 'wb') { |f| f.write('the model is ${f:model}') }
+
+    assert_equal(
+      'the model is BMW 328 Mille Miglia',
+      MyParticipant.new.render_template(fn, nil, @workitem))
+
+    FileUtils.rm_f(fn)
+  end
+
+  def test_string_template
+
+    template = %{
+My car is a ${f:car}
+    }.strip
+
+    assert_equal(
+      'My car is a BMW',
+      MyParticipant.new.render_template(template, nil, @workitem))
+  end
+end
+

data/test/unit/ut_1_fei.rb

@@ -74,5 +74,18 @@ class UtFeiTest < Test::Unit::TestCase
     assert_equal f0.hash, f1.hash
     assert_not_equal f0.hash, f2.hash
   end
+
+  def test_from_id
+
+    assert_equal(
+      '0_0_1!!20100224-fake',
+      Ruote::FlowExpressionId.from_id('0_0_1!!20100224-fake').to_storage_id)
+    assert_equal(
+      '0_0_1!!20100224-fake',
+      Ruote::FlowExpressionId.from_id('wi!0_0_1!!20100224-fake').to_storage_id)
+    assert_equal(
+      '0_0_1!!20100224-fake',
+      Ruote::FlowExpressionId.from_id('wi!store!0_0_1!!20100224-fake').to_storage_id)
+  end
 end
 

data/test/unit/ut_20_composite_storage.rb

@@ -0,0 +1,34 @@
+
+#
+# testing ruote
+#
+# Sun Mar 14 21:25:52 JST 2010
+#
+
+require File.join(File.dirname(__FILE__), '..', 'test_helper.rb')
+
+require 'ruote'
+require 'ruote/storage/composite_storage'
+
+
+class UtCompositeStorageTest < Test::Unit::TestCase
+
+  def test_initial
+
+    msgs = Ruote::HashStorage.new({})
+    default = Ruote::HashStorage.new({})
+
+    cs = Ruote::CompositeStorage.new(default, 'msgs' => msgs)
+
+    cs.put('action' => 'terminate', 'type' => 'msgs', 'id' => 'xxx')
+    cs.put_msg('terminate', 'type' => 'msgs')
+    cs.put_schedule('at', {}, Time.now + 10, 'action' => 'reply')
+
+    assert_equal 0, default.h['msgs'].size
+    assert_equal 1, default.h['schedules'].size
+    assert_equal 2, cs.get_msgs.size
+    assert_equal 2, msgs.get_msgs.size
+    assert_equal 0, msgs.h['schedules'].size
+  end
+end
+