oj 2.18.5 → 3.0.0

data/test/test_various.rb

@@ -132,6 +132,7 @@ class Juice < Minitest::Test
       :symbol_keys=>true,
       :bigdecimal_as_decimal=>false,
       :use_to_json=>false,
+      :use_to_hash=>false,
       :use_as_json=>false,
       :nilnil=>true,
       :empty_string=>true,
@@ -151,8 +152,12 @@ class Juice < Minitest::Test
       :nan=>:huge,
       :hash_class=>Hash,
       :omit_nil=>false,
+      :allow_nan=>true,
+      :array_class=>Array,
     }
     Oj.default_options = alt
+    #keys = alt.keys
+    #Oj.default_options.keys.each { |k| puts k unless keys.include? k}
     opts = Oj.default_options()
     assert_equal(alt, opts);
 
@@ -193,14 +198,16 @@ class Juice < Minitest::Test
 
     n = Oj.load('1000.0000123456789')
     assert_equal(BigDecimal, n.class)
-    assert_equal('0.10000000123456789E4', n.to_s)
+    assert_equal('0.10000000123456789E4', n.to_s.upcase)
 
     n = Oj.load('-0.000012345678901234567')
     assert_equal(BigDecimal, n.class)
-    assert_equal('-0.12345678901234567E-4', n.to_s)
+    assert_equal('-0.12345678901234567E-4', n.to_s.upcase)
 
   end
 
+=begin
+# TBD move to custom
   def test_float_dump
     Oj.default_options = { :float_precision => 16 }
     assert_equal('1405460727.723866', Oj.dump(1405460727.723866))
@@ -227,45 +234,7 @@ class Juice < Minitest::Test
     assert_equal('80.6', Oj.dump(80.6))
     assert_equal('-95.640172', Oj.dump(-95.640172))
   end
-
-  def test_nan_dump
-    assert_equal('null', Oj.dump(0/0.0, :mode => :strict, :nan => :null))
-    assert_equal('NaN', Oj.dump(0/0.0, :mode => :strict, :nan => :word))
-    assert_equal('3.3e14159265358979323846', Oj.dump(0/0.0, :mode => :strict, :nan => :huge))
-  end
-
-  def test_infinity_dump
-    assert_equal('null', Oj.dump(1/0.0, :mode => :strict, :nan => :null))
-    assert_equal('Infinity', Oj.dump(1/0.0, :mode => :strict, :nan => :word))
-    assert_equal('3.0e14159265358979323846', Oj.dump(1/0.0, :mode => :strict, :nan => :huge))
-  end
-
-  def test_neg_infinity_dump
-    assert_equal('null', Oj.dump(-1/0.0, :mode => :strict, :nan => :null))
-    assert_equal('-Infinity', Oj.dump(-1/0.0, :mode => :strict, :nan => :word))
-    assert_equal('-3.0e14159265358979323846', Oj.dump(-1/0.0, :mode => :strict, :nan => :huge))
-  end
-
-  def test_float
-    mode = Oj.default_options()[:mode]
-    Oj.default_options = {:mode => :object}
-    dump_and_load(0.0, false)
-    dump_and_load(12345.6789, false)
-    dump_and_load(70.35, false)
-    dump_and_load(-54321.012, false)
-    dump_and_load(1.7775, false)
-    dump_and_load(2.5024, false)
-    dump_and_load(2.48e16, false)
-    dump_and_load(2.48e100 * 1.0e10, false)
-    dump_and_load(-2.48e100 * 1.0e10, false)
-    dump_and_load(1/0.0, false)
-    # NaN does not always == NaN
-    json = Oj.dump(0/0.0)
-    assert_equal('3.3e14159265358979323846', json)
-    loaded = Oj.load(json);
-    assert_equal(true, loaded.nan?)
-    Oj.default_options = {:mode => mode}
-  end
+=end
 
   def test_string
     dump_and_load('', false)
@@ -275,12 +244,6 @@ class Juice < Minitest::Test
     assert_equal("a\u0000a", dump_and_load("a\u0000a", false))
   end
 
-  def test_string_object
-    Oj.default_options = {:mode => :object}
-    dump_and_load('abc', false)
-    dump_and_load(':abc', false)
-  end
-
   def test_encode
     opts = Oj.default_options
     Oj.default_options = { :ascii_only => false }
@@ -375,8 +338,8 @@ class Juice < Minitest::Test
 {"b":2}
 }
     results = []
