Merge pull request #1425 from Bovi-Li/test-assert-fix

[mrbtest] Actual/Expect Order - ArgumentError and Array

2 files changed, 58 insertions, 58 deletions

diff --git a/test/t/argumenterror.rb b/test/t/argumenterror.rb
index ac254afcd..c8d277cc5 100644
--- a/test/t/argumenterror.rb
+++ b/test/t/argumenterror.rb
@@ -11,11 +11,11 @@ assert('ArgumentError', '15.2.24') do
     e2 = e1
   end
 
-  assert_equal(ArgumentError.class, Class)
-  assert_equal(e2.class, ArgumentError)
+  assert_equal(Class, ArgumentError.class)
+  assert_equal(ArgumentError, e2.class)
 end
 
 assert('ArgumentError superclass', '15.2.24.2') do
-  assert_equal(ArgumentError.superclass, StandardError)
+  assert_equal(StandardError, ArgumentError.superclass)
 end
 
diff --git a/test/t/array.rb b/test/t/array.rb
index 9878e2cbf..78fb4bf05 100644
--- a/test/t/array.rb
+++ b/test/t/array.rb
@@ -2,15 +2,15 @@
 # Array ISO Test
 
 assert('Array', '15.2.12') do
-  assert_equal(Array.class, Class)
+  assert_equal(Class, Array.class)
 end
 
 assert('Array superclass', '15.2.12.2') do
-  assert_equal(Array.superclass, Object)
+  assert_equal(Object, Array.superclass)
 end
 
 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
 
 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
     [1].*(-1)
   end
-  assert_equal([1].*(3), [1, 1, 1])
-  assert_equal([1].*(0), [])
+  assert_equal([1, 1, 1], [1].*(3))
+  assert_equal([], [1].*(0))
 end
 
 assert('Array#+', '15.2.12.5.2') do
-  assert_equal([1].+([1]), [1, 1])
+  assert_equal([1, 1], [1].+([1]))
 end
 
 assert('Array#<<', '15.2.12.5.3') do
-  assert_equal([1].<<(1), [1, 1])
+  assert_equal([1, 1], [1].<<(1))
 end
 
 assert('Array#[]', '15.2.12.5.4') do
@@ -41,7 +41,7 @@ assert('Array#[]', '15.2.12.5.4') do
     a.[](1,2,3)
   end
 
-  assert_equal([1,2,3].[](1), 2)
+  assert_equal(2, [1,2,3].[](1))
 end
 
 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)
   end
 
-  assert_equal([1,2,3].[]=(1,4), 4)
-  assert_equal([1,2,3].[]=(1,2,3), 3)
+  assert_equal(4, [1,2,3].[]=(1,4))
+  assert_equal(3, [1,2,3].[]=(1,2,3))
 end
 
 assert('Array#clear', '15.2.12.5.6') do
   a = [1]
   a.clear
-  assert_equal(a, [])
+  assert_equal([], a)
 end
 
 assert('Array#collect!', '15.2.12.5.7') do
   a = [1,2,3]
   a.collect! { |i| i + i }
-  assert_equal(a, [2,4,6])
+  assert_equal([2,4,6], a)
 end
 
 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
 
 assert('Array#delete_at', '15.2.12.5.9') do
   a = [1,2,3]
   a.delete_at(1)
-  assert_equal(a, [1,3])
+  assert_equal([1,3], a)
 end
 
 assert('Array#each', '15.2.12.5.10') do
   a = [1,2,3]
   b = 0
   a.each {|i| b += i}
-  assert_equal(b, 6)
+  assert_equal(6, b)
 end
 
 assert('Array#each_index', '15.2.12.5.11') do
   a = [1]
   b = nil
   a.each_index {|i| b = i}
-  assert_equal(b, 0)
+  assert_equal(0, b)
 end
 
 assert('Array#empty?', '15.2.12.5.12') do
@@ -115,16 +115,16 @@ assert('Array#first', '15.2.12.5.13') do
   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])
+  assert_equal(1, b.first)
+  assert_equal([], b.first(0))
+  assert_equal([1], b.first(1))
+  assert_equal([1,2,3], b.first(4))
 end
 
 assert('Array#index', '15.2.12.5.14') do
   a = [1,2,3]
 
-  assert_equal(a.index(2), 1)
+  assert_equal(1, a.index(2))
 end
 
 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)
   d = [].initialize(2) {|i| i}
 
