test-unit 2.2.0 → 2.3.0

data/History.txt

@@ -1,3 +1,26 @@
+=== 2.3.0 / 2011-04-17
+
+* 13 enhancements
+  * improve Hash key sorting for diff.
+  * [#28928] support any characters in declarative style description.
+    [Daniel Berger]
+  * add Error#location and make #backtrace deprecated.
+  * make TestCase#passed? public.
+  * add result finished and pass assertion notifications.
+  * add TestSuite#passed? public.
+  * add XML test runner.
+  * add --output-file-descriptor option.
+  * measure elapsed time for each test.
+  * add --collector option.
+  * support test driven test.
+    [Haruka Yoshihara]
+  * add cleanup hook it runs between after test and before teardown.
+  * support recursive collection sort for diff.
+
+* Thanks
+  * Daniel Berger
+  * Haruka Yoshihara
+
 === 2.2.0 / 2011-02-14
 
 * 22 enhancements
@@ -6,7 +29,7 @@
   * [test-unit-users-en:00035] make GC-able finished tests.
     [Daniel Berger]
   * use also COLUMNS environment variable to guess terminal width.
-  * make delta for assert_in_delta optiona.
+  * make delta for assert_in_delta optional.
     [Nobuyoshi Nakada]
   * add assert_not_respond_to.
     [Nobuyoshi Nakada]

data/Manifest.txt

@@ -15,6 +15,7 @@ html/famfamfam-logo.png
 html/favicon.ico
 html/favicon.png
 html/favicon.svg
+html/github-logo.png
 html/heading-mark.png
 html/heading-mark.svg
 html/index.html
@@ -44,8 +45,10 @@ lib/test/unit/collector/descendant.rb
 lib/test/unit/collector/dir.rb
 lib/test/unit/collector/load.rb
 lib/test/unit/collector/objectspace.rb
+lib/test/unit/collector/xml.rb
 lib/test/unit/color-scheme.rb
 lib/test/unit/color.rb
+lib/test/unit/data.rb
 lib/test/unit/diff.rb
 lib/test/unit/error.rb
 lib/test/unit/exceptionhandler.rb
@@ -58,9 +61,11 @@ 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/runner/xml.rb
 lib/test/unit/testcase.rb
 lib/test/unit/testresult.rb
 lib/test/unit/testsuite.rb
+lib/test/unit/testsuitecreator.rb
 lib/test/unit/ui/console/outputlevel.rb
 lib/test/unit/ui/console/testrunner.rb
 lib/test/unit/ui/emacs/testrunner.rb
@@ -68,6 +73,7 @@ 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
+lib/test/unit/ui/xml/testrunner.rb
 lib/test/unit/util/backtracefilter.rb
 lib/test/unit/util/method-owner-finder.rb
 lib/test/unit/util/observable.rb
@@ -83,11 +89,13 @@ test/collector/test-descendant.rb
 test/collector/test-load.rb
 test/collector/test_dir.rb
 test/collector/test_objectspace.rb
+test/fixtures/plus.csv
 test/run-test.rb
 test/test-assertions.rb
 test/test-attribute.rb
 test/test-color-scheme.rb
 test/test-color.rb
+test/test-data.rb
 test/test-diff.rb
 test/test-emacs-runner.rb
 test/test-fixture.rb

data/README.txt

@@ -50,6 +50,7 @@ Ruby license and PSF license.
 === Active
 
 * Kouhei Sutou: The current maintainer
+* Haruka Yoshihara: Data driven test supports.
 
 === Inactive
 

data/Rakefile

@@ -46,8 +46,7 @@ end
 desc "Tag the current revision."
 task :tag do
   message = "Released Test::Unit #{version}!"
-  base = "svn+ssh://#{ENV['USER']}@rubyforge.org/var/svn/test-unit/"
-  sh 'svn', 'copy', '-m', message, "#{base}trunk", "#{base}tags/#{version}"
+  sh 'git', 'tag', '-a', version, '-m', message
 end
 
 # vim: syntax=Ruby

data/html/index.html

@@ -78,13 +78,18 @@ require "test/unit"</pre>
         </p>
 	<h3 id="test-unit-latest">test-unit: The latest release</h3>
 	<p>
-	  2.2.0 is the latest release. It had been released at 2011-02-14.
+	  2.3.0 is the latest release. It had been released at 2011-04-17.
         </p>
 	<h3 id="test-unit-install">test-unit: Install</h3>
         <p>
           Install:
           <pre class="command">% sudo gem install test-unit</pre>
         </p>
+        <p>
+          Usage:
+          <pre class="code">gem "test-unit"
+require "test/unit"</pre>
+        </p>
 
 	<h2 id="test-unit-full">test-unit-full</h2>
         <p>
@@ -125,7 +130,7 @@ require "test/unit"</pre>
         </p>
 	<h3 id="test-unit-notify-latest">test-unit-notify: The latest release</h3>
 	<p>
-	  0.2.1 is the latest release. It had been released at 2011-02-10.
+	  0.3.0 is the latest release. It had been released at 2011-04-15.
         </p>
 	<h3 id="test-unit-notify-install">test-unit-notify: Install</h3>
         <p>
@@ -228,23 +233,24 @@ require "test/unit"</pre>
 
 	<h3 id="repository">Repositories</h3>
 	<p>
-	  Test::Unit uses Subverseion repository on RubyForge. Here are a list to checkout each package.
-        </p>
-        <dl>
-          <dt>test-unit</dt>
-          <dd><pre class="command">% svn co http://test-unit.rubyforge.org/svn/trunk test-unit</pre></dd>
-          <dt>test-unit-full</dt>
-          <dd><pre class="command">% svn co http://test-unit.rubyforge.org/svn/extensions/test-unit-full/trunk test-unit-full</pre></dd>
-          <dt>test-unit-notify</dt>
-          <dd><pre class="command">% svn co http://test-unit.rubyforge.org/svn/extensions/test-unit-notify/trunk test-unit-notify</pre></dd>
-          <dt>test-unit-rr</dt>
-          <dd><pre class="command">% svn co http://test-unit.rubyforge.org/svn/extensions/test-unit-rr/trunk test-unit-rr</pre></dd>
-          <dt>test-unit-runner-gtk2</dt>
-          <dd><pre class="command">% svn co http://test-unit.rubyforge.org/svn/extensions/test-unit-runner-gtk2/trunk test-unit-runner-gtk2</pre></dd>
-          <dt>test-unit-runner-tk</dt>
-          <dd><pre class="command">% svn co http://test-unit.rubyforge.org/svn/extensions/test-unit-runner-tk/trunk test-unit-runner-tk</pre></dd>
-          <dt>test-unit-runner-fox</dt>
-          <dd><pre class="command">% svn co http://test-unit.rubyforge.org/svn/extensions/test-unit-runner-fox/trunk test-unit-runner-fox</pre></dd>
+	  Test::Unit uses <a href="https://github.com/test-unit/">git repository on GitHub</a>. Here is a list to get each source code.
+        </p>
+          <dt><a href="https://github.com/test-unit/test-unit/">test-unit</a></dt>
+          <dd><pre class="command">% git clone https://github.com/test-unit/test-unit.git</pre></dd>
+          <dt><a href="https://github.com/test-unit/test-unit-full/">test-unit-full</a></dt>
+          <dd><pre class="command">% git clone https://github.com/test-unit/test-unit-full.git</pre></dd>
+          <dt><a href="https://github.com/test-unit/test-unit-notify/">test-unit-notify</a></dt>
+          <dd><pre class="command">% git clone https://github.com/test-unit/test-unit-notify.git</pre></dd>
+          <dt><a href="https://github.com/test-unit/test-unit-rr/">test-unit-rr</a></dt>
+          <dd><pre class="command">% git clone https://github.com/test-unit/test-unit-rr.git</pre></dd>
+          <dt><a href="https://github.com/test-unit/test-unit-capybara/">test-unit-capybara</a></dt>
+          <dd><pre class="command">% git clone https://github.com/test-unit/test-unit-capybara.git</pre></dd>
+          <dt><a href="https://github.com/test-unit/test-unit-runner-gtk2/">test-unit-runner-gtk2</a></dt>
+          <dd><pre class="command">% git clone https://github.com/test-unit/test-unit-runner-gtk2.git</pre></dd>
+          <dt><a href="https://github.com/test-unit/test-unit-runner-tk/">test-unit-runner-tk</a></dt>
+          <dd><pre class="command">% git clone https://github.com/test-unit/test-unit-runner-tk.git</pre></dd>
+          <dt><a href="https://github.com/test-unit/test-unit-runner-fox/">test-unit-runner-fox</a></dt>
+          <dd><pre class="command">% git clone https://github.com/test-unit/test-unit-runner-fox.git</pre></dd>
         </dl>
       </div>
 
@@ -265,6 +271,11 @@ require "test/unit"</pre>
           <img src="rubyforge.png" width="120" height="24" border="0" alt="Test::Unit is hosted on RubyForge.org." />
         </a>
       </p>
+      <p id="sponsor-github">
+        <a href="https://github.com/test-unit/">
+          <img src="github-logo.png" width="100" height="45" border="0" alt="GitHub's git repositories are used." />
+        </a>
+      </p>
       <p id="sponsor-tango">
 	<a href="http://tango.freedesktop.org/">
           <img width="120" height="53" border="0" alt="Tango Desktop Project's icons are used." src="tango-logo.png" />

data/html/index.html.ja

@@ -91,13 +91,18 @@ require "test/unit"</pre>
         </p>
 	<h3 id="test-unit-latest">test-unit最新リリース</h3>
 	<p>
-	  2011-02-14にリリースされた2.2.0が最新リリースです。
+	  2011-04-17にリリースされた2.3.0が最新リリースです。
         </p>
 	<h3 id="test-unit-install">test-unitのインストール</h3>
         <p>
           インストール:
           <pre class="command">% sudo gem install test-unit</pre>
         </p>
+        <p>
+          使い方:
+          <pre class="code">gem "test-unit"
+require "test/unit"</pre>
+        </p>
 
 	<h2 id="test-unit-full">test-unit-full</h2>
         <p>
@@ -137,7 +142,7 @@ require "test/unit"</pre>
         </p>
 	<h3 id="test-unit-notify-latest">test-unit-notify最新リリース</h3>
 	<p>
-	  2011-02-10にリリースされた0.2.1が最新リリースです。
+	  2011-04-15にリリースされた0.3.0が最新リリースです。
         </p>
 	<h3 id="test-unit-notify-install">test-unit-notifyのインストール</h3>
         <p>
@@ -242,23 +247,25 @@ require "test/unit"</pre>
 
 	<h3 id="repository">リポジトリ</h3>
 	<p>
-	  RubyForge上のSubversionリポジトリを利用しています。チェックアウト方法は以下の通りです。
+	  <a href="https://github.com/test-unit/">GitHub上のgitリポジトリ</a>を利用しています。ソースコードは以下のように取得できます。
         </p>
         <dl>
-          <dt>test-unit</dt>
-          <dd><pre class="command">% svn co http://test-unit.rubyforge.org/svn/trunk test-unit</pre></dd>
-          <dt>test-unit-full</dt>
-          <dd><pre class="command">% svn co http://test-unit.rubyforge.org/svn/extensions/test-unit-full/trunk test-unit-full</pre></dd>
-          <dt>test-unit-notify</dt>
-          <dd><pre class="command">% svn co http://test-unit.rubyforge.org/svn/extensions/test-unit-notify/trunk test-unit-notify</pre></dd>
-          <dt>test-unit-rr</dt>
-          <dd><pre class="command">% svn co http://test-unit.rubyforge.org/svn/extensions/test-unit-rr/trunk test-unit-rr</pre></dd>
-          <dt>test-unit-runner-gtk2</dt>
-          <dd><pre class="command">% svn co http://test-unit.rubyforge.org/svn/extensions/test-unit-runner-gtk2/trunk test-unit-runner-gtk2</pre></dd>
-          <dt>test-unit-runner-tk</dt>
-          <dd><pre class="command">% svn co http://test-unit.rubyforge.org/svn/extensions/test-unit-runner-tk/trunk test-unit-runner-tk</pre></dd>
-          <dt>test-unit-runner-fox</dt>
-          <dd><pre class="command">% svn co http://test-unit.rubyforge.org/svn/extensions/test-unit-runner-fox/trunk test-unit-runner-fox</pre></dd>
+          <dt><a href="https://github.com/test-unit/test-unit/">test-unit</a></dt>
+          <dd><pre class="command">% git clone https://github.com/test-unit/test-unit.git</pre></dd>
+          <dt><a href="https://github.com/test-unit/test-unit-full/">test-unit-full</a></dt>
+          <dd><pre class="command">% git clone https://github.com/test-unit/test-unit-full.git</pre></dd>
+          <dt><a href="https://github.com/test-unit/test-unit-notify/">test-unit-notify</a></dt>
+          <dd><pre class="command">% git clone https://github.com/test-unit/test-unit-notify.git</pre></dd>
+          <dt><a href="https://github.com/test-unit/test-unit-rr/">test-unit-rr</a></dt>
+          <dd><pre class="command">% git clone https://github.com/test-unit/test-unit-rr.git</pre></dd>
+          <dt><a href="https://github.com/test-unit/test-unit-capybara/">test-unit-capybara</a></dt>
+          <dd><pre class="command">% git clone https://github.com/test-unit/test-unit-capybara.git</pre></dd>
+          <dt><a href="https://github.com/test-unit/test-unit-runner-gtk2/">test-unit-runner-gtk2</a></dt>
+          <dd><pre class="command">% git clone https://github.com/test-unit/test-unit-runner-gtk2.git</pre></dd>
+          <dt><a href="https://github.com/test-unit/test-unit-runner-tk/">test-unit-runner-tk</a></dt>
+          <dd><pre class="command">% git clone https://github.com/test-unit/test-unit-runner-tk.git</pre></dd>
+          <dt><a href="https://github.com/test-unit/test-unit-runner-fox/">test-unit-runner-fox</a></dt>
+          <dd><pre class="command">% git clone https://github.com/test-unit/test-unit-runner-fox.git</pre></dd>
         </dl>
       </div>
 
@@ -279,6 +286,11 @@ require "test/unit"</pre>
           <img src="rubyforge.png" width="120" height="24" border="0" alt="ラングバプロジェクトはRubyForge.orgにホスティングしてもらっています。" />
         </a>
       </p>
+      <p id="sponsor-github">
+        <a href="https://github.com/milter-manager/">
+          <img src="github-logo.png" width="100" height="45" border="0" alt="GitHubの提供するgitリポジトリを利用しています。" />
+        </a>
+      </p>
       <p id="sponsor-tango">
 	<a href="http://tango.freedesktop.org/">
           <img width="120" height="53" border="0" alt="Tango Desktop Projectのアイコンを利用しています。" src="tango-logo.png" />

data/html/test-unit.css

@@ -244,17 +244,24 @@ div.sponsors p#sponsor-rubyforge
   right: 50px;
 }
 
