oj 2.18.3 → 3.13.14

data/test/json_gem/json_parser_test.rb

@@ -0,0 +1,470 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+# frozen_string_literal: false
+
+require 'json_gem/test_helper'
+
+require 'stringio'
+require 'tempfile'
+require 'ostruct'
+
+class JSONParserTest < Test::Unit::TestCase
+  include Test::Unit::TestCaseOmissionSupport
+
+  def test_construction
+    parser = JSON::Parser.new('test')
+    assert_equal 'test', parser.source
+  end
+
+  def test_argument_encoding
+    source = "{}".encode("UTF-16")
+    JSON::Parser.new(source)
+    assert_equal Encoding::UTF_16, source.encoding
+  end if defined?(Encoding::UTF_16)
+
+  def test_error_message_encoding
+    bug10705 = '[ruby-core:67386] [Bug #10705]'
+    json = ".\"\xE2\x88\x9A\"".force_encoding(Encoding::UTF_8)
+    e = assert_raise(JSON::ParserError) {
+      JSON::Ext::Parser.new(json).parse
+    }
+    assert_equal(Encoding::UTF_8, e.message.encoding, bug10705)
+    assert_include(e.message, json, bug10705)
+  end if defined?(Encoding::UTF_8)
+
+  def test_parsing
+    parser = JSON::Parser.new('"test"')
+    assert_equal 'test', parser.parse
+  end
+
+  def test_parser_reset
+    parser = JSON::Parser.new('{"a":"b"}')
+    assert_equal({ 'a' => 'b' }, parser.parse)
+    assert_equal({ 'a' => 'b' }, parser.parse)
+  end
+
+  def test_parse_values
+    assert_equal(nil,      JSON.parse('null'))
+    assert_equal(false,    JSON.parse('false'))
+    assert_equal(true,     JSON.parse('true'))
+    assert_equal(-23,      JSON.parse('-23'))
+    assert_equal(23,       JSON.parse('23'))
+    assert_in_delta(0.23,  JSON.parse('0.23'), 1e-2)
+    assert_in_delta(0.0,   JSON.parse('0e0'), 1e-2)
+    assert_equal("",       JSON.parse('""'))
+    assert_equal("foobar", JSON.parse('"foobar"'))
+  end
+
+  def test_parse_simple_arrays
+    assert_equal([],             JSON.parse('[]'))
+    assert_equal([],             JSON.parse('  [  ] '))
+    assert_equal([ nil ],        JSON.parse('[null]'))
+    assert_equal([ false ],      JSON.parse('[false]'))
+    assert_equal([ true ],       JSON.parse('[true]'))
+    assert_equal([ -23 ],        JSON.parse('[-23]'))
+    assert_equal([ 23 ],         JSON.parse('[23]'))
+    assert_equal_float([ 0.23 ], JSON.parse('[0.23]'))
+    assert_equal_float([ 0.0 ],  JSON.parse('[0e0]'))
+    assert_equal([""],           JSON.parse('[""]'))
+    assert_equal(["foobar"],     JSON.parse('["foobar"]'))
+    assert_equal([{}],           JSON.parse('[{}]'))
+  end
+
+  def test_parse_simple_objects
+    assert_equal({}, JSON.parse('{}'))
+    assert_equal({}, JSON.parse(' {   }   '))
+    assert_equal({ "a" => nil }, JSON.parse('{   "a"   :  null}'))
+    assert_equal({ "a" => nil }, JSON.parse('{"a":null}'))
+    assert_equal({ "a" => false }, JSON.parse('{   "a"  :  false  }  '))
+    assert_equal({ "a" => false }, JSON.parse('{"a":false}'))
+    assert_raise(JSON::ParserError) { JSON.parse('{false}') }
+    assert_equal({ "a" => true }, JSON.parse('{"a":true}'))
+    assert_equal({ "a" => true }, JSON.parse('  { "a" :  true  }   '))
+    assert_equal({ "a" => -23 }, JSON.parse('  {  "a"  :  -23  }  '))
+    assert_equal({ "a" => -23 }, JSON.parse('  { "a" : -23 } '))
+    assert_equal({ "a" => 23 }, JSON.parse('{"a":23  } '))
+    assert_equal({ "a" => 23 }, JSON.parse('  { "a"  : 23  } '))
+    assert_equal({ "a" => 0.23 }, JSON.parse(' { "a"  :  0.23 }  '))
+    assert_equal({ "a" => 0.23 }, JSON.parse('  {  "a"  :  0.23  }  '))
+  end
+
+  def test_parse_numbers
+    assert_raise(JSON::ParserError) { JSON.parse('+23.2') }
+    assert_raise(JSON::ParserError) { JSON.parse('+23') }
+    assert_raise(JSON::ParserError) { JSON.parse('.23') }
+    assert_raise(JSON::ParserError) { JSON.parse('023') }
+    assert_equal 23, JSON.parse('23')
+    assert_equal -23, JSON.parse('-23')
+    assert_equal_float 3.141, JSON.parse('3.141')
+    assert_equal_float -3.141, JSON.parse('-3.141')
+    assert_equal_float 3.141, JSON.parse('3141e-3')
+    assert_equal_float 3.141, JSON.parse('3141.1e-3')
+    assert_equal_float 3.141, JSON.parse('3141E-3')
+    assert_equal_float 3.141, JSON.parse('3141.0E-3')
+    assert_equal_float -3.141, JSON.parse('-3141.0e-3')
+    assert_equal_float -3.141, JSON.parse('-3141e-3')
+    assert_raise(JSON::ParserError) { JSON.parse('NaN') }
+    assert JSON.parse('NaN', :allow_nan => true).nan?
+    assert_raise(JSON::ParserError) { JSON.parse('Infinity') }
+    assert_equal 1.0/0, JSON.parse('Infinity', :allow_nan => true)
+    assert_raise(JSON::ParserError) { JSON.parse('-Infinity') }
+    assert_equal -1.0/0, JSON.parse('-Infinity', :allow_nan => true)
+  end
+
+  if Array.method_defined?(:permutation)
+    def test_parse_more_complex_arrays
+      a = [ nil, false, true, "foßbar", [ "n€st€d", true ], { "nested" => true, "n€ßt€ð2" => {} }]
+      a.permutation.each do |perm|
+        json = JSON.pretty_generate(perm)
+        assert_equal perm, JSON.parse(json)
+      end
+    end
+
+    def test_parse_complex_objects
+      a = [ nil, false, true, "foßbar", [ "n€st€d", true ], { "nested" => true, "n€ßt€ð2" => {} }]
+      a.permutation.each do |perm|
+        s = "a"
+        orig_obj = perm.inject({}) { |h, x| h[s.dup] = x; s = s.succ; h }
+        json = JSON.pretty_generate(orig_obj)
+        assert_equal orig_obj, JSON.parse(json)
+      end
+    end
+  end
+
+  def test_parse_arrays
+    assert_equal([1,2,3], JSON.parse('[1,2,3]'))
+    assert_equal([1.2,2,3], JSON.parse('[1.2,2,3]'))
+    assert_equal([[],[[],[]]], JSON.parse('[[],[[],[]]]'))
+    assert_equal([], JSON.parse('[]'))
+    assert_equal([], JSON.parse('  [  ]  '))
+    assert_equal([1], JSON.parse('[1]'))
+    assert_equal([1], JSON.parse('  [ 1  ]  '))
+    ary = [[1], ["foo"], [3.14], [4711.0], [2.718], [nil],
+      [[1, -2, 3]], [false], [true]]
+    assert_equal(ary,
+      JSON.parse('[[1],["foo"],[3.14],[47.11e+2],[2718.0E-3],[null],[[1,-2,3]],[false],[true]]'))
+    assert_equal(ary, JSON.parse(%Q{   [   [1] , ["foo"]  ,  [3.14] \t ,  [47.11e+2]\s
+      , [2718.0E-3 ],\r[ null] , [[1, -2, 3 ]], [false ],[ true]\n ]  }))
+  end
+
+  def test_parse_json_primitive_values
+    assert_raise(JSON::ParserError) { JSON.parse('') }
+    assert_raise(TypeError) { JSON.parse(nil) }
+    assert_raise(JSON::ParserError) { JSON.parse('  /* foo */ ') }
+    assert_equal nil, JSON.parse('null')
+    assert_equal false, JSON.parse('false')
+    assert_equal true, JSON.parse('true')
+    assert_equal 23, JSON.parse('23')
+    assert_equal 1, JSON.parse('1')
+    assert_equal_float 3.141, JSON.parse('3.141'), 1E-3
+    assert_equal 2 ** 64, JSON.parse('18446744073709551616')
+    assert_equal 'foo', JSON.parse('"foo"')
+    assert JSON.parse('NaN', :allow_nan => true).nan?
+    assert JSON.parse('Infinity', :allow_nan => true).infinite?
+    assert JSON.parse('-Infinity', :allow_nan => true).infinite?
+    assert_raise(JSON::ParserError) { JSON.parse('[ 1, ]') }
+  end
+
+  def test_parse_some_strings
+    assert_equal([""], JSON.parse('[""]'))
+    assert_equal(["\\"], JSON.parse('["\\\\"]'))
+    assert_equal(['"'], JSON.parse('["\""]'))
+    assert_equal(['\\"\\'], JSON.parse('["\\\\\\"\\\\"]'))
+    assert_equal(
+      ["\"\b\n\r\t\0\037"],
+      JSON.parse('["\"\b\n\r\t\u0000\u001f"]')
+    )
+  end
+
+  def test_parse_big_integers
+    json1 = JSON(orig = (1 << 31) - 1)
+    assert_equal orig, JSON.parse(json1)
+    json2 = JSON(orig = 1 << 31)
+    assert_equal orig, JSON.parse(json2)
+    json3 = JSON(orig = (1 << 62) - 1)
+    assert_equal orig, JSON.parse(json3)
+    json4 = JSON(orig = 1 << 62)
+    assert_equal orig, JSON.parse(json4)
+    json5 = JSON(orig = 1 << 64)
+    assert_equal orig, JSON.parse(json5)
+  end
+
+  def test_some_wrong_inputs
+    assert_raise(JSON::ParserError) { JSON.parse('[] bla') }
+    assert_raise(JSON::ParserError) { JSON.parse('[] 1') }
+    assert_raise(JSON::ParserError) { JSON.parse('[] []') }
+    assert_raise(JSON::ParserError) { JSON.parse('[] {}') }
+    assert_raise(JSON::ParserError) { JSON.parse('{} []') }
+    assert_raise(JSON::ParserError) { JSON.parse('{} {}') }
+    assert_raise(JSON::ParserError) { JSON.parse('[NULL]') }
+    assert_raise(JSON::ParserError) { JSON.parse('[FALSE]') }
+    assert_raise(JSON::ParserError) { JSON.parse('[TRUE]') }
+    assert_raise(JSON::ParserError) { JSON.parse('[07]    ') }
+    assert_raise(JSON::ParserError) { JSON.parse('[0a]') }
+    assert_raise(JSON::ParserError) { JSON.parse('[1.]') }
+    assert_raise(JSON::ParserError) { JSON.parse('     ') }
+  end
+
+  def test_symbolize_names
+    assert_equal({ "foo" => "bar", "baz" => "quux" },
+      JSON.parse('{"foo":"bar", "baz":"quux"}'))
+    assert_equal({ :foo => "bar", :baz => "quux" },
+      JSON.parse('{"foo":"bar", "baz":"quux"}', :symbolize_names => true))
+    assert_raise(ArgumentError) do
+      JSON.parse('{}', :symbolize_names => true, :create_additions => true)
+    end
+  end
+
+  def test_parse_comments
+    json = <<EOT
+{
+  "key1":"value1", // eol comment
+  "key2":"value2"  /* multi line
+                    *  comment */,
+  "key3":"value3"  /* multi line
+                    // nested eol comment
+                    *  comment */
+}
+EOT
+    assert_equal(
+      { "key1" => "value1", "key2" => "value2", "key3" => "value3" },
+      JSON.parse(json))
+    json = <<EOT
+{
+  "key1":"value1"  /* multi line
+                    // nested eol comment
+                    /* illegal nested multi line comment */
+                    *  comment */
+}
+EOT
+    assert_raise(JSON::ParserError) { JSON.parse(json) }
+    json = <<EOT
+{
+  "key1":"value1"  /* multi line
+                   // nested eol comment
+                   closed multi comment */
+                   and again, throw an Error */
+}
+EOT
+    assert_raise(JSON::ParserError) { JSON.parse(json) }
+    json = <<EOT
+{
+  "key1":"value1"  /*/*/
+}
+EOT
+    assert_equal({ "key1" => "value1" }, JSON.parse(json))
+  end
+
+  def test_nesting
+    too_deep = '[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]'
+    too_deep_ary = eval too_deep
+    assert_raise(JSON::NestingError) { JSON.parse too_deep }
+    assert_raise(JSON::NestingError) { JSON.parse too_deep, :max_nesting => 100 }
+    ok = JSON.parse too_deep, :max_nesting => 101
+    assert_equal too_deep_ary, ok
+    ok = JSON.parse too_deep, :max_nesting => nil
+    assert_equal too_deep_ary, ok
+    ok = JSON.parse too_deep, :max_nesting => false
+    assert_equal too_deep_ary, ok
+    ok = JSON.parse too_deep, :max_nesting => 0
+    assert_equal too_deep_ary, ok
+  end
+
+  def test_backslash
+    data = [ '\\.(?i:gif|jpe?g|png)$' ]
+    json = '["\\\\.(?i:gif|jpe?g|png)$"]'
+    assert_equal data, JSON.parse(json)
+    #
+    data = [ '\\"' ]
+    json = '["\\\\\""]'
+    assert_equal data, JSON.parse(json)
+    #
+    json = '["/"]'
+    data = [ '/' ]
+    assert_equal data, JSON.parse(json)
+    #
+    json = '["\""]'
+    data = ['"']
+    assert_equal data, JSON.parse(json)
+    #
+    json = '["\\\'"]'
+    data = ["'"]
+    assert_equal data, JSON.parse(json)
+  end
+
+  class SubArray < Array
+    def <<(v)
+      @shifted = true
+      super
+    end
+
+    def shifted?
+      @shifted
+    end
+  end
+
+  class SubArray2 < Array
+    def to_json(*a)
+      {
+        JSON.create_id => self.class.name,
+        'ary'          => to_a,
+      }.to_json(*a)
+    end
+
+    def self.json_create(o)
+      o.delete JSON.create_id
+      o['ary']
+    end
+  end
+
+  class SubArrayWrapper
+    def initialize
+      @data = []
+    end
+
+    attr_reader :data
+
+    def [](index)
+      @data[index]
+    end
+
+    def <<(value)
+      @data << value
+      @shifted = true
+    end
+
+    def shifted?
+      @shifted
+    end
+  end
+
+  def test_parse_array_custom_array_derived_class
+    res = JSON.parse('[1,2]', :array_class => SubArray)
+    assert_equal([1,2], res)
+    assert_equal(SubArray, res.class)
+    assert res.shifted?
+  end
+
+  def test_parse_array_custom_non_array_derived_class
+    res = JSON.parse('[1,2]', :array_class => SubArrayWrapper)
+    assert_equal(SubArrayWrapper, res.class)
+    assert_equal([1,2], res.data)
+    assert res.shifted?
+  end
+
+  def test_parse_object
+    assert_equal({}, JSON.parse('{}'))
+    assert_equal({}, JSON.parse('  {  }  '))
+    assert_equal({'foo'=>'bar'}, JSON.parse('{"foo":"bar"}'))
+    assert_equal({'foo'=>'bar'}, JSON.parse('    { "foo"  :   "bar"   }   '))
+  end
+
+  class SubHash < Hash
+    def []=(k, v)
+      @item_set = true
+      super
+    end
+
+    def item_set?
+      @item_set
+    end
+  end
+
+  class SubHash2 < Hash
+    def to_json(*a)
+      {
+        JSON.create_id => self.class.name,
+      }.merge(self).to_json(*a)
+    end
+
+    def self.json_create(o)
+      o.delete JSON.create_id
+      self[o]
+    end
+  end
+
+  class SubOpenStruct < OpenStruct
+    def [](k)
+      __send__(k)
+    end
+
+    def []=(k, v)
+      @item_set = true
+      __send__("#{k}=", v)
+    end
+
+    def item_set?
+      @item_set
+    end
+  end
+
+  def test_parse_object_custom_hash_derived_class
+    res = JSON.parse('{"foo":"bar"}', :object_class => SubHash)
+    assert_equal(SubHash, res.class)
+    assert_equal({"foo" => "bar"}, res)
+    assert res.item_set?
+  end
+
+  def test_parse_object_custom_non_hash_derived_class
+    res = JSON.parse('{"foo":"bar"}', :object_class => SubOpenStruct)
+    assert_equal(SubOpenStruct, res.class)
+    assert_equal "bar", res.foo
+    assert res.item_set?
+  end
+
+  def test_parse_generic_object
+    res = JSON.parse(
+      '{"foo":"bar", "baz":{}}',
+      :object_class => JSON::GenericObject
+    )
+    assert_equal(JSON::GenericObject, res.class)
+    assert_equal "bar", res.foo
+    assert_equal "bar", res["foo"]
+    assert_equal "bar", res[:foo]
+    assert_equal "bar", res.to_hash[:foo]
+    assert_equal(JSON::GenericObject, res.baz.class)
+  end if defined?(JSON::GenericObject)
+
+  def test_generate_core_subclasses_with_new_to_json
+    obj = SubHash2["foo" => SubHash2["bar" => true]]
+    obj_json = JSON(obj)
+    obj_again = JSON.parse(obj_json, :create_additions => true)
+    assert_kind_of SubHash2, obj_again
+    assert_kind_of SubHash2, obj_again['foo']
+    assert obj_again['foo']['bar']
+    assert_equal obj, obj_again
+    assert_equal ["foo"],
+      JSON(JSON(SubArray2["foo"]), :create_additions => true)
+  end
+
+  def test_generate_core_subclasses_with_default_to_json
+    assert_equal '{"foo":"bar"}', JSON(SubHash["foo" => "bar"])
+    assert_equal '["foo"]', JSON(SubArray["foo"])
+  end
+
+  def test_generate_of_core_subclasses
+    obj = SubHash["foo" => SubHash["bar" => true]]
+    obj_json = JSON(obj)
+    obj_again = JSON(obj_json)
+    assert_kind_of Hash, obj_again
+    assert_kind_of Hash, obj_again['foo']
+    assert obj_again['foo']['bar']
+    assert_equal obj, obj_again
+  end
+
+  def test_parsing_frozen_ascii8bit_string
+    assert_equal(
+      { 'foo' => 'bar' },
+      JSON('{ "foo": "bar" }'.force_encoding(Encoding::ASCII_8BIT).freeze)
+    )
+  end
+
+  private
+
+  def assert_equal_float(expected, actual, delta = 1e-2)
+    Array === expected and expected = expected.first
+    Array === actual and actual = actual.first
+    assert_in_delta(expected, actual, delta)
+  end
+end

