test-unit-ext 0.4.0 → 0.5.0

data/NEWS.en

@@ -2,6 +2,12 @@
 
 = NEWS
 
+== 0.5.0: 2008-04-07
+
+  * Update document.
+  * Support pend.
+  * Support notify.
+
 == 0.4.0: 2008-03-17
 
   * Changed XML report format.

data/NEWS.ja

@@ -2,6 +2,12 @@
 
 = NEWS.ja
 
+== 0.5.0: 2008-04-07
+
+  * ドキュメントの更新
+  * pend（保留）のサポート
+  * notify（通知）のサポート
+
 == 0.4.0: 2008-03-17
 
   * XML出力形式の変更

data/README.en

@@ -14,9 +14,12 @@ TestUnitExt provides some useful features:
 
   * Emacs friendly backtrace format.
   * runs tests depending on priority.
-  * supports metadata for each test.
+  * supports attributes for each test.
   * always shows tests result even if tests are interrupted.
   * colorized output.
+  * outputs diff between expected and actual value.
+  * reports test result as XML format.
+  * adds pending/notification methods.
 
 == Author
 
@@ -42,10 +45,185 @@ None
 
   require 'test-unit-ext'
 
-=== Priority
+== Reference
 
 === Attributes
 
+You can add attributes to your test to get more useful
+information on failure. For example, you can add Bug ID like
+the following
+
+  class MyTest < Test::Unit::TestCase
+    bug 123
+    def test_invalid_input
+      assert_equal("OK", input)
+    end
+  end
+
+In the above example, test_invalid_input test has an
+attribute that the test is for Bug #123.
+
+You can also write like the following:
+
+  class MyTest < Test::Unit::TestCase
+    attribute :bug, 123
+    def test_invalid_input
+      assert_equal("OK", input)
+    end
+  end
+
+That is, bug method is a convenience method. You can add any
+attributes to your test if you use attribute method.
+
+=== Priority
+
+It will be difficult that you drop into test and develop
+cycle when you have many tests and the tests take much
+time. To reduce the problem, you can select some tests from
+all tests and reduce elapsed time each test. It's a problem
+that which tests are selected in each test.
+
+In TestUnitExt, each test has its priority and runs tests
+are selected by probabilistic method. --priority command
+line option enables this feature.
+
+A test that has higher priority will be ran in higher
+ratio. Each test doesn't run all tests but tests that are
+ran each test are changed in each test. All tests will be
+ran after some test and develop cycles.
+
+Tests that aren't succeeded in the previous test are ran in
+the current test in spite of its priority. This means that
+important tests are ran without you do something. You will
+keep your lightweight test and develop cycles without
+additional works.
+
+Here are a sample priority specification. Priority
+specification effects followed tests like public and
+private.
+
+  class MyTest < Test::Unit::TestCase
+    priority :must
+    def test_must
+      # will be always ran
+    end
+
+    def test_must2
+      # will be always ran too
+    end
+
+    priority :import
+    def test_import
+      # will be almost ran
+    end
+
+    priority :high
+    def test_high
+      # will be ran in high probability
+    end
+
+    priority :normal
+    def test_normal
+      # will be ran in fifty-fifty probability
+      # tests without priority specification has normal priority
+    end
+
+    priority :low
+    def test_low
+      # will be sometimes ran
+    end
+
+    priority :never
+    def test_never
+      # never be ran
+    end
+  end
+
+=== Pending
+
+You may write a test for a function that is not
+implemented. In the case, the test will be failed. It's
+correct that the test is failed but the test means 'the
+function is not implemented'. To state your intent, pend
+method is provided.
+
+Please state your intent by your test code by using the
+method.
+
+  class MyTest < Test::Unit::TestCase
+    def test_minor_function
+      pend("Should implement")
+      assert_equal("Good!", MyModule.minor_function)
+    end
+  end
+
+=== Notification
+
+You may put some messages in test. For example, "this test
+is omitted because XXX module is not found on the
+environment."
+
+Those messages can be displayed by puts but it causes test
+result output. To prevent this, notify method is
+provided. notify method doesn't display those messages in
+the place but display those messages in test result summary
+like "failure", "error" and so on. You can leave those
+messages without breaking test result output by using notify
+method.
+
+  class MyTest < Test::Unit::TestCase
+    def test_with_other_module
+      unless MyModule.have_XXX?
+         notify("XXX module isn't found. skip this test.")
+         return
+      end
+      assert_equal("XXX Module!!!", MyModule.use_XXX)
+    end
+  end
+
+=== XML report
+
+Test result can be reported as XML format if --xml-report
+option is specified. A reported XML has the following
+structure:
+
+  <report>
+    <result>
+      <test-case>
+        <name>TEST CASE NAME</name>
+        <description>DESCRIPTION OF TEST CASE (if exists)</description>
+      </test-case>
+      <test>
+        <name>TEST NAME</name>
+        <description>DESCRIPTION OF TEST CASE (if exists)</description>
+        <option><!-- ATTRIBUTE INFORMATION (if exists) -->
+          <name>ATTRIBUTE NAME (e.g.: bug)</name>
+          <value>ATTRIBUTE VALUE (e.g.: 1234)</value>
+        </option>
+        <option>
+          ...
+        </option>
+      </test>
+      <status>TEST RESULT ([success|failure|error|pending|notification])</status>
+      <detail>DETAIL OF TEST RESULT (if exists)</detail>
+      <backtrace><!-- BACKTRACE (if exists) -->
+        <entry>
+          <file>FILE NAME</file>
+          <line>LINE</line>
+          <info>ADDITIONAL INFORMATION</info>
+        </entry>
+        <entry>
+          ...
+        </entry>
+      </backtrace>
+      <elapsed>ELAPSED TIME (e.g.: 0.000010)</elapsed>
+    </result>
+    <result>
+      ...
+    </result>
+    ...
+  </report>
+
 == Thanks
 
   * ...