-    Oj.load(json) { |x| results << x }
-    assert_equal([{"a"=>1}, [1,2], [3,4], {"b"=>2}], results)
+    Oj.load(json, :mode => :strict) { |x, start, len| results << [x, start, len] }
+    assert_equal([[{"a"=>1}, 0, 7], [[1,2], 7, 6], [[3,4], 13, 5], [{"b"=>2}, 18, 8]], results)
   end
 
   def test_multiple_json_no_callback
@@ -433,86 +396,60 @@ class Juice < Minitest::Test
   end
 
   # Symbol
-  def test_symbol_strict
-    begin
-      Oj.dump(:abc, :mode => :strict)
-    rescue Exception
-      assert(true)
-      return
-    end
-    assert(false, "*** expected an exception")
-  end
   def test_symbol_null
     json = Oj.dump(:abc, :mode => :null)
-    assert_equal('null', json)
-  end
-  def test_symbol_compat
-    json = Oj.dump(:abc, :mode => :compat)
     assert_equal('"abc"', json)
   end
-  def test_symbol_object
-    Oj.default_options = { :mode => :object }
-    #dump_and_load(''.to_sym, false)
-    dump_and_load(:abc, false)
-    dump_and_load(':xyz'.to_sym, false)
-  end
 
   # Time
-  def test_time_strict
-    t = Time.local(2012, 1, 5, 23, 58, 7)
-    begin
-      Oj.dump(t, :mode => :strict)
-    rescue Exception
-      assert(true)
-      return
-    end
-    assert(false, "*** expected an exception")
-  end
   def test_time_null
     t = Time.local(2012, 1, 5, 23, 58, 7)
     json = Oj.dump(t, :mode => :null)
     assert_equal('null', json)
   end
-  def test_unix_time_compat
+
+=begin
+# TBD make thse tests for cusom mode
+  def test_unix_time_custom
     t = Time.xmlschema("2012-01-05T23:58:07.123456000+09:00")
     #t = Time.local(2012, 1, 5, 23, 58, 7, 123456)
-    json = Oj.dump(t, :mode => :compat, :time_format => :unix)
+    json = Oj.dump(t, :mode => :custom, :time_format => :unix)
     assert_equal(%{1325775487.123456000}, json)
   end
-  def test_unix_time_compat_precision
+  def test_unix_time_custom_precision
     t = Time.xmlschema("2012-01-05T23:58:07.123456789+09:00")
     #t = Time.local(2012, 1, 5, 23, 58, 7, 123456)
-    json = Oj.dump(t, :mode => :compat, :second_precision => 5, :time_format => :unix)
+    json = Oj.dump(t, :mode => :custom, :second_precision => 5, :time_format => :unix)
     assert_equal(%{1325775487.12346}, json)
     t = Time.xmlschema("2012-01-05T23:58:07.999600+09:00")
-    json = Oj.dump(t, :mode => :compat, :second_precision => 3, :time_format => :unix)
+    json = Oj.dump(t, :mode => :custom, :second_precision => 3, :time_format => :unix)
     assert_equal(%{1325775488.000}, json)
   end
-  def test_unix_time_compat_early
+  def test_unix_time_custom_early
     t = Time.xmlschema("1954-01-05T00:00:00.123456789+00:00")
-    json = Oj.dump(t, :mode => :compat, :second_precision => 5, :time_format => :unix)
+    json = Oj.dump(t, :mode => :custom, :second_precision => 5, :time_format => :unix)
     assert_equal(%{-504575999.87654}, json)
   end
-  def test_unix_time_compat_1970
+  def test_unix_time_custom_1970
     t = Time.xmlschema("1970-01-01T00:00:00.123456789+00:00")
-    json = Oj.dump(t, :mode => :compat, :second_precision => 5, :time_format => :unix)
+    json = Oj.dump(t, :mode => :custom, :second_precision => 5, :time_format => :unix)
     assert_equal(%{0.12346}, json)
   end
-  def test_ruby_time_compat
+  def test_ruby_time_custom
     t = Time.xmlschema("2012-01-05T23:58:07.123456000+09:00")
-    json = Oj.dump(t, :mode => :compat, :time_format => :ruby)
+    json = Oj.dump(t, :mode => :custom, :time_format => :ruby)
     #assert_equal(%{"2012-01-05 23:58:07 +0900"}, json)
     assert_equal(%{"#{t.to_s}"}, json)
   end
-  def test_xml_time_compat
+  def test_xml_time_custom
     begin
       t = Time.new(2012, 1, 5, 23, 58, 7.123456000, 34200)
-      json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema)
+      json = Oj.dump(t, :mode => :custom, :time_format => :xmlschema)
       assert_equal(%{"2012-01-05T23:58:07.123456000+09:30"}, json)
     rescue Exception
       # some Rubies (1.8.7) do not allow the timezome to be set
       t = Time.local(2012, 1, 5, 23, 58, 7, 123456)