data/test/json_gem/json_string_matching_test.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+#frozen_string_literal: false
+
+require 'json_gem/test_helper'
+
+require 'time'
+
+class JSONStringMatchingTest < Test::Unit::TestCase
+  include Test::Unit::TestCaseOmissionSupport
+
+  class TestTime < ::Time
+    def self.json_create(string)
+      Time.parse(string)
+    end
+
+    def to_json(*)
+      %{"#{strftime('%FT%T%z')}"}
+    end
+
+    def ==(other)
+      to_i == other.to_i
+    end
+  end
+
+  def test_match_date
+    t = TestTime.new
+    t_json = [ t ].to_json
+    time_regexp = /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\z/
+    assert_equal [ t ],
+      JSON.parse(
+        t_json,
+        :create_additions => true,
+        :match_string => { time_regexp => TestTime }
+      )
+    assert_equal [ t.strftime('%FT%T%z') ],
+      JSON.parse(
+        t_json,
+        :match_string => { time_regexp => TestTime }
+      )
+  end
+end

data/test/json_gem/test_helper.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+$: << File.dirname(__FILE__)
+$oj_dir = File.dirname(File.dirname(File.expand_path(File.dirname(__FILE__))))
+%w(lib ext).each do |dir|
+  $: << File.join($oj_dir, dir)
+end
+
+require 'test/unit'
+REAL_JSON_GEM = !!ENV['REAL_JSON_GEM']
+
+if ENV['REAL_JSON_GEM']
+  require 'json'
+else
+  require 'oj'
+  Oj.mimic_JSON
+
+  if defined?(GC.verify_compaction_references) == 'method'
+    # This method was added in Ruby 3.0.0. Calling it this way asks the GC to
+    # move objects around, helping to find object movement bugs.
+    GC.verify_compaction_references(double_heap: true, toward: :empty)
+  end
+end
+
+NaN = JSON::NaN if defined?(JSON::NaN)
+NaN = 0.0/0 unless defined?(NaN)

