test-unit 2.4.1 → 2.4.2

data/TODO

@@ -1,5 +1 @@
-* mock.
-* data-driven test.
-* port ruby trunk's assert_equal's intelligent inspection
-  when inspected expected and actual are same content
-  string.
+Do you have it?

data/lib/test/unit/autorunner.rb

@@ -202,13 +202,15 @@ module Test
 
           o.on('-n', '--name=NAME', String,
                "Runs tests matching NAME.",
-               "(patterns may be used).") do |n|
-            n = (%r{\A/(.*)/\Z} =~ n ? Regexp.new($1) : n)
-            case n
-            when Regexp
-              @filters << proc{|t| n =~ t.method_name ? true : false}
-            else
-              @filters << proc{|t| n == t.method_name}
+               "(patterns may be used).") do |name|
+            name = (%r{\A/(.*)/\Z} =~ name ? Regexp.new($1) : name)
+            @filters << lambda do |test|
+              return true if name === test.method_name
+              test_name_without_class_name = test.name.gsub(/\(.+?\)\z/, "")
+              if test_name_without_class_name != test.method_name
+                return true if name === test_name_without_class_name
+              end
+              false
             end
           end
 

data/lib/test/unit/testcase.rb

@@ -489,6 +489,7 @@ module Test
       def ==(other)
         return false unless other.kind_of?(self.class)
         return false unless @method_name == other.method_name
+        return false unless data_label == other.data_label
         self.class == other.class
       end
 

data/lib/test/unit/version.rb

@@ -1,5 +1,5 @@
 module Test
   module Unit
-    VERSION = '2.4.1'
+    VERSION = '2.4.2'
   end
 end

data/test/test-data.rb

@@ -167,6 +167,20 @@ class TestData < Test::Unit::TestCase
                  "0 omissions, 0 notifications", result.to_s)
   end
 
+  data("data set" => TestCalc::TestDataSet,
+       "n-data" => TestCalc::TestNData,
+       "dynamic-data-set" => TestCalc::TestDynamicDataSet,
+       "load-data-set" => TestCalc::TestLoadDataSet)
+  def test_equal(test_case)
+    suite = test_case.suite
+    positive_positive_test = suite.tests.find do |test|
+      test.data_label == "positive positive"
+    end
+    suite.tests.delete(positive_positive_test)
+    assert_equal(["test_plus[positive negative](#{test_case.name})"],
+                 suite.tests.collect {|test| test.name}.sort)
+  end
+
   def _run_test(test_case)
     result = Test::Unit::TestResult.new
     test = test_case.suite

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: test-unit
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 2
   - 4
-  - 1
-  version: 2.4.1
+  - 2
+  version: 2.4.2
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-09 00:00:00 Z
+date: 2011-11-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement