Show the source line at an invalid class/instance variable

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67264 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 7 insertions, 5 deletions

diff --git a/test/ruby/test_iseq.rb b/test/ruby/test_iseq.rb
index cac159085a..f2d11cdb7e 100644
--- a/test/ruby/test_iseq.rb
+++ b/test/ruby/test_iseq.rb
@@ -246,7 +246,7 @@ class TestISeq < Test::Unit::TestCase
       end
     end
     assert_equal([m1, e1.message], [m2, e2.message], feature11951)
-    e1, e2 = e1.message.lines
+    e1, *, e2 = e1.message.lines
     assert_send([e1, :start_with?, __FILE__])
     assert_send([e2, :start_with?, __FILE__])
   end
diff --git a/test/ruby/test_parse.rb b/test/ruby/test_parse.rb
index 0b3657f8a0..d21484f4b6 100644
--- a/test/ruby/test_parse.rb
+++ b/test/ruby/test_parse.rb
@@ -720,13 +720,15 @@ x = __ENCODING__
   end
 
   def test_invalid_instance_variable
-    assert_raise(SyntaxError) { eval('@#') }
-    assert_raise(SyntaxError) { eval('@') }
+    pattern = /without identifiers is not allowed as an instance variable name/
+    assert_raise_with_message(SyntaxError, pattern) { eval('@%') }
+    assert_raise_with_message(SyntaxError, pattern) { eval('@') }
   end
 
   def test_invalid_class_variable
-    assert_raise(SyntaxError) { eval('@@1') }
-    assert_raise(SyntaxError) { eval('@@') }
+    pattern = /without identifiers is not allowed as a class variable name/
+    assert_raise_with_message(SyntaxError, pattern) { eval('@@%') }
+    assert_raise_with_message(SyntaxError, pattern) { eval('@@') }
   end
 
   def test_invalid_char