diff options
Diffstat (limited to 'test/json/test_json_addition.rb')
| -rw-r--r-- | test/json/test_json_addition.rb | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/test/json/test_json_addition.rb b/test/json/test_json_addition.rb index f2059312de..7a49d62d73 100644 --- a/test/json/test_json_addition.rb +++ b/test/json/test_json_addition.rb @@ -1,9 +1,5 @@ -#!/usr/bin/env ruby -# -*- coding:utf-8 -*- # frozen_string_literal: false - -require 'test/unit' -require File.join(File.dirname(__FILE__), 'setup_variant') +require 'test_helper' require 'json/add/core' require 'json/add/complex' require 'json/add/rational' @@ -74,7 +70,7 @@ class TestJSONAddition < Test::Unit::TestCase a = A.new(666) assert A.json_creatable? json = generate(a) - a_again = JSON.parse(json, :create_additions => true) + a_again = parse(json, :create_additions => true) assert_kind_of a.class, a_again assert_equal a, a_again end @@ -83,7 +79,7 @@ class TestJSONAddition < Test::Unit::TestCase a = A.new(666) assert A.json_creatable? json = generate(a) - a_hash = JSON.parse(json) + a_hash = parse(json) assert_kind_of Hash, a_hash end @@ -91,10 +87,10 @@ class TestJSONAddition < Test::Unit::TestCase a = A.new(666) assert A.json_creatable? json = generate(a) - a_again = JSON.parse(json, :create_additions => true) + a_again = parse(json, :create_additions => true) assert_kind_of a.class, a_again assert_equal a, a_again - a_hash = JSON.parse(json, :create_additions => false) + a_hash = parse(json, :create_additions => false) assert_kind_of Hash, a_hash assert_equal( {"args"=>[666], "json_class"=>"TestJSONAddition::A"}.sort_by { |k,| k }, @@ -106,14 +102,14 @@ class TestJSONAddition < Test::Unit::TestCase b = B.new assert !B.json_creatable? json = generate(b) - assert_equal({ "json_class"=>"TestJSONAddition::B" }, JSON.parse(json)) + assert_equal({ "json_class"=>"TestJSONAddition::B" }, parse(json)) end def test_extended_json_fail2 c = C.new assert !C.json_creatable? json = generate(c) - assert_raise(ArgumentError, NameError) { JSON.parse(json, :create_additions => true) } + assert_raise(ArgumentError, NameError) { parse(json, :create_additions => true) } end def test_raw_strings @@ -131,7 +127,7 @@ class TestJSONAddition < Test::Unit::TestCase assert_match(/\A\{.*\}\z/, json) assert_match(/"json_class":"String"/, json) assert_match(/"raw":\[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255\]/, json) - raw_again = JSON.parse(json, :create_additions => true) + raw_again = parse(json, :create_additions => true) assert_equal raw, raw_again end @@ -168,19 +164,19 @@ class TestJSONAddition < Test::Unit::TestCase def test_utc_datetime now = Time.now - d = DateTime.parse(now.to_s, :create_additions => true) # usual case - assert_equal d, JSON.parse(d.to_json, :create_additions => true) - d = DateTime.parse(now.utc.to_s) # of = 0 - assert_equal d, JSON.parse(d.to_json, :create_additions => true) + d = DateTime.parse(now.to_s, :create_additions => true) # usual case + assert_equal d, parse(d.to_json, :create_additions => true) + d = DateTime.parse(now.utc.to_s) # of = 0 + assert_equal d, parse(d.to_json, :create_additions => true) d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(1,24)) - assert_equal d, JSON.parse(d.to_json, :create_additions => true) + assert_equal d, parse(d.to_json, :create_additions => true) d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(12,24)) - assert_equal d, JSON.parse(d.to_json, :create_additions => true) + assert_equal d, parse(d.to_json, :create_additions => true) end def test_rational_complex - assert_equal Rational(2, 9), JSON.parse(JSON(Rational(2, 9)), :create_additions => true) - assert_equal Complex(2, 9), JSON.parse(JSON(Complex(2, 9)), :create_additions => true) + assert_equal Rational(2, 9), parse(JSON(Rational(2, 9)), :create_additions => true) + assert_equal Complex(2, 9), parse(JSON(Complex(2, 9)), :create_additions => true) end def test_bigdecimal @@ -192,6 +188,6 @@ class TestJSONAddition < Test::Unit::TestCase o = OpenStruct.new # XXX this won't work; o.foo = { :bar => true } o.foo = { 'bar' => true } - assert_equal o, JSON.parse(JSON(o), :create_additions => true) + assert_equal o, parse(JSON(o), :create_additions => true) end end |