@@ -50,10 +50,10 @@ module OpenWFE # require 'openwfe/def' # # class AnotherDefinition0 < OpenWFE::ProcessDefinition - # sequence do - # participant :ref => "toto" - # subprocess :ref => "http://company.process.server/def0.rb" - # end + # sequence do + # participant :ref => "toto" + # subprocess :ref => "http://company.process.server/def0.rb" + # end # end # # (but the engine parameter :remove_definitions_allowed must be set to true, @@ -134,7 +134,6 @@ module OpenWFE end end - # # Takes care of cancelling the subprocess as well if any # def cancel lib/openwfe/expressions/fe_subprocess.rb @@ -31,7 +31,6 @@ module OpenWFE # module ValueMixin - # # Expressions that include the ValueMixin let it gather values and # then, in their reply() methods do the job with the values. # The gathering task is performed by the ValueMixin. @@ -82,18 +81,18 @@ module OpenWFE private - def lookup (name_array, workitem) - - name_array.each do |n| + def lookup (name_array, workitem) - v = lookup_string_attribute(n, workitem) + name_array.each do |n| - return v if v != nil - # covers v = false as well - end + v = lookup_string_attribute(n, workitem) - nil + return v if v != nil + # covers v == false as well end + + nil + end end end lib/openwfe/expressions/value.rb @@ -21,10 +21,10 @@ class FlowTest84b < Test::Unit::TestCase # TEST 0 class Test0 < OpenWFE::ProcessDefinition - sub0 - define "sub0" do - toto - end + sub0 + define "sub0" do + toto + end end def test_0 old_test/ft_84b_subrepr.rb @@ -60,7 +60,7 @@ end # no description sequence do end - define "sub0" do + define :name => "sub0" do end end @@ -70,7 +70,6 @@ end assert_nil OpenWFE::ExpressionTree.get_description(tree) tree = OpenWFE::DefParser.parse Test2b - #p tree assert_nil OpenWFE::ExpressionTree.get_description(tree) end end test/unit/ut_8_parser_description.rb f7e16d003651193c3e282a312c191888f6706940 John Mettraux jmettraux@gmail.com http://github.com/jmettraux/ruote/commit/e7c6652f5911959e5883ac608cb8cf538821c429 e7c6652f5911959e5883ac608cb8cf538821c429 2009-05-19T23:43:47-07:00 2009-05-19T23:43:47-07:00 define 'sub0' is no no; adapted test b0179ea9f3a8b18af605615f7630128241ff4ec3 John Mettraux jmettraux@gmail.com