data/README.ja

@@ -14,9 +14,12 @@ TestUnitExtはいくつかの有用な機能を提供します。
 
   * Emacsにやさしいバックトレースフォーマット
   * 優先度に応じたテストの実行
-  * 各テストへのメタデータの付加
+  * 各テストへの属性の付加
   * テストを途中終了（Ctrl+C）しても結果を表示
   * 色付き出力
+  * テスト結果のdiff出力
+  * テスト結果のXMLでの出力
+  * 保留(pending)・通知(notification)用メソッドの追加
 
 == 作者
 
@@ -42,10 +45,185 @@ Ruby's.
 
   require 'test-unit-ext'
 
-=== 優先度
+== リファレンス
 
 === 属性
 
+テストに属性を加えて、テスト失敗時により有益な情報を利用する
+ことができます。例えば、以下のようにテストにBug IDの情報を付
+加することができます。
+
+  class MyTest < Test::Unit::TestCase
+    bug 123
+    def test_invalid_input
+      assert_equal("OK", input)
+    end
+  end
+
+この例では、test_invalid_inputテストがBug #123のテストである
+という情報を付加しています。
+
+これは以下のように書くこともできます。
+
+  class MyTest < Test::Unit::TestCase
+    attribute :bug, 123
+    def test_invalid_input
+      assert_equal("OK", input)
+    end
+  end
+
+つまり、bugメソッドは便利のために用意されたメソッドです。
+attributeメソッドを使うことで任意の属性を付加することができ
+ます。
+
+=== 優先度
+
+テストが多くなるとテスト時間が長くなり、テストと開発をリズム
+良く繰り返すことが難しくなります。それを軽減するために、開発
+時のテストでは毎回全てのテストを実行するのではなく、一部のテ
+ストのみ実行して1回のテスト時間を短くすることができます。問題
+は各テストでどのテストを実行するかです。
+
+TestUnitExtでは属性としてテストに優先度を付け、それに従って毎
+回実行するテストを確率的に選択します。コマンドラインオプショ
+ンで--priorityを指定するとこの機能が有効になります。
+
+優先度が高いテスト程高い確率で実行され、そうではないテストは
+低い頻度で実行されます。各テストでは全てのテストは実行しない
+が、各テストで実行するテストがその都度変わるため、何度も走ら
+せることにより結果的にテスト全体を実行することになります。
+
+また、前回成功しなかったテストは確実に実行するため、明示的に
+優先度を上げなくても失敗している（現在注目すべき重要な）テス
+トは毎回必ず実行します。これにより、プログラマの負荷をあげる
+ことなくテストのメリットを受けたまま、テストと開発のリズムを
+保つことができます。
+
+優先度は以下のように指定します。優先度指定はpublicやprivateの
+ように、以降のメソッド定義に影響します。
+
+  class MyTest < Test::Unit::TestCase
+    priority :must
+    def test_must
+      # 必ず実行
+    end
+
+    def test_must2
+      # これも必ず実行
+    end
+
+    priority :import
+    def test_import
+      # 高い確率で実行
+    end
+
+    priority :high
+    def test_high
+      # やや高い確率で実行
+    end
+
+    priority :normal
+    def test_normal
+      # 半々の確率で実行
+      # 優先度を指定していないときはnormal
+    end
+
+    priority :low
+    def test_low
+      # たまに実行
+    end
+
+    priority :never
+    def test_never
+      # 実行しない
+    end
+  end
+
+=== 保留
+
+現在はまだ実装していない機能をテストとして書くことも場合もあ
+ります。その場合、まだ実装していない機能のテストは失敗します。
+たしかにテストは失敗なのですが、そのテストは「実装が間違って
+いる」ではなく、「まだ実装していない」を意図しています。これ
+を明示的に表現するために新しくpendというメソッドを用意してい
+ます。
+
+「現在はまだ実装していない」という場合はこのメソッドを使って、
+その意図をコードで表現してください。
+
+  class MyTest < Test::Unit::TestCase
+    def test_minor_function
+      pend("Should implement")
+      assert_equal("Good!", MyModule.minor_function)
+    end
+  end
+
+=== 通知
+
+テスト中で何らかのメッセージを残したいことがあります。例えば、
+「この環境では○○モジュールがないからこのテストは省略しま
+す」、という場合です。
+
+それらのメッセージをputsで表示することもできますが、テスト結
+果の表示が乱れてしまいます。これを防ぐために、新しくnotifyメ
+ソッドを用意しています。notifyを使うとメッセージはその場では
+表示されず、テスト終了後に他の「失敗」や「エラー」などと同じ
+ように表示されます。これにより、テスト結果の表示を乱さずにメッ
+セージを残すことができます。
+
+  class MyTest < Test::Unit::TestCase
+    def test_with_other_module
+      unless MyModule.have_XXX?
+         notify("XXX module isn't found. skip this test.")
+         return
+      end
+      assert_equal("XXX Module!!!", MyModule.use_XXX)
+    end
+  end
+
+=== XML出力
+
+--xml-reportオプションを指定することでテスト結果をXML形式で出
+力することができます。出力されるXMLは以下のような構造になって
+います。
+
+  <report>
+    <result>
+      <test-case>
+        <name>テストケース名</name>
+        <description>テストケースの説明（もしあれば）</description>
+      </test-case>
+      <test>
+        <name>テスト名</name>
+        <description>テストの説明（もしあれば）</description>
+        <option><!-- 属性情報（もしあれば） -->
+          <name>属性名（例: bug）</name>
+          <value>属性値（例: 1234）</value>
+        </option>
+        <option>
+          ...
+        </option>
+      </test>
+      <status>テスト結果（[success|failure|error|pending|notification]）</status>
+      <detail>テスト結果の詳細（もしあれば）</detail>
+      <backtrace><!-- バックトレース（もしあれば） -->
+        <entry>
+          <file>ファイル名</file>
+          <line>行</line>
+          <info>付加情報</info>
+        </entry>
+        <entry>
+          ...
+        </entry>
+      </backtrace>
+      <elapsed>実行時間（例: 0.000010）</elapsed>
+    </result>
+    <result>
+      ...
+    </result>
+    ...
+  </report>
+
 == 感謝
 
   * ...

