oj 2.18.3 → 3.13.14

data/test/test_various.rb

@@ -1,11 +1,17 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# encoding: utf-8
 
 $: << File.dirname(__FILE__)
 
 require 'helper'
 
 class Juice < Minitest::Test
+  def gen_whitespaced_string(length = Random.new.rand(100))
+    whitespace_chars = [" ", "\t", "\f", "\n", "\r"]
+    result = ""
+    length.times { result << whitespace_chars.sample }
+    result
+  end
 
   module TestModule
   end
@@ -23,7 +29,7 @@ class Juice < Minitest::Test
     end
     alias == eql?
 
-  end# Jam
+  end # Jam
 
   class Jeez < Jam
     def initialize(x, y)
@@ -37,7 +43,7 @@ class Juice < Minitest::Test
     def self.json_create(h)
       self.new(h['x'], h['y'])
     end
-  end# Jeez
+  end # Jeez
 
   # contributed by sauliusg to fix as_json
   class Orange < Jam
@@ -80,7 +86,7 @@ class Juice < Minitest::Test
     def self.json_create(h)
       self.new(h['x'], h['y'])
     end
-  end# Jazz
+  end # Jazz
 
   def setup
     @default_options = Oj.default_options
@@ -90,62 +96,53 @@ class Juice < Minitest::Test
     Oj.default_options = @default_options
   end
 
-=begin
-  # Depending on the order the values may have changed. The set_options sets
-  # should cover the function itself.
-  def test_get_options
-    opts = Oj.default_options()
-    assert_equal({ :indent=>0,
-                   :second_precision=>9,
-                   :circular=>false,
-                   :class_cache=>true,
-                   :auto_define=>false,
-                   :symbol_keys=>false,
-                   :bigdecimal_as_decimal=>true,
-                   :use_to_json=>true,
-                   :nilnil=>false,
-                   :allow_gc=>true,
-                   :quirks_mode=>true,
-                   :allow_invalid_unicode=>false,
-                   :float_precision=>15,
-                   :mode=>:object,
-                   :escape_mode=>:json,
-                   :time_format=>:unix_zone,
-                   :bigdecimal_load=>:auto,
-                   :create_id=>'json_class'}, opts)
-  end
-=end
   def test_set_options
     orig = Oj.default_options()
     alt ={
-      :indent=>" - ",
-      :second_precision=>5,
-      :circular=>true,
-      :class_cache=>false,
-      :auto_define=>true,
-      :symbol_keys=>true,
-      :bigdecimal_as_decimal=>false,
-      :use_to_json=>false,
-      :use_as_json=>false,
-      :nilnil=>true,
-      :allow_gc=>false,
-      :quirks_mode=>false,
-      :allow_invalid_unicode=>true,
-      :float_precision=>13,
-      :mode=>:strict,
-      :escape_mode=>:ascii,
-      :time_format=>:unix_zone,
-      :bigdecimal_load=>:float,
-      :create_id=>'classy',
-      :space=>'z',
-      :array_nl=>'a',
-      :object_nl=>'o',
-      :space_before=>'b',
-      :nan=>:huge,
-      :hash_class=>Hash,
-      :omit_nil=>false,
+      indent: " - ",
+      second_precision: 5,
+      circular: true,
+      class_cache: false,
+      auto_define: true,
+      symbol_keys: true,
+      bigdecimal_as_decimal: false,
+      use_to_json: false,
+      use_to_hash: false,
+      use_as_json: false,
+      use_raw_json: false,
+      nilnil: true,
+      empty_string: true,
+      allow_gc: false,
+      quirks_mode: false,
+      allow_invalid_unicode: true,
+      float_precision: 13,
+      mode: :strict,
+      escape_mode: :ascii,
+      time_format: :unix_zone,
+      bigdecimal_load: :float,
+      compat_bigdecimal: true,
+      create_id: 'classy',
+      create_additions: true,
+      cache_keys: false,
+      cache_str: 5,
+      space: 'z',
+      array_nl: 'a',
+      object_nl: 'o',
+      space_before: 'b',
+      nan: :huge,
+      hash_class: Hash,
+      omit_nil: false,
+      allow_nan: true,
+      integer_range: nil,
+      array_class: Array,
+      ignore: nil,
+      ignore_under: true,
+      trace: true,
+      safe: true,
     }
     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);
 
