6 files changed, 70 insertions, 4 deletions
diff --git a/test/t/argumenterror.rb b/test/t/argumenterror.rb
index abb53429b..3dcb29a4b 100644
--- a/test/t/argumenterror.rb
+++ b/test/t/argumenterror.rb
@@ -1,6 +1,13 @@
 ##
 # ArgumentError ISO Test
 
+def assert_argnum_error(given, expected, &block)
+  assert("wrong number of arguments") do
+    message = "wrong number of arguments (given #{given}, expected #{expected})"
+    assert_raise_with_message(ArgumentError, message, &block)
+  end
+end
+
 assert('ArgumentError', '15.2.24') do
   e2 = nil
   a = []
@@ -14,3 +21,12 @@ assert('ArgumentError', '15.2.24') do
   assert_equal(Class, ArgumentError.class)
   assert_equal(ArgumentError, e2.class)
 end
+
+assert("'wrong number of arguments' from mrb_get_args") do
+  assert_argnum_error(0, "1+"){__send__}
+  assert_argnum_error(0, 1..2){Object.const_defined?}
+  assert_argnum_error(3, 1..2){Object.const_defined?(:A, true, 2)}
+  assert_argnum_error(2, 0..1){{}.default(1, 2)}
+  assert_argnum_error(1, 2){Object.const_set(:B)}
+  assert_argnum_error(3, 2){Object.const_set(:C, 1, 2)}
+end
diff --git a/test/t/array.rb b/test/t/array.rb
index b3952e5a5..1e224a034 100644
--- a/test/t/array.rb
+++ b/test/t/array.rb
@@ -5,7 +5,7 @@ assert('Array', '15.2.12') do
   assert_equal(Class, Array.class)
 end
 
-assert('Array inclueded modules', '15.2.12.3') do
+assert('Array included modules', '15.2.12.3') do
   assert_true(Array.include?(Enumerable))
 end
 
diff --git a/test/t/integer.rb b/test/t/integer.rb
index 1d805ff11..adc8fe828 100644
--- a/test/t/integer.rb
+++ b/test/t/integer.rb
@@ -28,7 +28,7 @@ assert('Integer#*', '15.2.8.3.3') do
   a = 1*1
   assert_equal 1, a
   if Object.const_defined?(:Float)
-    b = 1*1.0 
+    b = 1*1.0
     assert_equal 1.0, b
   end
   assert_raise(TypeError){ 0*nil }
diff --git a/test/t/literals.rb b/test/t/literals.rb
index 6344219aa..b7b07cd9d 100644
--- a/test/t/literals.rb
+++ b/test/t/literals.rb
@@ -162,6 +162,47 @@ qq
 QQ2
       "o")
 
+  r = <<~RRR
+    rrr
+      rrr
+  RRR
+  s = <<~"SSS"
+    sss
+      sss
+  SSS
+  t = <<~'TTT'
+    ttt
+      ttt
+  TTT
+  u = [<<~UUU1   , <<~"UUU2"   , <<~'UUU3' ]
+    u#{1}u
+  UUU1
+    u#{2}u
+  UUU2
+    u#{3}u
+  UUU3
+  v1 = <<~VVV
+
+    vvv
+    #{"vvv"}
+  VVV
+  v2 = <<~VVV
+\tvvv
+  vvv
+  VVV
+  v3 = <<~VVV
+    v v v
+      vvv
+  VVV
+  v4 = <<~VVV
+    vvv \
+    vvv
+  VVV
+  v5 = <<~VVV
+      vvv \
+    vvv
+  VVV
+
   w = %W( 1 #{<<WWW} 3
 www
 WWW
@@ -197,6 +238,15 @@ ZZZ
   assert_equal [1, "nn1\n", 3, 4], n
   assert_equal "a $ q\n $ c $ d", q1
   assert_equal "l $ mqq\nn $ o", q2
+  assert_equal "rrr\n  rrr\n", r
+  assert_equal "sss\n  sss\n", s
+  assert_equal "ttt\n  ttt\n", t
+  assert_equal ["u1u\n", "u2u\n", "u\#{3}u\n"], u
+  assert_equal "\nvvv\nvvv\n", v1
+  assert_equal "\tvvv\n  vvv\n", v2
+  assert_equal "v v v\n  vvv\n", v3
+  assert_equal "vvv vvv\n", v4
+  assert_equal "  vvv vvv\n", v5
   assert_equal ["1", "www\n", "3", "4", "5"], w
   assert_equal [1, "foo 222 333\n 444\n5\n bar\n6\n", 9], x
   assert_equal "", z
diff --git a/test/t/module.rb b/test/t/module.rb
index 2957dec52..07d550804 100644
--- a/test/t/module.rb
+++ b/test/t/module.rb
@@ -674,7 +674,7 @@ end
     c1 = labeled_class("C1")
     c2 = labeled_class("C2", c1) {prepend m}
     c1.class_eval {prepend m}
-    assert_equal([m, c2, m, c1], c2.ancestors[0, 4], "should accesisble prepended module in superclass")
+    assert_equal([m, c2, m, c1], c2.ancestors[0, 4], "should accessible prepended module in superclass")
   end
 
   # requires #assert_separately
diff --git a/test/t/range.rb b/test/t/range.rb
index b5196cd9a..5f29b4514 100644
--- a/test/t/range.rb
+++ b/test/t/range.rb
@@ -155,7 +155,7 @@ assert('Range#eql?', '15.2.14.4.14') do
   assert_false (1..).eql? "1.."
   skip unless Object.const_defined?(:Float)
   assert_false (1..10).eql? (Range.new(1.0, 10.0))
-  assert_false (1..).eql? (Range.new(1.0, nil)) 
+  assert_false (1..).eql? (Range.new(1.0, nil))
 end
 
 assert('Range#initialize_copy', '15.2.14.4.15') do