test/functional/eft_16_if.rb in ruote-2.1.7 vs test/functional/eft_16_if.rb in ruote-2.1.8

@@ -20,11 +20,11 @@
       end
     end
 
     #noisy
 
-    assert_trace(pdef, 'then')
+    assert_trace('then', pdef)
   end
 
   def test_else
 
     pdef = Ruote.process_definition :name => 'test' do
@@ -34,11 +34,11 @@
       end
     end
 
     #noisy
 
-    assert_trace(pdef, 'else')
+    assert_trace('else', pdef)
   end
 
   def test_missing_then
 
     pdef = Ruote.process_definition :name => 'test' do
@@ -49,11 +49,11 @@
       end
     end
 
     #noisy
 
-    assert_trace(pdef, 'done.')
+    assert_trace('done.', pdef)
   end
 
   def test_missing_else
 
     pdef = Ruote.process_definition :name => 'test' do
@@ -65,11 +65,11 @@
       end
     end
 
     #noisy
 
-    assert_trace(pdef, 'done.')
+    assert_trace('done.', pdef)
   end
 
   def test_equals_true
 
     pdef = Ruote.process_definition :name => 'test' do
@@ -80,11 +80,11 @@
       end
     end
 
     #noisy
 
-    assert_trace(pdef, 'then')
+    assert_trace('then', pdef)
   end
 
   def test_equals_false
 
     pdef = Ruote.process_definition :name => 'test' do
@@ -95,11 +95,11 @@
       end
     end
 
     #noisy
 
-    assert_trace(pdef, 'else')
+    assert_trace('else', pdef)
   end
 
   def test_equals_true_no_then
 
     pdef = Ruote.process_definition :name => 'test' do
@@ -111,11 +111,11 @@
       end
     end
 
     #noisy
 
-    assert_trace(pdef, 'done.')
+    assert_trace('done.', pdef)
   end
 
   def test_attribute_text
 
     pdef = Ruote.process_definition :name => 'test' do
@@ -139,20 +139,16 @@
       end
     end
 
     #noisy
 
-    assert_trace(pdef, %w[ then else else else ])
+    assert_trace(%w[ then else else else ], pdef)
   end
 
   def test_xml_equals
 
-    begin
-      require 'yajl'
-    rescue LoadError
-      require 'json'
-    end
+    require_json
     Rufus::Json.detect_backend
       # making sure JSON dup is available in case of HashStorage
 
     pdef = %{
       <?xml version="1.0"?>
@@ -163,13 +159,13 @@
           <echo>bravo</echo>
         </if>
       </process-definition>
     }
 
-    assert_trace(pdef, { 'state' => 'A' }, 'alpha')
+    assert_trace('alpha', { 'state' => 'A' }, pdef)
 
     @tracer.clear
 
-    assert_trace(pdef, { :state => 'A' }, 'alpha')
+    assert_trace('alpha', { :state => 'A' }, pdef)
   end
 end