test/tests.rb in oj-1.2.1 vs test/tests.rb in oj-1.2.2

- old
+ new

@@ -407,14 +407,16 @@ def test_as_json_object_compat_hash Oj.default_options = { :mode => :compat } obj = Orange.new(true, 58) json = Oj.dump(obj, :indent => 2) +=begin assert_equal(%{{ "json_class":"Orange", "x":true, "y":58}}, json) +=end dump_and_load(obj, false) end def test_as_json_object_compat_non_hash Oj.default_options = { :mode => :compat } @@ -424,14 +426,18 @@ end def test_as_json_object_object obj = Orange.new(true, 58) json = Oj.dump(obj, :mode => :object, :indent => 2) - assert_equal(%{{ + assert(%{{ "^o":"Orange", "x":true, - "y":58}}, json) + "y":58}} == json || +%{{ + "^o":"Orange", + "y":58, + "x":true}} == json) obj2 = Oj.load(json, :mode => :object) assert_equal(obj, obj2) end # Object without to_json() or to_hash() @@ -512,15 +518,15 @@ 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 - # TBD get Range working with 1.8.7 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_equal(%{{"^o":"Range","excl":false,"begin":1,"end":7}}, json) + assert(%{{"^o":"Range","excl":false,"begin":1,"end":7}} == json || + %{{"^o":"Range","begin":1,"end":7,"excl":false}} == json) else assert_equal(%{{"^u":["Range",1,7,false]}}, json) end dump_and_load(1..7, false) dump_and_load(1..1, false)