-      json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema)
+      json = Oj.dump(t, :mode => :custom, :time_format => :xmlschema)
       tz = t.utc_offset
       # Ruby does not handle a %+02d properly so...
       sign = '+'
@@ -523,15 +460,15 @@ class Juice < Minitest::Test
       assert_equal(%{"2012-01-05T23:58:07.123456000%s%02d:%02d"} % [sign, tz / 3600, tz / 60 % 60], json)
     end
   end
-  def test_xml_time_compat_no_secs
+  def test_xml_time_custom_no_secs
     begin
       t = Time.new(2012, 1, 5, 23, 58, 7.0, 34200)
-      json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema)
+      json = Oj.dump(t, :mode => :custom, :time_format => :xmlschema)
       assert_equal(%{"2012-01-05T23:58:07+09:30"}, json)
     rescue Exception
       # some Rubies (1.8.7) do not allow the timezome to be set
       t = Time.local(2012, 1, 5, 23, 58, 7, 0)
-      json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema)
+      json = Oj.dump(t, :mode => :custom, :time_format => :xmlschema)
       tz = t.utc_offset
       # Ruby does not handle a %+02d properly so...
       sign = '+'
@@ -542,15 +479,15 @@ class Juice < Minitest::Test
       assert_equal(%{"2012-01-05T23:58:07%s%02d:%02d"} % [sign, tz / 3600, tz / 60 % 60], json)
     end
   end
-  def test_xml_time_compat_precision
+  def test_xml_time_custom_precision
     begin
       t = Time.new(2012, 1, 5, 23, 58, 7.123456789, 32400)
-      json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema, :second_precision => 5)
+      json = Oj.dump(t, :mode => :custom, :time_format => :xmlschema, :second_precision => 5)
       assert_equal(%{"2012-01-05T23:58:07.12346+09:00"}, json)
     rescue Exception
       # some Rubies (1.8.7) do not allow the timezome to be set
       t = Time.local(2012, 1, 5, 23, 58, 7, 123456)
-      json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema, :second_precision => 5)
+      json = Oj.dump(t, :mode => :custom, :time_format => :xmlschema, :second_precision => 5)
       tz = t.utc_offset
       # Ruby does not handle a %+02d properly so...
       sign = '+'
@@ -561,15 +498,15 @@ class Juice < Minitest::Test
       assert_equal(%{"2012-01-05T23:58:07.12346%s%02d:%02d"} % [sign, tz / 3600, tz / 60 % 60], json)
     end
   end
-  def test_xml_time_compat_precision_round
+  def test_xml_time_custom_precision_round
     begin
-      t = Time.new(2012, 1, 5, 23, 58, 7.9996, 32400)
-      json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema, :second_precision => 3)
+      t = Time.new(2012, 1, 5, 23, 58, 7.99996, 32400)
+      json = Oj.dump(t, :mode => :custom, :time_format => :xmlschema, :second_precision => 4)
       assert_equal(%{"2012-01-05T23:58:08+09:00"}, json)
     rescue Exception
       # some Rubies (1.8.7) do not allow the timezome to be set
       t = Time.local(2012, 1, 5, 23, 58, 7, 999600)
-      json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema, :second_precision => 3)
+      json = Oj.dump(t, :mode => :custom, :time_format => :xmlschema, :second_precision => 3)
       tz = t.utc_offset
       # Ruby does not handle a %+02d properly so...
       sign = '+'
@@ -580,82 +517,34 @@ class Juice < Minitest::Test
       assert_equal(%{"2012-01-05T23:58:08%s%02d:%02d"} % [sign, tz / 3600, tz / 60 % 60], json)
     end
   end
-  def test_xml_time_compat_zulu
+  def test_xml_time_custom_zulu
     begin
       t = Time.new(2012, 1, 5, 23, 58, 7.0, 0)
-      json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema)
+      json = Oj.dump(t, :mode => :custom, :time_format => :xmlschema)
       assert_equal(%{"2012-01-05T23:58:07Z"}, json)
     rescue Exception
       # some Rubies (1.8.7) do not allow the timezome to be set
       t = Time.utc(2012, 1, 5, 23, 58, 7, 0)
-      json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema)
+      json = Oj.dump(t, :mode => :custom, :time_format => :xmlschema)
       #tz = t.utc_offset
       assert_equal(%{"2012-01-05T23:58:07Z"}, json)
     end
   end
+=end
 
   # Class
