nobu	2012-02-22 18:34:59 +0900 (Wed, 22 Feb 2012)

  New Revision: 34739

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

  Log:
    * test/date, test/rdoc: exclude tests dependent on unbundled libraries.

  Modified files:
    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_switch_hitter.rb
    trunk/test/rdoc/test_rdoc_rubygems_hook.rb

Index: test/rdoc/test_rdoc_rubygems_hook.rb
===================================================================
--- test/rdoc/test_rdoc_rubygems_hook.rb	(revision 34738)
+++ test/rdoc/test_rdoc_rubygems_hook.rb	(revision 34739)
@@ -6,8 +6,6 @@
 
   def setup
     super
-    skip 'requires RubyGems 1.9+' unless
-      Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.9')
 
     @a = quick_spec 'a'
 
@@ -197,5 +195,5 @@
     FileUtils.chmod 0755, @a.doc_dir
   end
 
-end
+end if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.9')
 
Index: test/date/test_switch_hitter.rb
===================================================================
--- test/date/test_switch_hitter.rb	(revision 34738)
+++ test/date/test_switch_hitter.rb	(revision 34739)
@@ -570,8 +570,7 @@
   end
 
   def test_base
-    skip unless defined?(Date.test_all)
     assert_equal(true, Date.test_all)
-  end
+  end if defined?(Date.test_all)
 
 end
Index: test/date/test_date_new.rb
===================================================================
--- test/date/test_date_new.rb	(revision 34738)
+++ test/date/test_date_new.rb	(revision 34739)
@@ -202,7 +202,6 @@
   end
 
   def test_weeknum
-    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])
@@ -222,10 +221,9 @@
     assert_raise(ArgumentError) do
       Date.__send__(:weeknum, 1999,-53,-1, 0)
     end
-  end
+  end if Date.respond_to?(:weeknum, true)
 
   def test_nth_kday
-    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])
@@ -245,7 +243,7 @@
     assert_raise(ArgumentError) do
       Date.__send__(:nth_kday, 2006,5, -5,0)
     end
-  end
+  end if Date.respond_to?(:nth_kday, true)
 
   def test_today
     z = Time.now
Index: test/date/test_date_attr.rb
===================================================================
--- test/date/test_date_attr.rb	(revision 34738)
+++ test/date/test_date_attr.rb	(revision 34739)
@@ -96,7 +96,6 @@
   end
 
   def test_nth_kday
-    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))
@@ -107,6 +106,6 @@
     assert_equal(true, Date.new(2001,1,14).__send__(:nth_kday?, -3,0))
     assert_equal(false, Date.new(2001,1,14).__send__(:nth_kday?, -4,0))
     assert_equal(false, Date.new(2001,1,14).__send__(:nth_kday?, -5,0))
-  end
+  end if Date.new.respond_to?(:nth_kday?, true)
 
 end
Index: test/date/test_date_base.rb
===================================================================
--- test/date/test_date_base.rb	(revision 34738)
+++ test/date/test_date_base.rb	(revision 34739)
@@ -53,7 +53,6 @@
   end
 
   def test_ordinal__julian
-    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 +67,6 @@
   end
 
   def test_ordinal__gregorian
-    skip unless defined?(Calendar)
     for j in @from..@to
       m, d, y = gregorian_from_absolute(absolute_from_julian_day_number(j))
       j0 =
@@ -84,7 +82,6 @@
   end
 
   def test_civil__julian
-    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 +96,6 @@
   end
 
   def test_civil__gregorian
-    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 +110,6 @@
   end
 
   def test_commercial__gregorian
-    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 +124,6 @@
   end
 
   def test_weeknum
-    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 +134,6 @@
   end
 
   def test_weeknum__2
-    skip unless defined?(Calendar)
     for j in @from4t..@to4t
       d = Date.jd(j)
       t = Time.mktime(d.year, d.mon, d.mday)
@@ -158,7 +151,6 @@
   end
 
   def test_nth_kday
-    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
@@ -439,4 +431,4 @@
     assert_nil(DateTime.__send__(valid_time_p, 24,1,1))
   end
 
-end
+end if defined?(Calendar)

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