oj 2.9.4 → 2.9.5

data/test/{tests.rb → test_various.rb}

@@ -1,125 +1,91 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
-# Ubuntu does not accept arguments to ruby when called using env. To get warnings to show up the -w options is
-# required. That can be set in the RUBYOPT environment variable.
-# export RUBYOPT=-w
+$: << File.dirname(__FILE__)
 
-$VERBOSE = true
+require 'helper'
 
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
+class Juice < Minitest::Test
 
-require 'test/unit'
-require 'stringio'
-require 'date'
-require 'bigdecimal'
-require 'oj'
+  class Jam
+    attr_accessor :x, :y
 
-$ruby = RUBY_DESCRIPTION.split(' ')[0]
-$ruby = 'ree' if 'ruby' == $ruby && RUBY_DESCRIPTION.include?('Ruby Enterprise Edition')
-
-def hash_eql(h1, h2)
-  return false if h1.size != h2.size
-  h1.keys.each do |k|
-    return false unless h1[k] == h2[k]
-  end
-  true
-end
-
-class Jam
-  attr_accessor :x, :y
-
-  def initialize(x, y)
-    @x = x
-    @y = y
-  end
+    def initialize(x, y)
+      @x = x
+      @y = y
+    end
 
-  def eql?(o)
-    self.class == o.class && @x == o.x && @y == o.y
-  end
-  alias == eql?
+    def eql?(o)
+      self.class == o.class && @x == o.x && @y == o.y
+    end
+    alias == eql?
 
-end# Jam
+  end# Jam
 
-class Jeez < Jam
-  def initialize(x, y)
-    super
-  end
+  class Jeez < Jam
+    def initialize(x, y)
+      super
+    end
 