-  def test_class_strict
-    begin
-      Oj.dump(Juice, :mode => :strict)
-    rescue Exception
-      assert(true)
-      return
-    end
-    assert(false, "*** expected an exception")
-  end
   def test_class_null
     json = Oj.dump(Juice, :mode => :null)
     assert_equal('null', json)
   end
-  def test_class_compat
-    json = Oj.dump(Juice, :mode => :compat)
-    assert_equal(%{"Juice"}, json)
-  end
-  def test_class_object
-    Oj.default_options = { :mode => :object }
-    dump_and_load(Juice, false)
-  end
 
   # Module
-  def test_module_strict
-    begin
-      Oj.dump(TestModule, :mode => :strict)
-    rescue Exception
-      assert(true)
-      return
-    end
-    assert(false, "*** expected an exception")
-  end
   def test_module_null
     json = Oj.dump(TestModule, :mode => :null)
     assert_equal('null', json)
   end
-  def test_module_compat
-    json = Oj.dump(TestModule, :mode => :compat)
-    assert_equal(%{"Juice::TestModule"}, json)
-  end
-  def test_module_object
-    Oj.default_options = { :mode => :object }
-    dump_and_load(TestModule, false)
-  end
 
   # Hash
-  def test_hash
-    Oj.default_options = { :mode => :strict }
-    dump_and_load({}, false)
-    dump_and_load({ 'true' => true, 'false' => false}, false)
-    dump_and_load({ 'true' => true, 'array' => [], 'hash' => { }}, false)
-  end
-  def test_non_str_hash_strict
-    begin
-      Oj.dump({ 1 => true, 0 => false }, :mode => :strict)
-    rescue Exception
-      assert(true)
-      return
-    end
-    assert(false, "*** expected an exception")
-  end
   def test_non_str_hash_null
     begin
       Oj.dump({ 1 => true, 0 => false }, :mode => :null)
@@ -665,27 +554,7 @@ class Juice < Minitest::Test
     end
     assert(false, "*** expected an exception")
   end
-  def test_non_str_hash_compat
-    json = Oj.dump({ 1 => true, 0 => false }, :mode => :compat)
-    h = Oj.load(json, :mode => :strict)
-    assert_equal({ "1" => true, "0" => false }, h)
-  end
-  def test_non_str_hash_object
-    Oj.default_options = { :mode => :object }
-    json = Oj.dump({ 1 => true, :sim => nil })
-    h = Oj.load(json, :mode => :strict)
-    assert_equal({"^#1" => [1, true], ":sim" => nil}, h)
-    h = Oj.load(json)
-    assert_equal({ 1 => true, :sim => nil }, h)
-  end
-  def test_mixed_hash_object
-    Oj.default_options = { :mode => :object }
-    json = Oj.dump({ 1 => true, 'nil' => nil, :sim => 4 })
-    h = Oj.load(json, :mode => :strict)
-    assert_equal({"^#1" => [1, true], "nil" => nil, ":sim" => 4}, h)
-    h = Oj.load(json)
-    assert_equal({ 1 => true, 'nil' => nil, :sim => 4 }, h)
-  end
+
   def test_hash_not_closed
     begin
       Oj.load('{')
@@ -697,297 +566,44 @@ class Juice < Minitest::Test
   end
 
   # Object with to_json()
-  def test_json_object_strict
-    obj = Jeez.new(true, 58)
-    begin
-      Oj.dump(obj, :mode => :strict)
-    rescue Exception
-      assert(true)
-      return
-    end
-    assert(false, "*** expected an exception")
-  end
   def test_json_object_null
     obj = Jeez.new(true, 58)
     json = Oj.dump(obj, :mode => :null)
     assert_equal('null', json)
   end
-  def test_json_object_compat
-    Oj.default_options = { :mode => :compat, :use_to_json => true }
-    obj = Jeez.new(true, 58)
-    json = Oj.dump(obj, :indent => 2)
-    assert(%{{"json_class":"Juice::Jeez","x":true,"y":58}
-} == json ||
-           %{{"json_class":"Juice::Jeez","y":58,"x":true}
-} == json)
-    dump_and_load(obj, false)
-    Oj.default_options = { :mode => :compat, :use_to_json => false }
-  end
-  def test_json_object_create_id
-    Oj.default_options = { :mode => :compat, :create_id => 'kson_class' }
-    expected = Jeez.new(true, 58)
-    json = %{{"kson_class":"Juice::Jeez","x":true,"y":58}}
-    obj = Oj.load(json)
-    assert_equal(expected, obj)
-    Oj.default_options = { :create_id => 'json_class' }
-  end
-  def test_json_object_object
-    obj = Jeez.new(true, 58)
-    json = Oj.dump(obj, :mode => :object, :indent => 2)
-    assert(%{{
-  "^o":"Juice::Jeez",
-  "x":true,
-  "y":58
-}
-} == json ||
-%{{
-  "^o":"Juice::Jeez",
-  "y":58,
-  "x":true
-}
-} == json)
-    obj2 = Oj.load(json, :mode => :object)
-    assert_equal(obj, obj2)
-  end
 
 # Object with to_hash()
