openwferu 0.9.16 → 0.9.17

data/test/file_persistence_test.rb

@@ -19,7 +19,7 @@ class FilePersistenceTest < Test::Unit::TestCase
     end
 
     def ac
-        return @engine.application_context
+        @engine.application_context
     end
     
     # 
@@ -33,8 +33,8 @@ class FilePersistenceTest < Test::Unit::TestCase
     # flow expression check
     def test_flow_expression
         fei = new_fei()
-        fes = YamlFileExpressionStorage.new("yaml", ac)
-        fe = SequenceExpression.new(fei, nil, nil, nil, nil)
+        fes = YamlFileExpressionStorage.new "yaml", ac
+        fe = SequenceExpression.new_exp fei, nil, nil, nil, nil
         test_persistence(fes,fe)
     end
 
@@ -74,9 +74,9 @@ class FilePersistenceTest < Test::Unit::TestCase
     def test_utf8_with_file
 
         workflow_definition_name = "みんなにARIGATOU★☆に関する最新の情報公開"
-        fei = new_fei(workflow_definition_name)
-        fes = YamlFileExpressionStorage.new("yaml", ac)
-        fe = SequenceExpression.new(fei, nil, nil, nil, nil)
+        fei = new_fei workflow_definition_name
+        fes = YamlFileExpressionStorage.new "yaml", ac
+        fe = SequenceExpression.new_exp fei, nil, nil, nil, nil
         
         loaded = test_persistence(fes, fe)
 
@@ -95,12 +95,8 @@ class FilePersistenceTest < Test::Unit::TestCase
             fei = new_fei()
             fes.delete(fei) if (fes.has_key?(fei))
             
-            raw = 
-                  if fe == nil 
-                      RawExpression.new(fei, 'parent', 'env', nil, nil) 
-                  else
-                      fe
-                  end
+            raw = fe ? \
+                fe : RawExpression.new_raw(fei, 'parent', 'env', nil, nil)
 
             assert \
                 (not fes.has_key?(fei)), 

data/test/filep_cancel_test.rb

@@ -0,0 +1,116 @@
+
+#
+# Testing OpenWFE
+#
+# John Mettraux at openwfe.org
+#
+# Sun Nov 25 14:41:32 JST 2007
+#
+
+require 'test/unit'
+require 'fileutils'
+require 'openwfe/def'
+require 'openwfe/engine/file_persisted_engine'
+#require 'openwfe/expool/yamlexpstorage'
+
+include OpenWFE
+
+
+class FilePersistenceAndCancel < Test::Unit::TestCase
+
+    #def setup
+    #end
+
+    def teardown
+
+        $OWFE_LOG.level = Logger::INFO
+
+        FileUtils.rm_rf "work_filep"
+    end
+
+    class OpenWFE::YamlFileExpressionStorage
+        public :compute_file_path
+    end
+
+    XMLDEF = <<XML
+<process-definition name="simple_sequence" revision="1">
+<description>
+a tiny 'hello world' sequence
+</description>
+<sequence>
+<set field="message" value="hello world !" />
+<participant ref="bravo" />
+<participant ref="alpha" />
+</sequence>
+</process-definition>
+XML
+
+    class TestDef0 < ProcessDefinition
+        sequence do
+            alpha
+            bravo
+        end
+    end
+
+    def test_0
+
+        ac = { :work_directory => "work_filep" }
+
+        @engine = FilePersistedEngine.new ac
+
+        #fei = @engine.launch TestDef0
+        fei = @engine.launch XMLDEF
+
+        sleep 0.300
+
+        assert File.exist?(path0(fei))
+
+        @engine.cancel_process fei.wfid
+
+        sleep 0.300
+
+        assert ( ! File.exist?(path0(fei)))
+        #assert ( ! File.exist?("./work/ejournal/#{fei.wfid}.ejournal"))
+
+        @engine.stop
+
+        FileUtils.rm_rf "work_filep"
+    end
+
+    def test_1
+
+        ac = { :work_directory => "work_filep" }
+
+        @engine = CachedFilePersistedEngine.new ac
+
+        #$OWFE_LOG.level = Logger::DEBUG
+
+        #fei = @engine.launch TestDef0
+        fei = @engine.launch XMLDEF
+
+        sleep 0.900
+            # it's a bit longish...
+
+        #puts path1(fei)
+        assert File.exist?(path1(fei))
+
+        @engine.cancel_process fei.wfid
+
+        sleep 0.900
+
+        assert ( ! File.exist?(path1(fei)))
+        #assert ( ! File.exist?("./work/ejournal/#{fei.wfid}.ejournal"))
+
+        @engine.stop
+    end
+
+    protected
+
+        def path0 (fei)
+            @engine.get_expression_storage.compute_file_path(fei)
+        end
+
+        def path1 (fei)
+            @engine.ac[S_EXPRESSION_STORAGE + ".1"].compute_file_path(fei)
+        end
+end

