ruote 0.9.18 → 0.9.19

data/test/back_0916_test.rb

@@ -17,95 +17,93 @@ require 'openwfe/engine/file_persisted_engine'
 
 class Back0916Test < Test::Unit::TestCase
 
-    WORK = 'work_back'
+  WORK = 'work_back'
 
-    def setup
+  def setup
 
-        FileUtils.rm_rf WORK
-        FileUtils.mkdir WORK
+    FileUtils.rm_rf WORK
+    FileUtils.mkdir WORK
 
-        `cd work_back && tar xzvf ../test/expool_20031219_0916.tgz`
+    `cd work_back && tar xzvf ../test/expool_20031219_0916.tgz`
 
-        ac = { :work_directory => WORK }
+    ac = { :work_directory => WORK }
 
-        @engine = OpenWFE::FilePersistedEngine.new ac
-    end
+    @engine = OpenWFE::FilePersistedEngine.new ac
+  end
 
-    def teardown
+  def teardown
 
-        $OWFE_LOG.level = Logger::INFO
-        FileUtils.rm_rf WORK
-    end
+    $OWFE_LOG.level = Logger::INFO
+    FileUtils.rm_rf WORK
+  end
 
-    def test_0
+  def test_0
 
-        $OWFE_LOG.level = Logger::DEBUG
+    $OWFE_LOG.level = Logger::DEBUG
 
-        trace = []
+    trace = []
 
-        @engine.register_participant :alpha do
-            trace << :alpha
-        end
+    @engine.register_participant :alpha do
+      trace << :alpha
+    end
 
-        @engine.reload
+    @engine.reload
 
-        ps = @engine.process_status "20080212-moshijuzuke" # an XML process
-        #p ps.expressions.collect { |e| e.fei.to_s }
-        exp = ps.expressions.first
-        wi = exp.applied_workitem
-        wi.message = "back from obsolesence"
+    ps = @engine.process_status '20080212-moshijuzuke' # an XML process
+    #p ps.expressions.collect { |e| e.fei.to_s }
+    exp = ps.expressions.first
+    wi = exp.applied_workitem
+    wi.message = "back from obsolesence"
 
-        @engine.reply wi
+    @engine.reply wi
 
-        sleep 0.350
+    sleep 0.350
 
-        assert_equal [ :alpha ], trace
+    assert_equal [ :alpha ], trace
 
-        ps = @engine.process_status "20080212-moshijuzuke"
-        #puts ps.size
-        #puts ps.collect { |e| e.fei.to_s }.join("\n")
+    ps = @engine.process_status '20080212-moshijuzuke'
+    #puts ps.size
+    #puts ps.collect { |e| e.fei.to_s }.join("\n")
 
-        assert_nil ps
+    assert_nil ps
 
-        @engine.stop
+    @engine.stop
 
-        sleep 0.300
-    end
+    sleep 0.300
+  end
 
-    def test_1
+  def test_1
 
-        $OWFE_LOG.level = Logger::DEBUG
+    $OWFE_LOG.level = Logger::DEBUG
 
-        trace = []
+    trace = []
 
-        #@engine.register_participant :employee do
-        #    trace << :assistant
-        #end
-        #@engine.register_participant :employee do
-        #    trace << :employee
-        #end
-        [ :user_bob, :user_alice ].each do |p|
-            @engine.register_participant p do
-                trace << p
-            end
-        end
+    #@engine.register_participant :employee do
+    #  trace << :assistant
+    #end
+    #@engine.register_participant :employee do
+    #  trace << :employee
+    #end
+    [ :user_bob, :user_alice ].each do |p|
+      @engine.register_participant(p) { trace << p }
+    end
 
-        @engine.reload
+    @engine.reload
 
-        ps = @engine.process_status "20080213-depejetzube" # an ruby procdef
-        exp = ps.expressions.first
-        wi = exp.applied_workitem
+    ps = @engine.process_status '20080213-depejetzube' # a ruby procdef
+    exp = ps.expressions.first
+    wi = exp.applied_workitem
 
-        @engine.reply wi
+    @engine.reply wi
 
-        sleep 0.400
+    sleep 0.400
 
-        assert_equal [ :user_bob, :user_bob ], trace
+    assert_equal [ :user_bob, :user_bob ], trace
 
