test-unit 2.0.5 → 2.0.6

data/History.txt

@@ -1,3 +1,29 @@
+=== 2.0.6 / 2010-01-09
+
+* 3 major enhancements
+  * [#27380] Declarative syntax? [Daniel Berger]
+    support declarative syntax:
+
+      test "test description in natural language" do
+         ...
+      end
+  * support test description:
+      description "test description in natural language"
+      def test_my_test
+         ...
+      end
+  * make max diff target string size customizable by
+    TEST_UNIT_MAX_DIFF_TARGET_STRING_SIZE environment variable.
+
+* 2 bug fixes
+  * [#27374] omit_if unexpected behavior [David MARCHALAND]
+  * fix a bug that tests in sub directories aren't load with --basedir.
+    [Daniel Berger]
+
+* Thanks
+  * David MARCHALAND
+  * Daniel Berger
+
 === 2.0.5 / 2009-10-18
 
 * 1 bug fixes

data/README.txt

@@ -51,3 +51,5 @@ This software is distributed under the same terms as ruby.
 * Diego Pettenò: A bug report.
 * Angelo Lakra: A bug report.
 * Mike Pomraning: A bug report.
+* David MARCHALAND: A bug report.
+* Andrew Grimm: A bug report.

data/lib/test/unit.rb

@@ -303,12 +303,13 @@ module Test # :nodoc:
   #
 
   module Unit
-    # If set to false Test::Unit will not automatically run at exit.
+    # Set true when Test::Unit has run.  If set to true Test::Unit
+    # will not automatically run at exit.
     def self.run=(flag)
       @run = flag
     end
 
-    # Automatically run tests at exit?
+    # Already tests have run?
     def self.run?
       @run ||= false
     end

data/lib/test/unit/assertions.rb

@@ -798,6 +798,54 @@ EOT
         end
       end
 
+      ##
+      # Passes if +object+#+alias_name+ is an alias method of
+      # +object+#+original_name+.
+      #
+      # Example:
+      #   assert_alias_method([], :length, :size)  # -> pass
+      #   assert_alias_method([], :size, :length)  # -> pass
+      #   assert_alias_method([], :each, :size)    # -> fail
+      def assert_alias_method(object, alias_name, original_name, message=nil)
+        _wrap_assertion do
+          find_method_failure_message = Proc.new do |method_name|
+            build_message(message,
+                          "<?>.? doesn't exist\n" +
+                          "(Class: <?>)",
+                          object,
+                          AssertionMessage.literal(method_name),
+                          object.class)
+          end
+
+          alias_method = original_method = nil
+          assert_block(find_method_failure_message.call(alias_name)) do
+            begin
+              alias_method = object.method(alias_name)
+              true
+            rescue NameError
+              false
+            end
+          end
+          assert_block(find_method_failure_message.call(original_name)) do
+            begin
+              original_method = object.method(original_name)
+              true
+            rescue NameError
+              false
+            end
+          end
+
+          full_message = build_message(message,
+                                       "<?> is alias of\n" +
+                                       "<?> expected",
+                                       alias_method,
+                                       original_method)
+          assert_block(full_message) do
+            alias_method == original_method
+          end
+        end
+      end
+
       ##
       # Builds a failure message.  +head+ is added before the +template+ and
       # +arguments+ replaces the '?'s positionally in the template.
@@ -890,11 +938,23 @@ EOT
           end
 
           MAX_DIFF_TARGET_STRING_SIZE = 1000
+          def max_diff_target_string_size
+            size = ENV["TEST_UNIT_MAX_DIFF_TARGET_STRING_SIZE"]
+            if size
+              begin
+                size = Integer(size)
+              rescue ArgumentError
+                size = nil
+              end
+            end
+            size || MAX_DIFF_TARGET_STRING_SIZE
+          end
+
           def diff_target_string?(string)
             if string.respond_to?(:bytesize)
-              string.bytesize < MAX_DIFF_TARGET_STRING_SIZE
+              string.bytesize < max_diff_target_string_size
             else
-              string.size < MAX_DIFF_TARGET_STRING_SIZE
+              string.size < max_diff_target_string_size
             end
           end
 

data/lib/test/unit/collector/load.rb

@@ -29,7 +29,7 @@ module Test
           add_load_path(@base) do
             froms = ["."] if froms.empty?
             test_suites = froms.collect do |from|
-              test_suite = collect_recursive(from, find_test_cases)
+              test_suite = collect_recursive(resolve_path(from), find_test_cases)
               test_suite = nil if test_suite.tests.empty?
               test_suite
             end.compact
@@ -56,10 +56,9 @@ module Test
         end
 
         private
-        def collect_recursive(name, already_gathered)
+        def collect_recursive(path, already_gathered)
           sub_test_suites = []
 
-          path = resolve_path(name)
           if path.directory?
             directories, files = path.children.partition do |child|
               child.directory?

data/lib/test/unit/omission.rb

@@ -56,7 +56,7 @@ module Test
         end
       end
 
-      # Omit the test of part of the test.
+      # Omit the test or part of the test.
       #
       # Example:
       #   def test_omission
@@ -80,12 +80,56 @@ module Test
         end
       end
 
+      # Omit the test or part of the test if _condition_ is
+      # true.
+      #
+      # Example:
+      #   def test_omission
+      #     omit_if("".empty?)
+      #     # Not reached here
+      #   end
+      #
+      #   def test_omission_with_here
+      #     omit_if(true) do
+      #       # Not ran here
+      #     end
+      #     omit_if(false) do
+      #       # Reached here
+      #     end
+      #     # Reached here too
+      #   end
       def omit_if(condition, *args, &block)
-        omit(*args, &block) if condition
+        if condition
+          omit(*args, &block)
+        else
+          block.call if block
+        end
       end
 
+      # Omit the test or part of the test if _condition_ is
+      # not true.
+      #
+      # Example:
+      #   def test_omission
+      #     omit_unless("string".empty?)
+      #     # Not reached here
+      #   end
+      #
+      #   def test_omission_with_here
+      #     omit_unless(true) do
+      #       # Reached here
+      #     end
+      #     omit_unless(false) do
+      #       # Not ran here
+      #     end
+      #     # Reached here too
+      #   end
       def omit_unless(condition, *args, &block)
-        omit(*args, &block) unless condition
+        if condition
+          block.call if block
+        else
+          omit(*args, &block)
+        end
       end
 
       private

data/lib/test/unit/testcase.rb

@@ -212,6 +212,39 @@ module Test
           @@test_order = order
         end
 
+        # Defines a test in declarative syntax.
+        #
+        # The following two test definitions are the same:
+        #
+        #   description "register user"
+        #   def test_register_user
+        #     ...
+        #   end
+        #
+        #   test "register user" do
+        #     ...
+        #   end
+        def test(test_description, &block)
+          normalized_description = test_description.gsub(/[^a-zA-Z\d_]+/, '_')
+          method_name = "test_#{normalized_description}".to_sym
+          define_method(method_name, &block)
+          description(test_description, method_name)
+        end
+
+        # Describes a test.
+        #
+        # The following example associates "register a
+        # normal user" description with "test_register"
+        # test.
+        #
+        #   description "register a normal user"
+        #   def test_register
+        #     ...
+        #   end
+        def description(value, target=nil)
+          attribute(:description, value, {}, target || [])
+        end
+
         # :stopdoc:
         private
         def collect_test_names
@@ -374,6 +407,15 @@ module Test
         "#{@method_name}(#{self.class.name})"
       end
 
+      # Returns a description for the test. A description
+      # will be associated by Test::Unit::TestCase.test or
+      # Test::Unit::TestCase.description.
+      #
+      # Returns a name for the test for no description test.
+      def description
+        self[:description] || name
+      end
+
       # Overridden to return #name.
       def to_s
         name

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.5'
+    VERSION = '2.0.6'
   end
 end

data/test/test-omission.rb

@@ -68,7 +68,7 @@ class TestUnitOmission < Test::Unit::TestCase
 
   def test_omit_with_condition_and_block
     result = _run_test("test_omit_with_block_and_condition")
-    assert_equal("1 tests, 1 assertions, 0 failures, 0 errors, 0 pendings, " \
+    assert_equal("1 tests, 2 assertions, 0 failures, 0 errors, 0 pendings, " \
                  "1 omissions, 0 notifications",
                  result.to_s)
     assert_fault_messages(["Should omit."], result.omissions)

data/test/test-testcase.rb

@@ -490,6 +490,33 @@ module Test
         end
       end
 
+      def test_declarative_style
+        keep_test_order do
+          test_case = Class.new(Test::Unit::TestCase) do
+            test "declarative style test definition" do
+            end
+
+            test "include parenthesis" do
+            end
+
+            test "1 + 2 = 3" do
+            end
+          end
+
+          test_case.test_order = :defined
+
+          assert_equal(["test_declarative_style_test_definition",
+                        "test_include_parenthesis",
+                        "test_1_2_3"],
+                       test_case.suite.tests.collect {|test| test.method_name})
+
+          assert_equal(["declarative style test definition",
+                        "include parenthesis",
+                        "1 + 2 = 3"],
+                       test_case.suite.tests.collect {|test| test.description})
+        end
+      end
+
       private
       def check(message, passed)
         add_assertion

data/test/test_assertions.rb

@@ -275,6 +275,42 @@ EOM
         end
       end
 
+      def test_assert_equal_with_max_diff_target_string_size
+        key = "TEST_UNIT_MAX_DIFF_TARGET_STRING_SIZE"
+        before_value = ENV[key]
+        ENV[key] = "100"
+        begin
+          message = <<-EOM.chomp
+<#{("a\n" + "x" * 97).inspect}> expected but was
+<#{"x".inspect}>.
+
+diff:
++ x
+- a
+- #{"x" * 97}
+
+folded diff:
++ x
+- a
+#{(["- " + ("x" * 78)]).join("\n")}
+- #{"x" * 19}
+EOM
+          check_fails(message) do
+            assert_equal("a\n" + "x" * 97, "x")
+          end
+
+          message = <<-EOM.chomp
+<#{("a\n" + "x" * 98).inspect}> expected but was
+<#{"x".inspect}>.
+EOM
+          check_fails(message) do
+            assert_equal("a\n" + "x" * 98, "x")
+          end
+        ensure
+          ENV[key] = before_value
+        end
+      end
+
       def test_assert_raise_success
         return_value = nil
         check_nothing_fails(true) do
@@ -1061,6 +1097,41 @@ EOM
         end
       end
 
+      def test_assert_alias_method
+        object = Object.new
+        class << object
+          def original_method
+          end
+          alias_method :alias_method, :original_method
+
+          def other
+          end
+        end
+
+        check_nothing_fails do
+          assert_alias_method(object, :alias_method, :original_method)
+        end
+
+        check_nothing_fails do
+          assert_alias_method(object, :original_method, :alias_method)
+        end
+
+        check_fails("<#{object.method(:other).inspect}> is alias of\n" +
+                    "<#{object.method(:original_method).inspect}> expected") do
+          assert_alias_method(object, :other, :original_method)
+        end
+
+        check_fails("<#{object.inspect}>.nonexistent doesn't exist\n" +
+                    "(Class: <Object>)") do
+          assert_alias_method(object, :nonexistent, :original_method)
+        end
+
+        check_fails("<#{object.inspect}>.nonexistent doesn't exist\n" +
+                    "(Class: <Object>)") do
+          assert_alias_method(object, :alias_method, :nonexistent)
+        end
+      end
+
       private
       def add_failure(message, location=caller, options=nil)
         unless @catch_assertions

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: test-unit
 version: !ruby/object:Gem::Version 
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-18 00:00:00 +09:00
+date: 2010-01-09 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.4.0
     version: 
 description: |-
   Test::Unit 2.x - Improved version of Test::Unit bundled in