data/test/flowtestbase.rb

@@ -8,6 +8,7 @@
 # somewhere between Philippina and the Japan
 #
 
+require 'rubygems'
 require 'test/unit'
 
 require 'openwfe/workitem'
@@ -17,10 +18,10 @@ require 'openwfe/participants/participants'
 
 require 'rutest_utils'
 
-include OpenWFE
+#include OpenWFE
 
 
-$WORKFLOW_ENGINE_CLASS = Engine
+$WORKFLOW_ENGINE_CLASS = OpenWFE::Engine
 
 persistence = ENV["__persistence__"]
 
@@ -28,12 +29,12 @@ persistence = ENV["__persistence__"]
 if persistence == "pure-persistence"
 
     require "openwfe/engine/file_persisted_engine"
-    $WORKFLOW_ENGINE_CLASS = FilePersistedEngine
+    $WORKFLOW_ENGINE_CLASS = OpenWFE::FilePersistedEngine
 
 elsif persistence == "cached-persistence"
 
     require "openwfe/engine/file_persisted_engine"
-    $WORKFLOW_ENGINE_CLASS = CachedFilePersistedEngine
+    $WORKFLOW_ENGINE_CLASS = OpenWFE::CachedFilePersistedEngine
 
 elsif persistence == "db-persistence"
 
@@ -65,6 +66,11 @@ module FlowTestBase
 
         @engine = $WORKFLOW_ENGINE_CLASS.new
 
+        #@terminated_processes = []
+        #@engine.get_expression_pool.add_observer(:terminate) do |c, fe, wi|
+        #    @terminated_processes << fe.fei.wfid
+        #end
+
         @engine.application_context[:ruby_eval_allowed] = true
 
         @tracer = Tracer.new
@@ -87,7 +93,7 @@ module FlowTestBase
             @tracer << "--\n"
         end
 
-        @engine.register_participant('test-.*', PrintParticipant.new())
+        @engine.register_participant 'test-.*', OpenWFE::PrintParticipant.new
 
         @engine.register_participant('block-participant') do |workitem|
             @tracer << "the block participant received a workitem"
@@ -103,6 +109,7 @@ module FlowTestBase
     # TEARDOWN
     #
     def teardown
+
         if @engine
             $OWFE_LOG.level = Logger::INFO
             @engine.stop 
@@ -131,6 +138,17 @@ module FlowTestBase
             s
         end
 
+        #
+        # some tests return quickly, leverage the @terminated_processes
+        # of the test engine to determine those processes that are
+        # already over...
+        #
+        def wait_for (fei)
+
+            #return if @terminated_processes.include?(fei.wfid)
+            @engine.wait_for(fei)  
+        end
+
         #
         # dotest()
         #
@@ -145,14 +163,15 @@ module FlowTestBase
                 OpenWFE::LaunchItem.new(flowDef)
             end
 
-            fei = @engine.launch(li)
+            fei = @engine.launch li
 
             $OWFE_LOG.info { "dotest() launched #{fei.to_s}" }
 
             if join.is_a?(Numeric)
                 sleep join
             else
-                @engine.wait_for fei
+                #@engine.wait_for fei
+                wait_for fei
             end
 
             trace = @tracer.to_s
@@ -161,34 +180,37 @@ module FlowTestBase
 
             if expectedTrace.kind_of?(Array)
 
-                result = false
-                expectedTrace.each do |etrace|
-                    result = (result or (trace == etrace))
+                result = expectedTrace.find do |etrace|
+                    trace == etrace
                 end
-                unless result
-                    puts
-                    puts ">#{trace}<"
-                    puts
-                end
-                assert \
-                    result,
-                    "flow failed : trace doesn't correspond to any expected traces"
-            elsif expectedTrace.kind_of? Regexp
+                assert(
+                    (result != nil),
+                    """flow failed : 
+                   
+  trace doesn't correspond to any of the expected traces...
 
-                assert \
-                    trace.match(expectedTrace)
+  traced :
+                    
+'#{trace}'
+
+""")
+            elsif expectedTrace.kind_of?(Regexp)
+
+                assert trace.match(expectedTrace)
             else
 