-        assert_nil @engine.process_status("20080213-depejetzube")
+    assert_nil @engine.process_status('20080213-depejetzube')
 
-        @engine.stop
+    @engine.stop
 
-        sleep 0.300
-    end
+    sleep 0.300
+  end
 end

data/test/bm/bm_1_xml_vs_prog.rb

@@ -7,50 +7,53 @@
 
 require 'benchmark'
 
+require 'rubygems'
+
 require 'openwfe/def'
 #require 'openwfe/engine/engine'
 require 'openwfe/engine/file_persisted_engine'
 
 
 class ProgDef < OpenWFE::ProcessDefinition
-    sequence do
-        toto
-        toto
-        toto
-        toto
-        toto
-    end
+  sequence do
+    toto
+    toto
+    toto
+    toto
+    toto
+  end
 end
 
 xml = <<END
 <process-definition name="x" revision="y">
-    <sequence>
-        <toto/>
-        <toto/>
-        <toto/>
-        <toto/>
-        <toto/>
-    </sequence>
+  <sequence>
+    <toto/>
+    <toto/>
+    <toto/>
+    <toto/>
+    <toto/>
+  </sequence>
 </process-definition>
 END
 
 #$engine = OpenWFE::Engine.new
-$engine = OpenWFE::FilePersistedEngine.new
+$engine = OpenWFE::FilePersistedEngine.new(
+  :definition_in_launchitem_allowed => true)
 
 $engine.register_participant "toto" do |workitem|
-    # do nothing
+  # do nothing
 end
 
 N = 500
 
 def test (proc_def)
-    N.times do 
-        fei = $engine.launch proc_def
-        $engine.wait_for fei
-    end
+  N.times do
+    fei = $engine.launch proc_def
+    $engine.wait_for fei
+  end
 end
 
 Benchmark.bm do |x|
-    x.report("prog :") { test ProgDef }
-    x.report("xml :") { test xml.strip }
+  x.report("prog :") { test ProgDef }
+  x.report("xml :") { test xml.strip }
 end

data/test/bm/bm_2_step.rb

@@ -15,95 +15,95 @@ require 'flowtestbase'
 
 
 class FlowTestRecursion < Test::Unit::TestCase
-    include FlowTestBase
-
-    #def teardown
-    #end
-
-    #def setup
-    #end
-
-    #
-    # test 0
-    #
-
-    #N = 500
-    N = 100
-
-    #
-    # Test0, N=100
-    #
-    # Tue May 13 17:24:53 JST 2008
-    #
-    # without substitution :
-    # q : 2.72s
-    # p : 752s
-    #
-    # with substitution :
-    # q : 2.67s
-    # p : 715s
-    # (c : 10s)
-    #
-    # => :(
-    #
-    # with substitution : stack grows to 515 exps
-    # without : stack grows to 615 exps
-    #
-
-    #
-    # chaining N steps
-    #
-    # (took 39 seconds the first time for N = 500)
-    #
-    class Test0 < OpenWFE::ProcessDefinition
-
-        step0
-
-        (0..N).each do |i|
-            define "stage#{i}" do
-                sequence do
-                    _print "stage#{i}"
-                    set :f => 'outcome', :val => "step#{i+1}"
-                    #_print "${r:fexp.get_expression_storage.size}" if i == N
-                end
-            end
-            define "step#{i}" do
-                step "stage#{i}"
-            end
-        end
-
-        define "step#{N+1}" do
-            _print "over."
+  include FlowTestBase
+
+  #def teardown
+  #end
+
+  #def setup
+  #end
+
+  #
+  # test 0
+  #
+
+  #N = 500
+  N = 100
+
+  #
+  # Test0, N=100
+  #
+  # Tue May 13 17:24:53 JST 2008
+  #
+  # without substitution :
+  # q : 2.72s
+  # p : 752s
+  #
+  # with substitution :
+  # q : 2.67s
+  # p : 715s
+  # (c : 10s)
+  #
+  # => :(
+  #
+  # with substitution : stack grows to 515 exps
+  # without : stack grows to 615 exps
+  #
+
+  #
+  # chaining N steps
+  #
+  # (took 39 seconds the first time for N = 500)
+  #
+  class Test0 < OpenWFE::ProcessDefinition
+
+    step0
+
+    (0..N).each do |i|
+      define "stage#{i}" do
+        sequence do
+          _print "stage#{i}"
+          set :f => 'outcome', :val => "step#{i+1}"
+          #_print "${r:fexp.get_expression_storage.size}" if i == N
         end