-  assert_equal(a, [nil])
-  assert_equal(b, [nil,nil])
-  assert_equal(c, [1,1])
-  assert_equal(d, [0,1])
+  assert_equal([nil], a)
+  assert_equal([nil,nil], b)
+  assert_equal([1,1], c)
+  assert_equal([0,1], d)
 end
 
 assert('Array#initialize_copy', '15.2.12.5.16') do
   a = [1,2,3]
   b = [].initialize_copy(a)
 
-  assert_equal(b, [1,2,3])
+  assert_equal([1,2,3], b)
 end
 
 assert('Array#join', '15.2.12.5.17') do
   a = [1,2,3].join
   b = [1,2,3].join(',')
 
-  assert_equal(a, '123')
-  assert_equal(b, '1,2,3')
+  assert_equal('123', a)
+  assert_equal('1,2,3', b)
 end
 
 assert('Array#last', '15.2.12.5.18') do
@@ -161,20 +161,20 @@ assert('Array#last', '15.2.12.5.18') do
   end
 
   a = [1,2,3]
-  assert_equal(a.last, 3)
+  assert_equal(3, a.last)
   assert_nil([].last)
 end
 
 assert('Array#length', '15.2.12.5.19') do
   a = [1,2,3]
 
-  assert_equal(a.length, 3)
+  assert_equal(3, a.length)
 end
 
 assert('Array#map!', '15.2.12.5.20') do
   a = [1,2,3]
   a.map! { |i| i + i }
-  assert_equal(a, [2,4,6])
+  assert_equal([2,4,6], a)
 end
 
 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
 
   assert_nil([].pop)
-  assert_equal(a, [1,2])
-  assert_equal(b, 3)
+  assert_equal([1,2], a)
+  assert_equal(3, b)
 end
 
 assert('Array#push', '15.2.12.5.22') do
   a = [1,2,3]
   b = a.push(4)
 
-  assert_equal(a, [1,2,3,4])
-  assert_equal(b, [1,2,3,4])
+  assert_equal([1,2,3,4], a)
+  assert_equal([1,2,3,4], b)
 end
 
 assert('Array#replace', '15.2.12.5.23') do
   a = [1,2,3]
   b = [].replace(a)
 
-  assert_equal(b, [1,2,3])
+  assert_equal([1,2,3], b)
 end
 
 assert('Array#reverse', '15.2.12.5.24') do
   a = [1,2,3]
   b = a.reverse
 
-  assert_equal(a, [1,2,3])
-  assert_equal(b, [3,2,1])
+  assert_equal([1,2,3], a)
+  assert_equal([3,2,1], b)
 end
 
 assert('Array#reverse!', '15.2.12.5.25') do
   a = [1,2,3]
   b = a.reverse!
 
-  assert_equal(a, [3,2,1])
-  assert_equal(b, [3,2,1])
+  assert_equal([3,2,1], a)
+  assert_equal([3,2,1], b)
 end
 
 assert('Array#rindex', '15.2.12.5.26') do
   a = [1,2,3]
 
-  assert_equal(a.rindex(2), 1)
+  assert_equal(1, a.rindex(2))
 end
 
 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
 
   assert_nil([].shift)
-  assert_equal(a, [2,3])
-  assert_equal(b, 1)
+  assert_equal([2,3], a)
+  assert_equal(1, b)
 end
 
 assert('Array#size', '15.2.12.5.28') do
   a = [1,2,3]
 
-  assert_equal(a.size, 3)
+  assert_equal(3, a.size)
 end
 
 assert('Array#slice', '15.2.12.5.29') do
   a = "12345".slice(1, 3)
   b = a.slice(0)
 
-  assert_equal("#{b}:", "2:")
-  assert_equal([1,2,3].[](1), 2)
+  assert_equal("2:", "#{b}:")
+  assert_equal(2, [1,2,3].[](1))
 end
 
 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]
   d = c.unshift(0, 1)
 
-  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])
+  assert_equal([1,2,3], a)
+  assert_equal([1,2,3], b)
+  assert_equal([0,1,2,3], c)
+  assert_equal([0,1,2,3], d)
 end
 
 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
   r2 = a.inspect
 
-  assert_equal(r1, r2)
-  assert_equal(r1, "[2, 3, 4, 5]")
+  assert_equal(r2, r1)
+  assert_equal("[2, 3, 4, 5]", r1)
 end
 
 assert('Array#==', '15.2.12.5.33') do
@@ -293,9 +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
 
-  assert_equal(r1, -1)
-  assert_equal(r2, +1)
-  assert_equal(r3, 0)
+  assert_equal(-1, r1)
+  assert_equal(+1, r2)
+  assert_equal(0, r3)
 end
 
 # Not ISO specified