-div.sponsors p#sponsor-tango
+div.sponsors p#sponsor-github
 {
   position: absolute;
   top: 50px;
   right: 50px;
 }
 
+div.sponsors p#sponsor-tango
+{
+  position: absolute;
+  top: 105px;
+  right: 50px;
+}
+
 div.sponsors p#sponsor-famfamfam
 {
   position: absolute;
-  top: 118px;
+  top: 168px;
   right: 50px;
   padding-bottom: 50px;
 }

data/lib/test/unit/assertions.rb

@@ -1507,23 +1507,50 @@ Message: <#{convert(object.message)}>
 ---------------
 EOM
             else
+              inspector = Inspector.new(object)
               if use_pp
                 begin
                   require 'pp' unless defined?(PP)
-                  if HashInspector.target?(object)
-                    pp_target = HashInspector.new(object)
-                  else
-                    pp_target = object
-                  end
                   begin
-                    return PP.pp(pp_target, '').chomp
+                    return PP.pp(inspector, '').chomp
                   rescue NameError
                   end
                 rescue LoadError
                   self.use_pp = false
                 end
               end
-              object.inspect
+              inspector.inspect
+            end
+          end
+        end
+
+        class Inspector
+          def initialize(object)
+            @object = object
+            @inspect_target = inspect_target
+          end
+
+          alias_method :native_inspect, :inspect
+          def inspect
+            @inspect_target.inspect
+          end
+
+          def pretty_print(q)
+            @inspect_target.pretty_print(q)
+          end
+
+          def pretty_print_cycle(q)
+            @inspect_target.pretty_print_cycle(q)
+          end
+
+          private
+          def inspect_target
+            if HashInspector.target?(@object)
+              HashInspector.new(@object)
+            elsif ArrayInspector.target?(@object)
+              ArrayInspector.new(@object)
+            else
+              @object
             end
           end
         end