+      end
+      define "step#{i}" do
+        step "stage#{i}"
+      end
     end
 
-    #
-    # testing against a sequence of N subprocess calls
-    #
-    # (took 6 seconds the first time for N = 500)
-    # (just chaining N 'print "stage#{i}"' takes 0.7 second)
-    #
-    class Test0b < OpenWFE::ProcessDefinition
+    define "step#{N+1}" do
+      _print "over."
+    end
+  end
+
+  #
+  # testing against a sequence of N subprocess calls
+  #
+  # (took 6 seconds the first time for N = 500)
+  # (just chaining N 'print "stage#{i}"' takes 0.7 second)
+  #
+  class Test0b < OpenWFE::ProcessDefinition
+    sequence do
+      (0..N).each do |i|
+        subprocess :ref => "stage#{i}"
+      end
+      _print "over."
+    end
+    (0..N).each do |i|
+      define "stage#{i}" do
         sequence do
-            (0..N).each do |i|
-                subprocess :ref => "stage#{i}"
-            end
-            _print "over."
-        end
-        (0..N).each do |i|
-            define "stage#{i}" do
-                sequence do
-                    _print "stage#{i}"
-                end
-            end
+          _print "stage#{i}"
         end
+      end
     end
+  end
 
-    def test_0
+  def test_0
 
-        dotest Test0, (0..N).collect { |i| "stage#{i}" }.join("\n") + "\nover."
-        #dotest Test0b, (0..N).collect { |i| "stage#{i}" }.join("\n") + "\nover."
-    end
+    dotest Test0, (0..N).collect { |i| "stage#{i}" }.join("\n") + "\nover."
+    #dotest Test0b, (0..N).collect { |i| "stage#{i}" }.join("\n") + "\nover."
+  end
 
 end
 

data/test/bm/ft_0f_5ms.rb

@@ -11,25 +11,25 @@ require 'flowtestbase'
 
 
 class FlowTest0b < Test::Unit::TestCase
-    include FlowTestBase
+  include FlowTestBase
 
-    #def setup
-    #end
+  #def setup
+  #end
 
-    #def teardown
-    #end
+  #def teardown
+  #end
 
-    class Test5ms < OpenWFE::ProcessDefinition
-        concurrence do
-            _print "a"
-            _print "b"
-        end
+  class Test5ms < OpenWFE::ProcessDefinition
+    concurrence do
+      _print "a"
+      _print "b"
     end
+  end
 
-    def test_0
+  def test_0
 
-        dotest Test5ms, "a\nb"
-    end
+    dotest Test5ms, "a\nb"
+  end
 
 end
 

data/test/bm/ft_26_load.rb

@@ -10,201 +10,199 @@
 require 'flowtestbase'
 require 'openwfe/def'
 
-include OpenWFE
-
 
 class FlowTest26c < Test::Unit::TestCase
-    include FlowTestBase
+  include FlowTestBase
 
-    #def setup
-    #end
+  #def setup
+  #end
 
-    #def teardown
-    #end
+  #def teardown
+  #end
 
-    #
-    # Test 0
-    #
+  #
+  # Test 0
+  #
 
-    class TestDefinition0 < ProcessDefinition
-        process_definition :name => "test0", :revision => "0" do
-            sequence do
-                count
-                count
-            end
-        end
+  class TestDefinition0 < ProcessDefinition
+    process_definition :name => "test0", :revision => "0" do
+      sequence do
+        count
+        count
+      end
+    end
+  end
+  #class TestDefinition0 < ProcessDefinition
+  #  count
+  #end
+
+  #def xxxx_load_0
+  def test_load_0
+
+    map = {}
+
+    @engine.register_participant("count") do |workitem|
+      count = map[workitem.flow_id]
+      count = unless count
+        1
+      else
+        count + 1
+      end
+      map[workitem.flow_id] = count
     end
