fixed test setup

8 files changed, 18 insertions, 35 deletions

diff --git a/tests/setup_variant.rb b/tests/setup_variant.rb
new file mode 100644
index 0000000..2dab184
--- /dev/null
+++ b/tests/setup_variant.rb
@@ -0,0 +1,11 @@
+case ENV['JSON']
+when 'pure'
+  $:.unshift 'lib'
+  require 'json/pure'
+when 'ext'
+  $:.unshift 'ext', 'lib'
+  require 'json/ext'
+else
+  $:.unshift 'ext', 'lib'
+  require 'json'
+end
diff --git a/tests/test_json.rb b/tests/test_json.rb
index 00e52f5..2fc3c09 100755
--- a/tests/test_json.rb
+++ b/tests/test_json.rb
@@ -2,11 +2,7 @@
 # -*- coding: utf-8 -*-
 
 require 'test/unit'
-case ENV['JSON']
-when 'pure' then require 'json/pure'
-when 'ext'  then require 'json/ext'
-else             require 'json'
-end
+require File.join(File.dirname(__FILE__), 'setup_variant')
 require 'stringio'
 
 unless Array.method_defined?(:permutation)
diff --git a/tests/test_json_addition.rb b/tests/test_json_addition.rb
index edf8699..c8bfb41 100755
--- a/tests/test_json_addition.rb
+++ b/tests/test_json_addition.rb
@@ -2,11 +2,7 @@
 # -*- coding:utf-8 -*-
 
 require 'test/unit'
-case ENV['JSON']
-when 'pure' then require 'json/pure'
-when 'ext'  then require 'json/ext'
-else             require 'json'
-end
+require File.join(File.dirname(__FILE__), 'setup_variant')
 load 'json/add/core.rb'
 require 'date'
 
diff --git a/tests/test_json_encoding.rb b/tests/test_json_encoding.rb
index cdeca58..7af5e63 100644
--- a/tests/test_json_encoding.rb
+++ b/tests/test_json_encoding.rb
@@ -2,11 +2,7 @@
 # -*- coding: utf-8 -*-
 
 require 'test/unit'
-case ENV['JSON']
-when 'pure' then require 'json/pure'
-when 'ext'  then require 'json/ext'
-else             require 'json'
-end
+require File.join(File.dirname(__FILE__), 'setup_variant')
 
 class TC_JSONEncoding < Test::Unit::TestCase
   include JSON
diff --git a/tests/test_json_fixtures.rb b/tests/test_json_fixtures.rb
index 378667f..e9df8f5 100755
--- a/tests/test_json_fixtures.rb
+++ b/tests/test_json_fixtures.rb
@@ -2,11 +2,7 @@
 # -*- coding: utf-8 -*-
 
 require 'test/unit'
-case ENV['JSON']
-when 'pure' then require 'json/pure'
-when 'ext'  then require 'json/ext'
-else             require 'json'
-end
+require File.join(File.dirname(__FILE__), 'setup_variant')
 
 class TC_JSONFixtures < Test::Unit::TestCase
   def setup
diff --git a/tests/test_json_generate.rb b/tests/test_json_generate.rb
index 5380a06..e6219df 100755
--- a/tests/test_json_generate.rb
+++ b/tests/test_json_generate.rb
@@ -2,11 +2,7 @@
 # -*- coding: utf-8 -*-
 
 require 'test/unit'
-case ENV['JSON']
-when 'pure' then require 'json/pure'
-when 'ext'  then require 'json/ext'
-else             require 'json'
-end
+require File.join(File.dirname(__FILE__), 'setup_variant')
 
 class TC_JSONGenerate < Test::Unit::TestCase
   include JSON
diff --git a/tests/test_json_string_matching.rb b/tests/test_json_string_matching.rb
index 0ea12ed..149a63b 100644
--- a/tests/test_json_string_matching.rb
+++ b/tests/test_json_string_matching.rb
@@ -2,11 +2,7 @@
 # -*- coding: utf-8 -*-
 
 require 'test/unit'
-case ENV['JSON']
-when 'pure' then require 'json/pure'
-when 'ext'  then require 'json/ext'
-else             require 'json'
-end
+require File.join(File.dirname(__FILE__), 'setup_variant')
 require 'stringio'
 require 'time'
 
diff --git a/tests/test_json_unicode.rb b/tests/test_json_unicode.rb
index 505f5d5..ace56ca 100755
--- a/tests/test_json_unicode.rb
+++ b/tests/test_json_unicode.rb
@@ -2,11 +2,7 @@
 # -*- coding: utf-8 -*-
 
 require 'test/unit'
-case ENV['JSON']
-when 'pure' then require 'json/pure'
-when 'ext'  then require 'json/ext'
-else             require 'json'
-end
+require File.join(File.dirname(__FILE__), 'setup_variant')
 
 class TC_JSONUnicode < Test::Unit::TestCase
   include JSON