-  def test_to_hash_object_strict
-    obj = Jazz.new(true, 58)
-    begin
-      Oj.dump(obj, :mode => :strict)
-    rescue Exception
-      assert(true)
-      return
-    end
-    assert(false, "*** expected an exception")
-  end
   def test_to_hash_object_null
     obj = Jazz.new(true, 58)
     json = Oj.dump(obj, :mode => :null)
     assert_equal('null', json)
   end
-  def test_to_hash_object_compat
-    Oj.default_options = { :use_to_json => true }
-    obj = Jazz.new(true, 58)
-    json = Oj.dump(obj, :mode => :compat, :indent => 2)
-    h = Oj.load(json, :mode => :strict)
-    assert_equal(obj.to_hash, h)
-  end
-  def test_to_hash_object_object
-    obj = Jazz.new(true, 58)
-    json = Oj.dump(obj, :mode => :object, :indent => 2)
-    assert(%{{
-  "^o":"Juice::Jazz",
-  "x":true,
-  "y":58
-}
-} == json ||
-%{{
-  "^o":"Juice::Jazz",
-  "y":58,
-  "x":true
-}
-} == json)
-    obj2 = Oj.load(json, :mode => :object)
-    assert_equal(obj, obj2)
-  end
 
   # Object with as_json() # contributed by sauliusg
-  def test_as_json_object_strict
-    obj = Orange.new(true, 58)
-    begin
-      Oj.dump(obj, :mode => :strict)
-    rescue Exception
-      assert(true)
-      return
-    end
-    assert(false, "*** expected an exception")
-  end
-
   def test_as_json_object_null
     obj = Orange.new(true, 58)
     json = Oj.dump(obj, :mode => :null)
     assert_equal('null', json)
   end
 
-  def test_as_json_object_compat_hash
-    Oj.default_options = { :mode => :compat, :use_as_json => true }
-    obj = Orange.new(true, 58)
-    json = Oj.dump(obj, :indent => 2)
-    assert(!json.nil?)
-    dump_and_load(obj, false)
-  end
-
-  def test_as_json_object_compat_non_hash
-    Oj.default_options = { :mode => :compat, :use_as_json => true }
-    obj = Melon.new(true, 58)
-    json = Oj.dump(obj, :indent => 2)
-    assert_equal(%{"true 58"}, json)
-  end
-
-  def test_as_json_object_object
-    obj = Orange.new(true, 58)
-    json = Oj.dump(obj, :mode => :object, :indent => 2)
-    assert(%{{
-  "^o":"Juice::Orange",
-  "x":true,
-  "y":58
-}
-} == json ||
-%{{
-  "^o":"Juice::Orange",
-  "y":58,
-  "x":true
-}
-} == json)
-    obj2 = Oj.load(json, :mode => :object)
-    assert_equal(obj, obj2)
-  end
-
   # Object without to_json() or to_hash()
-  def test_object_strict
-    obj = Jam.new(true, 58)
-    begin
-      Oj.dump(obj, :mode => :strict)
-    rescue Exception
-      assert(true)
-      return
-    end
-    assert(false, "*** expected an exception")
-  end
   def test_object_null
     obj = Jam.new(true, 58)
     json = Oj.dump(obj, :mode => :null)
     assert_equal('null', json)
   end
