Improve Array tests

1 files changed, 79 insertions, 91 deletions

diff --git a/test/t/array.rb b/test/t/array.rb
index 47259c268..840f7653b 100644
--- a/test/t/array.rb
+++ b/test/t/array.rb
@@ -2,156 +2,129 @@
 # Array ISO Test
 
 assert('Array', '15.2.12') do
-  Array.class == Class
+  assert_equal(Array.class, Class)
 end
 
 assert('Array superclass', '15.2.12.2') do
-  Array.superclass == Object
+  assert_equal(Array.superclass, Object)
 end
 
 assert('Array.[]', '15.2.12.4.1') do
-  Array.[](1,2,3) == [1, 2, 3]
+  assert_equal(Array.[](1,2,3), [1, 2, 3])
 end
 
 assert('Array#*', '15.2.12.5.1') do
-  e2 = nil
-  begin
+  assert_raise(ArgumentError) do
     # this will cause an exception due to the wrong argument
     [1].*(-1)
-  rescue => e1
-    e2 = e1
   end
-  a = [1].*(3)
-  b = [1].*(0)
-  a == [1, 1, 1] and b == [] and
-    e2.class == ArgumentError
+  assert_equal([1].*(3), [1, 1, 1])
+  assert_equal([1].*(0), [])
 end
 
 assert('Array#+', '15.2.12.5.2') do
-  [1].+([1]) == [1, 1]
+  assert_equal([1].+([1]), [1, 1])
 end
 
 assert('Array#<<', '15.2.12.5.3') do
-  [1].<<(1) == [1, 1]
+  assert_equal([1].<<(1), [1, 1])
 end
 
 assert('Array#[]', '15.2.12.5.4') do
-  e2 = nil
-  e3 = nil
   a = Array.new
-  begin
+  assert_raise(ArgumentError) do
     # this will cause an exception due to the wrong arguments
     a.[]()
-  rescue => e1
-    e2 = e1
   end
-  begin
+  assert_raise(ArgumentError) do
     # this will cause an exception due to the wrong arguments
     a.[](1,2,3)
-  rescue => e1
-    e3 = e1
   end
 
-  [1,2,3].[](1) == 2 and
-    e2.class == ArgumentError and
-    e3.class == ArgumentError
+  assert_equal([1,2,3].[](1), 2)
 end
 
 assert('Array#[]=', '15.2.12.5.5') do
-  e2 = nil
-  e3 = nil
   a = Array.new
-  begin
+  assert_raise(ArgumentError) do
     # this will cause an exception due to the wrong arguments
     a.[]=()
-  rescue => e1
-    e2 = e1
   end
-  begin
+  assert_raise(ArgumentError) do
     # this will cause an exception due to the wrong arguments
     a.[]=(1,2,3,4)
-  rescue => e1
-    e3 = e1
   end
 
-  [1,2,3].[]=(1,4) == 4 and
-  [1,2,3].[]=(1,2,3) == 3 and
-    e2.class == ArgumentError and
-    e3.class == ArgumentError
+  assert_equal([1,2,3].[]=(1,4), 4)
+  assert_equal([1,2,3].[]=(1,2,3), 3)
 end
 
 assert('Array#clear', '15.2.12.5.6') do
   a = [1]
   a.clear
-  a == []
+  assert_equal(a, [])
 end
 
 assert('Array#collect!', '15.2.12.5.7') do
   a = [1,2,3]
   a.collect! { |i| i + i }
-  a == [2,4,6]
+  assert_equal(a, [2,4,6])
 end
 
 assert('Array#concat', '15.2.12.5.8') do
-  a = [1,2]
-  b = [3,4]
-  a.concat(b) == [1,2,3,4]
+  assert_equal([1, 2].concat([3, 4]), [1,2,3,4])
 end
 
 assert('Array#delete_at', '15.2.12.5.9') do
   a = [1,2,3]
   a.delete_at(1)
-  a == [1,3]
+  assert_equal(a, [1,3])
 end
 
 assert('Array#each', '15.2.12.5.10') do
   a = [1,2,3]
   b = 0
   a.each {|i| b += i}
-  b == 6
+  assert_equal(b, 6)
 end
 
 assert('Array#each_index', '15.2.12.5.11') do
   a = [1]
   b = nil
   a.each_index {|i| b = i}