data/html/news.html

@@ -9,16 +9,7 @@
 </head>
 <body>
 <h1><a name="label-0" id="label-0">NEWS</a></h1><!-- RDLabel: "NEWS" -->
-<h2><a name="label-1" id="label-1">0.4.0: 2008-03-17</a></h2><!-- RDLabel: "0.4.0: 2008-03-17" -->
-<ul>
-<li>Changed XML report format.</li>
-</ul>
-<h2><a name="label-2" id="label-2">0.3.0: 2008-03-10</a></h2><!-- RDLabel: "0.3.0: 2008-03-10" -->
-<ul>
-<li>Changed XML report format.</li>
-<li>Improved search method to find test result directory.</li>
-</ul>
-<h2><a name="label-3" id="label-3">0.2.0: 2008-03-03</a></h2><!-- RDLabel: "0.2.0: 2008-03-03" -->
+<h2><a name="label-1" id="label-1">0.2.0: 2008-03-03</a></h2><!-- RDLabel: "0.2.0: 2008-03-03" -->
 <ul>
 <li>Supported XML report.
 <ul>
@@ -26,7 +17,7 @@
 </ul></li>
 <li>Supported diff output for assert_equal.</li>
 </ul>
-<h2><a name="label-4" id="label-4">0.1.0: 2008-02-21</a></h2><!-- RDLabel: "0.1.0: 2008-02-21" -->
+<h2><a name="label-2" id="label-2">0.1.0: 2008-02-21</a></h2><!-- RDLabel: "0.1.0: 2008-02-21" -->
 <ul>
 <li>Initial release.</li>
 </ul>

data/html/news.html.en

@@ -9,16 +9,7 @@
 </head>
 <body>
 <h1><a name="label-0" id="label-0">NEWS</a></h1><!-- RDLabel: "NEWS" -->
-<h2><a name="label-1" id="label-1">0.4.0: 2008-03-17</a></h2><!-- RDLabel: "0.4.0: 2008-03-17" -->
-<ul>
-<li>Changed XML report format.</li>
-</ul>
-<h2><a name="label-2" id="label-2">0.3.0: 2008-03-10</a></h2><!-- RDLabel: "0.3.0: 2008-03-10" -->
-<ul>
-<li>Changed XML report format.</li>
-<li>Improved search method to find test result directory.</li>
-</ul>
-<h2><a name="label-3" id="label-3">0.2.0: 2008-03-03</a></h2><!-- RDLabel: "0.2.0: 2008-03-03" -->
+<h2><a name="label-1" id="label-1">0.2.0: 2008-03-03</a></h2><!-- RDLabel: "0.2.0: 2008-03-03" -->
 <ul>
 <li>Supported XML report.
 <ul>
@@ -26,7 +17,7 @@
 </ul></li>
 <li>Supported diff output for assert_equal.</li>
 </ul>
-<h2><a name="label-4" id="label-4">0.1.0: 2008-02-21</a></h2><!-- RDLabel: "0.1.0: 2008-02-21" -->
+<h2><a name="label-2" id="label-2">0.1.0: 2008-02-21</a></h2><!-- RDLabel: "0.1.0: 2008-02-21" -->
 <ul>
 <li>Initial release.</li>
 </ul>

data/html/news.html.ja

@@ -9,16 +9,7 @@
 </head>
 <body>
 <h1><a name="label-0" id="label-0">NEWS.ja</a></h1><!-- RDLabel: "NEWS.ja" -->