data/test/mem.rb

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << '.'
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'oj'
+
+Oj.default_options = { mode: :rails, cache_keys: false, cache_str: -1 }
+
+def mem
+  `ps -o rss= -p #{$$}`.to_i
+end
+
+('a'..'z').each { |a|
+  ('a'..'z').each { |b|
+    ('a'..'z').each { |c|
+      ('a'..'z').each { |d|
+	('a'..'z').each { |e|
+	  ('a'..'z').each { |f|
+	    key = "#{a}#{b}#{c}#{d}#{e}#{f}"
+	    x = Oj.load(%|{ "#{key}": 101}|)
+	    #Oj.dump(x)
+	  }
+	}
+      }
+    }
+    puts "#{a}#{b} #{mem}"
+  }
+}
+
+Oj::Parser.new(:usual)

data/test/perf.rb

@@ -17,7 +17,7 @@ class Perf
       end
     end
   end
-  
+
   def run(iter)
     base = Item.new(nil, nil) { }
     base.run(iter, 0.0)

data/test/perf_compat.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby -wW1
+#!/usr/bin/env ruby
 # encoding: UTF-8
 
 $: << '.'
@@ -12,8 +12,6 @@ require 'oj'
 $verbose = false
 $indent = 0
 $iter = 20000
-$with_bignum = false
-$with_nums = true
 $size = 0
 
 opts = OptionParser.new
