aboutsummaryrefslogtreecommitdiffstats
path: root/test/date
diff options
context:
space:
mode:
Diffstat (limited to 'test/date')
-rw-r--r--test/date/test_date_parse.rb3
-rw-r--r--test/date/test_switch_hitter.rb29
2 files changed, 1 insertions, 31 deletions
diff --git a/test/date/test_date_parse.rb b/test/date/test_date_parse.rb
index dda952b8ce..26c61eb3d5 100644
--- a/test/date/test_date_parse.rb
+++ b/test/date/test_date_parse.rb
@@ -421,10 +421,9 @@ class TestDateParse < Test::Unit::TestCase
l = format('<failed at line %d>', l)
assert_equal(y, a, l)
if y[6]
- h = Date._parse(x[0].dup.taint, *x[1..-1])
+ h = Date._parse(x[0].dup, *x[1..-1])
assert_equal(y[6], h[:zone], l)
assert_equal(y[6].encoding, h[:zone].encoding, l)
- assert_predicate(h[:zone], :tainted?, l)
end
end
end
diff --git a/test/date/test_switch_hitter.rb b/test/date/test_switch_hitter.rb
index 6c587d805b..bdf299e030 100644
--- a/test/date/test_switch_hitter.rb
+++ b/test/date/test_switch_hitter.rb
@@ -568,35 +568,6 @@ class TestSH < Test::Unit::TestCase
assert_equal(Date::GREGORIAN, d.start)
end
- def test_taint
- h = Date._strptime('15:43+09:00', '%R%z')
- assert_equal(false, h[:zone].tainted?)
- h = Date._strptime('15:43+09:00'.dup.taint, '%R%z')
- assert_equal(true, h[:zone].tainted?)
-
- h = Date._strptime('1;1/0', '%d')
- assert_equal(false, h[:leftover].tainted?)
- h = Date._strptime('1;1/0'.dup.taint, '%d')
- assert_equal(true, h[:leftover].tainted?)
-
- h = Date._parse('15:43+09:00')
- assert_equal(false, h[:zone].tainted?)
- h = Date._parse('15:43+09:00'.dup.taint)
- assert_equal(true, h[:zone].tainted?)
-
- s = Date.today.strftime('new 105')
- assert_equal(false, s.tainted?)
- s = Date.today.strftime('new 105'.dup.taint)
- assert_equal(true, s.tainted?)
- s = Date.today.strftime("new \000 105".dup.taint)
- assert_equal(true, s.tainted?)
-
- s = DateTime.now.strftime('super $record')
- assert_equal(false, s.tainted?)
- s = DateTime.now.strftime('super $record'.dup.taint)
- assert_equal(true, s.tainted?)
- end
-
def test_enc
Date::MONTHNAMES.each do |s|
assert_equal(Encoding::US_ASCII, s.encoding) if s