Clean up some test assertions

6 files changed, 18 insertions, 18 deletions

diff --git a/Library/Homebrew/test/test_bottle_hooks.rb b/Library/Homebrew/test/test_bottle_hooks.rb
index 9e28784c2..abc3d5f4e 100644
--- a/Library/Homebrew/test/test_bottle_hooks.rb
+++ b/Library/Homebrew/test/test_bottle_hooks.rb
@@ -17,14 +17,14 @@ class BottleHookTests < Test::Unit::TestCase
     Homebrew::Hooks::Bottles.setup_formula_has_bottle do |f|
       f.some_random_method
     end
-    assert_equal true, @fi.pour_bottle?
+    assert @fi.pour_bottle?
   end
 
   def test_has_no_bottle
     Homebrew::Hooks::Bottles.setup_formula_has_bottle do |f|
       !f.some_random_method
     end
-    assert_equal false, @fi.pour_bottle?
+    assert !@fi.pour_bottle?
   end
 
   def test_pour_formula_bottle
diff --git a/Library/Homebrew/test/test_formula.rb b/Library/Homebrew/test/test_formula.rb
index 429e71c73..6d724d044 100644
--- a/Library/Homebrew/test/test_formula.rb
+++ b/Library/Homebrew/test/test_formula.rb
@@ -126,19 +126,19 @@ class FormulaTests < Test::Unit::TestCase
   def test_equality
     x = TestBall.new
     y = TestBall.new
-    assert x == y
-    assert y == x
+    assert_equal x, y
+    assert_equal y, x
     assert x.eql?(y)
     assert y.eql?(x)
-    assert x.hash == y.hash
+    assert_equal x.hash, y.hash
   end
 
   def test_inequality
     x = TestBall.new("foo")
     y = TestBall.new("bar")
-    assert x != y
-    assert y != x
-    assert x.hash != y.hash
+    assert_not_equal x, y
+    assert_not_equal y, x
+    assert_not_equal x.hash, y.hash
     assert !x.eql?(y)
     assert !y.eql?(x)
   end
diff --git a/Library/Homebrew/test/test_language_module_dependency.rb b/Library/Homebrew/test/test_language_module_dependency.rb
index 54d709953..5b8eceb13 100644
--- a/Library/Homebrew/test/test_language_module_dependency.rb
+++ b/Library/Homebrew/test/test_language_module_dependency.rb
@@ -15,7 +15,7 @@ class LanguageModuleDependencyTests < Test::Unit::TestCase
   def test_unique_deps_are_not_eql
     x = LanguageModuleDependency.new(:node, "less")
     y = LanguageModuleDependency.new(:node, "coffee-script")
-    assert x.hash != y.hash
+    assert_not_equal x.hash, y.hash
     assert !x.eql?(y)
     assert !y.eql?(x)
   end
diff --git a/Library/Homebrew/test/test_mach.rb b/Library/Homebrew/test/test_mach.rb
index 0c4398cbe..f472cced9 100644
--- a/Library/Homebrew/test/test_mach.rb
+++ b/Library/Homebrew/test/test_mach.rb
@@ -23,7 +23,7 @@ class MachOPathnameTests < Test::Unit::TestCase
     assert pn.dylib?
     assert !pn.mach_o_executable?
     assert !pn.text_executable?
-    assert pn.arch == :universal
+    assert_equal :universal, pn.arch
     assert_match(/Mach-O (64-bit )?dynamically linked shared library/, file(pn))
   end
 
@@ -122,7 +122,7 @@ class MachOPathnameTests < Test::Unit::TestCase
     assert !pn.mach_o_executable?
     assert !pn.text_executable?
     assert !pn.mach_o_bundle?
-    assert pn.arch == :dunno
+    assert_equal :dunno, pn.arch
     assert_no_match(/Mach-O (64-bit )?dynamically linked shared library/, file(pn))
     assert_no_match(/Mach-O [^ ]* ?executable/, file(pn))
   end
@@ -187,7 +187,7 @@ class TextExecutableTests < Test::Unit::TestCase
     assert !pn.mach_o_executable?
     assert pn.text_executable?
     assert_equal [], pn.archs
-    assert pn.arch == :dunno
+    assert_equal :dunno, pn.arch
     assert_match(/text executable/, file(pn))
   end
 
@@ -203,7 +203,7 @@ class TextExecutableTests < Test::Unit::TestCase
     assert !pn.mach_o_executable?
     assert pn.text_executable?
     assert_equal [], pn.archs
-    assert pn.arch == :dunno
+    assert_equal :dunno, pn.arch
     assert_match(/text executable/, file(pn))
   end
 
@@ -219,7 +219,7 @@ class TextExecutableTests < Test::Unit::TestCase
     assert !pn.mach_o_executable?
     assert !pn.text_executable?
     assert_equal [], pn.archs
-    assert pn.arch == :dunno
+    assert_equal :dunno, pn.arch
     assert_no_match(/text executable/, file(pn))
   end
 end
diff --git a/Library/Homebrew/test/test_string.rb b/Library/Homebrew/test/test_string.rb
index 547e99c3d..5aacbf174 100644
--- a/Library/Homebrew/test/test_string.rb
+++ b/Library/Homebrew/test/test_string.rb
@@ -8,7 +8,7 @@ class StringTest < Test::Unit::TestCase
 ....my friend over
     there
     EOS
-    assert undented == "hi\nmy friend over\nthere\n"
+    assert_equal "hi\nmy friend over\nthere\n", undented
   end
 
   def test_undent_not_indented
@@ -16,6 +16,6 @@ class StringTest < Test::Unit::TestCase
 hi
 I'm not indented
     EOS
-    assert undented == "hi\nI'm not indented\n"
+    assert_equal "hi\nI'm not indented\n", undented
   end
 end
diff --git a/Library/Homebrew/test/test_x11_dependency.rb b/Library/Homebrew/test/test_x11_dependency.rb
index 6c56ac87f..33cecae89 100644
--- a/Library/Homebrew/test/test_x11_dependency.rb
+++ b/Library/Homebrew/test/test_x11_dependency.rb
@@ -8,13 +8,13 @@ class X11DependencyTests < Test::Unit::TestCase
     y = X11Dependency.new
     assert x.eql?(y)
     assert y.eql?(x)
-    assert x.hash == y.hash
+    assert_equal x.hash, y.hash
   end
 
   def test_not_eql_when_hashes_differ
     x = X11Dependency.new("foo")
     y = X11Dependency.new
-    assert x.hash != y.hash
+    assert_not_equal x.hash, y.hash
     assert !x.eql?(y)
     assert !y.eql?(x)
   end