-<h2><a name="label-1" id="label-1">0.4.0: 2008-03-17</a></h2><!-- RDLabel: "0.4.0: 2008-03-17" -->
-<ul>
-<li>XML出力形式の変更</li>
-</ul>
-<h2><a name="label-2" id="label-2">0.3.0: 2008-03-10</a></h2><!-- RDLabel: "0.3.0: 2008-03-10" -->
-<ul>
-<li>XML出力形式の変更</li>
-<li>テスト結果を保存するディレクトリの検索処理を改良</li>
-</ul>
-<h2><a name="label-3" id="label-3">0.2.0: 2008-03-03</a></h2><!-- RDLabel: "0.2.0: 2008-03-03" -->
+<h2><a name="label-1" id="label-1">0.2.0: 2008-03-03</a></h2><!-- RDLabel: "0.2.0: 2008-03-03" -->
 <ul>
 <li>XML出力のサポート。
 <ul>
@@ -26,7 +17,7 @@
 </ul></li>
 <li>assert_equal時のdiff出力のサポート。</li>
 </ul>
-<h2><a name="label-4" id="label-4">0.1.0: 2008-02-21</a></h2><!-- RDLabel: "0.1.0: 2008-02-21" -->
+<h2><a name="label-2" id="label-2">0.1.0: 2008-02-21</a></h2><!-- RDLabel: "0.1.0: 2008-02-21" -->
 <ul>
 <li>最初のリリース。</li>
 </ul>

data/html/readme.html

@@ -32,7 +32,7 @@
 <h2><a name="label-7" id="label-7">Usage</a></h2><!-- RDLabel: "Usage" -->
 <pre>require 'test-unit-ext'</pre>
 <h3><a name="label-8" id="label-8">Priority</a></h3><!-- RDLabel: "Priority" -->
-<h3><a name="label-9" id="label-9">Attributes</a></h3><!-- RDLabel: "Attributes" -->
+<h3><a name="label-9" id="label-9">Metadata</a></h3><!-- RDLabel: "Metadata" -->
 <h2><a name="label-10" id="label-10">Thanks</a></h2><!-- RDLabel: "Thanks" -->
 <ul>
 <li>...</li>

data/html/readme.html.en

@@ -32,7 +32,7 @@
 <h2><a name="label-7" id="label-7">Usage</a></h2><!-- RDLabel: "Usage" -->
 <pre>require 'test-unit-ext'</pre>
 <h3><a name="label-8" id="label-8">Priority</a></h3><!-- RDLabel: "Priority" -->
-<h3><a name="label-9" id="label-9">Attributes</a></h3><!-- RDLabel: "Attributes" -->
+<h3><a name="label-9" id="label-9">Metadata</a></h3><!-- RDLabel: "Metadata" -->
 <h2><a name="label-10" id="label-10">Thanks</a></h2><!-- RDLabel: "Thanks" -->
 <ul>
 <li>...</li>

data/html/readme.html.ja

@@ -32,7 +32,7 @@
 <h2><a name="label-7" id="label-7">使用法</a></h2><!-- RDLabel: "使用法" -->
 <pre>require 'test-unit-ext'</pre>
 <h3><a name="label-8" id="label-8">優先度</a></h3><!-- RDLabel: "優先度" -->
-<h3><a name="label-9" id="label-9">属性</a></h3><!-- RDLabel: "属性" -->
+<h3><a name="label-9" id="label-9">メタデータ</a></h3><!-- RDLabel: "メタデータ" -->
 <h2><a name="label-10" id="label-10">感謝</a></h2><!-- RDLabel: "感謝" -->
 <ul>
 <li>...</li>

data/lib/test-unit-ext.rb

@@ -5,9 +5,11 @@ require "test-unit-ext/color"
 require "test-unit-ext/colorized-runner"
 require "test-unit-ext/diff"
 require "test-unit-ext/always-show-result"
+require "test-unit-ext/attributes"
 require "test-unit-ext/priority"
 require "test-unit-ext/backtrace-filter"
 require "test-unit-ext/long-display-for-emacs"
-require "test-unit-ext/attributes"
 require "test-unit-ext/xml-report"
 require "test-unit-ext/assertions"
+require "test-unit-ext/pending"
+require "test-unit-ext/notification"

data/lib/test-unit-ext/assertions.rb

@@ -11,9 +11,9 @@ module Test
         diff = Diff.readable(expected, actual)
         if /^[\?\-\+].{79}/ =~ diff
           folded_diff = Diff.readable(fold(expected), fold(actual))
-          diff = "#{diff}\nfolded diff:\n#{folded_diff}"
+          diff = "#{diff}\n\nfolded diff:\n#{folded_diff}"
         end
-        raise $!, "#{$!.message}\ndiff:\n#{diff}", $@
+        raise $!, "#{$!.message}\n\ndiff:\n#{diff}", $@
       end
 
       def fold(string)

data/lib/test-unit-ext/attributes.rb

@@ -8,15 +8,25 @@ module Test
         def method_added(name)
           method_added_without_attributes(name)
           if defined?(@current_attributes)
-            set_attributes(name, @current_attributes)
-            @current_attributes = {}
+            attributes = {}
+            kept_attributes = {}
+            @current_attributes.each do |attribute_name, attribute|
+              attributes[attribute_name] = attribute[:value]
+              kept_attributes[attribute_name] = attribute if attribute[:keep]
+            end
+            set_attributes(name, attributes)
+            @current_attributes = kept_attributes
           end
         end
 
-        def attribute(name, value, *tests)
+        def attribute(name, value, options={}, *tests)
+          unless options.is_a?(Hash)
+            tests << options
+            options = {}
+          end
           @current_attributes ||= {}
           if tests.empty?
-            @current_attributes[name] = value
+            @current_attributes[name] = options.merge(:value => value)
           else
             tests.each do |test|
               set_attribute(test, {name => value})
