* ext/json: Merge json gem 1.5.4+ (f7f78896607b6f6226cd).

  [Bug #4700]

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

1 files changed, 10 insertions, 5 deletions

diff --git a/test/json/test_json_addition.rb b/test/json/test_json_addition.rb
index 36b89e5c35..a8181e8d74 100755
--- a/test/json/test_json_addition.rb
+++ b/test/json/test_json_addition.rb
@@ -2,11 +2,7 @@
 # -*- coding:utf-8 -*-
 
 require 'test/unit'
-case ENV['JSON']
-when 'pure' then require 'json/pure'
-when 'ext'  then require 'json/ext'
-else             require 'json'
-end
+require File.join(File.dirname(__FILE__), 'setup_variant')
 load 'json/add/core.rb'
 require 'date'
 
@@ -36,6 +32,15 @@ class TC_JSONAddition < Test::Unit::TestCase
     end
   end
 
+  class A2 < A
+    def to_json(*args)
+      {
+        'json_class'  => self.class.name,
+        'args'        => [ @a ],
+      }.to_json(*args)
+    end
+  end
+
   class B
     def self.json_creatable?
       false