Commit 6873674e authored by Daniel Bovensiepen's avatar Daniel Bovensiepen

Fix order of actual and expect test value for Array

parent 11c4c65b
...@@ -2,15 +2,15 @@ ...@@ -2,15 +2,15 @@
# Array ISO Test # Array ISO Test
assert('Array', '15.2.12') do assert('Array', '15.2.12') do
assert_equal(Array.class, Class) assert_equal(Class, Array.class)
end end
assert('Array superclass', '15.2.12.2') do assert('Array superclass', '15.2.12.2') do
assert_equal(Array.superclass, Object) assert_equal(Object, Array.superclass)
end end
assert('Array.[]', '15.2.12.4.1') do assert('Array.[]', '15.2.12.4.1') do
assert_equal(Array.[](1,2,3), [1, 2, 3]) assert_equal([1, 2, 3], Array.[](1,2,3))
end end
assert('Array#*', '15.2.12.5.1') do assert('Array#*', '15.2.12.5.1') do
...@@ -18,16 +18,16 @@ assert('Array#*', '15.2.12.5.1') do ...@@ -18,16 +18,16 @@ assert('Array#*', '15.2.12.5.1') do
# this will cause an exception due to the wrong argument # this will cause an exception due to the wrong argument
[1].*(-1) [1].*(-1)
end end
assert_equal([1].*(3), [1, 1, 1]) assert_equal([1, 1, 1], [1].*(3))
assert_equal([1].*(0), []) assert_equal([], [1].*(0))
end end
assert('Array#+', '15.2.12.5.2') do assert('Array#+', '15.2.12.5.2') do
assert_equal([1].+([1]), [1, 1]) assert_equal([1, 1], [1].+([1]))
end end
assert('Array#<<', '15.2.12.5.3') do assert('Array#<<', '15.2.12.5.3') do
assert_equal([1].<<(1), [1, 1]) assert_equal([1, 1], [1].<<(1))
end end
assert('Array#[]', '15.2.12.5.4') do assert('Array#[]', '15.2.12.5.4') do
...@@ -41,7 +41,7 @@ assert('Array#[]', '15.2.12.5.4') do ...@@ -41,7 +41,7 @@ assert('Array#[]', '15.2.12.5.4') do
a.[](1,2,3) a.[](1,2,3)
end end
assert_equal([1,2,3].[](1), 2) assert_equal(2, [1,2,3].[](1))
end end
assert('Array#[]=', '15.2.12.5.5') do assert('Array#[]=', '15.2.12.5.5') do
...@@ -55,44 +55,44 @@ assert('Array#[]=', '15.2.12.5.5') do ...@@ -55,44 +55,44 @@ assert('Array#[]=', '15.2.12.5.5') do
a.[]=(1,2,3,4) a.[]=(1,2,3,4)
end end
assert_equal([1,2,3].[]=(1,4), 4) assert_equal(4, [1,2,3].[]=(1,4))
assert_equal([1,2,3].[]=(1,2,3), 3) assert_equal(3, [1,2,3].[]=(1,2,3))
end end
assert('Array#clear', '15.2.12.5.6') do assert('Array#clear', '15.2.12.5.6') do
a = [1] a = [1]
a.clear a.clear
assert_equal(a, []) assert_equal([], a)
end end
assert('Array#collect!', '15.2.12.5.7') do assert('Array#collect!', '15.2.12.5.7') do
a = [1,2,3] a = [1,2,3]
a.collect! { |i| i + i } a.collect! { |i| i + i }
assert_equal(a, [2,4,6]) assert_equal([2,4,6], a)
end end
assert('Array#concat', '15.2.12.5.8') do assert('Array#concat', '15.2.12.5.8') do
assert_equal([1, 2].concat([3, 4]), [1,2,3,4]) assert_equal([1,2,3,4], [1, 2].concat([3, 4]))
end end
assert('Array#delete_at', '15.2.12.5.9') do assert('Array#delete_at', '15.2.12.5.9') do
a = [1,2,3] a = [1,2,3]
a.delete_at(1) a.delete_at(1)
assert_equal(a, [1,3]) assert_equal([1,3], a)
end end
assert('Array#each', '15.2.12.5.10') do assert('Array#each', '15.2.12.5.10') do
a = [1,2,3] a = [1,2,3]
b = 0 b = 0
a.each {|i| b += i} a.each {|i| b += i}
assert_equal(b, 6) assert_equal(6, b)
end end
assert('Array#each_index', '15.2.12.5.11') do assert('Array#each_index', '15.2.12.5.11') do
a = [1] a = [1]
b = nil b = nil
a.each_index {|i| b = i} a.each_index {|i| b = i}
assert_equal(b, 0) assert_equal(0, b)
end end
assert('Array#empty?', '15.2.12.5.12') do assert('Array#empty?', '15.2.12.5.12') do
...@@ -115,16 +115,16 @@ assert('Array#first', '15.2.12.5.13') do ...@@ -115,16 +115,16 @@ assert('Array#first', '15.2.12.5.13') do
assert_nil([].first) assert_nil([].first)
b = [1,2,3] b = [1,2,3]
assert_equal(b.first, 1) assert_equal(1, b.first)
assert_equal(b.first(0), []) assert_equal([], b.first(0))
assert_equal(b.first(1), [1]) assert_equal([1], b.first(1))
assert_equal(b.first(4), [1,2,3]) assert_equal([1,2,3], b.first(4))
end end
assert('Array#index', '15.2.12.5.14') do assert('Array#index', '15.2.12.5.14') do
a = [1,2,3] a = [1,2,3]
assert_equal(a.index(2), 1) assert_equal(1, a.index(2))
end end
assert('Array#initialize', '15.2.12.5.15') do assert('Array#initialize', '15.2.12.5.15') do
...@@ -133,25 +133,25 @@ assert('Array#initialize', '15.2.12.5.15') do ...@@ -133,25 +133,25 @@ assert('Array#initialize', '15.2.12.5.15') do
c = [].initialize(2, 1) c = [].initialize(2, 1)
d = [].initialize(2) {|i| i} d = [].initialize(2) {|i| i}
assert_equal(a, [nil]) assert_equal([nil], a)
assert_equal(b, [nil,nil]) assert_equal([nil,nil], b)
assert_equal(c, [1,1]) assert_equal([1,1], c)
assert_equal(d, [0,1]) assert_equal([0,1], d)
end end
assert('Array#initialize_copy', '15.2.12.5.16') do assert('Array#initialize_copy', '15.2.12.5.16') do
a = [1,2,3] a = [1,2,3]
b = [].initialize_copy(a) b = [].initialize_copy(a)
assert_equal(b, [1,2,3]) assert_equal([1,2,3], b)
end end
assert('Array#join', '15.2.12.5.17') do assert('Array#join', '15.2.12.5.17') do
a = [1,2,3].join a = [1,2,3].join
b = [1,2,3].join(',') b = [1,2,3].join(',')
assert_equal(a, '123') assert_equal('123', a)
assert_equal(b, '1,2,3') assert_equal('1,2,3', b)
end end
assert('Array#last', '15.2.12.5.18') do assert('Array#last', '15.2.12.5.18') do
...@@ -161,20 +161,20 @@ assert('Array#last', '15.2.12.5.18') do ...@@ -161,20 +161,20 @@ assert('Array#last', '15.2.12.5.18') do
end end
a = [1,2,3] a = [1,2,3]
assert_equal(a.last, 3) assert_equal(3, a.last)
assert_nil([].last) assert_nil([].last)
end end
assert('Array#length', '15.2.12.5.19') do assert('Array#length', '15.2.12.5.19') do
a = [1,2,3] a = [1,2,3]
assert_equal(a.length, 3) assert_equal(3, a.length)
end end
assert('Array#map!', '15.2.12.5.20') do assert('Array#map!', '15.2.12.5.20') do
a = [1,2,3] a = [1,2,3]
a.map! { |i| i + i } a.map! { |i| i + i }
assert_equal(a, [2,4,6]) assert_equal([2,4,6], a)
end end
assert('Array#pop', '15.2.12.5.21') do assert('Array#pop', '15.2.12.5.21') do
...@@ -182,45 +182,45 @@ assert('Array#pop', '15.2.12.5.21') do ...@@ -182,45 +182,45 @@ assert('Array#pop', '15.2.12.5.21') do
b = a.pop b = a.pop
assert_nil([].pop) assert_nil([].pop)
assert_equal(a, [1,2]) assert_equal([1,2], a)
assert_equal(b, 3) assert_equal(3, b)
end end
assert('Array#push', '15.2.12.5.22') do assert('Array#push', '15.2.12.5.22') do
a = [1,2,3] a = [1,2,3]
b = a.push(4) b = a.push(4)
assert_equal(a, [1,2,3,4]) assert_equal([1,2,3,4], a)
assert_equal(b, [1,2,3,4]) assert_equal([1,2,3,4], b)
end end
assert('Array#replace', '15.2.12.5.23') do assert('Array#replace', '15.2.12.5.23') do
a = [1,2,3] a = [1,2,3]
b = [].replace(a) b = [].replace(a)
assert_equal(b, [1,2,3]) assert_equal([1,2,3], b)
end end
assert('Array#reverse', '15.2.12.5.24') do assert('Array#reverse', '15.2.12.5.24') do
a = [1,2,3] a = [1,2,3]
b = a.reverse b = a.reverse
assert_equal(a, [1,2,3]) assert_equal([1,2,3], a)
assert_equal(b, [3,2,1]) assert_equal([3,2,1], b)
end end
assert('Array#reverse!', '15.2.12.5.25') do assert('Array#reverse!', '15.2.12.5.25') do
a = [1,2,3] a = [1,2,3]
b = a.reverse! b = a.reverse!
assert_equal(a, [3,2,1]) assert_equal([3,2,1], a)
assert_equal(b, [3,2,1]) assert_equal([3,2,1], b)
end end
assert('Array#rindex', '15.2.12.5.26') do assert('Array#rindex', '15.2.12.5.26') do
a = [1,2,3] a = [1,2,3]
assert_equal(a.rindex(2), 1) assert_equal(1, a.rindex(2))
end end
assert('Array#shift', '15.2.12.5.27') do assert('Array#shift', '15.2.12.5.27') do
...@@ -228,22 +228,22 @@ assert('Array#shift', '15.2.12.5.27') do ...@@ -228,22 +228,22 @@ assert('Array#shift', '15.2.12.5.27') do
b = a.shift b = a.shift
assert_nil([].shift) assert_nil([].shift)
assert_equal(a, [2,3]) assert_equal([2,3], a)
assert_equal(b, 1) assert_equal(1, b)
end end
assert('Array#size', '15.2.12.5.28') do assert('Array#size', '15.2.12.5.28') do
a = [1,2,3] a = [1,2,3]
assert_equal(a.size, 3) assert_equal(3, a.size)
end end
assert('Array#slice', '15.2.12.5.29') do assert('Array#slice', '15.2.12.5.29') do
a = "12345".slice(1, 3) a = "12345".slice(1, 3)
b = a.slice(0) b = a.slice(0)
assert_equal("#{b}:", "2:") assert_equal("2:", "#{b}:")
assert_equal([1,2,3].[](1), 2) assert_equal(2, [1,2,3].[](1))
end end
assert('Array#unshift', '15.2.12.5.30') do assert('Array#unshift', '15.2.12.5.30') do
...@@ -252,10 +252,10 @@ assert('Array#unshift', '15.2.12.5.30') do ...@@ -252,10 +252,10 @@ assert('Array#unshift', '15.2.12.5.30') do
c = [2,3] c = [2,3]
d = c.unshift(0, 1) d = c.unshift(0, 1)
assert_equal(a, [1,2,3]) assert_equal([1,2,3], a)
assert_equal(b, [1,2,3]) assert_equal([1,2,3], b)
assert_equal(c, [0,1,2,3]) assert_equal([0,1,2,3], c)
assert_equal(d, [0,1,2,3]) assert_equal([0,1,2,3], d)
end end
assert('Array#to_s', '15.2.12.5.31 / 15.2.12.5.32') do assert('Array#to_s', '15.2.12.5.31 / 15.2.12.5.32') do
...@@ -263,8 +263,8 @@ assert('Array#to_s', '15.2.12.5.31 / 15.2.12.5.32') do ...@@ -263,8 +263,8 @@ assert('Array#to_s', '15.2.12.5.31 / 15.2.12.5.32') do
r1 = a.to_s r1 = a.to_s
r2 = a.inspect r2 = a.inspect
assert_equal(r1, r2) assert_equal(r2, r1)
assert_equal(r1, "[2, 3, 4, 5]") assert_equal("[2, 3, 4, 5]", r1)
end end
assert('Array#==', '15.2.12.5.33') do assert('Array#==', '15.2.12.5.33') do
...@@ -293,9 +293,9 @@ assert('Array#<=>', '15.2.12.5.36') do ...@@ -293,9 +293,9 @@ assert('Array#<=>', '15.2.12.5.36') do
r2 = [ 1, 2, 3, 4, 5, 6 ] <=> [ 1, 2 ] #=> +1 r2 = [ 1, 2, 3, 4, 5, 6 ] <=> [ 1, 2 ] #=> +1
r3 = [ "a", "b", "c" ] <=> [ "a", "b", "c" ] #=> 0 r3 = [ "a", "b", "c" ] <=> [ "a", "b", "c" ] #=> 0
assert_equal(r1, -1) assert_equal(-1, r1)
assert_equal(r2, +1) assert_equal(+1, r2)
assert_equal(r3, 0) assert_equal(0, r3)
end end
# Not ISO specified # Not ISO specified
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment