From b67bc8d722e9351b34e68ac77d397aead29961cc Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 22 Feb 2012 09:34:59 +0000 Subject: * test/date, test/rdoc: exclude tests dependent on unbundled libraries. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34739 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/date/test_date_attr.rb | 3 +-- test/date/test_date_base.rb | 10 +--------- test/date/test_date_new.rb | 6 ++---- test/date/test_switch_hitter.rb | 3 +-- test/rdoc/test_rdoc_rubygems_hook.rb | 4 +--- 5 files changed, 6 insertions(+), 20 deletions(-) diff --git a/test/date/test_date_attr.rb b/test/date/test_date_attr.rb index 88a54d7461..2f0246296d 100644 --- a/test/date/test_date_attr.rb +++ b/test/date/test_date_attr.rb @@ -96,7 +96,6 @@ class TestDateAttr < Test::Unit::TestCase 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 @@ class TestDateAttr < Test::Unit::TestCase 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 diff --git a/test/date/test_date_base.rb b/test/date/test_date_base.rb index 1f3d8c0a55..81be8907ea 100644 --- a/test/date/test_date_base.rb +++ b/test/date/test_date_base.rb @@ -53,7 +53,6 @@ class TestDateBase < Test::Unit::TestCase 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 @@ class TestDateBase < Test::Unit::TestCase 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 @@ class TestDateBase < Test::Unit::TestCase 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 @@ class TestDateBase < Test::Unit::TestCase 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 @@ class TestDateBase < Test::Unit::TestCase 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 @@ class TestDateBase < Test::Unit::TestCase 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 @@ class TestDateBase < Test::Unit::TestCase 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 @@ class TestDateBase < Test::Unit::TestCase 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 @@ class TestDateBase < Test::Unit::TestCase assert_nil(DateTime.__send__(valid_time_p, 24,1,1)) end -end +end if defined?(Calendar) diff --git a/test/date/test_date_new.rb b/test/date/test_date_new.rb index 0bbbfee44b..c46cb4664b 100644 --- a/test/date/test_date_new.rb +++ b/test/date/test_date_new.rb @@ -202,7 +202,6 @@ class TestDateNew < Test::Unit::TestCase 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 @@ class TestDateNew < Test::Unit::TestCase 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 @@ class TestDateNew < Test::Unit::TestCase 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 diff --git a/test/date/test_switch_hitter.rb b/test/date/test_switch_hitter.rb index 8431d40a29..7206904175 100644 --- a/test/date/test_switch_hitter.rb +++ b/test/date/test_switch_hitter.rb @@ -570,8 +570,7 @@ class TestSH < Test::Unit::TestCase end def test_base - skip unless defined?(Date.test_all) assert_equal(true, Date.test_all) - end + end if defined?(Date.test_all) end diff --git a/test/rdoc/test_rdoc_rubygems_hook.rb b/test/rdoc/test_rdoc_rubygems_hook.rb index e8f8621820..af6ffddf4a 100644 --- a/test/rdoc/test_rdoc_rubygems_hook.rb +++ b/test/rdoc/test_rdoc_rubygems_hook.rb @@ -6,8 +6,6 @@ class TestRDocRubygemsHook < Gem::TestCase 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 @@ class TestRDocRubygemsHook < Gem::TestCase FileUtils.chmod 0755, @a.doc_dir end -end +end if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.9') -- cgit v1.2.3