-  def test_object_compat
-    obj = Jam.new(true, 58)
-    json = Oj.dump(obj, :mode => :compat, :indent => 2)
-    assert(%{{
-  "x":true,
-  "y":58
-}
-} == json ||
-%{{
-  "y":58,
-  "x":true
-}
-} == json)
-  end
-  def test_object_object
-    obj = Jam.new(true, 58)
-    json = Oj.dump(obj, :mode => :object, :indent => 2)
-    assert(%{{
-  "^o":"Juice::Jam",
-  "x":true,
-  "y":58
-}
-} == json ||
-%{{
-  "^o":"Juice::Jam",
-  "y":58,
-  "x":true
-}
-} == json)
-    obj2 = Oj.load(json, :mode => :object)
-    assert_equal(obj, obj2)
-  end
-
-  def test_object_object_no_cache
-    obj = Jam.new(true, 58)
-    json = Oj.dump(obj, :mode => :object, :indent => 2)
-    assert(%{{
-  "^o":"Juice::Jam",
-  "x":true,
-  "y":58
-}
-} == json ||
-%{{
-  "^o":"Juice::Jam",
-  "y":58,
-  "x":true
-}
-} == json)
-    obj2 = Oj.load(json, :mode => :object, :class_cache => false)
-    assert_equal(obj, obj2)
-  end
-
-  # Exception
-  def test_exception
-    err = nil
-    begin
-      raise StandardError.new('A Message')
-    rescue Exception => e
-      err = e
-    end
-    json = Oj.dump(err, :mode => :object, :indent => 2)
-    #puts "*** #{json}"
-    e2 = Oj.load(json, :mode => :strict)
-    assert_equal(err.class.to_s, e2['^o'])
-    assert_equal(err.message, e2['~mesg'])
-    assert_equal(err.backtrace, e2['~bt'])
-    e2 = Oj.load(json, :mode => :object)
-    if RUBY_VERSION.start_with?('1.8') || 'rubinius' == $ruby
-      assert_equal(e.class, e2.class);
-      assert_equal(e.message, e2.message);
-      assert_equal(e.backtrace, e2.backtrace);
-    else
-      assert_equal(e, e2);
-    end
-  end
 
   # Range
-  def test_range_strict
-    begin
-      Oj.dump(1..7, :mode => :strict)
-    rescue Exception
-      assert(true)
-      return
-    end
-    assert(false, "*** expected an exception")
-  end
   def test_range_null
     json = Oj.dump(1..7, :mode => :null)
     assert_equal('null', json)
   end
-  def test_range_compat
-    Oj.default_options = { :use_to_json => true }
-    json = Oj.dump(1..7, :mode => :compat)
-    h = Oj.load(json, :mode => :strict)
-    assert_equal({'begin' => 1, 'end' => 7, 'exclude_end' => false}, h)
-    json = Oj.dump(1...7, :mode => :compat)
-    h = Oj.load(json, :mode => :strict)
-    assert_equal({'begin' => 1, 'end' => 7, 'exclude_end' => true}, h)
-  end
-  def test_range_object
-    unless RUBY_VERSION.start_with?('1.8')
-      Oj.default_options = { :mode => :object }
-      json = Oj.dump(1..7, :mode => :object, :indent => 0)
-      if 'rubinius' == $ruby
-        assert(%{{"^O":"Range","begin":1,"end":7,"exclude_end?":false}} == json)
-      else
-        assert_equal(%{{"^u":["Range",1,7,false]}}, json)
-      end
-      dump_and_load(1..7, false)
-      dump_and_load(1..1, false)
-      dump_and_load(1...7, false)
-    end
-  end
 
   # BigNum
-  def test_bignum_strict
-    json = Oj.dump(7 ** 55, :mode => :strict)
-    assert_equal('30226801971775055948247051683954096612865741943', json)
-  end
   def test_bignum_null
     json = Oj.dump(7 ** 55, :mode => :null)
     assert_equal('30226801971775055948247051683954096612865741943', json)
   end
-  def test_bignum_compat
-    json = Oj.dump(7 ** 55, :mode => :compat)
-    b = Oj.load(json, :mode => :strict)
-    assert_equal(30226801971775055948247051683954096612865741943, b)
-  end
 
   def test_bignum_object
     dump_and_load(7 ** 55, false)
@@ -995,136 +611,31 @@ class Juice < Minitest::Test
   end
 
   # BigDecimal
-  def test_bigdecimal_strict
-    mode = Oj.default_options[:mode]
-    Oj.default_options = {:mode => :strict}
-    dump_and_load(BigDecimal.new('3.14159265358979323846'), false)
-    Oj.default_options = {:mode => mode}
-  end
   def test_bigdecimal_null
     mode = Oj.default_options[:mode]
     Oj.default_options = {:mode => :null}
     dump_and_load(BigDecimal.new('3.14159265358979323846'), false)
     Oj.default_options = {:mode => mode}
   end
