Merge pull request #613 from ruby/update-test-layout

Move test directory to test/json same as layout of other default gems

Rakefile

@@ -107,9 +107,7 @@ task(:set_env_pure) { ENV['JSON'] = 'pure' }
 
 UndocumentedTestTask.new do |t|
   t.name = 'do_test_pure'
-  t.libs << 'lib' << 'tests' << 'tests/lib'
-  t.ruby_opts << "-rhelper"
-  t.test_files = FileList['tests/*_test.rb']
+  t.test_files = FileList['test/json/*_test.rb']
   t.verbose = true
   t.options = '-v'
 end
@@ -187,8 +185,7 @@ if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
 
   UndocumentedTestTask.new do |t|
     t.name = 'do_test_ext'
-    t.libs << 'lib' << 'tests'
-    t.test_files = FileList['tests/*_test.rb']
+    t.test_files = FileList['test/json/*_test.rb']
     t.verbose = true
     t.options = '-v'
   end
@@ -266,9 +263,7 @@ else
 
   UndocumentedTestTask.new do |t|
     t.name = 'do_test_ext'
-    t.libs << 'lib' << 'tests' << "tests/lib"
-    t.ruby_opts << '-rhelper'
-    t.test_files = FileList['tests/*_test.rb']
+    t.test_files = FileList['test/json/*_test.rb']
     t.verbose = true
     t.options = '-v'
   end

test/json/test_helper.rb

@@ -0,0 +1,22 @@
+case ENV['JSON']
+when 'pure'
+  $:.unshift File.join(__dir__, '../../lib')
+  require 'json/pure'
+when 'ext'
+  $:.unshift File.join(__dir__, '../../ext'), File.join(__dir__, '../../lib')
+  require 'json/ext'
+else
+  $:.unshift File.join(__dir__, '../../ext'), File.join(__dir__, '../../lib')
+  require 'json'
+end
+
+require 'test/unit'
+begin
+  require 'byebug'
+rescue LoadError
+end
+
+unless defined?(Test::Unit::CoreAssertions)
+  require "core_assertions"
+  Test::Unit::TestCase.include Test::Unit::CoreAssertions
+end