diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-25 13:49:14 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-25 13:49:14 +0000 |
commit | ef990446737fc7923aed358e5b2c618a77a12d65 (patch) | |
tree | f30d8b3c24be51100b3b50056674d59fe338ee82 /test | |
parent | c41b036f4d6b0ddd3f2310641f44763c270a7712 (diff) | |
download | ruby-ef990446737fc7923aed358e5b2c618a77a12d65.tar.gz |
* test/csv: DifferentOFS needs to be include in each classes.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30370 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/csv/base.rb | 1 | ||||
-rwxr-xr-x | test/csv/test_csv_parsing.rb | 2 | ||||
-rwxr-xr-x | test/csv/test_csv_writing.rb | 2 | ||||
-rwxr-xr-x | test/csv/test_data_converters.rb | 2 | ||||
-rwxr-xr-x | test/csv/test_encodings.rb | 2 | ||||
-rwxr-xr-x | test/csv/test_features.rb | 2 | ||||
-rwxr-xr-x | test/csv/test_headers.rb | 2 | ||||
-rwxr-xr-x | test/csv/test_interface.rb | 2 | ||||
-rwxr-xr-x | test/csv/test_row.rb | 2 | ||||
-rwxr-xr-x | test/csv/test_serialization.rb | 1 | ||||
-rwxr-xr-x | test/csv/test_table.rb | 2 | ||||
-rw-r--r-- | test/digest/test_digest_extend.rb | 2 |
12 files changed, 20 insertions, 2 deletions
diff --git a/test/csv/base.rb b/test/csv/base.rb index 6596467b34..42f4fa26ea 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 01598f5b31..3da9df755d 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 9fb1692614..2c98abb137 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 04613770e8..e878c28380 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 c40faa3dc9..e125f3baad 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 747c6a11d4..70ba39d0fe 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 f6608fc871..96ff485cad 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 7a56f0fb29..f939d9e1ad 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 af2a7dc1b2..38383d5a00 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 7878a7e1f0..9fafe02c59 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 18e9e77d18..731d526190 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 8f541afa92..0821720210 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 |