Update json + tests to 2.1 and update excludes.

jruby · May 15, 2018 · 2f12d0e · 2f12d0e
1 parent 4eee05e
commit 2f12d0e
Show file tree

Hide file tree

Showing 21 changed files with 23 additions and 1,469 deletions.
diff --git a/pom.rb b/pom.rb
@@ -65,7 +65,7 @@
               'polyglot.dump.readonly' => 'true',
               'jruby.plugins.version' => '1.0.10',
 
-              'json.version' => '1.8.3',
+              'json.version' => '2.1.0',
               'rspec.version' => '3.4.0',
               'rspec-core.version' => '3.4.4',
               'rspec-expectations.version' => '3.4.0',

diff --git a/pom.xml b/pom.xml
@@ -125,7 +125,7 @@ DO NOT MODIFIY - GENERATED CODE
     <rspec-mocks.version>3.4.1</rspec-mocks.version>
     <jruby.plugins.version>1.0.10</jruby.plugins.version>
     <invoker.skip>true</invoker.skip>
-    <json.version>1.8.3</json.version>
+    <json.version>2.1.0</json.version>
     <jar-dependencies.version>0.3.12</jar-dependencies.version>
     <power_assert.version>1.1.1</power_assert.version>
     <version.jruby>${project.version}</version.jruby>

diff --git a/test/mri.index b/test/mri.index
@@ -192,16 +192,15 @@ io/wait/test_io_wait.rb
 io/nonblock/test_flush.rb
 #io/console/test_io_console.rb
 
-json/test_json.rb
-json/test_json_addition.rb
-json/test_json_encoding.rb
-json/test_json_fixtures.rb
-json/test_json_generate.rb
-json/test_json_generic_object.rb
-# Depends on some rails lib?.rb
-#json/test_json_rails.rb
-json/test_json_string_matching.rb
-json/test_json_unicode.rb
+json/json_addition_test.rb
+json/json_common_interface_test.rb
+json/json_encoding_test.rb
+json/json_ext_parser_test.rb
+json/json_fixtures_test.rb
+json/json_generator_test.rb
+json/json_generic_object_test.rb
+json/json_parser_test.rb
+json/json_string_matching_test.rb
 
 logger/test_logger.rb
 

diff --git a/test/mri/excludes/JSONGeneratorTest.rb b/test/mri/excludes/JSONGeneratorTest.rb
@@ -0,0 +1 @@
+exclude :test_gc, "needs investigation, probably related to flori/json#336"
diff --git a/test/mri/excludes/JSONParserTest.rb b/test/mri/excludes/JSONParserTest.rb
@@ -0,0 +1 @@
+exclude :test_parse_big_integers, "needs work in json lib to gracefully handle Bignum (flori/json#336)"
diff --git a/test/mri/excludes/TestJSON.rb b/test/mri/excludes/TestJSON.rb
diff --git a/test/mri/excludes/TestJSONEncoding.rb b/test/mri/excludes/TestJSONEncoding.rb
diff --git a/test/mri/excludes/TestJSONGenerate.rb b/test/mri/excludes/TestJSONGenerate.rb
diff --git a/test/mri/json/fixtures/fail1.json b/test/mri/json/fixtures/fail1.json
diff --git a/test/mri/json/json_addition_test.rb b/test/mri/json/json_addition_test.rb
@@ -5,6 +5,7 @@
 require 'json/add/rational'
 require 'json/add/bigdecimal'
 require 'json/add/ostruct'
+require 'json/add/set'
 require 'date'
 
 class JSONAdditionTest < Test::Unit::TestCase
@@ -190,4 +191,13 @@ def test_ostruct
     o.foo = { 'bar' => true }
     assert_equal o, parse(JSON(o), :create_additions => true)
   end
+
+  def test_set
+    s = Set.new([:a, :b, :c, :a])
+    assert_equal s, JSON.parse(JSON(s), :create_additions => true)
+    ss = SortedSet.new([:d, :b, :a, :c])
+    ss_again = JSON.parse(JSON(ss), :create_additions => true)
+    assert_kind_of ss.class, ss_again
+    assert_equal ss, ss_again
+  end
 end
diff --git a/test/mri/json/json_generator_test.rb b/test/mri/json/json_generator_test.rb
diff --git a/test/mri/json/setup_variant.rb b/test/mri/json/setup_variant.rb
diff --git a/test/mri/json/test_helper.rb b/test/mri/json/test_helper.rb
@@ -15,7 +15,3 @@
   require 'byebug'
 rescue LoadError
 end
-if ENV['START_SIMPLECOV'].to_i == 1
-  require 'simplecov'
-  SimpleCov.start
-end