-  def test_bigdecimal_compat
-    orig = BigDecimal.new('80.51')
-    json = Oj.dump(orig, :mode => :compat, :bigdecimal_as_decimal => false)
-    bg = Oj.load(json, :mode => :compat)
-    assert_equal(orig.to_s, bg)
-    orig = BigDecimal.new('3.14159265358979323846')
-    json = Oj.dump(orig, :mode => :compat, :bigdecimal_as_decimal => false)
-    bg = Oj.load(json, :mode => :compat)
-    assert_equal(orig.to_s, bg)
-  end
-  def test_bigdecimal_load
-    orig = BigDecimal.new('80.51')
-    json = Oj.dump(orig, :mode => :compat, :bigdecimal_as_decimal => true)
-    bg = Oj.load(json, :mode => :compat, :bigdecimal_load => true)
-    assert_equal(BigDecimal, bg.class)
-    assert_equal(orig, bg)
-  end
-  def test_float_load
-    orig = BigDecimal.new('80.51')
-    json = Oj.dump(orig, :mode => :compat, :bigdecimal_as_decimal => true)
-    bg = Oj.load(json, :mode => :compat, :bigdecimal_load => :float)
-    assert_equal(Float, bg.class)
-    assert_equal(orig.to_f, bg)
-  end
-  def test_bigdecimal_compat_as_json
-    Oj.default_options = { :use_as_json => true }
-    orig = BigDecimal.new('80.51')
-    BigDecimal.send(:define_method, :as_json) do
-      %{this is big}
-    end
-    json = Oj.dump(orig, :mode => :compat, :bigdecimal_as_decimal => false)
-    bg = Oj.load(json, :mode => :compat)
-    assert_equal("this is big", bg)
-    BigDecimal.send(:remove_method, :as_json) # cleanup
-  end
-  def test_bigdecimal_object
-    mode = Oj.default_options[:mode]
-    Oj.default_options = {:mode => :object}
-    dump_and_load(BigDecimal.new('3.14159265358979323846'), false)
-    Oj.default_options = {:mode => mode}
-    # Infinity is the same for Float and BigDecimal
-    json = Oj.dump(BigDecimal.new('Infinity'), :mode => :object)
-    assert_equal('Infinity', json)
-    json = Oj.dump(BigDecimal.new('-Infinity'), :mode => :object)
-    assert_equal('-Infinity', json)
-  end
 
   def test_infinity
     n = Oj.load('Infinity', :mode => :object)
     assert_equal(BigDecimal.new('Infinity').to_f, n);
-    begin
-      Oj.load('Infinity', :mode => :strict)
-      fail()
-    rescue Oj::ParseError
-      assert(true)
-    end
     x = Oj.load('Infinity', :mode => :compat)
     assert_equal('Infinity', x.to_s)
-
   end
 
   # Date
-  def test_date_strict
-    begin
-      Oj.dump(Date.new(2012, 6, 19), :mode => :strict)
-    rescue Exception
-      assert(true)
-      return
-    end
-    assert(false, "*** expected an exception")
-  end
   def test_date_null
     json = Oj.dump(Date.new(2012, 6, 19), :mode => :null)
     assert_equal('null', json)
   end
-  def test_date_compat
-    orig = Date.new(2012, 6, 19)
-    json = Oj.dump(orig, :mode => :compat)
-    x = Oj.load(json, :mode => :compat)
-    # Some Rubies implement Date as data and some as a real Object. Either are
-    # okay for the test.
-    if x.is_a?(String)
-      assert_equal(orig.to_s, x)
-    else # better be a Hash
-      assert_equal({"year" => orig.year, "month" => orig.month, "day" => orig.day, "start" => orig.start}, x)
-    end
-  end
-  def test_date_object
-    Oj.default_options = {:mode => :object}
-    dump_and_load(Date.new(2012, 6, 19), false)
-  end
 
   # DateTime
-  def test_datetime_strict
-    begin
-      Oj.dump(DateTime.new(2012, 6, 19, 20, 19, 27), :mode => :strict)
-    rescue Exception
-      assert(true)
-      return
-    end
-    assert(false, "*** expected an exception")
-  end
   def test_datetime_null
     json = Oj.dump(DateTime.new(2012, 6, 19, 20, 19, 27), :mode => :null)
     assert_equal('null', json)
   end
-  def test_datetime_compat
-    orig = DateTime.new(2012, 6, 19, 20, 19, 27)
-    json = Oj.dump(orig, :mode => :compat)
-    x = Oj.load(json, :mode => :compat)
-    # Some Rubies implement Date as data and some as a real Object. Either are
-    # okay for the test.
-    assert_equal(orig.to_s, x)
-  end
-  def test_datetime_object
-    Oj.default_options = {:mode => :object}
-    dump_and_load(DateTime.new(2012, 6, 19), false)
-  end
 
   # autodefine Oj::Bag
   def test_bag
@@ -1138,75 +649,7 @@ class Juice < Minitest::Test
     assert_equal(58, obj.y)
   end
 