-                assert \
+                assert(
                     trace == expectedTrace,
                     """flow failed : 
+
+  traced :
                     
 '#{trace}'
 
-  != 
+  but was expecting :
 
 '#{expectedTrace}'
-"""
+""")
             end
 
             if allowRemainingExpressions
@@ -203,7 +225,7 @@ module FlowTestBase
 
             if size != 1
                 puts
-                puts "    remaining expressions : #{exp_storage.length}"
+                puts "    remaining expressions : #{size}"
                 puts
                 puts exp_storage.to_s
                 puts

data/test/ft_0.rb

@@ -29,7 +29,7 @@ class FlowTest0 < Test::Unit::TestCase
     def test_empty
         dotest(
 '''<process-definition name="n" revision="0">
-</process-definition>''', "")
+</process-definition>''', '')
     end
 
     def test_dollar_notation_0

data/test/ft_10_loop.rb

@@ -40,11 +40,9 @@ class FlowTest10 < Test::Unit::TestCase
         </loop>
     </sequence>
 </process-definition>''', 
-        $s,
-        true)
+        $s)
     end
 
-    #def xxxx_loop_1
     def test_loop_1
         dotest(
 '<process-definition name="'+name_of_test+'''" revision="0">
@@ -59,11 +57,9 @@ class FlowTest10 < Test::Unit::TestCase
         </loop>
     </sequence>
 </process-definition>''', 
-        $s,
-        true)
+        $s)
     end
 
-    #def xxxx_loop_2
     def test_loop_2
         dotest(
 '<process-definition name="'+name_of_test+'''" revision="0">
@@ -76,11 +72,9 @@ class FlowTest10 < Test::Unit::TestCase
         </loop>
     </sequence>
 </process-definition>''', 
-        $s,
-        true)
+        $s)
     end
 
-    #def xxxx_loop_3
     def test_loop_3
         dotest(
 '<process-definition name="'+name_of_test+'''" revision="0">
@@ -93,11 +87,9 @@ class FlowTest10 < Test::Unit::TestCase
         </loop>
     </sequence>
 </process-definition>''', 
-        $s,
-        true)
+        $s)
     end
 
-    #def xxxx_loop_4
     def test_loop_4
         dotest(
 '<process-definition name="'+name_of_test+'''" revision="0">
@@ -110,8 +102,31 @@ class FlowTest10 < Test::Unit::TestCase
         </loop>
     </sequence>
 </process-definition>''', 
-        $s,
-        true)
+        $s)
+    end
+
+    def test_loop_5
+
+        #log_level_to_debug
+
+        dotest(
+'<process-definition name="'+name_of_test+'''" revision="0">
+    <sequence>
+        <reval>$i = 0</reval>
+        <loop>
+            <!--
+            <reval>$i = $i + 1</reval>
+            <set field="f" value="${r:$i}" />
+            -->
+            <set field="f">
+                <reval>$i = $i + 1</reval>
+            </set>
+            <print>${r:$i}</print>
+            <break if="${f:f}" />
+        </loop>
+    </sequence>
+</process-definition>''', 
+        '1')
     end
 
 end

data/test/{ft_10b_loop2.rb → ft_10b_loop.rb}

@@ -8,7 +8,7 @@
 #
 
 require 'flowtestbase'
-require 'openwfe/expressions/raw_prog'
+require 'openwfe/def'
 
 
 class FlowTest10b < Test::Unit::TestCase
@@ -50,16 +50,7 @@ class FlowTest10b < Test::Unit::TestCase
             workitem.__cursor_command__ = "break" if last_digit > "4"
         end
 
-        dotest(
-            TestDefinition0,
-            """
-0
-1
-2
-3
-4
-            """.strip,
-            true)
+        dotest TestDefinition0, (0..4).to_a.join("\n")
     end
 
 end

data/test/ft_11_ppd.rb

@@ -179,7 +179,7 @@ end
 
     def test_ppd_4
 
-        s = TestDefinition4.do_make.to_code_s
+        s = OpenWFE::ExpressionTree.to_code_s TestDefinition4.do_make
 
         dotest(
             TestDefinition4,
@@ -209,7 +209,7 @@ end
         end
     end
 
-    CODE5 = """
+    CODE5 = <<-EOS
 process_definition :name => 'test5', :revision => '0' do
     sequence do
         sequence do
@@ -224,26 +224,15 @@ process_definition :name => 'test5', :revision => '0' do
         end
     end
 end
-    """.strip
+    EOS
 
     def test_ppd_5
-    #def xxxx_ppd_5
-
-        s = TestDefinition5.do_make.to_code_s
 
-        #puts
-        #puts s
-        #puts
-        #puts TestDefinition5.do_make(ExpressionMap.new(nil, nil)).to_s
+        s = OpenWFE::ExpressionTree.to_code_s(TestDefinition5.do_make)
 
-        dotest(
-            TestDefinition5,
-            """a
-b""")
+        dotest TestDefinition5, "a\nb"
 
-        assert \
-            s == CODE5,
-            "nested sequences test failed (5)"
+        assert CODE5, s
     end