@@ -1533,14 +1560,6 @@ EOM
             def target?(object)
               object.is_a?(Hash) or object == ENV
             end
-
-            def normalize(object)
-              if target?(object)
-                new(object)
-              else
-                object
-              end
-            end
           end
 
           def initialize(hash)
@@ -1567,13 +1586,52 @@ EOM
           end
 
           def pretty_print_cycle(q)
-            q.text(@hash.empty? ? '{}' : '{...}')
+            @hash.pretty_print_cycle(q)
           end
 
           def each_pair
-            @hash.keys.sort.each do |key|
-              yield(self.class.normalize(key),
-                    self.class.normalize(@hash[key]))
+            keys = @hash.keys
+            begin
+              keys = keys.sort # FIXME: more cleverly
+            rescue ArgumentError
+            end
+            keys.each do |key|
+              yield(Inspector.new(key),
+                    Inspector.new(@hash[key]))
+            end
+          end
+        end
+
+        class ArrayInspector
+          class << self
+            def target?(object)
+              object.is_a?(Array)
+            end
+          end
+
+          def initialize(array)
+            @array = array
+          end
+
+          def inspect
+            @array.inspect
+          end
+
+          def pretty_print(q)
+            q.group(1, '[', ']') do
+              q.seplist(self) do |v|
+                q.pp(v)
+              end
+            end
+          end
+
+          def pretty_print_cycle(q)
+            @array.pretty_print_cycle(q)
+          end
+
+          def each
+            @array.each do |element|
+              yield(Inspector.new(element))
             end
           end
         end