-  b == 0
+  assert_equal(b, 0)
 end
 
 assert('Array#empty?', '15.2.12.5.12') do
   a = []
   b = [b]
-  a.empty? and not b.empty?
+  assert_true([].empty?)
+  assert_false([1].empty?)
 end
 
 assert('Array#first', '15.2.12.5.13') do
-  a = []
-  b = [1,2,3]
-
-  e2 = nil
-  e3 = nil
-  begin
+  assert_raise(ArgumentError) do
     # this will cause an exception due to the wrong argument
     [1,2,3].first(-1)
-  rescue => e1
-    e2 = e1
   end
-  begin
+  assert_raise(ArgumentError) do
     # this will cause an exception due to the wrong argument
     [1,2,3].first(1,2)
-  rescue => e1
-    e3 = e1
   end
 
-  a.first == nil and b.first == 1 and b.first(0) == [] and
-    b.first(1) == [1] and b.first(4) == [1,2,3] and
-    e2.class == ArgumentError and e3.class == ArgumentError
+  assert_nil([].first)
+
+  b = [1,2,3]
+  assert_equal(b.first, 1)
+  assert_equal(b.first(0), [])
+  assert_equal(b.first(1), [1])
+  assert_equal(b.first(4), [1,2,3])
 end
 
 assert('Array#index', '15.2.12.5.14') do
   a = [1,2,3]
 
-  a.index(2) == 1
+  assert_equal(a.index(2), 1)
 end
 
 assert('Array#initialize', '15.2.12.5.15') do
@@ -160,107 +133,117 @@ assert('Array#initialize', '15.2.12.5.15') do
   c = [].initialize(2, 1)
   d = [].initialize(2) {|i| i}
 
-  a == [nil] and b == [nil,nil] and c == [1,1] and d == [0,1]
+  assert_equal(a, [nil])
+  assert_equal(b, [nil,nil])
+  assert_equal(c, [1,1])
+  assert_equal(d, [0,1])
 end
 
 assert('Array#initialize_copy', '15.2.12.5.16') do
   a = [1,2,3]
   b = [].initialize_copy(a)
 
-  b == [1,2,3]
+  assert_equal(b, [1,2,3])
 end
 
 assert('Array#join', '15.2.12.5.17') do
   a = [1,2,3].join
   b = [1,2,3].join(',')
 
-  a == '123' and b == '1,2,3'
+  assert_equal(a, '123')
+  assert_equal(b, '1,2,3')
 end
 
 assert('Array#last', '15.2.12.5.18') do
-  a = [1,2,3]
-
-  e2 = nil
-  begin
+  assert_raise(ArgumentError) do
     # this will cause an exception due to the wrong argument
     [1,2,3].last(-1)
-  rescue => e1
-    e2 = e1
   end
 
-  a.last == 3 and [].last == nil and e2.class == ArgumentError
+  a = [1,2,3]
+  assert_equal(a.last, 3)
+  assert_nil([].last)
 end
 
 assert('Array#length', '15.2.12.5.19') do
   a = [1,2,3]
 
-  a.length == 3
+  assert_equal(a.length, 3)
 end
 
 assert('Array#map!', '15.2.12.5.20') do
   a = [1,2,3]
   a.map! { |i| i + i }
-  a == [2,4,6]
+  assert_equal(a, [2,4,6])
 end
 
 assert('Array#pop', '15.2.12.5.21') do
   a = [1,2,3]
   b = a.pop
 
-  [].pop == nil and a == [1,2] and b = 3
+  assert_nil([].pop)
+  assert_equal(a, [1,2])
+  assert_equal(b, 3)
 end
 
 assert('Array#push', '15.2.12.5.22') do
   a = [1,2,3]
   b = a.push(4)
 
-  a == [1,2,3,4] and b = [1,2,3,4]
+  assert_equal(a, [1,2,3,4])
+  assert_equal(b, [1,2,3,4])
 end
 
 assert('Array#replace', '15.2.12.5.23') do
   a = [1,2,3]
   b = [].replace(a)
 
-  b == [1,2,3]
+  assert_equal(b, [1,2,3])
 end
 
 assert('Array#reverse', '15.2.12.5.24') do
   a = [1,2,3]
   b = a.reverse
 