-    #class TestDefinition0 < ProcessDefinition
-    #    count
-    #end
 
-    #def xxxx_load_0
-    def test_load_0
-
-        map = {}
-
-        @engine.register_participant("count") do |workitem|
-            count = map[workitem.flow_id]
-            count = unless count
-                1
-            else
-                count + 1
-            end
-            map[workitem.flow_id] = count
-        end
-
-        n = 1000
-
-        n.times do |i|
-            li = LaunchItem.new(TestDefinition0)
-            li.flow_id = i
-            @engine.launch(li)
-        end
-
-        #while @engine.get_expression_storage.size > 1
-        #    sleep 0.001
-        #end
-        @engine.join_until_idle
-
-        good = true
-
-        n.times do |i|
-            c = map[i]
-            if c == 2
-            #if c == 1
-                print "."
-            else
-                print c
-                good = false
-            end
-        end
-
-        #puts "\n__good ? #{good}"
-        assert good, "missing count"
-
-        #     100 in    1s (in memory engine)
-        #   1'000 in   14s (in memory engine)
-        #  10'000 in  143s (in memory engine)
-        #   1'000 in   31s (cache engine)
-        #  10'000 in  321s (cache engine)
-        #   1'000 in  113s (persistence only engine)
-        #  10'000 in 1173s (persistence only engine)
-        #
-        #
-        # ruby 1.8.5 (2006-12-25 patchlevel 12) [i686-darwin8.8.3]
-        #
-        # Machine Name:             Mac
-        # Machine Model:            MacBook2,1
-        # Processor Name:           Intel Core 2 Duo
-        # Processor Speed:          2 GHz
-        # Number Of Processors:     1
-        # Total Number Of Cores:    2
-        # L2 Cache (per processor): 4 MB
-        # Memory:                   2 GB
-        # Bus Speed:                667 MHz
-
-        # Thu Sep 13 15:38:46 JST 2007
-        #
-        #     100 in    3s (in memory engine)
-        #   1'000 in   85s (in memory engine)
-        #  10'000 in     s (in memory engine)
+    n = 1000
+
+    n.times do |i|
+      li = LaunchItem.new(TestDefinition0)
+      li.flow_id = i
+      @engine.launch(li)
+    end
+
+    #while @engine.get_expression_storage.size > 1
+    #  sleep 0.001
+    #end
+    @engine.join_until_idle
+
+    good = true
+
+    n.times do |i|
+      c = map[i]
+      if c == 2
+      #if c == 1
+        print "."
+      else
+        print c
+        good = false
+      end
     end
 
+    #puts "\n__good ? #{good}"
+    assert good, "missing count"
 
+    #   100 in  1s (in memory engine)
+    #   1'000 in   14s (in memory engine)
+    #  10'000 in  143s (in memory engine)
+    #   1'000 in   31s (cache engine)
+    #  10'000 in  321s (cache engine)
+    #   1'000 in  113s (persistence only engine)
+    #  10'000 in 1173s (persistence only engine)
+    #
+    #
+    # ruby 1.8.5 (2006-12-25 patchlevel 12) [i686-darwin8.8.3]
     #
-    # TEST 1
+    # Machine Name:       Mac
+    # Machine Model:      MacBook2,1
+    # Processor Name:       Intel Core 2 Duo
+    # Processor Speed:      2 GHz
+    # Number Of Processors:   1
+    # Total Number Of Cores:  2
+    # L2 Cache (per processor): 4 MB
+    # Memory:           2 GB
+    # Bus Speed:        667 MHz
+
+    # Thu Sep 13 15:38:46 JST 2007
     #
+    #   100 in  3s (in memory engine)
+    #   1'000 in   85s (in memory engine)
+    #  10'000 in   s (in memory engine)
+  end
+
+
+  #
+  # TEST 1
+  #
+
+  def xxxx_load_1
+  #def test_load_1
+
+    map = {}
+
+    @engine.register_participant("count") do |workitem|
+      count = map[workitem.flow_id]
+      count = unless count
+        1
+      else
+        count + 1
+      end
+      map[workitem.flow_id] = count
+      #puts "(#{workitem.flow_id} => #{map[workitem.flow_id]})"
+    end
 
