summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--test/csv/base.rb1
-rwxr-xr-xtest/csv/test_csv_parsing.rb2
-rwxr-xr-xtest/csv/test_csv_writing.rb2
-rwxr-xr-xtest/csv/test_data_converters.rb2
-rwxr-xr-xtest/csv/test_encodings.rb2
-rwxr-xr-xtest/csv/test_features.rb2
-rwxr-xr-xtest/csv/test_headers.rb2
-rwxr-xr-xtest/csv/test_interface.rb2
-rwxr-xr-xtest/csv/test_row.rb2
-rwxr-xr-xtest/csv/test_serialization.rb1
-rwxr-xr-xtest/csv/test_table.rb2
-rw-r--r--test/digest/test_digest_extend.rb2
13 files changed, 23 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f3ab84e..443e811 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Sat Dec 25 22:32:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Dec 25 22:49:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/csv: DifferentOFS needs to be include in each classes.
* test/digest/test_digest_extend.rb (TestDigestExtend#setup):
should not depend on the result of previous tests
diff --git a/test/csv/base.rb b/test/csv/base.rb
index 6596467..42f4fa2 100644
--- a/test/csv/base.rb
+++ b/test/csv/base.rb
@@ -5,5 +5,4 @@ require "csv"
require_relative "../with_different_ofs.rb"
class TestCSV < Test::Unit::TestCase
- include DifferentOFS
end
diff --git a/test/csv/test_csv_parsing.rb b/test/csv/test_csv_parsing.rb
index 01598f5..3da9df7 100755
--- a/test/csv/test_csv_parsing.rb
+++ b/test/csv/test_csv_parsing.rb
@@ -18,6 +18,8 @@ require_relative "base"
# separator <tt>$/</tt>.
#
class TestCSV::Parsing < TestCSV
+ include DifferentOFS
+
BIG_DATA = "123456789\n" * 1024
def test_mastering_regex_example
diff --git a/test/csv/test_csv_writing.rb b/test/csv/test_csv_writing.rb
index 9fb1692..2c98abb 100755
--- a/test/csv/test_csv_writing.rb
+++ b/test/csv/test_csv_writing.rb
@@ -10,6 +10,8 @@
require_relative "base"
class TestCSV::Writing < TestCSV
+ include DifferentOFS
+
def test_writing
[ ["\t", ["\t"]],
["foo,\"\"\"\"\"\",baz", ["foo", "\"\"", "baz"]],
diff --git a/test/csv/test_data_converters.rb b/test/csv/test_data_converters.rb
index 0461377..e878c28 100755
--- a/test/csv/test_data_converters.rb
+++ b/test/csv/test_data_converters.rb
@@ -10,6 +10,8 @@
require_relative "base"
class TestCSV::DataConverters < TestCSV
+ include DifferentOFS
+
def setup
super
@data = "Numbers,:integer,1,:float,3.015"
diff --git a/test/csv/test_encodings.rb b/test/csv/test_encodings.rb
index c40faa3..e125f3b 100755
--- a/test/csv/test_encodings.rb
+++ b/test/csv/test_encodings.rb
@@ -10,6 +10,8 @@
require_relative "base"
class TestCSV::Encodings < TestCSV
+ include DifferentOFS
+
def setup
super
require 'tempfile'
diff --git a/test/csv/test_features.rb b/test/csv/test_features.rb
index 747c6a1..70ba39d 100755
--- a/test/csv/test_features.rb
+++ b/test/csv/test_features.rb
@@ -12,6 +12,8 @@ require "zlib"
require_relative "base"
class TestCSV::Features < TestCSV
+ include DifferentOFS
+
TEST_CASES = [ [%Q{a,b}, ["a", "b"]],
[%Q{a,"""b"""}, ["a", "\"b\""]],
[%Q{a,"""b"}, ["a", "\"b"]],
diff --git a/test/csv/test_headers.rb b/test/csv/test_headers.rb
index f6608fc..96ff485 100755
--- a/test/csv/test_headers.rb
+++ b/test/csv/test_headers.rb
@@ -10,6 +10,8 @@
require_relative "base"
class TestCSV::Headers < TestCSV
+ include DifferentOFS
+
def setup
super
@data = <<-END_CSV.gsub(/^\s+/, "")
diff --git a/test/csv/test_interface.rb b/test/csv/test_interface.rb
index 7a56f0f..f939d9e 100755
--- a/test/csv/test_interface.rb
+++ b/test/csv/test_interface.rb
@@ -10,6 +10,8 @@
require_relative "base"
class TestCSV::Interface < TestCSV
+ include DifferentOFS
+
def setup
super
@path = File.join(File.dirname(__FILE__), "temp_test_data.csv")
diff --git a/test/csv/test_row.rb b/test/csv/test_row.rb
index af2a7dc..38383d5 100755
--- a/test/csv/test_row.rb
+++ b/test/csv/test_row.rb
@@ -10,6 +10,8 @@
require_relative "base"
class TestCSV::Row < TestCSV
+ include DifferentOFS
+
def setup
super
@row = CSV::Row.new(%w{A B C A A}, [1, 2, 3, 4])
diff --git a/test/csv/test_serialization.rb b/test/csv/test_serialization.rb
index 7878a7e..9fafe02 100755
--- a/test/csv/test_serialization.rb
+++ b/test/csv/test_serialization.rb
@@ -25,6 +25,7 @@ class Hash
end
class TestCSV::Serialization < TestCSV
+ include DifferentOFS
### Classes Used to Test Serialization ###
diff --git a/test/csv/test_table.rb b/test/csv/test_table.rb
index 18e9e77..731d526 100755
--- a/test/csv/test_table.rb
+++ b/test/csv/test_table.rb
@@ -10,6 +10,8 @@
require_relative "base"
class TestCSV::Table < TestCSV
+ include DifferentOFS
+
def setup
super
@rows = [ CSV::Row.new(%w{A B C}, [1, 2, 3]),
diff --git a/test/digest/test_digest_extend.rb b/test/digest/test_digest_extend.rb
index 8f541af..0821720 100644
--- a/test/digest/test_digest_extend.rb
+++ b/test/digest/test_digest_extend.rb
@@ -1,6 +1,6 @@
require 'test/unit'
require 'digest'
-require_relative '../with_diffent_ofs.rb'
+require_relative '../with_different_ofs.rb'
class TestDigestExtend < Test::Unit::TestCase
include DifferentOFS