From 923d3ea159d59bc355b19a74ba01723a0d16cd36 Mon Sep 17 00:00:00 2001 From: akr Date: Fri, 21 Dec 2007 03:56:45 +0000 Subject: * lib/runit, lib/rubyunit.rb, test/testunit/runit: removed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14391 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rubyunit.rb | 6 ---- lib/runit/assert.rb | 76 --------------------------------------------- lib/runit/cui/testrunner.rb | 51 ------------------------------ lib/runit/error.rb | 9 ------ lib/runit/testcase.rb | 45 --------------------------- lib/runit/testresult.rb | 44 -------------------------- lib/runit/testsuite.rb | 26 ---------------- lib/runit/topublic.rb | 8 ----- 8 files changed, 265 deletions(-) delete mode 100644 lib/rubyunit.rb delete mode 100644 lib/runit/assert.rb delete mode 100644 lib/runit/cui/testrunner.rb delete mode 100644 lib/runit/error.rb delete mode 100644 lib/runit/testcase.rb delete mode 100644 lib/runit/testresult.rb delete mode 100644 lib/runit/testsuite.rb delete mode 100644 lib/runit/topublic.rb (limited to 'lib') diff --git a/lib/rubyunit.rb b/lib/rubyunit.rb deleted file mode 100644 index 1aca37864f..0000000000 --- a/lib/rubyunit.rb +++ /dev/null @@ -1,6 +0,0 @@ -# Author:: Nathaniel Talbott. -# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved. -# License:: Ruby license. - -require 'runit/testcase' -require 'test/unit' diff --git a/lib/runit/assert.rb b/lib/runit/assert.rb deleted file mode 100644 index f18bb36127..0000000000 --- a/lib/runit/assert.rb +++ /dev/null @@ -1,76 +0,0 @@ -# Author:: Nathaniel Talbott. -# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved. -# License:: Ruby license. - -require 'test/unit/assertions' -require 'runit/error' - -module RUNIT - module AssertMixin - - def setup_assert - end - - def assert_no_exception(*args, &block) - assert_nothing_raised(*args, &block) - end - - # To deal with the fact that RubyUnit does not check that the - # regular expression is, indeed, a regular expression, if it is - # not, we do our own assertion using the same semantics as - # RubyUnit - def assert_match(actual_string, expected_re, message="") - _wrap_assertion { - full_message = build_message(message, "Expected to match ", actual_string, expected_re) - assert_block(full_message) { - expected_re =~ actual_string - } - Regexp.last_match - } - end - - def assert_not_nil(actual, message="") - assert(!actual.nil?, message) - end - - def assert_not_match(actual_string, expected_re, message="") - assert_no_match(expected_re, actual_string, message) - end - - def assert_matches(*args) - assert_match(*args) - end - - def assert_fail(message="") - flunk(message) - end - - def assert_equal_float(expected, actual, delta, message="") - assert_in_delta(expected, actual, delta, message) - end - - def assert_send(object, method, *args) - super([object, method, *args]) - end - - def assert_exception(exception, message="", &block) - assert_raises(exception, message, &block) - end - - def assert_respond_to(method, object, message="") - if (called_internally?) - super - else - super(object, method, message) - end - end - - def called_internally? - /assertions\.rb/.match(caller[1]) - end - end - module Assert - include Test::Unit::Assertions - include AssertMixin - end -end diff --git a/lib/runit/cui/testrunner.rb b/lib/runit/cui/testrunner.rb deleted file mode 100644 index d521ec16ad..0000000000 --- a/lib/runit/cui/testrunner.rb +++ /dev/null @@ -1,51 +0,0 @@ -# Author:: Nathaniel Talbott. -# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved. -# License:: Ruby license. - -require 'test/unit/ui/console/testrunner' -require 'runit/testresult' - -module RUNIT - module CUI - class TestRunner < Test::Unit::UI::Console::TestRunner - @@quiet_mode = false - - def self.run(suite) - self.new().run(suite) - end - - def initialize - super nil - end - - def run(suite, quiet_mode=@@quiet_mode) - @suite = suite - def @suite.suite - self - end - @output_level = (quiet_mode ? Test::Unit::UI::PROGRESS_ONLY : Test::Unit::UI::VERBOSE) - start - end - - def create_mediator(suite) - mediator = Test::Unit::UI::TestRunnerMediator.new(suite) - class << mediator - attr_writer :result_delegate - def create_result - return @result_delegate.create_result - end - end - mediator.result_delegate = self - return mediator - end - - def create_result - return RUNIT::TestResult.new - end - - def self.quiet_mode=(boolean) - @@quiet_mode = boolean - end - end - end -end diff --git a/lib/runit/error.rb b/lib/runit/error.rb deleted file mode 100644 index 4a727fb02b..0000000000 --- a/lib/runit/error.rb +++ /dev/null @@ -1,9 +0,0 @@ -# Author:: Nathaniel Talbott. -# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved. -# License:: Ruby license. - -require 'test/unit/assertionfailederror.rb' - -module RUNIT - AssertionFailedError = Test::Unit::AssertionFailedError -end diff --git a/lib/runit/testcase.rb b/lib/runit/testcase.rb deleted file mode 100644 index 9e05a58abe..0000000000 --- a/lib/runit/testcase.rb +++ /dev/null @@ -1,45 +0,0 @@ -# Author:: Nathaniel Talbott. -# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved. -# License:: Ruby license. - -require 'runit/testresult' -require 'runit/testsuite' -require 'runit/assert' -require 'runit/error' -require 'test/unit/testcase' - -module RUNIT - class TestCase < Test::Unit::TestCase - include RUNIT::AssertMixin - - def self.suite - method_names = instance_methods(true) - tests = method_names.delete_if { |method_name| method_name !~ /^test/ } - suite = TestSuite.new(name) - tests.each { - |test| - catch(:invalid_test) { - suite << new(test, name) - } - } - return suite - end - - def initialize(test_name, suite_name=self.class.name) - super(test_name) - end - - def assert_equals(*args) - assert_equal(*args) - end - - def name - super.sub(/^(.*?)\((.*)\)$/, '\2#\1') - end - - def run(result, &progress_block) - progress_block = proc {} unless (block_given?) - super(result, &progress_block) - end - end -end diff --git a/lib/runit/testresult.rb b/lib/runit/testresult.rb deleted file mode 100644 index 7f70778171..0000000000 --- a/lib/runit/testresult.rb +++ /dev/null @@ -1,44 +0,0 @@ -# Author:: Nathaniel Talbott. -# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved. -# License:: Ruby license. - -require 'test/unit/testresult' - -module RUNIT - class TestResult < Test::Unit::TestResult - attr_reader(:errors, :failures) - def succeed? - return passed? - end - def failure_size - return failure_count - end - def run_asserts - return assertion_count - end - def error_size - return error_count - end - def run_tests - return run_count - end - def add_failure(failure) - def failure.at - return location - end - def failure.err - return message - end - super(failure) - end - def add_error(error) - def error.at - return location - end - def error.err - return exception - end - super(error) - end - end -end diff --git a/lib/runit/testsuite.rb b/lib/runit/testsuite.rb deleted file mode 100644 index 63baf65707..0000000000 --- a/lib/runit/testsuite.rb +++ /dev/null @@ -1,26 +0,0 @@ -# Author:: Nathaniel Talbott. -# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved. -# License:: Ruby license. - -require 'test/unit/testsuite' - -module RUNIT - class TestSuite < Test::Unit::TestSuite - def add_test(*args) - add(*args) - end - - def add(*args) - self.<<(*args) - end - - def count_test_cases - return size - end - - def run(result, &progress_block) - progress_block = proc {} unless (block_given?) - super(result, &progress_block) - end - end -end diff --git a/lib/runit/topublic.rb b/lib/runit/topublic.rb deleted file mode 100644 index 566f0dd35c..0000000000 --- a/lib/runit/topublic.rb +++ /dev/null @@ -1,8 +0,0 @@ -# Author:: Nathaniel Talbott. -# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved. -# License:: Ruby license. - -module RUNIT - module ToPublic - end -end -- cgit v1.2.3