@@ -24,25 +22,48 @@ opts.on("-s", "--size [Int]", Integer, "size (~Kbytes)")    { |i| $size = i }
 opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
 files = opts.parse(ARGV)
 
+def capture_error(tag, orig, load_key, dump_key, &blk)
+  begin
+    obj = blk.call(orig)
+    puts obj unless orig == obj
+    raise "#{tag} #{dump_key} and #{load_key} did not return the same object as the original." unless orig == obj
+  rescue Exception => e
+    $failed[tag] = "#{e.class}: #{e.message}"
+  end
+end
+
+# Verify that all packages dump and load correctly and return the same Object as the original.
+capture_error('Oj:compat', $obj, 'load', 'dump') { |o| Oj.compat_load(Oj.dump(o, :mode => :compat)) }
+capture_error('JSON::Ext', $obj, 'generate', 'parse') { |o|
+  require 'json'
+  require 'json/ext'
+  JSON.generator = JSON::Ext::Generator
+  JSON.parser = JSON::Ext::Parser
+  JSON.load(JSON.generate(o))
+}
+
 module One
   module Two
     module Three
       class Empty
 
         def initialize()
+          @a = 1
+          @b = 2
+          @c = 3
         end
 
         def eql?(o)
-          self.class == o.class
+          self.class == o.class && @a == o.a && @b = o.b && @c = o.c
         end
         alias == eql?
 
