[前][次][番号順一覧][スレッド一覧]

ruby-changes:19449

From: tadf <ko1@a...>
Date: Sun, 8 May 2011 22:18:57 +0900 (JST)
Subject: [ruby-changes:19449] Ruby:r31489 (trunk): * test/ruby/test_{complex2,complexrational}.rb: use skip.

tadf	2011-05-08 22:18:47 +0900 (Sun, 08 May 2011)

  New Revision: 31489

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31489

  Log:
    * test/ruby/test_{complex2,complexrational}.rb: use skip.
    * test/date/*.rb: ditto.

  Modified files:
    trunk/ChangeLog
    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
    trunk/test/ruby/test_complex2.rb
    trunk/test/ruby/test_complexrational.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31488)
+++ ChangeLog	(revision 31489)
@@ -1,3 +1,8 @@
+Sun May  8 22:17:24 2011  Tadayoshi Funaba  <tadf@d...>
+
+	* test/ruby/test_{complex2,complexrational}.rb: use skip.
+	* test/date/*.rb: ditto.
+
 Sun May  8 21:02:31 2011  Tadayoshi Funaba  <tadf@d...>
 
 	* test/ruby/test_{complex2,complexrational}.rb: NEVER SKIP.
Index: test/ruby/test_complex2.rb
===================================================================
--- test/ruby/test_complex2.rb	(revision 31488)
+++ test/ruby/test_complex2.rb	(revision 31489)
@@ -3,8 +3,7 @@
 class Complex_Test2 < Test::Unit::TestCase
 
   def test_kumi
-    return
-#    skip unless defined?(Rational)
+    skip unless defined?(Rational)
 
     assert_equal(Complex(1, 0), +Complex(1, 0))
     assert_equal(Complex(-1, 0), -Complex(1, 0))
Index: test/ruby/test_complexrational.rb
===================================================================
--- test/ruby/test_complexrational.rb	(revision 31488)
+++ test/ruby/test_complexrational.rb	(revision 31489)
@@ -3,8 +3,7 @@
 class ComplexRational_Test < Test::Unit::TestCase
 
   def test_rat_srat
-    return
-#    skip unless defined?(Rational)
+    skip unless defined?(Rational)
 
     c = SimpleRat(1,3)
     cc = Rational(3,2)
Index: test/date/test_date_new.rb
===================================================================
--- test/date/test_date_new.rb	(revision 31488)
+++ test/date/test_date_new.rb	(revision 31489)
@@ -211,8 +211,7 @@
   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 @@
   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])
Index: test/date/test_date_attr.rb
===================================================================
--- test/date/test_date_attr.rb	(revision 31488)
+++ test/date/test_date_attr.rb	(revision 31489)
@@ -96,8 +96,7 @@
   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))
Index: test/date/test_date_base.rb
===================================================================
--- test/date/test_date_base.rb	(revision 31488)
+++ test/date/test_date_base.rb	(revision 31489)
@@ -53,8 +53,7 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   # -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 @@
   # 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 @@
   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 @@
   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 @@
   # 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 @@
   # 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 @@
   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 @@
   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 @@
   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 @@
   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))
Index: test/date/test_date_strftime.rb
===================================================================
--- test/date/test_date_strftime.rb	(revision 31488)
+++ test/date/test_date_strftime.rb	(revision 31489)
@@ -123,9 +123,8 @@
   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'))

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]