first argument to assertions is the expected value

stereobooster · Apr 4, 2011 · 3e013b0 · 3e013b0
1 parent 8991057
commit 3e013b0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/test/test_backtick.rb b/test/test_backtick.rb
@@ -6,31 +6,31 @@ class BacktickTest < Test::Unit::TestCase
 
   def test_backtick_simple
     out = `exit`
-    assert_equal out, ''
-    assert_equal $?.exitstatus, 0
+    assert_equal '', out
+    assert_equal 0, $?.exitstatus
   end
 
   def test_backtick_output
     out = `echo 123`
-    assert_equal out, "123\n"
-    assert_equal $?.exitstatus, 0
+    assert_equal "123\n", out
+    assert_equal 0, $?.exitstatus, 0
   end
 
   def test_backtick_failure
     out = `nosuchcmd 2> /dev/null`
-    assert_equal out, ''
-    assert_equal $?.exitstatus, 127
+    assert_equal '', out
+    assert_equal 127, $?.exitstatus
   end
 
   def test_backtick_redirect
     out = `nosuchcmd 2>&1`
-    assert_equal out, "/bin/sh: nosuchcmd: command not found\n"
-    assert_equal $?.exitstatus, 127
+    assert_equal "/bin/sh: nosuchcmd: command not found\n", out
+    assert_equal 127, $?.exitstatus, 127
   end
 
   def test_backtick_huge
     out = `yes | head -50000`
-    assert_equal out.size, 100000
-    assert_equal $?.exitstatus, 0
+    assert_equal 100000, out.size
+    assert_equal 0, $?.exitstatus
   end
 end
diff --git a/test/test_popen.rb b/test/test_popen.rb
@@ -10,8 +10,8 @@ def test_popen4
     i.close
     ::Process.wait(pid)
 
-    assert_equal o.read, "hello world"
-    assert_equal $?.exitstatus, 0
+    assert_equal "hello world", o.read
+    assert_equal 0, $?.exitstatus
   ensure
     [i, o, e].each{ |io| io.close rescue nil }
   end

diff --git a/test/test_system.rb b/test/test_system.rb
@@ -6,24 +6,24 @@ class SystemTest < Test::Unit::TestCase
 
   def test_system
     ret = system("true")
-    assert_equal ret, true
-    assert_equal $?.exitstatus, 0
+    assert_equal true, ret
+    assert_equal 0, $?.exitstatus
   end
 
   def test_system_nonzero
     ret = system("false")
-    assert_equal ret, false
-    assert_equal $?.exitstatus, 1
+    assert_equal false, ret
+    assert_equal 1, $?.exitstatus
   end
 
   def test_system_nonzero_via_sh
     ret = system("exit 1")
-    assert_equal ret, false
-    assert_equal $?.exitstatus, 1
+    assert_equal false, ret
+    assert_equal 1, $?.exitstatus
   end
 
   def test_system_failure
     ret = system("nosuch")
-    assert_equal ret, false
+    assert_equal false, ret
   end
 end