@@ -186,25 +183,22 @@ 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))
     Oj.default_options = { :float_precision => 5 }
     assert_equal('1.4055', Oj.dump(1.405460727))
     Oj.default_options = { :float_precision => 0 }
-    if RUBY_VERSION.start_with?('1.8')
-      assert_equal('1405460727.72387', Oj.dump(1405460727.723866))
-    else
-      assert_equal('1405460727.723866', Oj.dump(1405460727.723866))
-    end
+    assert_equal('1405460727.723866', Oj.dump(1405460727.723866))
     Oj.default_options = { :float_precision => 15 }
     assert_equal('0.56', Oj.dump(0.56))
     assert_equal('0.5773', Oj.dump(0.5773))
@@ -220,45 +214,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)
@@ -268,12 +224,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 }
@@ -368,8 +318,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
@@ -424,231 +374,56 @@ class Juice < Minitest::Test
     out = Oj.dump(x)
     assert_equal(json, out)
   end
+  def test_dump_invalid_utf8
+    Oj.default_options = { :escape_mode => :ascii }
+    assert_raises(EncodingError) {
+      Oj.dump(["abc\xbe\x1f\x11"], mode: :strict)
+    }
+  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
-    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)
-    assert_equal(%{1325775487.123456000}, json)
-  end
-  def test_unix_time_compat_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)
-    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)
-    assert_equal(%{1325775488.000}, json)
-  end
-  def test_unix_time_compat_early
-    t = Time.xmlschema("1954-01-05T00:00:00.123456789+00:00")
-    json = Oj.dump(t, :mode => :compat, :second_precision => 5, :time_format => :unix)
-    assert_equal(%{-504575999.87654}, json)
-  end
-  def test_unix_time_compat_1970
-    t = Time.xmlschema("1970-01-01T00:00:00.123456789+00:00")
-    json = Oj.dump(t, :mode => :compat, :second_precision => 5, :time_format => :unix)
-    assert_equal(%{0.12346}, json)
-  end
-  def test_ruby_time_compat
-    t = Time.xmlschema("2012-01-05T23:58:07.123456000+09:00")
-    json = Oj.dump(t, :mode => :compat, :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
-    begin
-      t = Time.new(2012, 1, 5, 23, 58, 7.123456000, 34200)
-      json = Oj.dump(t, :mode => :compat, :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)
-      tz = t.utc_offset
-      # Ruby does not handle a %+02d properly so...
-      sign = '+'
-      if 0 > tz
-        sign = '-'
-        tz = -tz
-      end
-      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
-    begin
-      t = Time.new(2012, 1, 5, 23, 58, 7.0, 34200)
-      json = Oj.dump(t, :mode => :compat, :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)
-      tz = t.utc_offset
-      # Ruby does not handle a %+02d properly so...
-      sign = '+'
-      if 0 > tz
-        sign = '-'
-        tz = -tz
-      end
-      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
-    begin
-      t = Time.new(2012, 1, 5, 23, 58, 7.123456789, 32400)
-      json = Oj.dump(t, :mode => :compat, :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)
-      tz = t.utc_offset
-      # Ruby does not handle a %+02d properly so...
-      sign = '+'
-      if 0 > tz
-        sign = '-'
-        tz = -tz
-      end
-      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
-    begin
-      t = Time.new(2012, 1, 5, 23, 58, 7.9996, 32400)
-      json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema, :second_precision => 3)
-      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)
-      tz = t.utc_offset
-      # Ruby does not handle a %+02d properly so...
-      sign = '+'
-      if 0 > tz
-        sign = '-'
-        tz = -tz
-      end
-      assert_equal(%{"2012-01-05T23:58:08%s%02d:%02d"} % [sign, tz / 3600, tz / 60 % 60], json)
-    end
+
+  def test_time_neg
+    t = Time.parse("1900-01-01 00:18:59 UTC")
+    json = Oj.dump(t, :mode => :custom, :time_format => :unix)
+    assert_equal('-2208987661.000000000', json)
   end
