summaryrefslogtreecommitdiff
path: root/test/csv
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-25 13:04:43 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-25 13:04:43 +0000
commit36feefecb9db8f66dd228d4cfb3e185679dbdf0d (patch)
tree309cd5f58ed9f3ac002c4b0de5e60e860b28e26d /test/csv
parentc9958d6ab46bb5562dbb67fad116b176a0fba9fc (diff)
* test/csv/test_data_converters.rb, test/csv/test_table.rb: don't
not call setup within tests. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30366 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/csv')
-rwxr-xr-xtest/csv/test_data_converters.rb17
-rwxr-xr-xtest/csv/test_table.rb13
2 files changed, 17 insertions, 13 deletions
diff --git a/test/csv/test_data_converters.rb b/test/csv/test_data_converters.rb
index 06653f5..fcd03dc 100755
--- a/test/csv/test_data_converters.rb
+++ b/test/csv/test_data_converters.rb
@@ -63,24 +63,25 @@ class TestCSV::DataConverters < TestCSV
assert_instance_of(String, CSV::Converters[:date_time]["junk"])
end
- def test_convert_with_builtin
+ def test_convert_with_builtin_integer
# setup parser...
assert(@parser.respond_to?(:convert))
assert_nothing_raised(Exception) { @parser.convert(:integer) }
# and use
assert_equal(["Numbers", ":integer", 1, ":float", "3.015"], @parser.shift)
+ end
- setup # reset
-
+ def test_convert_with_builtin_float
# setup parser...
+ assert(@parser.respond_to?(:convert))
assert_nothing_raised(Exception) { @parser.convert(:float) }
# and use
assert_equal(["Numbers", ":integer", 1.0, ":float", 3.015], @parser.shift)
end
- def test_convert_order
+ def test_convert_order_float_integer
# floats first, then integers...
assert_nothing_raised(Exception) do
@parser.convert(:float)
@@ -90,9 +91,9 @@ class TestCSV::DataConverters < TestCSV
# gets us nothing but floats
assert_equal( [String, String, Float, String, Float],
@parser.shift.map { |field| field.class } )
+ end
- setup # reset
-
+ def test_convert_order_integer_float
# integers have precendance...
assert_nothing_raised(Exception) do
@parser.convert(:integer)
@@ -132,9 +133,9 @@ class TestCSV::DataConverters < TestCSV
# and use
assert_equal(["Numbers", :integer, "1", :float, "3.015"], @parser.shift)
+ end
- setup # reset
-
+ def test_convert_with_custom_code_mix
# mix built-in and custom...
assert_nothing_raised(Exception) { @parser.convert(:numeric) }
assert_nothing_raised(Exception) { @parser.convert(&@custom) }
diff --git a/test/csv/test_table.rb b/test/csv/test_table.rb
index 67e5b54..0bca919 100755
--- a/test/csv/test_table.rb
+++ b/test/csv/test_table.rb
@@ -270,7 +270,7 @@ class TestCSV::Table < TestCSV
assert_equal(CSV::Row.new(%w[A B C], [13, 14, 15]), @table[-1])
end
- def test_delete
+ def test_delete_mixed
##################
### Mixed Mode ###
##################
@@ -286,11 +286,12 @@ class TestCSV::Table < TestCSV
2,3
8,9
END_RESULT
+ end
+ def test_delete_column
###################
### Column Mode ###
###################
- setup
@table.by_col!
assert_equal(@rows.map { |row| row[0] }, @table.delete(0))
@@ -303,11 +304,12 @@ class TestCSV::Table < TestCSV
5
8
END_RESULT
+ end
+ def test_delete_row
################
### Row Mode ###
################
- setup
@table.by_row!
assert_equal(@rows[1], @table.delete(1))
@@ -327,7 +329,7 @@ class TestCSV::Table < TestCSV
assert_equal(["ra2", nil, "rb2"], table.delete("col2"))
end
- def test_delete_if
+ def test_delete_if_row
######################
### Mixed/Row Mode ###
######################
@@ -339,11 +341,12 @@ class TestCSV::Table < TestCSV
A,B,C
4,5,6
END_RESULT
+ end
+ def test_delete_if_column
###################
### Column Mode ###
###################
- setup
@table.by_col!
assert_equal(@table, @table.delete_if { |h, v| h > "A" })