-  def to_json()
-    %{{"json_class":"#{self.class}","x":#{@x},"y":#{@y}}}
-  end
+    def to_json()
+      %{{"json_class":"#{self.class}","x":#{@x},"y":#{@y}}}
+    end
 
-  def self.json_create(h)
-    self.new(h['x'], h['y'])
-  end
-end# Jeez
+    def self.json_create(h)
+      self.new(h['x'], h['y'])
+    end
+  end# Jeez
 
-# contributed by sauliusg to fix as_json
-class Orange < Jam
-  def initialize(x, y)
-    super
-  end
+  # contributed by sauliusg to fix as_json
+  class Orange < Jam
+    def initialize(x, y)
+      super
+    end
 
-  def as_json()
-    { :json_class => self.class,
-      :x => @x,
-      :y => @y }
-  end
+    def as_json()
+      { :json_class => self.class,
+        :x => @x,
+        :y => @y }
+    end
 
-  def self.json_create(h)
-    self.new(h['x'], h['y'])
+    def self.json_create(h)
+      self.new(h['x'], h['y'])
+    end
   end
-end
 
-class Melon < Jam
-  def initialize(x, y)
-    super
-  end
+  class Melon < Jam
+    def initialize(x, y)
+      super
+    end
 
-  def as_json()
-    "#{x} #{y}"
-  end
+    def as_json()
+      "#{x} #{y}"
+    end
 
-  def self.json_create(h)
-    self.new(h['x'], h['y'])
+    def self.json_create(h)
+      self.new(h['x'], h['y'])
+    end
   end
-end
 
-class Jazz < Jam
-  def initialize(x, y)
-    super
-  end
-  def to_hash()
-    { 'json_class' => self.class.to_s, 'x' => @x, 'y' => @y }
-  end
-  def self.json_create(h)
-    self.new(h['x'], h['y'])
-  end
-end# Jazz
+  class Jazz < Jam
+    def initialize(x, y)
+      super
+    end
+    def to_hash()
+      { 'json_class' => self.class.to_s, 'x' => @x, 'y' => @y }
+    end
+    def self.json_create(h)
+      self.new(h['x'], h['y'])
+    end
+  end# Jazz
 
-class Range
-  def to_hash()
-    { 'begin' => self.begin, 'end' => self.end, 'exclude_end' => self.exclude_end? }
+  def setup
+    @default_options = Oj.default_options
   end
-end # Range
 
-# define the symbol
-class ActiveSupport
-end
-
-class RailsLike
-  attr_accessor :x
-  def initialize(x)
-    @x = x
-  end
-  def to_json(options = nil)
-    Oj.dump(self, :mode => :compat)
+  def teardown
+    Oj.default_options = @default_options
   end
-end # RailsLike
-
-class Juice < ::Test::Unit::TestCase
 
   def test0_get_options
     opts = Oj.default_options()
@@ -225,6 +191,7 @@ class Juice < ::Test::Unit::TestCase
   end
 
   def test_string_object
+    Oj.default_options = {:mode => :object}
     dump_and_load('abc', false)
     dump_and_load(':abc', false)
   end
@@ -252,6 +219,11 @@ class Juice < ::Test::Unit::TestCase
     assert_equal(json, json2)
   end
 
+  def test_null_char
+    assert_raises(Oj::ParseError) { Oj.load("\"\0\"") }
+    assert_raises(Oj::ParseError) { Oj.load("\"\\\0\"") }
+  end
+
   def test_array
     dump_and_load([], false)
     dump_and_load([true, false], false)
@@ -262,7 +234,7 @@ class Juice < ::Test::Unit::TestCase
   def test_array_not_closed
     begin
       Oj.load('[')
-    rescue Exception => e
+    rescue Exception
       assert(true)
       return
     end
@@ -271,6 +243,7 @@ class Juice < ::Test::Unit::TestCase
 
   # rails encoding tests
   def test_does_not_escape_entities_by_default
+    Oj.default_options = { :escape_mode => :ascii } # set in mimic mode
     # use Oj to create the hash since some Rubies don't deal nicely with unicode.
     json = %{{"key":"I <3 this\\u2028space"}}
     hash = Oj.load(json)
@@ -543,7 +516,7 @@ class Juice < ::Test::Unit::TestCase
   def test_hash_not_closed
     begin
       Oj.load('{')
-    rescue Exception => e
+    rescue Exception
       assert(true)
       return
     end
@@ -570,9 +543,9 @@ class Juice < ::Test::Unit::TestCase
     Oj.default_options = { :mode => :compat, :use_to_json => true }
     obj = Jeez.new(true, 58)
     json = Oj.dump(obj, :indent => 2)
-    assert(%{{"json_class":"Jeez","x":true,"y":58}
+    assert(%{{"json_class":"Juice::Jeez","x":true,"y":58}
 } == json ||
-           %{{"json_class":"Jeez","y":58,"x":true}
+           %{{"json_class":"Juice::Jeez","y":58,"x":true}
 } == json)
     dump_and_load(obj, false)
     Oj.default_options = { :mode => :compat, :use_to_json => false }
@@ -580,7 +553,7 @@ class Juice < ::Test::Unit::TestCase
   def test_json_object_create_id
     Oj.default_options = { :mode => :compat, :create_id => 'kson_class' }
     expected = Jeez.new(true, 58)
-    json = %{{"kson_class":"Jeez","x":true,"y":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' }
@@ -589,13 +562,13 @@ class Juice < ::Test::Unit::TestCase
     obj = Jeez.new(true, 58)
     json = Oj.dump(obj, :mode => :object, :indent => 2)
     assert(%{{
-  "^o":"Jeez",
+  "^o":"Juice::Jeez",
   "x":true,
   "y":58
 }
 } == json ||
 %{{
-  "^o":"Jeez",
+  "^o":"Juice::Jeez",
   "y":58,
   "x":true
 }
@@ -630,13 +603,13 @@ class Juice < ::Test::Unit::TestCase
     obj = Jazz.new(true, 58)
     json = Oj.dump(obj, :mode => :object, :indent => 2)
     assert(%{{
-  "^o":"Jazz",
+  "^o":"Juice::Jazz",
   "x":true,
   "y":58
 }
 } == json ||
 %{{
-  "^o":"Jazz",
+  "^o":"Juice::Jazz",
   "y":58,
   "x":true
 }
@@ -682,13 +655,13 @@ class Juice < ::Test::Unit::TestCase
     obj = Orange.new(true, 58)
     json = Oj.dump(obj, :mode => :object, :indent => 2)
     assert(%{{
-  "^o":"Orange",
+  "^o":"Juice::Orange",
   "x":true,
   "y":58
 }
 } == json ||
 %{{
-  "^o":"Orange",
+  "^o":"Juice::Orange",
   "y":58,
   "x":true
 }
@@ -731,13 +704,13 @@ class Juice < ::Test::Unit::TestCase
     obj = Jam.new(true, 58)
     json = Oj.dump(obj, :mode => :object, :indent => 2)
     assert(%{{
-  "^o":"Jam",
+  "^o":"Juice::Jam",
   "x":true,
   "y":58
 }
 } == json ||
 %{{
-  "^o":"Jam",
+  "^o":"Juice::Jam",
   "y":58,
   "x":true
 }
@@ -750,13 +723,13 @@ class Juice < ::Test::Unit::TestCase
     obj = Jam.new(true, 58)
     json = Oj.dump(obj, :mode => :object, :indent => 2)
     assert(%{{
-  "^o":"Jam",
+  "^o":"Juice::Jam",
   "x":true,
   "y":58
 }
 } == json ||
 %{{
-  "^o":"Jam",
+  "^o":"Juice::Jam",
   "y":58,
   "x":true
 }
@@ -932,6 +905,7 @@ class Juice < ::Test::Unit::TestCase
     end
   end
   def test_date_object
+    Oj.default_options = {:mode => :object}
     dump_and_load(Date.new(2012, 6, 19), false)
   end
 
@@ -958,17 +932,18 @@ class Juice < ::Test::Unit::TestCase
     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
     json = %{{
-  "^o":"Jem",
+  "^o":"Juice::Jem",
   "x":true,
   "y":58 }}
     obj = Oj.load(json, :mode => :object, :auto_define => true)
-    assert_equal('Jem', obj.class.name)
+    assert_equal('Juice::Jem', obj.class.name)
     assert_equal(true, obj.x)
     assert_equal(58, obj.y)
   end
@@ -979,14 +954,14 @@ class Juice < ::Test::Unit::TestCase
     obj.x = obj
     json = Oj.dump(obj, :mode => :object, :indent => 2, :circular => true)
     assert(%{{
-  "^o":"Jam",
+  "^o":"Juice::Jam",
   "^i":1,
   "x":"^r1",
   "y":58
 }
 } == json ||
 %{{
-  "^o":"Jam",
+  "^o":"Juice::Jam",
   "^i":1,
   "y":58,
   "x":"^r1"
@@ -1026,7 +1001,7 @@ class Juice < ::Test::Unit::TestCase
     obj.x['b'] = obj
     json = Oj.dump(obj, :mode => :object, :indent => 2, :circular => true)
     ha = Oj.load(json, :mode => :strict)
-    assert_equal({'^o' => 'Jam', '^i' => 1, 'x' => { '^i' => 2, 'a' => 7, 'b' => '^r1' }, 'y' => 58 }, ha)
+    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__)
@@ -1048,7 +1023,7 @@ class Juice < ::Test::Unit::TestCase
       a = []
       10000.times { a << [a] }
       Oj.dump(a)
-    rescue Exception => e
+    rescue Exception
       assert(true)
       return
     end
@@ -1068,7 +1043,7 @@ class Juice < ::Test::Unit::TestCase
 
   def test_io_file
     src = { 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}
-    filename = 'open_file_test.json'
+    filename = File.join(File.dirname(__FILE__), 'open_file_test.json')
     File.open(filename, "w") { |f|
       Oj.to_stream(f, src)
     }
@@ -1129,7 +1104,7 @@ class Juice < ::Test::Unit::TestCase
   def test_nilnil_false
     begin
       Oj.load(nil)
-    rescue Exception => e
+    rescue Exception
       assert(true)
       return
     end
@@ -1141,18 +1116,10 @@ class Juice < ::Test::Unit::TestCase
     assert_equal(nil, obj)
   end
 
-# Rails re-call test. Active support recalls the json dumper when the to_json
-# method is called. This mimics that and verifies Oj detects it.
-  def test_rails_like
-    obj = RailsLike.new(3)
-    json = Oj.dump(obj, :mode => :compat)
-    assert_equal('{"x":3}', json)
-  end
-
   def dump_and_load(obj, trace=false)
     json = Oj.dump(obj, :indent => 2)
     puts json if trace
-    loaded = Oj.load(json);
+    loaded = Oj.load(json)
     assert_equal(obj, loaded)
     loaded
   end

data/test/test_writer.rb

@@ -1,21 +1,19 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
-# Ubuntu does not accept arguments to ruby when called using env. To get warnings to show up the -w options is
-# required. That can be set in the RUBYOPT environment variable.
-# export RUBYOPT=-w
+$: << File.dirname(__FILE__)
 
-$VERBOSE = true
+require 'helper'
 
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
+class OjWriter < Minitest::Test
 
-require 'test/unit'
-require 'stringio'
-require 'date'
-require 'oj'
+  def setup
+    @default_options = Oj.default_options
+  end
 
-class OjWriter < ::Test::Unit::TestCase
+  def teardown
+    Oj.default_options = @default_options
+  end
 
   def test_string_writer_empty_array
     w = Oj::StringWriter.new(:indent => 0)
@@ -249,7 +247,7 @@ class OjWriter < ::Test::Unit::TestCase
   end
 
   def test_stream_writer_mixed_file
-    filename = 'open_file_writer_test.json'
+    filename = File.join(File.dirname(__FILE__), 'open_file_test.json')
     File.open(filename, "w") do |f|
       w = Oj::StreamWriter.new(f, :indent => 0)
       w.push_object()