-  def test_xml_time_compat_zulu
-    begin
-      t = Time.new(2012, 1, 5, 23, 58, 7.0, 0)
-      json = Oj.dump(t, :mode => :compat, :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)
-      #tz = t.utc_offset
-      assert_equal(%{"2012-01-05T23:58:07Z"}, json)
-    end
+
+  def test_time_years
+    (-2020..2020).each { |year|
+      s = "%04d-03-01T15:14:13Z" % [year]
+      json = Oj.dump(Time.parse(s), mode: :custom, time_format: :xmlschema, second_precision: -1)
+      assert_equal(s, json[1..-2])
+
+      json = Oj.dump(Time.parse(s), mode: :custom, time_format: :xmlschema, second_precision: 3)
+      assert_equal(s[0..-2] + '.000Z', json[1..-2])
+    }
   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)
@@ -658,27 +433,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('{')
@@ -690,297 +445,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)
@@ -988,136 +490,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)
+    dump_and_load(BigDecimal('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
+    assert_equal(BigDecimal('Infinity').to_f, n);
     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
@@ -1131,75 +528,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
-
+  # Stream Deeply Nested
   def test_deep_nest_dump
     begin
       a = []
@@ -1212,7 +541,7 @@ class Juice < Minitest::Test
     assert(false, "*** expected an exception")
   end
 
-# Stream IO
+  # Stream IO
   def test_io_string
     src = { 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}
     output = StringIO.open("", "w+")
@@ -1224,6 +553,9 @@ class Juice < Minitest::Test
   end
 
   def test_io_file
+    # Windows does not support fork
+    return if RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
+
     src = { 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}
     filename = File.join(File.dirname(__FILE__), 'open_file_test.json')
     File.open(filename, "w") { |f|
@@ -1235,16 +567,26 @@ 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)
+  def test_io_stream
+    IO.pipe do |r, w|
+      if fork
+	r.close
+	#w.nonblock = false
+	a = []
+	10_000.times do |i|
+	  a << i
+	end
+	Oj.to_stream(w, a, indent: 2)
+	w.close
+      else
+	w.close
+	sleep(0.1) # to force a busy
+	cnt = 0
+	r.each_line { cnt += 1 }
+	r.close
+	Process.exit(0)
+      end
+    end
   end
 
 # comments
@@ -1286,7 +628,7 @@ class Juice < Minitest::Test
 
   def test_nilnil_false
     begin
-      Oj.load(nil)
+      Oj.load(nil, :nilnil => false)
     rescue Exception
       assert(true)
       return
@@ -1296,12 +638,30 @@ 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
+    result = Oj.load(gen_whitespaced_string, :empty_string => true, mode: :strict)
+    assert_nil(result)
+  end
+
+  def test_empty_string_false
+    # Could be either a Oj::ParseError or an EncodingError depending on
+    # whether mimic_JSON has been called. Since we don't know when the test
+    # will be called either is okay.
+    begin
+      Oj.load(gen_whitespaced_string, :empty_string => false)
+    rescue Exception => e
+      assert(Oj::ParseError == e.class || EncodingError == e.class)
+      return
+    end
+    assert(false, "*** expected an exception")
   end
 
   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
@@ -1324,6 +684,31 @@ class Juice < Minitest::Test
     assert_equal('string', Oj.load('"string"', :quirks_mode => true))
   end
 
+  def test_error_path
+    msg = ''
+    assert_raises(Oj::ParseError) {
+      begin
+	Oj.load(%|{
+  "first": [
+    1, 2, { "third": 123x }
+  ]
+}|)
+      rescue Oj::ParseError => e
+	msg = e.message
+	raise e
+      end
+    }
+    assert_equal('after first[2].third', msg.split('(')[1].split(')')[0])
+  end
+
+  def test_bad_bignum
+    if '2.4.0' < RUBY_VERSION
+      assert_raises Oj::ParseError do
+	Oj.load(%|{ "big": -e123456789 }|, mode: :strict)
+      end
+    end
+  end
+
   def test_quirks_array_mode
     assert_equal([], Oj.load("[]", :quirks_mode => false))
     assert_equal([], Oj.load("[]", :quirks_mode => true))
@@ -1340,9 +725,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)
 
@@ -1354,7 +736,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