-    def xxxx_load_1
-    #def test_load_1
-
-        map = {}
-
-        @engine.register_participant("count") do |workitem|
-            count = map[workitem.flow_id]
-            count = unless count
-                1
-            else
-                count + 1
-            end
-            map[workitem.flow_id] = count
-            #puts "(#{workitem.flow_id} => #{map[workitem.flow_id]})"
-        end
-
-        n = 10000
-
-        n.times do |i|
-
-            #t = Thread.new do
-            #    begin
-            #        li = LaunchItem.new(TestDefinition0)
-            #        li.flow_id = i
-            #        @engine.launch(li)
-            #        #print "."
-            #    rescue Exception => e
-            #        print "e"
-            #        @engine.lwarn do 
-            #            "ft_26_test_1 exception...\n" + 
-            #            OpenWFE::exception_to_s(e)
-            #        end
-            #    end
-            #end
-
-            li = LaunchItem.new(TestDefinition0)
-            li.flow_id = i
-
-            fei, t = @engine.launch(li, true)
-                #
-                # async : true
-
-            t.join if i == n-1
-        end
-
-        sleep(1)
-        puts
-
-        good = true
-
-        n.times do |i|
-
-            c = map[i]
-
-            if c == 2
-                print "."
-            elsif c == nil
-                print "x"
-                good = false
-            else
-                print c
-                good = false
-            end
-        end
-
-        #puts "\n__good ? #{good}"
-
-        assert good, "missing count"
-
-        #     100 in    3s (in memory engine)
-        #   1'000 in   85s (in memory engine)
-        #  10'000 in     s (in memory engine)
-        #   1'000 in  551s (cache engine)
-        #  10'000 in     s (cache engine)
-        #   1'000 in     s (persistence only engine)
-        #  10'000 in     s (persistence only engine)
-        #
+    n = 10000
+
+    n.times do |i|
+
+      #t = Thread.new do
+      #  begin
+      #    li = LaunchItem.new(TestDefinition0)
+      #    li.flow_id = i
+      #    @engine.launch(li)
+      #    #print "."
+      #  rescue Exception => e
+      #    print "e"
+      #    @engine.lwarn do
+      #      "ft_26_test_1 exception...\n" +
+      #      OpenWFE::exception_to_s(e)
+      #    end
+      #  end
+      #end
+
+      li = LaunchItem.new(TestDefinition0)
+      li.flow_id = i
+
+      fei, t = @engine.launch(li, true)
         #
-        # ruby 1.8.5 (2006-12-25 patchlevel 12) [i686-darwin8.8.3]
-        #
-        # Machine Name:             Mac
-        # Machine Model:            MacBook2,1
-        # Processor Name:           Intel Core 2 Duo
-        # Processor Speed:          2 GHz
-        # Number Of Processors:     1
-        # Total Number Of Cores:    2
-        # L2 Cache (per processor): 4 MB
-        # Memory:                   2 GB
-        # Bus Speed:                667 MHz
+        # async : true
+
+      t.join if i == n-1
+    end
+
+    sleep(1)
+    puts
+
+    good = true
+
+    n.times do |i|
+
+      c = map[i]
+
+      if c == 2
+        print "."
+      elsif c == nil
+        print "x"
+        good = false
+      else
+        print c
+        good = false
+      end
     end
 
+    #puts "\n__good ? #{good}"
+
+    assert good, "missing count"
+
+    #   100 in  3s (in memory engine)
+    #   1'000 in   85s (in memory engine)
+    #  10'000 in   s (in memory engine)
+    #   1'000 in  551s (cache engine)
+    #  10'000 in   s (cache engine)
+    #   1'000 in   s (persistence only engine)
+    #  10'000 in   s (persistence only engine)
+    #
+    #
+    # ruby 1.8.5 (2006-12-25 patchlevel 12) [i686-darwin8.8.3]
+    #
+    # Machine Name:       Mac
+    # Machine Model:      MacBook2,1
+    # Processor Name:       Intel Core 2 Duo
+    # Processor Speed:      2 GHz
+    # Number Of Processors:   1
+    # Total Number Of Cores:  2
+    # L2 Cache (per processor): 4 MB
+    # Memory:           2 GB
+    # Bus Speed:        667 MHz
+  end
+
 end