1 files changed, 29 insertions, 10 deletions
diff --git a/test/json/json_ext_parser_test.rb b/test/json/json_ext_parser_test.rb
index da61504989..e610f642f1 100644
--- a/test/json/json_ext_parser_test.rb
+++ b/test/json/json_ext_parser_test.rb
@@ -6,24 +6,43 @@ class JSONExtParserTest < Test::Unit::TestCase
 
   def test_allocate
     parser = JSON::Ext::Parser.new("{}")
-    assert_raise(TypeError, '[ruby-core:35079]') do
-      parser.__send__(:initialize, "{}")
-    end
+    parser.__send__(:initialize, "{}")
+    assert_equal "{}", parser.source
+
     parser = JSON::Ext::Parser.allocate
-    assert_raise(TypeError, '[ruby-core:35079]') { parser.source }
+    assert_nil parser.source
   end
 
   def test_error_messages
-    ex = assert_raise(ParserError) { parse('Infinity') }
-    assert_equal "unexpected token at 'Infinity'", ex.message
+    ex = assert_raise(ParserError) { parse('Infinity something') }
+    unless RUBY_PLATFORM =~ /java/
+      assert_equal "unexpected token 'Infinity' at line 1 column 1", ex.message
+    end
 
+    ex = assert_raise(ParserError) { parse('foo bar') }
     unless RUBY_PLATFORM =~ /java/
-      ex = assert_raise(ParserError) { parse('-Infinity') }
-      assert_equal "unexpected token at '-Infinity'", ex.message
+      assert_equal "unexpected token 'foo' at line 1 column 1", ex.message
     end
 
-    ex = assert_raise(ParserError) { parse('NaN') }
-    assert_equal "unexpected token at 'NaN'", ex.message
+    ex = assert_raise(ParserError) { parse('-Infinity something') }
+    unless RUBY_PLATFORM =~ /java/
+      assert_equal "unexpected token '-Infinity' at line 1 column 1", ex.message
+    end
+
+    ex = assert_raise(ParserError) { parse('NaN something') }
+    unless RUBY_PLATFORM =~ /java/
+      assert_equal "unexpected token 'NaN' at line 1 column 1", ex.message
+    end
+
+    ex = assert_raise(ParserError) { parse('   ') }
+    unless RUBY_PLATFORM =~ /java/
+      assert_equal "unexpected end of input at line 1 column 4", ex.message
+    end
+
+    ex = assert_raise(ParserError) { parse('{   ') }
+    unless RUBY_PLATFORM =~ /java/
+      assert_equal "expected object key, got EOF at line 1 column 5", ex.message
+    end
   end
 
   if GC.respond_to?(:stress=)