From 2b3f026b8abb2cf7061e0978fb3eca4c3e0cbeaf Mon Sep 17 00:00:00 2001
From: mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 26 Oct 2008 12:30:07 +0000
Subject: * test/json/test_json.rb: remove dependency on permutation gem.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19950 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog              |  4 ++++
 test/json/test_json.rb | 34 +++++++++++++---------------------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a10c46179e..8cf0fd6de1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Oct 26 21:28:42 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/json/test_json.rb: remove dependency on permutation gem.
+
 Sun Oct 26 19:18:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* thread.c (blocking_region_{begin,end}): declared as inline.
diff --git a/test/json/test_json.rb b/test/json/test_json.rb
index 8cb226702b..02da6d4e7a 100755
--- a/test/json/test_json.rb
+++ b/test/json/test_json.rb
@@ -90,30 +90,22 @@ class TC_JSON < Test::Unit::TestCase
     assert_equal({ "a" => 0.23 }, parse('  {  "a"  :  0.23  }  '))
   end
 
-  begin
-    require 'permutation'
-    def test_parse_more_complex_arrays
-      a = [ nil, false, true, "foßbar", [ "n€st€d", true ], { "nested" => true, "n€ßt€ð2" => {} }]
-      perms = Permutation.for a
-      perms.each do |perm|
-        orig_ary = perm.project
-        json = pretty_generate(orig_ary)
-        assert_equal orig_ary, parse(json)
-      end
+  def test_parse_more_complex_arrays
+    a = [ nil, false, true, "foßbar", [ "n€st€d", true ], { "nested" => true, "n€ßt€ð2" => {} }]
+    a.permutation do |orig_ary|
+      json = pretty_generate(orig_ary)
+      assert_equal orig_ary, parse(json)
     end
+  end
 
-    def test_parse_complex_objects
-      a = [ nil, false, true, "foßbar", [ "n€st€d", true ], { "nested" => true, "n€ßt€ð2" => {} }]
-      perms = Permutation.for a
-      perms.each do |perm|
-        s = "a"
-        orig_obj = perm.project.inject({}) { |h, x| h[s.dup] = x; s = s.succ; h }
-        json = pretty_generate(orig_obj)
-        assert_equal orig_obj, parse(json)
-      end
+  def test_parse_complex_objects
+    a = [ nil, false, true, "foßbar", [ "n€st€d", true ], { "nested" => true, "n€ßt€ð2" => {} }]
+    a.permutation do |orig_ary|
+      s = "a"
+      orig_obj = orig_ary.inject({}) { |h, x| h[s.dup] = x; s = s.succ; h }
+      json = pretty_generate(orig_obj)
+      assert_equal orig_obj, parse(json)
     end
-  rescue LoadError
-    warn "Skipping permutation tests."
   end
 
   def test_parse_arrays
-- 
cgit v1.2.3