nobu	2010-12-26 11:15:55 +0900 (Sun, 26 Dec 2010)

  New Revision: 30380

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30380

  Log:
    * test/with_different_ofs.rb (DifferentOFS): should not affect
      original classes.

  Modified files:
    trunk/ChangeLog
    trunk/test/csv/test_csv_parsing.rb
    trunk/test/csv/test_csv_writing.rb
    trunk/test/csv/test_data_converters.rb
    trunk/test/csv/test_encodings.rb
    trunk/test/csv/test_features.rb
    trunk/test/csv/test_headers.rb
    trunk/test/csv/test_interface.rb
    trunk/test/csv/test_row.rb
    trunk/test/csv/test_serialization.rb
    trunk/test/csv/test_table.rb
    trunk/test/digest/test_digest_extend.rb
    trunk/test/with_different_ofs.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30379)
+++ ChangeLog	(revision 30380)
@@ -1,3 +1,8 @@
+Sun Dec 26 11:15:50 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* test/with_different_ofs.rb (DifferentOFS): should not affect
+	  original classes.
+
 Sun Dec 26 09:35:07 2010  Tanaka Akira  <akr@f...>
 
 	* rational.c: parenthesize macro arguments.
Index: test/digest/test_digest_extend.rb
===================================================================
--- test/digest/test_digest_extend.rb	(revision 30379)
+++ test/digest/test_digest_extend.rb	(revision 30380)
@@ -3,7 +3,7 @@
 require_relative '../with_different_ofs.rb'
 
 class TestDigestExtend < Test::Unit::TestCase
-  include DifferentOFS
+  extend DifferentOFS
 
   class MyDigest < Digest::Class
     def initialize(*arg)
Index: test/with_different_ofs.rb
===================================================================
--- test/with_different_ofs.rb	(revision 30379)
+++ test/with_different_ofs.rb	(revision 30380)
@@ -1,18 +1,16 @@
 module DifferentOFS
-  def setup
-    super
-    @ofs, $, = $,, "-"
-  end
-  def teardown
-    $, = @ofs
-    super
-  end
-
   module WithDifferentOFS
-    def with_diffrent_ofs
+    def setup
+      super
+      @ofs, $, = $,, "-"
     end
+    def teardown
+      $, = @ofs
+      super
+    end
   end
-  def self.included(klass)
+
+  def self.extended(klass)
     super(klass)
     klass.const_set(:DifferentOFS, Class.new(klass).class_eval {include WithDifferentOFS}).name
   end
Index: test/csv/test_csv_parsing.rb
===================================================================
--- test/csv/test_csv_parsing.rb	(revision 30379)
+++ test/csv/test_csv_parsing.rb	(revision 30380)
@@ -18,7 +18,7 @@
 # separator <tt>$/</tt>.
 #
 class TestCSV::Parsing < TestCSV
-  include DifferentOFS
+  extend DifferentOFS
 
   BIG_DATA = "123456789\n" * 1024
 
Index: test/csv/test_csv_writing.rb
===================================================================
--- test/csv/test_csv_writing.rb	(revision 30379)
+++ test/csv/test_csv_writing.rb	(revision 30380)
@@ -10,7 +10,7 @@
 require_relative "base"
 
 class TestCSV::Writing < TestCSV
-  include DifferentOFS
+  extend DifferentOFS
 
   def test_writing
     [ ["\t",                      ["\t"]],
Index: test/csv/test_features.rb
===================================================================
--- test/csv/test_features.rb	(revision 30379)
+++ test/csv/test_features.rb	(revision 30380)
@@ -12,7 +12,7 @@
 require_relative "base"
 
 class TestCSV::Features < TestCSV
-  include DifferentOFS
+  extend DifferentOFS
 
   TEST_CASES = [ [%Q{a,b},               ["a", "b"]],
                  [%Q{a,"""b"""},         ["a", "\"b\""]],
Index: test/csv/test_interface.rb
===================================================================
--- test/csv/test_interface.rb	(revision 30379)
+++ test/csv/test_interface.rb	(revision 30380)
@@ -10,7 +10,7 @@
 require_relative "base"
 
 class TestCSV::Interface < TestCSV
-  include DifferentOFS
+  extend DifferentOFS
 
   def setup
     super
Index: test/csv/test_data_converters.rb
===================================================================
--- test/csv/test_data_converters.rb	(revision 30379)
+++ test/csv/test_data_converters.rb	(revision 30380)
@@ -10,7 +10,7 @@
 require_relative "base"
 
 class TestCSV::DataConverters < TestCSV
-  include DifferentOFS
+  extend DifferentOFS
 
   def setup
     super
Index: test/csv/test_row.rb
===================================================================
--- test/csv/test_row.rb	(revision 30379)
+++ test/csv/test_row.rb	(revision 30380)
@@ -10,7 +10,7 @@
 require_relative "base"
 
 class TestCSV::Row < TestCSV
-  include DifferentOFS
+  extend DifferentOFS
 
   def setup
     super
Index: test/csv/test_table.rb
===================================================================
--- test/csv/test_table.rb	(revision 30379)
+++ test/csv/test_table.rb	(revision 30380)
@@ -10,7 +10,7 @@
 require_relative "base"
 
 class TestCSV::Table < TestCSV
-  include DifferentOFS
+  extend DifferentOFS
 
   def setup
     super
Index: test/csv/test_encodings.rb
===================================================================
--- test/csv/test_encodings.rb	(revision 30379)
+++ test/csv/test_encodings.rb	(revision 30380)
@@ -10,7 +10,7 @@
 require_relative "base"
 
 class TestCSV::Encodings < TestCSV
-  include DifferentOFS
+  extend DifferentOFS
 
   def setup
     super
Index: test/csv/test_headers.rb
===================================================================
--- test/csv/test_headers.rb	(revision 30379)
+++ test/csv/test_headers.rb	(revision 30380)
@@ -10,7 +10,7 @@
 require_relative "base"
 
 class TestCSV::Headers < TestCSV
-  include DifferentOFS
+  extend DifferentOFS
 
   def setup
     super
Index: test/csv/test_serialization.rb
===================================================================
--- test/csv/test_serialization.rb	(revision 30379)
+++ test/csv/test_serialization.rb	(revision 30380)
@@ -25,7 +25,7 @@
 end
 
 class TestCSV::Serialization < TestCSV
-  include DifferentOFS
+  extend DifferentOFS
 
   ### Classes Used to Test Serialization ###
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/