data/lib/test/unit/attribute.rb

@@ -1,6 +1,22 @@
 module Test
   module Unit
     module Attribute
+      class StringifyKeyHash < Hash
+        class << self
+          def stringify(object)
+            object.to_s
+          end
+        end
+
+        def [](key)
+          super(self.class.stringify(key))
+        end
+
+        def []=(key, value)
+          super(self.class.stringify(key), value)
+        end
+      end
+
       class << self
         def included(base)
           base.extend(BaseClassMethods)
@@ -34,9 +50,8 @@ module Test
             method_names << options
             options = {}
           end
-          @current_attributes ||= {}
           if method_names.empty?
-            @current_attributes[name] = options.merge(:value => value)
+            current_attributes[name] = options.merge(:value => value)
           else
             method_names.each do |method_name|
               set_attributes(method_name, {name => value})
@@ -44,23 +59,29 @@ module Test
           end
         end
 
+        def current_attributes
+          @current_attributes ||= StringifyKeyHash.new
+        end
+
+        def current_attribute(name)
+          current_attributes[name] || StringifyKeyHash.new
+        end
+
         def attributes_table
-          @attributes_table ||= {}
+          @attributes_table ||= StringifyKeyHash.new
           super.merge(@attributes_table)
         end
 
         def set_attributes(method_name, new_attributes)
           return if new_attributes.empty?