@@ -41,6 +51,11 @@ module Test
           @attributes ||= {}
           @attributes[test_name]
         end
+
+        private
+        def normalize_test_name(test_name)
+          "test_#{test_name.to_s.sub(/^test_/, '')}"
+        end
       end
 
       alias_method :run_without_attributes, :run

data/lib/test-unit-ext/colorized-runner.rb

@@ -11,6 +11,8 @@ module Test
             :default => {
               "success" => Color.new("green", :bold => true),
               "failure" => Color.new("red", :bold => true),
+              "pending" => Color.new("magenta", :bold => true),
+              "notification" => Color.new("cyan", :bold => true),
               "error" => Color.new("yellow", :bold => true),
             },
           }
@@ -59,7 +61,13 @@ module Test
 
           def result_color
             if @result.passed?
-              @color_scheme["success"]
+              if @result.pending_count > 0
+                @color_scheme["pending"]
+              elsif @result.notification_count > 0
+                @color_scheme["notification"]
+              else
+                @color_scheme["success"]
+              end
             elsif @result.error_count > 0
               @color_scheme["error"]
             elsif @result.failure_count > 0
@@ -85,6 +93,7 @@ module Test
           end
 
           def guess_color_availability
+            return false unless @io.tty?
             term = ENV["TERM"]
             return true if term and (/term\z/ =~ term or term == "screen")
             return true if ENV["EMACS"] == "t"

data/lib/test-unit-ext/diff.rb

@@ -153,9 +153,9 @@ module Test
         best_from, best_to, best_size = best_info
         while best_from > from_start and best_to > to_start and
             (should_junk ?
-             @junks.has_key?(@to[best_to]) :
-             !@junks.has_key?(@to[best_to])) and
-            @from[best_from] == @to[best_to]
+             @junks.has_key?(@to[best_to - 1]) :
+             !@junks.has_key?(@to[best_to - 1])) and
+            @from[best_from - 1] == @to[best_to - 1]
           best_from -= 1
           best_to -= 1
           best_size += 1
@@ -174,27 +174,31 @@ module Test
       end
 
       def matches
-        _matches = []
-        queue = [[0, @from.size - 1, 0, @to.size - 1]]
+        indexed_matches = []
+        queue = [[0, @from.size, 0, @to.size]]
         until queue.empty?
           from_start, from_end, to_start, to_end = queue.pop
-          match = longest_match(from_start, from_end, to_start, to_end)
+          match = longest_match(from_start, from_end - 1, to_start, to_end - 1)
           match_from_index, match_to_index, size = match
           unless size.zero?
-            _matches << match
             if from_start < match_from_index and
                 to_start < match_to_index
-              queue.push([from_start, match_from_index - 1,
-                          to_start, match_to_index - 1])
+              queue.push([from_start, match_from_index,
+                          to_start, match_to_index])
             end
-            if match_from_index + size <= from_end and
-                match_to_index + size <= to_end
+            indexed_matches << [match_from_index, match]
+            if match_from_index + size < from_end and
+                match_to_index + size < to_end
               queue.push([match_from_index + size, from_end,
                           match_to_index + size, to_end])
             end
           end
         end
