aboutsummaryrefslogtreecommitdiffstats
path: root/test/json/test_json_generic_object.rb
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-05 11:49:39 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-05 11:49:39 +0000
commit021790997aa225bf547ffd03a7aaddd84cd0597e (patch)
treed63e457298a3c27b345fd674c1557e1cb390248c /test/json/test_json_generic_object.rb
parentb98f39c2a45bc7eb814885c7eb9e679bff6126a8 (diff)
downloadruby-021790997aa225bf547ffd03a7aaddd84cd0597e.tar.gz
* ext/json/*, test/json/*: Update json-2.0.1.
Changes of 2.0.0: https://github.com/flori/json/blob/f679ebd0c69a94e3e70a897ac9a229f5779c2ee1/CHANGES.md#2015-09-11-200 Changes of 2.0.1: https://github.com/flori/json/blob/f679ebd0c69a94e3e70a897ac9a229f5779c2ee1/CHANGES.md#2016-07-01-201 [Feature #12542][ruby-dev:49706][fix GH-1395] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/json/test_json_generic_object.rb')
-rw-r--r--test/json/test_json_generic_object.rb20
1 files changed, 13 insertions, 7 deletions
diff --git a/test/json/test_json_generic_object.rb b/test/json/test_json_generic_object.rb
index e04e1a1cb3..a3fd6b860a 100644
--- a/test/json/test_json_generic_object.rb
+++ b/test/json/test_json_generic_object.rb
@@ -1,9 +1,6 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
# frozen_string_literal: false
+require 'test_helper'
-require 'test/unit'
-require File.join(File.dirname(__FILE__), 'setup_variant')
class TestJSONGenericObject < Test::Unit::TestCase
include JSON
@@ -27,11 +24,20 @@ class TestJSONGenericObject < Test::Unit::TestCase
end
def test_parse_json
- assert_kind_of Hash, JSON('{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }', :create_additions => true)
+ assert_kind_of Hash,
+ JSON(
+ '{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }',
+ :create_additions => true
+ )
switch_json_creatable do
- assert_equal @go, l = JSON('{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }', :create_additions => true)
+ assert_equal @go, l =
+ JSON(
+ '{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }',
+ :create_additions => true
+ )
assert_equal 1, l.a
- assert_equal @go, l = JSON('{ "a": 1, "b": 2 }', :object_class => GenericObject)
+ assert_equal @go,
+ l = JSON('{ "a": 1, "b": 2 }', :object_class => GenericObject)
assert_equal 1, l.a
assert_equal GenericObject[:a => GenericObject[:b => 2]],
l = JSON('{ "a": { "b": 2 } }', :object_class => GenericObject)