diff options
-rw-r--r-- | lib/ipaddr.rb | 1 | ||||
-rw-r--r-- | test/fileutils/fileasserts.rb | 4 | ||||
-rwxr-xr-x | test/json/test_json.rb | 1 | ||||
-rw-r--r-- | test/rss/rss-assertions.rb | 4 | ||||
-rw-r--r-- | test/runner.rb | 13 |
5 files changed, 20 insertions, 3 deletions
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb index 7c246326ca..26364cd9ce 100644 --- a/lib/ipaddr.rb +++ b/lib/ipaddr.rb @@ -577,7 +577,6 @@ end __END__ require 'test/unit' -require 'test/unit/ui/console/testrunner' class TC_IPAddr < Test::Unit::TestCase def test_s_new diff --git a/test/fileutils/fileasserts.rb b/test/fileutils/fileasserts.rb index 41469a6ac6..d784544555 100644 --- a/test/fileutils/fileasserts.rb +++ b/test/fileutils/fileasserts.rb @@ -4,6 +4,10 @@ module Test module Unit module Assertions # redefine + def _wrap_assertion + yield + end + def assert_same_file(from, to) _wrap_assertion { assert_block("file #{from} != #{to}") { diff --git a/test/json/test_json.rb b/test/json/test_json.rb index 0ee993eb88..2c706d52f1 100755 --- a/test/json/test_json.rb +++ b/test/json/test_json.rb @@ -29,7 +29,6 @@ class TC_JSON < Test::Unit::TestCase @json = '{"a":2,"b":3.141,"c":"c","d":[1,"b",3.14],"e":{"foo":"bar"},' + '"g":"\\"\\u0000\\u001f","h":1.0E3,"i":1.0E-3}' end - suite << TC_JSON.suite def test_construction parser = JSON::Parser.new('test') diff --git a/test/rss/rss-assertions.rb b/test/rss/rss-assertions.rb index 12e53f7cd5..88634f360f 100644 --- a/test/rss/rss-assertions.rb +++ b/test/rss/rss-assertions.rb @@ -2,6 +2,10 @@ require 'erb' module RSS module Assertions + def _wrap_assertion + yield + end + def assert_parse(rss, assert_method, *args) __send__("assert_#{assert_method}", *args) do ::RSS::Parser.parse(rss) diff --git a/test/runner.rb b/test/runner.rb index f9ed25a931..0295260ba0 100644 --- a/test/runner.rb +++ b/test/runner.rb @@ -6,4 +6,15 @@ rcsid = %w$Id$ Version = rcsid[2].scan(/\d+/).collect!(&method(:Integer)).freeze Release = rcsid[3].freeze -exit Test::Unit::AutoRunner.run(true, File.dirname($0)) +# not sure why these are needed now... but whatever +$:.push(*Dir["test/*"].find_all { |path| File.directory? path }) + +class Module + def tu_deprecation_warning old, new = nil, kaller = nil + # stfu - for now... + end +end + +(Dir["test/test_*.rb"] + Dir["test/**/test_*.rb"]).each do |test| + require test +end |