-  # Circular
-  def test_circular_object
-    obj = Jam.new(nil, 58)
-    obj.x = obj
-    json = Oj.dump(obj, :mode => :object, :indent => 2, :circular => true)
-    assert(%{{
-  "^o":"Juice::Jam",
-  "^i":1,
-  "x":"^r1",
-  "y":58
-}
-} == json ||
-%{{
-  "^o":"Juice::Jam",
-  "^i":1,
-  "y":58,
-  "x":"^r1"
-}
-} == json)
-    obj2 = Oj.load(json, :mode => :object, :circular => true)
-    assert_equal(obj2.x.__id__, obj2.__id__)
-  end
-
-  def test_circular_hash
-    h = { 'a' => 7 }
-    h['b'] = h
-    json = Oj.dump(h, :mode => :object, :indent => 2, :circular => true)
-    ha = Oj.load(json, :mode => :strict)
-    assert_equal({'^i' => 1, 'a' => 7, 'b' => '^r1'}, ha)
-    Oj.load(json, :mode => :object, :circular => true)
-    assert_equal(h['b'].__id__, h.__id__)
-  end
-
-  def test_circular_array
-    a = [7]
-    a << a
-    json = Oj.dump(a, :mode => :object, :indent => 2, :circular => true)
-    assert_equal(%{[
-  "^i1",
-  7,
-  "^r1"
-]
-}, json)
-    a2 = Oj.load(json, :mode => :object, :circular => true)
-    assert_equal(a2[1].__id__, a2.__id__)
-  end
-
-  def test_circular
-    h = { 'a' => 7 }
-    obj = Jam.new(h, 58)
-    obj.x['b'] = obj
-    json = Oj.dump(obj, :mode => :object, :indent => 2, :circular => true)
-    ha = Oj.load(json, :mode => :strict)
-    assert_equal({'^o' => 'Juice::Jam', '^i' => 1, 'x' => { '^i' => 2, 'a' => 7, 'b' => '^r1' }, 'y' => 58 }, ha)
-    Oj.load(json, :mode => :object, :circular => true)
-    assert_equal(obj.x.__id__, h.__id__)
-    assert_equal(h['b'].__id__, obj.__id__)
-  end
-
 # Stream Deeply Nested
-  def test_deep_nest
-    begin
-      n = 10000
-      Oj.strict_load('[' * n + ']' * n)
-    rescue Exception => e
-      assert(false, e.message)
-    end
-  end
-
   def test_deep_nest_dump
     begin
       a = []
@@ -1242,18 +685,6 @@ class Juice < Minitest::Test
     assert_equal(src, obj)
   end
 
-# symbol_keys option
-  def test_symbol_keys
-    json = %{{
-  "x":true,
-  "y":58,
-  "z": [1,2,3]
-}
-}
-    obj = Oj.load(json, :mode => :strict, :symbol_keys => true)
-    assert_equal({ :x => true, :y => 58, :z => [1, 2, 3]}, obj)
-  end
-
 # comments
   def test_comment_slash
     json = %{{
@@ -1293,7 +724,7 @@ class Juice < Minitest::Test
 
   def test_nilnil_false
     begin
-      Oj.load(nil)
+      Oj.load(nil, :nilnil => false)
     rescue Exception
       assert(true)
       return
@@ -1303,7 +734,7 @@ class Juice < Minitest::Test
 
   def test_nilnil_true
     obj = Oj.load(nil, :nilnil => true)
-    assert_equal(nil, obj)
+    assert_nil(obj)
   end
 
   def test_empty_string_true
@@ -1323,7 +754,7 @@ class Juice < Minitest::Test
 
   def test_quirks_null_mode
     assert_raises(Oj::ParseError) { Oj.load("null", :quirks_mode => false) }
-    assert_equal(nil, Oj.load("null", :quirks_mode => true))
+    assert_nil(Oj.load("null", :quirks_mode => true))
   end
 
   def test_quirks_bool_mode
@@ -1362,9 +793,6 @@ class Juice < Minitest::Test
     json = Oj.dump(jam, :omit_nil => true, :mode => :object)
     assert_equal(%|{"^o":"Juice::Jam","x":{"a":1}}|, json)
 
-    json = Oj.dump(jam, :omit_nil => true, :mode => :compat)
-    assert_equal(%|{"x":{"a":1}}|, json)
-
     json = Oj.dump({'x' => {'a' => 1, 'b' => nil }, 'y' => nil}, :omit_nil => true, :mode => :strict)
     assert_equal(%|{"x":{"a":1}}|, json)
 
@@ -1376,7 +804,11 @@ class Juice < Minitest::Test
     json = Oj.dump(obj, :indent => 2)
     puts json if trace
     loaded = Oj.load(json)
-    assert_equal(obj, loaded)
+    if obj.nil?
+      assert_nil(loaded)
+    else
+      assert_equal(obj, loaded)
+    end
     loaded
   end