-  a == [1,2,3] and b == [3,2,1]
+  assert_equal(a, [1,2,3])
+  assert_equal(b, [3,2,1])
 end
 
 assert('Array#reverse!', '15.2.12.5.25') do
   a = [1,2,3]
   b = a.reverse!
 
-  a == [3,2,1] and b == [3,2,1]
+  assert_equal(a, [3,2,1])
+  assert_equal(b, [3,2,1])
 end
 
 assert('Array#rindex', '15.2.12.5.26') do
   a = [1,2,3]
 
-  a.rindex(2) == 1
+  assert_equal(a.rindex(2), 1)
 end
 
 assert('Array#shift', '15.2.12.5.27') do
   a = [1,2,3]
   b = a.shift
 
-  [].shift == nil and a == [2,3] and b == 1
+  assert_nil([].shift)
+  assert_equal(a, [2,3])
+  assert_equal(b, 1)
 end
 
 assert('Array#size', '15.2.12.5.28') do
   a = [1,2,3]
 
-  a.size == 3
+  assert_equal(a.size, 3)
 end
 
 assert('Array#slice', '15.2.12.5.29') do
   a = "12345".slice(1, 3)
   b = a.slice(0)
-  "#{b}:" == "2:" and [1,2,3].[](1) == 2
+
+  assert_equal("#{b}:", "2:")
+  assert_equal([1,2,3].[](1), 2)
 end
 
 assert('Array#unshift', '15.2.12.5.30') do
@@ -269,7 +252,10 @@ assert('Array#unshift', '15.2.12.5.30') do
   c = [2,3]
   d = c.unshift(0, 1)
 
-  a == [1,2,3] and b == [1,2,3] and c == [0,1,2,3] and d == [0,1,2,3] 
+  assert_equal(a, [1,2,3])
+  assert_equal(b, [1,2,3])
+  assert_equal(c, [0,1,2,3])
+  assert_equal(d, [0,1,2,3])
 end
 
 assert('Array#to_s', '15.2.12.5.31 / 15.2.12.5.32') do
@@ -277,15 +263,14 @@ assert('Array#to_s', '15.2.12.5.31 / 15.2.12.5.32') do
   r1 = a.to_s
   r2 = a.inspect
 
-  r1 == r2 and r1 == "[2, 3, 4, 5]"
+  assert_equal(r1, r2)
+  assert_equal(r1, "[2, 3, 4, 5]")
 end
 
 assert('Array#==', '15.2.12.5.33') do
-  r1 = [ "a", "c" ]    == [ "a", "c", 7 ]     #=> false
-  r2 = [ "a", "c", 7 ] == [ "a", "c", 7 ]     #=> true
-  r3 = [ "a", "c", 7 ] == [ "a", "d", "f" ]   #=> false
-
-  r1 == false and r2 == true and r3 == false
+  assert_false(["a", "c"] == ["a", "c", 7])
+  assert_true(["a", "c", 7] == ["a", "c", 7])
+  assert_false(["a", "c", 7] == ["a", "d", "f"])
 end
 
 assert('Array#eql?', '15.2.12.5.34') do
@@ -293,13 +278,14 @@ assert('Array#eql?', '15.2.12.5.34') do
   a2 = [ 1, 2, 3 ]
   a3 = [ 1.0, 2.0, 3.0 ]
 
-  (a1.eql? a2) and (not a1.eql? a3)
+  assert_true(a1.eql? a2)
+  assert_false(a1.eql? a3)
 end
 
 assert('Array#hash', '15.2.12.5.35') do
   a = [ 1, 2, 3 ]
 
-  a.hash.is_a? Integer
+  assert_true(a.hash.is_a? Integer)
 end
 
 assert('Array#<=>', '15.2.12.5.36') do
@@ -307,7 +293,9 @@ assert('Array#<=>', '15.2.12.5.36') do
   r2 = [ 1, 2, 3, 4, 5, 6 ] <=> [ 1, 2 ]            #=> +1
   r3 = [ "a", "b", "c" ]    <=> [ "a", "b", "c" ]   #=> 0
 
-  r1 == -1 and r2 == +1 and r3 == 0
+  assert_equal(r1 == -1)
+  assert_equal(r2 == +1)
+  assert_equal(r3 == 0)
 end
 
 # Not ISO specified