aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2014-06-11 13:05:10 -0500
committerJack Nagel2014-06-11 13:05:10 -0500
commitf3e9c5c0706f001528b011e6241ceebd848a22fe (patch)
treeecbdbb530e7ccf765692f776001d3a5366817c07
parentddc615366c791cbfaedde0eee3c6596c3f5d394a (diff)
downloadbrew-f3e9c5c0706f001528b011e6241ceebd848a22fe.tar.bz2
Fix up some assertions
-rw-r--r--Library/Homebrew/test/test_build_options.rb8
-rw-r--r--Library/Homebrew/test/test_options.rb2
-rw-r--r--Library/Homebrew/test/test_stdlib.rb8
3 files changed, 9 insertions, 9 deletions
diff --git a/Library/Homebrew/test/test_build_options.rb b/Library/Homebrew/test/test_build_options.rb
index b5674ea50..8100c6c4e 100644
--- a/Library/Homebrew/test/test_build_options.rb
+++ b/Library/Homebrew/test/test_build_options.rb
@@ -55,10 +55,10 @@ class BuildOptionsTests < Test::Unit::TestCase
end
def test_opposite_of
- assert @build.opposite_of(Option.new("with-foo")) == Option.new("without-foo")
- assert @build.opposite_of("without-foo") == Option.new("with-foo")
- assert @build.opposite_of(Option.new("enable-spam")) == Option.new("disable-spam")
- assert @build.opposite_of("disable-beer") == Option.new("enable-beer")
+ assert_equal Option.new("without-foo"), @build.opposite_of(Option.new("with-foo"))
+ assert_equal Option.new("with-foo"), @build.opposite_of("without-foo")
+ assert_equal Option.new("disable-spam"), @build.opposite_of(Option.new("enable-spam"))
+ assert_equal Option.new("enable-beer"), @build.opposite_of("disable-beer")
end
def test_has_opposite_of?
diff --git a/Library/Homebrew/test/test_options.rb b/Library/Homebrew/test/test_options.rb
index 741581a01..110446ed0 100644
--- a/Library/Homebrew/test/test_options.rb
+++ b/Library/Homebrew/test/test_options.rb
@@ -21,7 +21,7 @@ class OptionTests < Test::Unit::TestCase
assert_not_equal bar, @option
assert @option.eql?(foo)
assert !@option.eql?(bar)
- assert bar < foo
+ assert_operator bar, :<, foo
end
def test_strips_leading_dashes
diff --git a/Library/Homebrew/test/test_stdlib.rb b/Library/Homebrew/test/test_stdlib.rb
index 7bc0c03d6..383577439 100644
--- a/Library/Homebrew/test/test_stdlib.rb
+++ b/Library/Homebrew/test/test_stdlib.rb
@@ -52,14 +52,14 @@ class CxxStdlibTests < Test::Unit::TestCase
end
def test_type_string_formatting
- assert_equal @clang.type_string, 'libstdc++'
- assert_equal @lcxx.type_string, 'libc++'
+ assert_equal "libstdc++", @clang.type_string
+ assert_equal "libc++", @lcxx.type_string
end
def test_constructing_from_tab
stdlib = Tab.dummy_tab.cxxstdlib
- assert_equal stdlib.compiler, :clang
- assert_equal stdlib.type, nil
+ assert_equal :clang, stdlib.compiler
+ assert_nil stdlib.type
end
def test_compatibility_for_non_cxx_software