summaryrefslogtreecommitdiff
path: root/test/date
diff options
context:
space:
mode:
authortadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-08 08:18:10 +0000
committertadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-08 08:18:10 +0000
commit847b46145229b083b8c7a09ef0f15b5fc1b32fd5 (patch)
treeedbcff0a6866665e0b404b3d3d740a8b89608d83 /test/date
parentd54240d35e0ca6d090cbf325ee6d098b2cfd5af9 (diff)
* test/date/*.rb: use skip /w messages.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31478 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/date')
-rw-r--r--test/date/test_date_attr.rb2
-rw-r--r--test/date/test_date_base.rb44
-rw-r--r--test/date/test_date_new.rb4
-rw-r--r--test/date/test_date_strftime.rb2
4 files changed, 26 insertions, 26 deletions
diff --git a/test/date/test_date_attr.rb b/test/date/test_date_attr.rb
index 88a54d7461..160571f9cb 100644
--- a/test/date/test_date_attr.rb
+++ b/test/date/test_date_attr.rb
@@ -96,7 +96,7 @@ class TestDateAttr < Test::Unit::TestCase
end
def test_nth_kday
- skip unless Date.new.respond_to?(:nth_kday?, true)
+ skip 'not provided'unless Date.new.respond_to?(:nth_kday?, true)
assert_equal(false, Date.new(2001,1,14).__send__(:nth_kday?, 1,0))
assert_equal(true, Date.new(2001,1,14).__send__(:nth_kday?, 2,0))
assert_equal(false, Date.new(2001,1,14).__send__(:nth_kday?, 3,0))
diff --git a/test/date/test_date_base.rb b/test/date/test_date_base.rb
index 382da41b36..5dc6bc7bfb 100644
--- a/test/date/test_date_base.rb
+++ b/test/date/test_date_base.rb
@@ -53,7 +53,7 @@ class TestDateBase < Test::Unit::TestCase
end
def test_ordinal__julian
- return unless defined?(Calendar)
+ skip 'not provided'unless defined?(Calendar)
for j in @from..@to
m, d, y = julian_from_absolute(absolute_from_julian_day_number(j))
j0 = julian_day_number_from_absolute(absolute_from_julian(12, 31, y - 1))
@@ -68,7 +68,7 @@ class TestDateBase < Test::Unit::TestCase
end
def test_ordinal__gregorian
- return unless defined?(Calendar)
+ skip 'not provided'unless defined?(Calendar)
for j in @from..@to
m, d, y = gregorian_from_absolute(absolute_from_julian_day_number(j))
j0 =
@@ -84,7 +84,7 @@ class TestDateBase < Test::Unit::TestCase
end
def test_civil__julian
- return unless defined?(Calendar)
+ skip 'not provided'unless defined?(Calendar)
for j in @from..@to
m, d, y = julian_from_absolute(absolute_from_julian_day_number(j))
j2 = julian_day_number_from_absolute(absolute_from_julian(m, d, y))
@@ -99,7 +99,7 @@ class TestDateBase < Test::Unit::TestCase
end
def test_civil__gregorian
- return unless defined?(Calendar)
+ skip 'not provided'unless defined?(Calendar)
for j in @from..@to
m, d, y = gregorian_from_absolute(absolute_from_julian_day_number(j))
j2 = julian_day_number_from_absolute(absolute_from_gregorian(m, d, y))
@@ -114,7 +114,7 @@ class TestDateBase < Test::Unit::TestCase
end
def test_commercial__gregorian
- return unless defined?(Calendar)
+ skip 'not provided'unless defined?(Calendar)
for j in @from..@to
w, d, y = iso_from_absolute(absolute_from_julian_day_number(j))
j2 = julian_day_number_from_absolute(absolute_from_iso(w, d, y))
@@ -129,7 +129,7 @@ class TestDateBase < Test::Unit::TestCase
end
def test_weeknum
- return unless defined?(Calendar)
+ skip 'not provided'unless defined?(Calendar)
for j in @from..@to
for k in 0..1
wy, ww, wd = Date.__send__(:jd_to_weeknum, j, k, Date::GREGORIAN)
@@ -140,7 +140,7 @@ class TestDateBase < Test::Unit::TestCase
end
def test_weeknum__2
- return unless defined?(Calendar)
+ skip 'not provided'unless defined?(Calendar)
for j in @from4t..@to4t
d = Date.jd(j)
t = Time.mktime(d.year, d.mon, d.mday)
@@ -158,8 +158,8 @@ class TestDateBase < Test::Unit::TestCase
end
def test_nth_kday
- return unless defined?(Calendar)
- return unless (Date.respond_to?(:nth_kday_to_jd, true) &&
+ skip 'not provided'unless defined?(Calendar)
+ skip 'not provided'unless (Date.respond_to?(:nth_kday_to_jd, true) &&
Date.respond_to?(:jd_to_nth_kday, true))
for y in 1601..2401
for m in 1..12
@@ -221,7 +221,7 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_jd
valid_jd_p = :_valid_jd?
- return unless Date.respond_to?(valid_jd_p, true)
+ skip 'not provided'unless Date.respond_to?(valid_jd_p, true)
assert_equal(-1, Date.__send__(valid_jd_p, -1))
assert_equal(0, Date.__send__(valid_jd_p, 0))
assert_equal(1, Date.__send__(valid_jd_p, 1))
@@ -230,7 +230,7 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_ordinal
valid_ordinal_p = :_valid_ordinal?
- return unless Date.respond_to?(valid_ordinal_p, true)
+ skip 'not provided'unless Date.respond_to?(valid_ordinal_p, true)
assert_nil(Date.__send__(valid_ordinal_p, 1999,366))
assert_equal(2451910, Date.__send__(valid_ordinal_p, 2000,366))
assert_nil(Date.__send__(valid_ordinal_p, 1999,-366))
@@ -245,7 +245,7 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_ordinal__edge
valid_ordinal_p = :_valid_ordinal?
- return unless Date.respond_to?(valid_ordinal_p, true)
+ skip 'not provided'unless Date.respond_to?(valid_ordinal_p, true)
(1601..2400).each do |y|
d = if Date.leap?(y) then 366 else 365 end
assert_not_nil(Date.__send__(valid_ordinal_p, y,d))
@@ -271,7 +271,7 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_ordinal__italy
valid_ordinal_p = :_valid_ordinal?
- return unless Date.respond_to?(valid_ordinal_p, true)
+ skip 'not provided'unless Date.respond_to?(valid_ordinal_p, true)
(1..355).each do |d|
assert_not_nil(Date.__send__(valid_ordinal_p, 1582,d,Date::ITALY))
end
@@ -288,7 +288,7 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_ordinal__england
valid_ordinal_p = :_valid_ordinal?
- return unless Date.respond_to?(valid_ordinal_p, true)
+ skip 'not provided'unless Date.respond_to?(valid_ordinal_p, true)
(1..355).each do |d|
assert_not_nil(Date.__send__(valid_ordinal_p, 1752,d,Date::ENGLAND))
end
@@ -299,7 +299,7 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_civil
valid_civil_p = :_valid_civil?
- return unless Date.respond_to?(valid_civil_p, true)
+ skip 'not provided'unless Date.respond_to?(valid_civil_p, true)
assert_nil(Date.__send__(valid_civil_p, 1999,2,29))
assert_equal(2451604, Date.__send__(valid_civil_p, 2000,2,29))
assert_nil(Date.__send__(valid_civil_p, 1999,2,-29))
@@ -315,7 +315,7 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_civil__edge
valid_civil_p = :_valid_civil?
- return unless Date.respond_to?(valid_civil_p, true)
+ skip 'not provided'unless Date.respond_to?(valid_civil_p, true)
(1601..2400).each do |y|
d = if Date.leap?(y) then 29 else 28 end
assert_not_nil(Date.__send__(valid_civil_p, y,2,d))
@@ -334,7 +334,7 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_civil__italy
valid_civil_p = :_valid_civil?
- return unless Date.respond_to?(valid_civil_p, true)
+ skip 'not provided'unless Date.respond_to?(valid_civil_p, true)
(1..4).each do |d|
assert_not_nil(Date.__send__(valid_civil_p, 1582,10,d,Date::ITALY))
end
@@ -363,7 +363,7 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_civil__england
valid_civil_p = :_valid_civil?
- return unless Date.respond_to?(valid_civil_p, true)
+ skip 'not provided'unless Date.respond_to?(valid_civil_p, true)
(1..2).each do |d|
assert_not_nil(Date.__send__(valid_civil_p, 1752,9,d,Date::ENGLAND))
end
@@ -386,7 +386,7 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_commercial
valid_commercial_p = :_valid_commercial?
- return unless Date.respond_to?(valid_commercial_p, true)
+ skip 'not provided'unless Date.respond_to?(valid_commercial_p, true)
assert_nil(Date.__send__(valid_commercial_p, 1999,53,1))
assert_equal(2453367, Date.__send__(valid_commercial_p, 2004,53,1))
assert_nil(Date.__send__(valid_commercial_p, 1999,-53,-1))
@@ -396,7 +396,7 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_weeknum
valid_weeknum_p = :_valid_weeknum?
- return unless Date.respond_to?(valid_weeknum_p, true)
+ skip 'not provided'unless Date.respond_to?(valid_weeknum_p, true)
assert_nil(Date.__send__(valid_weeknum_p, 1999,53,0, 0))
assert_equal(2454101, Date.__send__(valid_weeknum_p, 2006,53,0, 0))
assert_nil(Date.__send__(valid_weeknum_p, 1999,-53,-1, 0))
@@ -411,7 +411,7 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_nth_kday
valid_nth_kday_p = :_valid_nth_kday?
- return unless Date.respond_to?(valid_nth_kday_p, true)
+ skip 'not provided'unless Date.respond_to?(valid_nth_kday_p, true)
assert_nil(Date.__send__(valid_nth_kday_p, 1992,2, 5,0))
assert_equal(2448682, Date.__send__(valid_nth_kday_p, 1992,2, 5,6))
assert_equal(2448682, Date.__send__(valid_nth_kday_p, 1992,2, 5,-1))
@@ -421,7 +421,7 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_time
valid_time_p = :_valid_time?
- return unless Date.respond_to?(valid_time_p, true)
+ skip 'not provided'unless Date.respond_to?(valid_time_p, true)
assert_equal(Rational(0), DateTime.__send__(valid_time_p, 0,0,0))
assert_nil(DateTime.__send__(valid_time_p, 25,59,59))
assert_nil(DateTime.__send__(valid_time_p, 23,60,59))
diff --git a/test/date/test_date_new.rb b/test/date/test_date_new.rb
index da63c2248e..26fdd39544 100644
--- a/test/date/test_date_new.rb
+++ b/test/date/test_date_new.rb
@@ -211,7 +211,7 @@ class TestDateNew < Test::Unit::TestCase
end
def test_weeknum
- skip unless Date.respond_to?(:weeknum, true)
+ skip 'not provided'unless Date.respond_to?(:weeknum, true)
d = Date.__send__(:weeknum)
dt = DateTime.__send__(:weeknum)
assert_equal([-4712, 1, 1], [d.year, d.mon, d.mday])
@@ -234,7 +234,7 @@ class TestDateNew < Test::Unit::TestCase
end
def test_nth_kday
- skip unless Date.respond_to?(:nth_kday, true)
+ skip 'not provided'unless Date.respond_to?(:nth_kday, true)
d = Date.__send__(:nth_kday)
dt = DateTime.__send__(:nth_kday)
assert_equal([-4712, 1, 1], [d.year, d.mon, d.mday])
diff --git a/test/date/test_date_strftime.rb b/test/date/test_date_strftime.rb
index c56ad6fe5a..c4ac2de0db 100644
--- a/test/date/test_date_strftime.rb
+++ b/test/date/test_date_strftime.rb
@@ -124,7 +124,7 @@ class TestDateStrftime < Test::Unit::TestCase
def test_strftime__3_2
s = Time.now.strftime('%G')
- skip if s.empty? || s == '%G'
+ skip 'not provided'if s.empty? || s == '%G'
(Date.new(1970,1,1)..Date.new(2037,12,31)).each do |d|
t = Time.utc(d.year,d.mon,d.mday)
assert_equal(t.strftime('%G'), d.strftime('%G'))