test-unit 2.0.3 → 2.0.4

data/lib/test/unit/ui/testrunner.rb

@@ -14,6 +14,14 @@ module Test
           end
           @options = options
         end
+
+        def diff_target_string?(string)
+          Assertions::AssertionMessage.diff_target_string?(string)
+        end
+
+        def prepare_for_diff(from, to)
+          Assertions::AssertionMessage.prepare_for_diff(from, to)
+        end
       end
     end
   end

data/lib/test/unit/version.rb

@@ -2,6 +2,6 @@
 # HACK: quick and dirty to get integrated into the new project - ryan
 module Test
   module Unit
-    VERSION = '2.0.3'
+    VERSION = '2.0.4'
   end
 end

data/sample/{tc_adder.rb → test_adder.rb}

@@ -5,13 +5,15 @@
 require 'test/unit'
 require 'adder'
 
-class TC_Adder < Test::Unit::TestCase
+class TestAdder < Test::Unit::TestCase
   def setup
     @adder = Adder.new(5)
   end
+
   def test_add
     assert_equal(7, @adder.add(2), "Should have added correctly")
   end
+
   def teardown
     @adder = nil
   end

data/sample/{tc_subtracter.rb → test_subtracter.rb}

@@ -5,13 +5,15 @@
 require 'test/unit'
 require 'subtracter'
 
-class TC_Subtracter < Test::Unit::TestCase
+class TestSubtracter < Test::Unit::TestCase
   def setup
     @subtracter = Subtracter.new(5)
   end
+
   def test_subtract
     assert_equal(3, @subtracter.subtract(2), "Should have subtracted correctly")
   end
+
   def teardown
     @subtracter = nil
   end

data/sample/test_user.rb

@@ -1,4 +1,5 @@
 # nested test case example.
+require 'test/unit'
 
 class UserTest < Test::Unit::TestCase
   def setup

data/test/collector/test-load.rb

@@ -240,11 +240,7 @@ EOT
                      [:test, {:name => "test1_2"}]]],
                    @test_case1.to_s)
 
-    assert_collect([:suite, {:name => @no_load_sub_test_case5.basename.to_s},
-                    [:suite, {:name => _test_case_name("NoLoadSubTestCase5")},
-                     [:test, {:name => "test5_1"}],
-                     [:test, {:name => "test5_2"}]]],
-                   @no_load_sub_test_case5.to_s)
+    assert_collect(nil, @no_load_sub_test_case5.to_s)
   end
 
   def test_nil_pattern

data/test/run-test.rb

@@ -2,6 +2,8 @@
 
 $VERBOSE = true
 
+$KCODE = "utf8" unless "".respond_to?(:encoding)
+
 base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 lib_dir = File.join(base_dir, "lib")
 test_dir = File.join(base_dir, "test")

data/test/test-color-scheme.rb

@@ -8,6 +8,17 @@ class TestUnitColorScheme < Test::Unit::TestCase
                    "notification" => color("cyan", :bold => true),
                    "error" => color("yellow", :bold => true) +
                               color("black", :foreground => false),
+                   "case" => color("white", :bold => true) +
+                             color("blue", :foreground => false),
+                   "suite" => color("white", :bold => true) +
+                              color("green", :foreground => false),
+                   "diff-inserted-tag" => color("red", :bold => true),
+                   "diff-deleted-tag" => color("green", :bold => true),
+                   "diff-difference-tag" => color("cyan", :bold => true),
+                   "diff-inserted" => color("red", :foreground => false) +
+                                      color("white", :bold => true),
+                   "diff-deleted" => color("green", :foreground => false) +
+                                     color("white", :bold => true),
                  },
                  Test::Unit::ColorScheme.default.to_hash)
   end

data/test/test-diff.rb

@@ -1,4 +1,9 @@
 class TestUnitDiff < Test::Unit::TestCase
+  def test_binary_search_ranges
+    assert_found_binary_search_ranges(5, [1..2, 4..5, 7..9])
+    assert_not_found_binary_search_ranges(3, [1..2, 4..5, 7..9])
+  end
+
   def test_to_indexes
     assert_to_indexes({"abc def" => [0, 2], "abc" => [1]},
                       ["abc def", "abc", "abc def"])
@@ -387,6 +392,18 @@ class TestUnitDiff < Test::Unit::TestCase
   end
 
   private
+  def assert_found_binary_search_ranges(numeric, ranges)
+    assert_true(Test::Unit::Diff::UTF8Line.send(:binary_search_ranges,
+                                                numeric,
+                                                ranges))
+  end
+
+  def assert_not_found_binary_search_ranges(numeric, ranges)
+    assert_false(Test::Unit::Diff::UTF8Line.send(:binary_search_ranges,
+                                                 numeric,
+                                                 ranges))
+  end
+
   def assert_to_indexes(expected, to, &junk_predicate)
     matcher = Test::Unit::Diff::SequenceMatcher.new([""], to, &junk_predicate)
     assert_equal(expected, matcher.instance_variable_get("@to_indexes"))
@@ -451,21 +468,30 @@ class TestUnitDiff < Test::Unit::TestCase
                         from_start, from_end,
                         to_start, to_end)
     differ = Test::Unit::Diff::ReadableDiffer.new(from, to)
-    assert_equal(expected, differ.send(:diff_lines,
-                                       from_start, from_end,
-                                       to_start, to_end))
+    result = []
+    differ.instance_variable_set("@result", result)
+    differ.send(:diff_lines,
+                from_start, from_end,
+                to_start, to_end)
+    assert_equal(expected, result)
   end
 
   def assert_diff_line(expected, from_line, to_line)
     differ = Test::Unit::Diff::ReadableDiffer.new([""], [""])