-        _matches
+        indexed_matches.sort_by do |index, match|
+          index
+        end.collect do |index, match|
+          match
+        end
       end
 
       def determine_tag(from_index, to_index,
@@ -278,6 +282,10 @@ module Test
         tag("  ", contents)
       end
 
+      def tag_difference(contents)
+        tag("? ", contents)
+      end
+
       def diff_lines(from_start, from_end, to_start, to_end)
         best_ratio, cut_off = 0.74, 0.75
         from_equal_index = to_equal_index = nil
@@ -368,9 +376,13 @@ module Test
         to_tags = to_tags[common..-1].rstrip
 
         result = tag_deleted([from_line])
-        result << "? #{"\t" * common}#{from_tags}" unless from_tags.empty?
+        unless from_tags.empty?
+          result.concat(tag_difference(["#{"\t" * common}#{from_tags}"]))
+        end
         result.concat(tag_inserted([to_line]))
-        result << "? #{"\t" * common}#{to_tags}" unless to_tags.empty?
+        unless to_tags.empty?
+          result.concat(tag_difference(["#{"\t" * common}#{to_tags}"]))
+        end
         result
       end
 

data/lib/test-unit-ext/notification.rb

@@ -0,0 +1,81 @@
+module Test
+  module Unit
+    class TestResult
+      attr_reader :notifications
+
+      alias_method(:initialize_without_notifications, :initialize)
+      def initialize
+        initialize_without_notifications
+        @notifications = []
+      end
+
+      def add_notification(notification)
+        @notifications << notification
+        notify_listeners(FAULT, notification)
+        notify_listeners(CHANGED, self)
+      end
+
+      def notification_count
+        @notifications.size
+      end
+
+      alias_method(:to_s_without_notifications, :to_s)
+      def to_s
+        to_s_without_notifications + ", #{notification_count} notifications"
+      end
+    end
+
+    class Notification
+      attr_reader :test_name, :location, :message
+      
+      SINGLE_CHARACTER = 'N'
+
+      # Creates a new Notification with the given location and
+      # message.
+      def initialize(test_name, location, message)
+        @test_name = test_name
+        @location = location
+        @message = message
+      end
+      
+      # Returns a single character representation of a notification.
+      def single_character_display
+        SINGLE_CHARACTER
+      end
+
+      # Returns a brief version of the error description.
+      def short_display
+        "#@test_name: #{@message.split("\n")[0]}"
+      end
+
+      # Returns a verbose version of the error description.
+      def long_display
+        if location.size == 1
+          location_display = location[0].sub(/\A(.+:\d+).*/, ' [\\1]')
+        else
+          location_display = "\n" + location.join("\n")
+        end
+        "Notification:\n#{@test_name}#{location_display}:\n#{@message}"
+      end
+
+      # Overridden to return long_display.
+      def to_s
+        long_display
+      end
+    end
+
+    class NotifiedError < StandardError
+    end
+
+    module AssertionsWithNotify
+      def notify(message)
+        notification = Notification.new(name, caller[0, 1], message)
+        @_result.add_notification(notification)
+      end
+    end
+
+    class TestCase
+      include AssertionsWithNotify
+    end
+  end
+end

data/lib/test-unit-ext/pending.rb

@@ -0,0 +1,99 @@
+module Test
+  module Unit
+    class TestResult
+      attr_reader :pendings
+
+      alias_method(:initialize_without_pendings, :initialize)
+      def initialize
+        initialize_without_pendings
+        @pendings = []
+      end
+
+      def add_pending(pending)
+        @pendings << pending
+        notify_listeners(FAULT, pending)
+        notify_listeners(CHANGED, self)
+      end
+
+      def pending_count
+        @pendings.size
+      end
+
+      alias_method(:to_s_without_pendings, :to_s)
+      def to_s
+        to_s_without_pendings + ", #{pending_count} pendings"
+      end
+    end
+
+    class Pending
+      attr_reader :test_name, :location, :message
+      
+      SINGLE_CHARACTER = 'P'
+
+      # Creates a new Pending with the given location and
+      # message.
+      def initialize(test_name, location, message)
+        @test_name = test_name
+        @location = location
+        @message = message
+      end
+      
+      # Returns a single character representation of a pending.
+      def single_character_display
+        SINGLE_CHARACTER
+      end
+
+      # Returns a brief version of the error description.
+      def short_display
+        "#@test_name: #{@message.split("\n")[0]}"
+      end
+
+      # Returns a verbose version of the error description.
+      def long_display
+        if location.size == 1
+          location_display = location[0].sub(/\A(.+:\d+).*/, ' [\\1]')
+        else
+          location_display = "\n" + location.join("\n")
+        end
+        "Pending:\n#{@test_name}#{location_display}:\n#{@message}"
+      end
+
+      # Overridden to return long_display.
+      def to_s
+        long_display
+      end
+    end
+
+    class PendedError < StandardError
+    end
+
+    module AssertionsWithPend
+      def pend(message="Pended", &block)
+        if block_given?
+          begin
+            yield
+          rescue Exception
+            raise PendedError, message, $!.backtrace
+          end
+          flunk("Pending block should not be passed: #{message}")
+        else
+          raise PendedError.new(message)
+        end
+      end
+    end
+
+    class TestCase
+      include AssertionsWithPend
+
+      alias_method(:add_error_without_pending, :add_error)
+      def add_error(exception)
+        if exception.is_a?(PendedError)
+          pending = Pending.new(name, exception.backtrace, exception.message)
+          @_result.add_pending(pending)
+        else
+          add_error_without_pending(exception)
+        end
+      end
+    end
+  end
+end

data/lib/test-unit-ext/priority.rb

@@ -3,52 +3,23 @@ require "test/unit"
 require "fileutils"
 require "tmpdir"
 
+require "test-unit-ext/attributes"
+
 module Test
   module Unit
     class TestCase
       class << self
-        def inherited(sub)
-          super
-          sub.instance_variable_set("@priority_initialized", true)
-          sub.instance_variable_set("@priority_table", {})
-          sub.priority :normal
-        end
-
-        def include(*args)
-          args.reverse_each do |mod|
-            super(mod)
-            next unless defined?(@priority_initialized)
-            mod.instance_methods(false).each do |name|
-              set_priority(name)
-            end
-          end
-        end
-
-        alias_method :method_added_without_priority, :method_added
-        def method_added(name)
-          method_added_without_priority(name)
-          set_priority(name) if defined?(@priority_initialized)
-        end
-
         def priority(name, *tests)
           singleton_class = (class << self; self; end)
           priority_check_method = priority_check_method_name(name)
           unless singleton_class.private_method_defined?(priority_check_method)
             raise ArgumentError, "unknown priority: #{name}"
           end
-          if tests.empty?
-            @current_priority = name
-          else
-            tests.each do |test|
-              set_priority(test, name)
-            end
-          end
+          attribute(:priority, name, {:keep => true}, *tests)
         end
 
         def need_to_run?(test_name)
-          normalized_test_name = normalize_test_name(test_name)
-          priority = @priority_table[normalized_test_name]
-          return true unless priority
+          priority = (attributes(test_name) || {})[:priority] || :normal
           __send__(priority_check_method_name(priority), test_name)
         end
 
@@ -57,10 +28,6 @@ module Test
           "run_priority_#{priority_name}?"
         end
 
-        def normalize_test_name(test_name)
-          "test_#{test_name.to_s.sub(/^test_/, '')}"
-        end
-
         def set_priority(name, priority=@current_priority)
           @priority_table[normalize_test_name(name)] = priority
         end

data/lib/test-unit-ext/version.rb

@@ -1,3 +1,3 @@
 module TestUnitExt
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/test/test_attributes.rb

@@ -74,6 +74,7 @@ class TestAttributes < Test::Unit::TestCase
                    "#{__FILE__}:#{first_arg_end_line}:in `#{method_name}':\n" \
                    "<2> expected but was\n" \
                    "<1>.\n" \
+                   "\n" \
                    "diff:\n" \
                    "- 2\n" \
                    "+ 1",
@@ -84,6 +85,7 @@ class TestAttributes < Test::Unit::TestCase
                    "#{__FILE__}:#{first_arg_end_line}:in `#{method_name}':\n" \
                    "<0> expected but was\n" \
                    "<11>.\n" \
+                   "\n" \
                    "diff:\n" \
                    "- 0\n" \
                    "+ 11"],
