ruby-changes:19446
From: tadf <ko1@a...>
Date: Sun, 8 May 2011 20:57:10 +0900 (JST)
Subject: [ruby-changes:19446] Ruby:r31486 (trunk): * test/date/*.rb: NEVER SKIP.
tadf 2011-05-08 20:56:32 +0900 (Sun, 08 May 2011) New Revision: 31486 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31486 Log: * test/date/*.rb: NEVER SKIP. Modified files: trunk/ChangeLog trunk/test/date/test_date.rb trunk/test/date/test_date_attr.rb trunk/test/date/test_date_base.rb trunk/test/date/test_date_new.rb trunk/test/date/test_date_strftime.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 31485) +++ ChangeLog (revision 31486) @@ -1,3 +1,7 @@ +Sun May 8 20:54:11 2011 Tadayoshi Funaba <tadf@d...> + + * test/date/*.rb: NEVER SKIP. + Sun May 8 20:37:33 2011 Tadayoshi Funaba <tadf@d...> * test/date/*.rb: reverted 31432. Index: test/date/test_date_new.rb =================================================================== --- test/date/test_date_new.rb (revision 31485) +++ test/date/test_date_new.rb (revision 31486) @@ -211,7 +211,8 @@ end def test_weeknum - skip unless Date.respond_to?(:weeknum, true) + return +# 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]) @@ -234,7 +235,8 @@ end def test_nth_kday - skip unless Date.respond_to?(:nth_kday, true) + return +# 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]) Index: test/date/test_date_attr.rb =================================================================== --- test/date/test_date_attr.rb (revision 31485) +++ test/date/test_date_attr.rb (revision 31486) @@ -96,7 +96,8 @@ end def test_nth_kday - skip unless Date.new.respond_to?(:nth_kday?, true) + return +# 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)) Index: test/date/test_date_base.rb =================================================================== --- test/date/test_date_base.rb (revision 31485) +++ test/date/test_date_base.rb (revision 31486) @@ -53,7 +53,8 @@ end def test_ordinal__julian - return unless defined?(Calendar) + return +# 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)) @@ -68,7 +69,8 @@ end def test_ordinal__gregorian - return unless defined?(Calendar) + return +# skip unless defined?(Calendar) for j in @from..@to m, d, y = gregorian_from_absolute(absolute_from_julian_day_number(j)) j0 = @@ -84,7 +86,8 @@ end def test_civil__julian - return unless defined?(Calendar) + return +# 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)) @@ -99,7 +102,8 @@ end def test_civil__gregorian - return unless defined?(Calendar) + return +# 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)) @@ -114,7 +118,8 @@ end def test_commercial__gregorian - return unless defined?(Calendar) + return +# 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)) @@ -129,7 +134,8 @@ end def test_weeknum - return unless defined?(Calendar) + return +# 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) @@ -140,7 +146,8 @@ end def test_weeknum__2 - return unless defined?(Calendar) + return +# skip unless defined?(Calendar) for j in @from4t..@to4t d = Date.jd(j) t = Time.mktime(d.year, d.mon, d.mday) @@ -158,8 +165,9 @@ end def test_nth_kday - return unless defined?(Calendar) - return unless (Date.respond_to?(:nth_kday_to_jd, true) && + return +# 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 @@ -220,8 +228,9 @@ end def test_valid_jd + return valid_jd_p = :_valid_jd? - return 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)) @@ -229,8 +238,9 @@ end def test_valid_ordinal + return valid_ordinal_p = :_valid_ordinal? - return 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)) @@ -244,8 +254,9 @@ end def test_valid_ordinal__edge + return valid_ordinal_p = :_valid_ordinal? - return 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)) @@ -270,8 +281,9 @@ # -62 def test_valid_ordinal__italy + return valid_ordinal_p = :_valid_ordinal? - return 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 @@ -287,8 +299,9 @@ # 268 269 270 271 272 273 274 def test_valid_ordinal__england + return valid_ordinal_p = :_valid_ordinal? - return 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 @@ -298,8 +311,9 @@ end def test_valid_civil + return valid_civil_p = :_valid_civil? - return 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)) @@ -314,8 +328,9 @@ end def test_valid_civil__edge + return valid_civil_p = :_valid_civil? - return 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)) @@ -333,8 +348,9 @@ # 31 def test_valid_civil__italy + return valid_civil_p = :_valid_civil? - return 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 @@ -362,8 +378,9 @@ # 24 25 26 27 28 29 30 def test_valid_civil__england + return valid_civil_p = :_valid_civil? - return 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 @@ -385,8 +402,9 @@ end def test_valid_commercial + return valid_commercial_p = :_valid_commercial? - return 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)) @@ -395,8 +413,9 @@ end def test_valid_weeknum + return valid_weeknum_p = :_valid_weeknum? - return 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)) @@ -410,8 +429,9 @@ end def test_valid_nth_kday + return valid_nth_kday_p = :_valid_nth_kday? - return 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)) @@ -420,8 +440,9 @@ end def test_valid_time + return valid_time_p = :_valid_time? - return 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)) Index: test/date/test_date_strftime.rb =================================================================== --- test/date/test_date_strftime.rb (revision 31485) +++ test/date/test_date_strftime.rb (revision 31486) @@ -123,8 +123,9 @@ 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')) Index: test/date/test_date.rb =================================================================== --- test/date/test_date.rb (revision 31485) +++ test/date/test_date.rb (revision 31486) @@ -113,27 +113,6 @@ assert_equal(d2, dt2) end - def test_coerce - bug4375 = '[ruby-core:35127]' - d = Date.jd(0) - d2 = Date.jd(1) - others = [1, d2, Date::Infinity.new, nil, Object.new] - assert_nothing_raised(bug4375) { - others.each do |o| - case o - when d - flunk("expected not to match") - end - end - } - assert_nothing_raised(bug4375) { - case d - when *others - flunk("expected not to match") - end - } - end - def test_hash h = {} h[Date.new(1999,5,23)] = 0 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/