-    assert_equal(expected, differ.send(:diff_line, from_line, to_line))
+    result = []
+    differ.instance_variable_set("@result", result)
+    differ.send(:diff_line, from_line, to_line)
+    assert_equal(expected, result)
   end
 
   def assert_format_diff_point(expected, from_line, to_line, from_tags, to_tags)
     differ = Test::Unit::Diff::ReadableDiffer.new([""], [""])
-    assert_equal(expected, differ.send(:format_diff_point,
-                                       from_line, to_line,
-                                       from_tags, to_tags))
+    result = []
+    differ.instance_variable_set("@result", result)
+    differ.send(:format_diff_point,
+                from_line, to_line,
+                from_tags, to_tags)
+    assert_equal(expected, result)
   end
 
   def assert_interesting_line(expected, from, to, from_start, to_start)

data/test/test_assertions.rb

@@ -248,32 +248,30 @@ EOM
 
       def test_assert_equal_with_large_string
         message = <<-EOM.chomp
-<#{("a\n" + "x" * 297).inspect}> expected but was
+<#{("a\n" + "x" * 997).inspect}> expected but was
 <#{"x".inspect}>.
 
 diff:
 + x
 - a
-- #{"x" * 297}
+- #{"x" * 997}
 
 folded diff:
 + x
 - a
-- #{"x" * 78}
-- #{"x" * 78}
-- #{"x" * 78}
-- #{"x" * 63}
+#{(["- " + ("x" * 78)] * 12).join("\n")}
+- #{"x" * 61}
 EOM
         check_fails(message) do
-          assert_equal("a\n" + "x" * 297, "x")
+          assert_equal("a\n" + "x" * 997, "x")
         end
 
         message = <<-EOM.chomp
-<#{("a\n" + "x" * 298).inspect}> expected but was
+<#{("a\n" + "x" * 998).inspect}> expected but was
 <#{"x".inspect}>.
 EOM
         check_fails(message) do
-          assert_equal("a\n" + "x" * 298, "x")
+          assert_equal("a\n" + "x" * 998, "x")
         end
       end
 
@@ -1064,7 +1062,7 @@ EOM
       end
 
       private
-      def add_failure(message, location=caller)
+      def add_failure(message, location=caller, options=nil)
         unless @catch_assertions
           super
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: test-unit
 version: !ruby/object:Gem::Version 
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-19 00:00:00 +09:00
+date: 2009-10-17 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,13 +21,13 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: 2.3.3
     version: 
 description: |-
   Test::Unit 2.x - Improved version of Test::Unit bundled in
   Ruby 1.8.x.
   
-  Ruby 1.9.x bundles miniunit not Test::Unit. Test::Unit
+  Ruby 1.9.x bundles minitest not Test::Unit. Test::Unit
   bundled in Ruby 1.8.x had not been improved but unbundled
   Test::Unit (Test::Unit 2.x) will be improved actively.
 email: 
@@ -52,6 +52,7 @@ files:
 - html/index.html
 - html/index.html.ja
 - html/test-unit-classic.png
+- images/color-diff.png
 - lib/test/unit.rb
 - lib/test/unit/assertionfailederror.rb
 - lib/test/unit/assertions.rb
@@ -75,12 +76,14 @@ files:
 - lib/test/unit/priority.rb
 - lib/test/unit/runner/console.rb
 - lib/test/unit/runner/emacs.rb
+- lib/test/unit/runner/tap.rb
 - lib/test/unit/testcase.rb
 - lib/test/unit/testresult.rb
 - lib/test/unit/testsuite.rb
 - lib/test/unit/ui/console/outputlevel.rb
 - lib/test/unit/ui/console/testrunner.rb
 - lib/test/unit/ui/emacs/testrunner.rb
+- lib/test/unit/ui/tap/testrunner.rb
 - lib/test/unit/ui/testrunner.rb
 - lib/test/unit/ui/testrunnermediator.rb
 - lib/test/unit/ui/testrunnerutilities.rb
@@ -91,10 +94,9 @@ files:
 - lib/test/unit/version.rb
 - sample/adder.rb
 - sample/subtracter.rb
-- sample/tc_adder.rb
-- sample/tc_subtracter.rb
+- sample/test_adder.rb
+- sample/test_subtracter.rb
 - sample/test_user.rb
-- sample/ts_examples.rb
 - test/collector/test-descendant.rb
 - test/collector/test-load.rb
 - test/collector/test_dir.rb
@@ -147,19 +149,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: test-unit
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Test::Unit 2.x - Improved version of Test::Unit bundled in Ruby 1.8.x
 test_files: 
-- test/collector/test_dir.rb
+- test/test_failure.rb
 - test/collector/test_objectspace.rb
-- test/ui/test_testrunmediator.rb
+- test/collector/test_dir.rb
+- test/test_testsuite.rb
 - test/test_assertions.rb
+- test/util/test_observable.rb
 - test/util/test_procwrapper.rb
 - test/util/test_backtracefilter.rb
-- test/util/test_observable.rb
-- test/test_failure.rb
-- test/test_testsuite.rb
+- test/ui/test_testrunmediator.rb
 - test/test_testresult.rb
 - test/test_error.rb

data/sample/ts_examples.rb

@@ -1,7 +0,0 @@
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-require 'test/unit'
-require 'tc_adder'
-require 'tc_subtracter'