* lib/set.rb (Set#freeze, taint, untaint): Save a "self" by

  utilizing super returning self, and add tests while at it.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 29 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 18eab62e9d..82874d5cf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun  1 17:58:13 2013  Akinori MUSHA  <[email protected]>
+
+	* lib/set.rb (Set#freeze, taint, untaint): Save a "self" by
+	  utilizing super returning self, and add tests while at it.
+
 Sat Jun  1 17:24:47 2013  Nobuyoshi Nakada  <[email protected]>
 
 	* compile.c (iseq_set_arguments): not a simple single argument if any
diff --git a/lib/set.rb b/lib/set.rb
index cc7542f223..a9aa7e7936 100644
--- a/lib/set.rb
+++ b/lib/set.rb
@@ -99,21 +99,18 @@ class Set
   end
 
   def freeze    # :nodoc:
-    super
     @hash.freeze
-    self
+    super
   end
 
   def taint     # :nodoc:
-    super
     @hash.taint
-    self
+    super
   end
 
   def untaint   # :nodoc:
-    super
     @hash.untaint
-    self
+    super
   end
 
   # Returns the number of elements.
diff --git a/test/test_set.rb b/test/test_set.rb
index 904118250c..26950c3e30 100644
--- a/test/test_set.rb
+++ b/test/test_set.rb
@@ -528,6 +528,27 @@ class TC_Set < Test::Unit::TestCase
     }
   end
 
+  def test_taintness
+    orig = set = Set[1,2,3]
+    assert_equal false, set.tainted?
+    assert_same orig, set.taint
+    assert_equal true, set.tainted?
+    assert_same orig, set.untaint
+    assert_equal false, set.tainted?
+  end
+
+  def test_freeze
+    orig = set = Set[1,2,3]
+    assert_equal false, set.frozen?
+    set << 4
+    assert_same orig, set.freeze
+    assert_equal true, set.frozen?
+    assert_raises(RuntimeError) {
+      set << 5
+    }
+    assert_equal 4, set.size
+  end
+
   def test_inspect
     set1 = Set[1]