summaryrefslogtreecommitdiff
path: root/test/csv
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-25 13:41:11 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-25 13:41:11 +0000
commitc41b036f4d6b0ddd3f2310641f44763c270a7712 (patch)
tree4fd62d916ff802571d11f7a71ce3694a85722732 /test/csv
parent3e7c68119c1528f1589e53d9a795bc303dbddc1c (diff)
test/with_different_ofs.rb: fixed typos.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30369 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/csv')
-rw-r--r--test/csv/base.rb2
-rwxr-xr-xtest/csv/test_csv_parsing.rb2
-rwxr-xr-xtest/csv/test_csv_writing.rb2
-rwxr-xr-xtest/csv/test_data_converters.rb3
-rwxr-xr-xtest/csv/test_encodings.rb4
-rwxr-xr-xtest/csv/test_features.rb3
-rwxr-xr-xtest/csv/test_headers.rb3
-rwxr-xr-xtest/csv/test_interface.rb4
-rwxr-xr-xtest/csv/test_row.rb3
-rwxr-xr-xtest/csv/test_serialization.rb2
-rwxr-xr-xtest/csv/test_table.rb3
11 files changed, 10 insertions, 21 deletions
diff --git a/test/csv/base.rb b/test/csv/base.rb
index 31f949a..6596467 100644
--- a/test/csv/base.rb
+++ b/test/csv/base.rb
@@ -2,7 +2,7 @@ require "test/unit"
require "csv"
-require_relative "../with_diffent_ofs.rb"
+require_relative "../with_different_ofs.rb"
class TestCSV < Test::Unit::TestCase
include DifferentOFS
diff --git a/test/csv/test_csv_parsing.rb b/test/csv/test_csv_parsing.rb
index 6b50ab3..01598f5 100755
--- a/test/csv/test_csv_parsing.rb
+++ b/test/csv/test_csv_parsing.rb
@@ -216,6 +216,4 @@ class TestCSV::Parsing < TestCSV
end
end
end
-
- with_diffrent_ofs
end
diff --git a/test/csv/test_csv_writing.rb b/test/csv/test_csv_writing.rb
index 73a27d2..9fb1692 100755
--- a/test/csv/test_csv_writing.rb
+++ b/test/csv/test_csv_writing.rb
@@ -92,6 +92,4 @@ class TestCSV::Writing < TestCSV
CSV.generate_line( [1, "b", nil, %Q{already "quoted"}],
force_quotes: true ) )
end
-
- with_diffrent_ofs
end
diff --git a/test/csv/test_data_converters.rb b/test/csv/test_data_converters.rb
index fcd03dc..0461377 100755
--- a/test/csv/test_data_converters.rb
+++ b/test/csv/test_data_converters.rb
@@ -11,6 +11,7 @@ require_relative "base"
class TestCSV::DataConverters < TestCSV
def setup
+ super
@data = "Numbers,:integer,1,:float,3.015"
@parser = CSV.new(@data)
@@ -257,6 +258,4 @@ class TestCSV::DataConverters < TestCSV
assert_respond_to(row, :unconverted_fields)
assert_equal(Array.new, row.unconverted_fields)
end
-
- with_diffrent_ofs
end
diff --git a/test/csv/test_encodings.rb b/test/csv/test_encodings.rb
index 46e9929..c40faa3 100755
--- a/test/csv/test_encodings.rb
+++ b/test/csv/test_encodings.rb
@@ -11,6 +11,7 @@ require_relative "base"
class TestCSV::Encodings < TestCSV
def setup
+ super
require 'tempfile'
@temp_csv_file = Tempfile.new(%w"test_csv. .csv")
@temp_csv_path = @temp_csv_file.path
@@ -19,6 +20,7 @@ class TestCSV::Encodings < TestCSV
def teardown
@temp_csv_file.close!
+ super
end
########################################
@@ -306,6 +308,4 @@ class TestCSV::Encodings < TestCSV
yield encoding
end
end
-
- with_diffrent_ofs
end
diff --git a/test/csv/test_features.rb b/test/csv/test_features.rb
index 4141f39..747c6a1 100755
--- a/test/csv/test_features.rb
+++ b/test/csv/test_features.rb
@@ -31,6 +31,7 @@ class TestCSV::Features < TestCSV
[%Q{"\r\n,",}, ["\r\n,", nil]] ]
def setup
+ super
@sample_data = <<-END_DATA.gsub(/^ +/, "")
line,1,abc
line,2,"def\nghi"
@@ -263,6 +264,4 @@ class TestCSV::Features < TestCSV
assert(CSV::VERSION.frozen?)
assert_match(/\A\d\.\d\.\d\Z/, CSV::VERSION)
end
-
- with_diffrent_ofs
end
diff --git a/test/csv/test_headers.rb b/test/csv/test_headers.rb
index ef955fb..f6608fc 100755
--- a/test/csv/test_headers.rb
+++ b/test/csv/test_headers.rb
@@ -11,6 +11,7 @@ require_relative "base"
class TestCSV::Headers < TestCSV
def setup
+ super
@data = <<-END_CSV.gsub(/^\s+/, "")
first,second,third
A,B,C
@@ -283,6 +284,4 @@ class TestCSV::Headers < TestCSV
assert_instance_of(CSV::Row, row)
end
end
-
- with_diffrent_ofs
end
diff --git a/test/csv/test_interface.rb b/test/csv/test_interface.rb
index 8bcd134..7a56f0f 100755
--- a/test/csv/test_interface.rb
+++ b/test/csv/test_interface.rb
@@ -11,6 +11,7 @@ require_relative "base"
class TestCSV::Interface < TestCSV
def setup
+ super
@path = File.join(File.dirname(__FILE__), "temp_test_data.csv")
File.open(@path, "wb") do |file|
@@ -23,6 +24,7 @@ class TestCSV::Interface < TestCSV
def teardown
File.unlink(@path)
+ super
end
### Test Read Interface ###
@@ -304,6 +306,4 @@ class TestCSV::Interface < TestCSV
assert_equal(STDOUT, CSV.instance.instance_eval { @io })
assert_equal(STDOUT, CSV { |new_csv| new_csv.instance_eval { @io } })
end
-
- with_diffrent_ofs
end
diff --git a/test/csv/test_row.rb b/test/csv/test_row.rb
index b2d94fa..af2a7dc 100755
--- a/test/csv/test_row.rb
+++ b/test/csv/test_row.rb
@@ -11,6 +11,7 @@ require_relative "base"
class TestCSV::Row < TestCSV
def setup
+ super
@row = CSV::Row.new(%w{A B C A A}, [1, 2, 3, 4])
end
@@ -307,6 +308,4 @@ class TestCSV::Row < TestCSV
"Header field pair not found." )
end
end
-
- with_diffrent_ofs
end
diff --git a/test/csv/test_serialization.rb b/test/csv/test_serialization.rb
index 989a7e9..7878a7e 100755
--- a/test/csv/test_serialization.rb
+++ b/test/csv/test_serialization.rb
@@ -151,6 +151,4 @@ class TestCSV::Serialization < TestCSV
obj = {1 => "simple", test: Hash}
assert_equal(obj, CSV.load(CSV.dump([obj])).first)
end
-
- with_diffrent_ofs
end
diff --git a/test/csv/test_table.rb b/test/csv/test_table.rb
index 0bca919..18e9e77 100755
--- a/test/csv/test_table.rb
+++ b/test/csv/test_table.rb
@@ -11,6 +11,7 @@ require_relative "base"
class TestCSV::Table < TestCSV
def setup
+ super
@rows = [ CSV::Row.new(%w{A B C}, [1, 2, 3]),
CSV::Row.new(%w{A B C}, [4, 5, 6]),
CSV::Row.new(%w{A B C}, [7, 8, 9]) ]
@@ -414,6 +415,4 @@ class TestCSV::Table < TestCSV
@table.inspect.encoding ),
"inspect() was not ASCII compatible." )
end
-
- with_diffrent_ofs
end