From 10c4a861ebcbf0190beaca91c015126b851e5023 Mon Sep 17 00:00:00 2001 From: tadf Date: Sun, 8 May 2011 13:18:47 +0000 Subject: * test/ruby/test_{complex2,complexrational}.rb: use skip. * test/date/*.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31489 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/date/test_date_attr.rb | 3 +- test/date/test_date_base.rb | 67 ++++++++++++++--------------------------- test/date/test_date_new.rb | 6 ++-- test/date/test_date_strftime.rb | 3 +- 4 files changed, 27 insertions(+), 52 deletions(-) (limited to 'test/date') diff --git a/test/date/test_date_attr.rb b/test/date/test_date_attr.rb index 607ba67a2d..88a54d7461 100644 --- a/test/date/test_date_attr.rb +++ b/test/date/test_date_attr.rb @@ -96,8 +96,7 @@ class TestDateAttr < Test::Unit::TestCase end def test_nth_kday - return -# skip unless Date.new.respond_to?(:nth_kday?, true) + skip 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 cc08068017..9f76bac8a3 100644 --- a/test/date/test_date_base.rb +++ b/test/date/test_date_base.rb @@ -53,8 +53,7 @@ class TestDateBase < Test::Unit::TestCase end def test_ordinal__julian - return -# skip unless defined?(Calendar) + skip 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)) @@ -69,8 +68,7 @@ class TestDateBase < Test::Unit::TestCase end def test_ordinal__gregorian - return -# skip unless defined?(Calendar) + skip unless defined?(Calendar) for j in @from..@to m, d, y = gregorian_from_absolute(absolute_from_julian_day_number(j)) j0 = @@ -86,8 +84,7 @@ class TestDateBase < Test::Unit::TestCase end def test_civil__julian - return -# skip unless defined?(Calendar) + skip 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)) @@ -102,8 +99,7 @@ class TestDateBase < Test::Unit::TestCase end def test_civil__gregorian - return -# skip unless defined?(Calendar) + skip 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)) @@ -118,8 +114,7 @@ class TestDateBase < Test::Unit::TestCase end def test_commercial__gregorian - return -# skip unless defined?(Calendar) + skip 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)) @@ -134,8 +129,7 @@ class TestDateBase < Test::Unit::TestCase end def test_weeknum - return -# skip unless defined?(Calendar) + skip 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) @@ -146,8 +140,7 @@ class TestDateBase < Test::Unit::TestCase end def test_weeknum__2 - return -# skip unless defined?(Calendar) + skip unless defined?(Calendar) for j in @from4t..@to4t d = Date.jd(j) t = Time.mktime(d.year, d.mon, d.mday) @@ -165,10 +158,9 @@ class TestDateBase < Test::Unit::TestCase end def test_nth_kday - return -# skip unless defined?(Calendar) -# skip unless (Date.respond_to?(:nth_kday_to_jd, true) && -# Date.respond_to?(:jd_to_nth_kday, true)) + skip unless defined?(Calendar) + skip 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 for n in -5..5 @@ -228,9 +220,8 @@ class TestDateBase < Test::Unit::TestCase end def test_valid_jd - return valid_jd_p = :_valid_jd? -# skip unless Date.respond_to?(valid_jd_p, true) + skip 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)) @@ -238,9 +229,8 @@ class TestDateBase < Test::Unit::TestCase end def test_valid_ordinal - return valid_ordinal_p = :_valid_ordinal? -# skip unless Date.respond_to?(valid_ordinal_p, true) + skip 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)) @@ -254,9 +244,8 @@ class TestDateBase < Test::Unit::TestCase end def test_valid_ordinal__edge - return valid_ordinal_p = :_valid_ordinal? -# skip unless Date.respond_to?(valid_ordinal_p, true) + skip 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)) @@ -281,9 +270,8 @@ class TestDateBase < Test::Unit::TestCase # -62 def test_valid_ordinal__italy - return valid_ordinal_p = :_valid_ordinal? -# skip unless Date.respond_to?(valid_ordinal_p, true) + skip 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 @@ -299,9 +287,8 @@ class TestDateBase < Test::Unit::TestCase # 268 269 270 271 272 273 274 def test_valid_ordinal__england - return valid_ordinal_p = :_valid_ordinal? -# skip unless Date.respond_to?(valid_ordinal_p, true) + skip 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 @@ -311,9 +298,8 @@ class TestDateBase < Test::Unit::TestCase end def test_valid_civil - return valid_civil_p = :_valid_civil? -# skip unless Date.respond_to?(valid_civil_p, true) + skip 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)) @@ -328,9 +314,8 @@ class TestDateBase < Test::Unit::TestCase end def test_valid_civil__edge - return valid_civil_p = :_valid_civil? -# skip unless Date.respond_to?(valid_civil_p, true) + skip 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)) @@ -348,9 +333,8 @@ class TestDateBase < Test::Unit::TestCase # 31 def test_valid_civil__italy - return valid_civil_p = :_valid_civil? -# skip unless Date.respond_to?(valid_civil_p, true) + skip 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 @@ -378,9 +362,8 @@ class TestDateBase < Test::Unit::TestCase # 24 25 26 27 28 29 30 def test_valid_civil__england - return valid_civil_p = :_valid_civil? -# skip unless Date.respond_to?(valid_civil_p, true) + skip 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 @@ -402,9 +385,8 @@ class TestDateBase < Test::Unit::TestCase end def test_valid_commercial - return valid_commercial_p = :_valid_commercial? -# skip unless Date.respond_to?(valid_commercial_p, true) + skip 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)) @@ -413,9 +395,8 @@ class TestDateBase < Test::Unit::TestCase end def test_valid_weeknum - return valid_weeknum_p = :_valid_weeknum? -# skip unless Date.respond_to?(valid_weeknum_p, true) + skip 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)) @@ -429,9 +410,8 @@ class TestDateBase < Test::Unit::TestCase end def test_valid_nth_kday - return valid_nth_kday_p = :_valid_nth_kday? -# skip unless Date.respond_to?(valid_nth_kday_p, true) + skip 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)) @@ -440,9 +420,8 @@ class TestDateBase < Test::Unit::TestCase end def test_valid_time - return valid_time_p = :_valid_time? -# skip unless Date.respond_to?(valid_time_p, true) + skip 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 48ac28f83c..da63c2248e 100644 --- a/test/date/test_date_new.rb +++ b/test/date/test_date_new.rb @@ -211,8 +211,7 @@ class TestDateNew < Test::Unit::TestCase end def test_weeknum - return -# skip unless Date.respond_to?(:weeknum, true) + skip 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]) @@ -235,8 +234,7 @@ class TestDateNew < Test::Unit::TestCase end def test_nth_kday - return -# skip unless Date.respond_to?(:nth_kday, true) + skip 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 e4b336fa1d..c56ad6fe5a 100644 --- a/test/date/test_date_strftime.rb +++ b/test/date/test_date_strftime.rb @@ -123,9 +123,8 @@ class TestDateStrftime < Test::Unit::TestCase end def test_strftime__3_2 - return s = Time.now.strftime('%G') -# skip if s.empty? || s == '%G' + skip 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')) -- cgit v1.2.3