@@ -101,6 +103,7 @@ class TestAttributes < Test::Unit::TestCase
                    "#{__FILE__}:#{first_arg_end_line}:in `#{method_name}':\n" \
                    "<1> expected but was\n" \
                    "<12>.\n" \
+                   "\n" \
                    "diff:\n" \
                    "- 1\n" \
                    "+ 12"],

data/test/test_diff.rb

@@ -72,6 +72,24 @@ class TestDiff < Test::Unit::TestCase
                        [:equal, 4, 6, 3, 5],
                        [:insert, 6, 6, 5, 6]],
                       "qabxcd", "abycdf")
+
+    assert_operations([[:equal, 0, 23, 0, 23],
+                       [:replace, 23, 24, 23, 24],
+                       [:equal, 24, 35, 24, 35],
+                       [:replace, 35, 36, 35, 36],
+                       [:equal, 36, 45, 36, 45]],
+                      "1 tests, 0 assertions, 1 failures, 0 pendings",
+                      "1 tests, 0 assertions, 0 failures, 1 pendings")
+
+    assert_operations([[:equal, 0, 23, 0, 23],
+                       [:replace, 23, 24, 23, 24],
+                       [:equal, 24, 35, 24, 35],
+                       [:replace, 35, 36, 35, 36],
+                       [:equal, 36, 45, 36, 45]],
+                      "1 tests, 0 assertions, 1 failures, 0 pendings",
+                      "1 tests, 0 assertions, 0 failures, 1 pendings") do |x|
+      x == " "[0]
+    end
   end
 
   def test_grouped_operations
@@ -148,6 +166,15 @@ class TestDiff < Test::Unit::TestCase
                          ["abcd abcd xyz abc"])
   end
 
