diff --git a/ChangeLog b/ChangeLog index 70acd4d9c6..a631f2432c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ -Thu Apr 29 14:24:48 2010 Nobuyoshi Nakada +Thu Apr 29 14:33:39 2010 Nobuyoshi Nakada + + * test/ruby: fixed nonsense assertions. * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert): reverted. [ruby-core:29872] diff --git a/test/ruby/marshaltestlib.rb b/test/ruby/marshaltestlib.rb index 3c8f1228a3..39471aac64 100644 --- a/test/ruby/marshaltestlib.rb +++ b/test/ruby/marshaltestlib.rb @@ -287,7 +287,7 @@ module MarshalTestLib o.extend(Mod1) str = MyString.new(o, "c") marshal_equal(str) { |v| - assert(v.instance_eval { @v }).kind_of?(Mod1) + assert(v.instance_eval { @v }.kind_of?(Mod1)) } end diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index ec1f0fdbb9..fedcec71fc 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -1837,8 +1837,8 @@ class TestArray < Test::Unit::TestCase o = Object.new def o.to_ary; end def o.==(x); :foo; end - assert(:foo, [0, 1, 2] == o) - assert([0, 1, 2] != [0, 1, 3]) + assert_equal([0, 1, 2], o) + assert_not_equal([0, 1, 2], [0, 1, 3]) end def test_hash2 diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb index 634197e0a7..7d2f4ca9b9 100644 --- a/test/ruby/test_file_exhaustive.rb +++ b/test/ruby/test_file_exhaustive.rb @@ -434,7 +434,7 @@ class TestFileExhaustive < Test::Unit::TestCase end def test_extname - assert(".test", File.extname(@file)) + assert_equal(".test", File.extname(@file)) prefixes = ["", "/", ".", "/.", "bar/.", "/bar/."] infixes = ["", " ", "."] infixes2 = infixes + [".ext "] diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb index 3e5b1177c0..ebb4fb89ae 100644 --- a/test/ruby/test_float.rb +++ b/test/ruby/test_float.rb @@ -245,8 +245,8 @@ class TestFloat < Test::Unit::TestCase def test_infinite_p inf = Float::INFINITY - assert(1, inf.infinite?) - assert(1, (-inf).infinite?) + assert_equal(1, inf.infinite?) + assert_equal(-1, (-inf).infinite?) assert_nil(1.0.infinite?) end diff --git a/test/ruby/test_iterator.rb b/test/ruby/test_iterator.rb index 42e3960e72..362becc0e0 100644 --- a/test/ruby/test_iterator.rb +++ b/test/ruby/test_iterator.rb @@ -306,7 +306,7 @@ class TestIterator < Test::Unit::TestCase rescue LocalJumpError assert(false, "LocalJumpError occurred from break in lambda") else - assert(11, val) + assert_equal(11, val) end block = get_block{11} diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index 453d850bb4..c2084a2e72 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -241,7 +241,7 @@ class TestModule < Test::Unit::TestCase "foo" end end - assert("foo", Other.class_eval_test) + assert_equal("foo", Other.class_eval_test) assert_equal([Other], Other.class_eval { |*args| args }) end diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb index 5e04d465ca..dc38f18e81 100644 --- a/test/ruby/test_proc.rb +++ b/test/ruby/test_proc.rb @@ -379,7 +379,7 @@ class TestProc < Test::Unit::TestCase assert_equal [1,2,3,[4,5,6]], pr.call([1,2,3,4,5,6]) r = proc{|*a| a}.call([1,2,3]) - assert [1,2,3], r + assert_equal [[1,2,3]], r end def test_proc_args_rest_and_post