-          method_name = normalize_method_name(method_name)
-          @attributes_table ||= {}
-          @attributes_table[method_name] ||= {}
+          @attributes_table ||= StringifyKeyHash.new
+          @attributes_table[method_name] ||= StringifyKeyHash.new
           current_attributes = @attributes_table[method_name]
           new_attributes.each do |key, value|
-            key = normalize_attribute_name(key)
             observers = attribute_observers(key) || []
             observers.each do |observer|
               observer.call(self,
-                            key,
+                            StringifyKeyHash.stringify(key),
                             (attributes(method_name) || {})[key],
                             value,
                             method_name)
@@ -70,7 +91,6 @@ module Test
         end
 
         def attributes(method_name)
-          method_name = normalize_method_name(method_name)
           attributes = attributes_table[method_name]
           ancestors[1..-1].each do |ancestor|
             if ancestor.is_a?(Class) and ancestor < Test::Unit::Attribute
@@ -83,42 +103,26 @@ module Test
               break
             end
           end
-          attributes
-        end
-
-        def get_attribute(method_name, attribute_name)
-          attribute_name = normalize_attribute_name(attribute_name)
-          (attributes(method_name) || {})[attribute_name]
+          attributes || StringifyKeyHash.new
         end
 
-        @@attribute_observers = {}
+        @@attribute_observers = StringifyKeyHash.new
         def register_attribute_observer(attribute_name, observer=Proc.new)
-          attribute_name = normalize_attribute_name(attribute_name)
           @@attribute_observers[attribute_name] ||= []
           @@attribute_observers[attribute_name] << observer
         end
 
         def attribute_observers(attribute_name)
-          attribute_name = normalize_attribute_name(attribute_name)
           @@attribute_observers[attribute_name]
         end
-
-        private
-        def normalize_attribute_name(name)
-          name.to_s
-        end
-
-        def normalize_method_name(name)
-          name.to_s
-        end
       end
 
       def attributes
-        self.class.attributes(@method_name) || {}
+        self.class.attributes(@method_name) || StringifyKeyHash.new
       end
 
       def [](name)
-        self.class.get_attribute(@method_name, name)
+        attributes[name]
       end
     end
   end