+  def test_difference_readable_diff
+    assert_readable_diff("- 1 tests, 0 assertions, 1 failures, 0 pendings\n" \
+                         "?                        ^           ^\n" \
+                         "+ 1 tests, 0 assertions, 0 failures, 1 pendings\n" \
+                         "?                        ^           ^",
+                         ["1 tests, 0 assertions, 1 failures, 0 pendings"],
+                         ["1 tests, 0 assertions, 0 failures, 1 pendings"])
+  end
+
   def test_complex_readable_diff
     assert_readable_diff("  aaa\n" \
                          "- bbb\n" \
@@ -281,6 +308,15 @@ class TestDiff < Test::Unit::TestCase
     assert_equal(expected, matcher.instance_variable_get("@to_indexes"))
   end
 
+  def assert_find_best_match_position(expected, from, to,
+                                      from_start, from_end,
+                                      to_start, to_end, &junk_predicate)
+    matcher = Test::Diff::SequenceMatcher.new(from, to, &junk_predicate)
+    assert_equal(expected, matcher.send(:find_best_match_position,
+                                        from_start, from_end,
+                                        to_start, to_end))
+  end
+
   def assert_longest_match(expected, from, to,
                            from_start, from_end,
                            to_start, to_end, &junk_predicate)
@@ -294,8 +330,8 @@ class TestDiff < Test::Unit::TestCase
     assert_equal(expected, matcher.blocks)
   end
 
-  def assert_operations(expected, from, to)
-    matcher = Test::Diff::SequenceMatcher.new(from, to)
+  def assert_operations(expected, from, to, &junk_predicate)
+    matcher = Test::Diff::SequenceMatcher.new(from, to, &junk_predicate)
     assert_equal(expected, matcher.operations)
   end
 

data/test/test_notification.rb

@@ -0,0 +1,32 @@
+require 'test-unit-ext'
+
+class TestNotification < Test::Unit::TestCase
+  class TestCase < Test::Unit::TestCase
+    class << self
+      def suite
+        Test::Unit::TestSuite.new(name)
+      end
+    end
+
+    def test_notify
+      notify("1st notify")
+      notify("2nd notify. Reach here.")
+    end
+  end
+
+  def test_notify
+    result = run_test("test_notify")
+    assert_equal("1 tests, 0 assertions, 0 failures, 0 errors, 0 pendings, " \
+                 "2 notifications",
+                 result.to_s)
+    assert_equal(["1st notify", "2nd notify. Reach here."],
+                 result.notifications.collect {|n| n.message})
+  end
+
+  private
+  def run_test(name)
+    result = Test::Unit::TestResult.new
+    TestCase.new(name).run(result) {}
+    result
+  end
+end

data/test/test_pending.rb

@@ -0,0 +1,64 @@
+require 'test-unit-ext'
+
+class TestPending < Test::Unit::TestCase
+  class TestCase < Test::Unit::TestCase
+    class << self
+      def suite
+        Test::Unit::TestSuite.new(name)
+      end
+    end
+
+    def test_pend
+      pend("1st pend")
+      pend("2nd pend. Not reached here.")
+    end
+
+    def test_pend_with_failure_in_block
+      pend("Wait a minute") do
+        raise "Not implemented yet"
+      end
+      assert(true, "Not reached here.")
+    end
+
+    def test_pend_with_no_failure_in_block
+      pend("Wait a minute") do
+        "Nothing raised"
+      end
+      assert(true, "Reached here.")
+    end
+  end
+
+  def test_pend
+    result = run_test("test_pend")
+    assert_equal("1 tests, 0 assertions, 0 failures, 0 errors, 1 pendings, " \
+                 "0 notifications",
+                 result.to_s)
+    assert_equal(["1st pend"],
+                 result.pendings.collect {|pending| pending.message})
+  end
+
+  def test_pend_with_failure_in_block
+    result = run_test("test_pend_with_failure_in_block")
+    assert_equal("1 tests, 0 assertions, 0 failures, 0 errors, 1 pendings, " \
+                 "0 notifications",
+                 result.to_s)
+    assert_equal(["Wait a minute"],
+                 result.pendings.collect {|pending| pending.message})
+  end
+
+  def test_pend_with_no_failure_in_block
+    result = run_test("test_pend_with_no_failure_in_block")
+    assert_equal("1 tests, 1 assertions, 1 failures, 0 errors, 0 pendings, " \
+                 "0 notifications",
+                 result.to_s)
+    assert_equal(["Pending block should not be passed: Wait a minute."],
+                 result.failures.collect {|failure| failure.message})
+  end
+
+  private
+  def run_test(name)
+    result = Test::Unit::TestResult.new
+    TestCase.new(name).run(result) {}
+    result
+  end
+end

data/test/test_priority.rb

@@ -0,0 +1,88 @@
+require 'test-unit-ext'
+
+class TestPriority < Test::Unit::TestCase
+  class TestCase < Test::Unit::TestCase
+    class << self
+      def suite
+        Test::Unit::TestSuite.new(name)
+      end
+    end
+
+    priority :must
+    def test_must
+      assert(true)
+    end
+
+    def test_must_inherited
+      assert(true)
+    end
+
+    priority :important
+    def test_important
+      assert(true)
+    end
+
+    def test_important_inherited
+      assert(true)
+    end
+
+    priority :high
+    def test_high
+      assert(true)
+    end
+
+    def test_high_inherited
+      assert(true)
+    end
+
+    priority :normal
+    def test_normal
+      assert(true)
+    end
+
+    def test_normal_inherited
+      assert(true)
+    end
+
+    priority :low
+    def test_low
+      assert(true)
+    end
+
+    def test_low_inherited
+      assert(true)
+    end
+
+    priority :never
+    def test_never
+      assert(true)
+    end
+
+    def test_never_inherited
+      assert(true)
+    end
+  end
+
+  def test_priority
+    assert_priority("must", 1.0, 0.0001)
+    assert_priority("important", 0.9, 0.09)
+    assert_priority("high", 0.70, 0.1)
+    assert_priority("normal", 0.5, 0.1)
+    assert_priority("low", 0.25, 0.1)
+    assert_priority("never", 0.0, 0.0001)
+  end
+
+  def assert_priority(priority, expected, delta)
+    assert_need_to_run("test_#{priority}", expected, delta)
+    assert_need_to_run("test_#{priority}_inherited", expected, delta)
+  end
+
+  def assert_need_to_run(test_name, expected, delta)
+    n = 1000
+    n_need_to_run = 0
+    n.times do |i|
+      n_need_to_run +=1 if TestCase.need_to_run?(test_name)
+    end
+    assert_in_delta(expected, n_need_to_run.to_f / n, delta)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: test-unit-ext
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-17 00:00:00 +09:00
+date: 2008-04-07 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -47,6 +47,8 @@ files:
 - lib/test-unit-ext/colorized-runner.rb
 - lib/test-unit-ext/diff.rb
 - lib/test-unit-ext/long-display-for-emacs.rb
+- lib/test-unit-ext/notification.rb
+- lib/test-unit-ext/pending.rb
 - lib/test-unit-ext/priority.rb
 - lib/test-unit-ext/version.rb
 - lib/test-unit-ext/xml-report.rb
@@ -55,6 +57,9 @@ files:
 - test/test_attributes.rb
 - test/test_color.rb
 - test/test_diff.rb
+- test/test_notification.rb
+- test/test_pending.rb
+- test/test_priority.rb
 - test/test_xml_report.rb
 has_rdoc: true
 homepage: http://test-unit-ext.rubyforge.org/
@@ -84,7 +89,10 @@ signing_key:
 specification_version: 2
 summary: TestUnitExt extends the standard Test::Unit.
 test_files: 
+- test/test_pending.rb
 - test/test_diff.rb
+- test/test_priority.rb
+- test/test_notification.rb
+- test/test_attributes.rb
 - test/test_color.rb
 - test/test_xml_report.rb
-- test/test_attributes.rb