-        def to_hash()
-          {'json_class' => "#{self.class.name}"}
+        def as_json(*a)
+          {JSON.create_id => self.class.name, 'a' => @a, 'b' => @b, 'c' => @c }
         end
-
+        
         def to_json(*a)
-          %{{"json_class":"#{self.class.name}"}}
+          JSON.generate(as_json())
         end
 
         def self.json_create(h)
@@ -65,7 +86,7 @@ $obj = {
   'i' => [[[[[[[nil]]]]]]]  # deep array, again, not that deep
 }
 
-Oj.default_options = { :indent => $indent, :mode => :compat }
+Oj.default_options = { :indent => $indent, :mode => :compat, :use_to_json => true, :create_additions => true, :create_id => '^o' }
 
 if 0 < $size
   s = Oj.dump($obj).size + 1
@@ -80,25 +101,6 @@ end
 $json = Oj.dump($obj)
 $failed = {} # key is same as String used in tests later
 
-def capture_error(tag, orig, load_key, dump_key, &blk)
-  begin
-    obj = blk.call(orig)
-    raise "#{tag} #{dump_key} and #{load_key} did not return the same object as the original." unless orig == obj
-  rescue Exception => e
-    $failed[tag] = "#{e.class}: #{e.message}"
-  end
-end
-
-# Verify that all packages dump and load correctly and return the same Object as the original.
-capture_error('Oj:compat', $obj, 'load', 'dump') { |o| Oj.compat_load(Oj.dump(o, :mode => :compat)) }
-capture_error('JSON::Ext', $obj, 'generate', 'parse') { |o|
-  require 'json'
-  require 'json/ext'
-  JSON.generator = JSON::Ext::Generator
-  JSON.parser = JSON::Ext::Parser
-  JSON.load(JSON.generate(o))
-}
-
 if $verbose
   puts "size: #{$json.size}"
   puts "json:\n#{$json}\n"