test/functional/ft_10_dollar.rb in ruote-2.3.0.1 vs test/functional/ft_10_dollar.rb in ruote-2.3.0.2

@@ -19,12 +19,10 @@
         set :field => 'x', :val => 'field'
         echo '${x}'
       end
     end
 
-    #noisy
-
     assert_trace 'field', pdef
   end
 
   def test_v
 
@@ -36,12 +34,10 @@
         echo 'c${var:v0}'
         echo 'd${variable:v0}'
       end
     end
 
-    #noisy
-
     assert_trace(%w[ a b0 c0 d0 ], pdef)
   end
 
   def test_nested_v
 
@@ -55,12 +51,10 @@
         echo 'a:${v:v0.name}'
         echo 'b:${v:v0.address.1}'
       end
     end
 
-    #noisy
-
     assert_trace(%w[ a:toto b:atlantic_city ], pdef)
   end
 
   def test_f
 
@@ -71,12 +65,10 @@
         echo 'b${f:f.name}'
         echo 'c${f:f.address.1}'
       end
     end
 
-    #noisy
-
     assert_trace(%w[ a btoto cAsia ], pdef)
   end
 
   def test_no_r
 
@@ -84,12 +76,10 @@
       sequence do
         echo '>${r:1 + 2}<'
       end
     end
 
-    #noisy
-
     wfid = @dashboard.launch(pdef)
 
     @dashboard.wait_for(wfid)
 
     assert_equal(
@@ -104,12 +94,10 @@
       sequence do
         echo '>${r:1 + 2}<'
       end
     end
 
-    #noisy
-
     @dashboard.context['ruby_eval_allowed'] = true
 
     assert_trace('>3<', pdef)
   end
 
@@ -122,12 +110,10 @@
         echo "${r:wi.fields['toto']}"
         echo "${r:workitem.fields['toto']}"
       end
     end
 
-    #noisy
-
     @dashboard.context['ruby_eval_allowed'] = true
 
     assert_trace [ 'person' ] * 3, pdef
   end
 
@@ -138,12 +124,10 @@
         set 'f:toto' => 'person'
         echo "${r:d('f:toto')}"
       end
     end
 
-    #noisy
-
     @dashboard.context['ruby_eval_allowed'] = true
 
     assert_trace 'person', pdef
   end
 
@@ -155,12 +139,10 @@
         set 'v:a' => 'AA'
         echo '${v:${f:a}}'
       end
     end
 
-    #noisy
-
     assert_trace 'AA', pdef
   end
 
   def test_fei_and_wfid
 
@@ -187,12 +169,10 @@
       end
     end
 
     @dashboard.context['ruby_eval_allowed'] = true
 
-    #noisy
-
     assert_trace 'alpha/bravo/charly', pdef
   end
 
   def test_dollar_quote
 
@@ -219,29 +199,37 @@
       set 'f:D' => '$f:nada'
       set 'f:E' => '$v:nada'
       set 'f:F' => '$a'
       set 'f:G' => '$nada'
       set 'f:H' => '$a '
+      set 'f:I' => '$v:a '
+      set 'f:J' => ' $a'
+      set 'f:K' => ' $v:a'
+      set 'f:L' => '$$'
+      set 'f:M' => '$$a'
       filter :f => /^[a-c]$/, :del => true
     end
 
-    #noisy
-
     wfid = @dashboard.launch(pdef)
 
     r = @dashboard.wait_for(wfid)
 
     assert_equal(
       {
         'A' => %w[ A B C ],
         'B' => %w[ A B C ],
         'C' => %w[ venture capitalist ],
-        'D' => '$f:nada',
-        'E' => '$v:nada',
+        'D' => nil,
+        'E' => nil,
         'F' => %w[ A B C ],
-        'G' => '$nada',
-        'H' => '$a '
+        'G' => nil,
+        'H' => '$a ',
+        'I' => '$v:a ',
+        'J' => ' $a',
+        'K' => ' $v:a',
+        'L' => '$$',
+        'M' => '$$a'
       },
       r['workitem']['fields'])
   end
 
   def test_literally_and_participant_params
@@ -253,12 +241,10 @@
 
     @dashboard.register_participant :alpha do |wi|
       wi.fields['parameters'] = wi.fields['params']
     end
 
-    #noisy
-
     wfid = @dashboard.launch(pdef)
 
     r = @dashboard.wait_for(wfid)
 
     assert_equal(
@@ -301,11 +287,9 @@
 
     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