test-unit 3.4.1 → 3.4.5

data/lib/test/unit/testsuite.rb

@@ -77,7 +77,7 @@ module Test
         @tests -= tests
       end
 
-      # Retuns the rolled up number of tests in this suite;
+      # Returns the rolled up number of tests in this suite;
       # i.e. if the suite contains other suites, it counts the
       # tests within those suites, not the suites themselves.
       def size

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

@@ -660,6 +660,7 @@ module Test
 
           def diff_line(from_line, to_line)
             to_operations = []
+            mark_operations = []
             from_line, to_line, _operations = line_operations(from_line, to_line)
 
             no_replace = true
@@ -689,11 +690,22 @@ module Test
                     output_single(" " * (from_width - to_width))
                   end
                 end
+                mark_operations << Proc.new do
+                  output_single("?" * from_width,
+                                color("diff-difference-tag"))
+                  if (to_width < from_width)
+                    output_single(" " * (from_width - to_width))
+                  end
+                end
               when :delete
                 output_single(from_line[from_start...from_end],
                               color("diff-deleted"))
                 unless no_replace
                   to_operations << Proc.new {output_single(" " * from_width)}
+                  mark_operations << Proc.new do
+                    output_single("-" * from_width,
+                                  color("diff-deleted"))
+                  end
                 end
               when :insert
                 if no_replace
@@ -705,11 +717,16 @@ module Test
                     output_single(to_line[to_start...to_end],
                                   color("diff-inserted"))
                   end
+                  mark_operations << Proc.new do
+                    output_single("+" * to_width,
+                                  color("diff-inserted"))
+                  end
                 end
               when :equal
                 output_single(from_line[from_start...from_end])
                 unless no_replace
                   to_operations << Proc.new {output_single(" " * to_width)}
+                  mark_operations << Proc.new {output_single(" " * to_width)}
                 end
               else
                 raise "unknown tag: #{tag}"
@@ -725,6 +742,15 @@ module Test
               end
               output("")
             end
+
+            unless mark_operations.empty?
+              output_single("?", color("diff-difference-tag"))
+              output_single(" ")
+              mark_operations.each do |operation|
+                operation.call
+              end
+              output("")
+            end
           end
         end
       end

data/lib/test/unit/util/memory-usage.rb

@@ -0,0 +1,47 @@
+module Test
+  module Unit
+    module Util
+      class MemoryUsage
+        attr_reader :virtual
+        attr_reader :physical
+        def initialize
+          @virtual = nil
+          @physical = nil
+          collect_data
+        end
+
+        def collected?
+          return false if @virtual.nil?
+          return false if @physical.nil?
+          true
+        end
+
+        private
+        def collect_data
+          collect_data_proc
+        end
+
+        def collect_data_proc
+          status_file = "/proc/self/status"
+          return false unless File.exist?(status_file)
+
+          data = File.binread(status_file)
+          data.each_line do |line|
+            case line
+            when /\AVm(Size|RSS):\s*(\d+)\s*kB/
+              name = $1
+              value = Integer($2, 10) * 1024
+              case name
+              when "Size"
+                @virtual = value
+              when "RSS"
+                @physical = value
+              end
+            end
+          end
+          collected?
+        end
+      end
+    end
+  end
+end

data/lib/test/unit/version.rb

@@ -1,5 +1,5 @@
 module Test
   module Unit
-    VERSION = "3.4.1"
+    VERSION = "3.4.5"
   end
 end

data/lib/test/unit.rb

@@ -324,14 +324,14 @@ module Test # :nodoc:
       # Set true when Test::Unit has run.  If set to true Test::Unit
       # will not automatically run at exit.
       #
-      # @deprecated Use Test::Unit::AutoRunner.need_auto_run= instead.
+      # @deprecated Use {Test::Unit::AutoRunner.need_auto_run=} instead.
       def run=(have_run)
         AutoRunner.need_auto_run = (not have_run)
       end
 
       # Already tests have run?
       #
-      # @deprecated Use Test::Unit::AutoRunner.need_auto_run? instead.
+      # @deprecated Use {Test::Unit::AutoRunner.need_auto_run?} instead.
       def run?
         not AutoRunner.need_auto_run?
       end
@@ -339,7 +339,7 @@ module Test # :nodoc:
       # @api private
       @@at_start_hooks = []
 
-      # Regsiter a hook that is run before running tests.
+      # Register a hook that is run before running tests.
       # To register multiple hooks, call this method multiple times.
       #
       # Here is an example test case:
@@ -425,7 +425,7 @@ module Test # :nodoc:
       # @api private
       @@at_exit_hooks = []
 
-      # Regsiter a hook that is run after running tests.
+      # Register a hook that is run after running tests.
       # To register multiple hooks, call this method multiple times.
       #
       # Here is an example test case:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-unit
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.5
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: power_assert
@@ -159,6 +159,7 @@ files:
 - lib/test/unit/ui/testrunnerutilities.rb
 - lib/test/unit/ui/xml/testrunner.rb
 - lib/test/unit/util/backtracefilter.rb
+- lib/test/unit/util/memory-usage.rb
 - lib/test/unit/util/method-owner-finder.rb
 - lib/test/unit/util/observable.rb
 - lib/test/unit/util/output.rb
@@ -170,46 +171,6 @@ files:
 - sample/test_adder.rb
 - sample/test_subtracter.rb
 - sample/test_user.rb
-- test/collector/test-descendant.rb
-- test/collector/test-load.rb
-- test/collector/test_dir.rb
-- test/collector/test_objectspace.rb
-- test/fixtures/header-label.csv
-- test/fixtures/header-label.tsv
-- test/fixtures/header.csv
-- test/fixtures/header.tsv
-- test/fixtures/no-header.csv
-- test/fixtures/no-header.tsv
-- test/fixtures/plus.csv
-- test/run-test.rb
-- test/test-assertions.rb
-- test/test-attribute-matcher.rb
-- test/test-attribute.rb
-- test/test-code-snippet.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-error.rb
-- test/test-failure.rb
-- test/test-fault-location-detector.rb
-- test/test-fixture.rb
-- test/test-notification.rb
-- test/test-omission.rb
-- test/test-pending.rb
-- test/test-priority.rb
-- test/test-test-case.rb
-- test/test-test-result.rb
-- test/test-test-suite-creator.rb
-- test/test-test-suite.rb
-- test/testunit-test-util.rb
-- test/ui/test_testrunmediator.rb
-- test/util/test-method-owner-finder.rb
-- test/util/test-output.rb
-- test/util/test_backtracefilter.rb
-- test/util/test_observable.rb
-- test/util/test_procwrapper.rb
 homepage: http://test-unit.github.io/
 licenses:
 - Ruby
@@ -217,6 +178,8 @@ licenses:
 - PSFL
 metadata:
   source_code_uri: https://github.com/test-unit/test-unit
+  documentation_uri: https://test-unit.github.io/test-unit/en/
+  bug_tracker_uri: https://github.com/test-unit/test-unit/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -236,44 +199,4 @@ rubygems_version: 3.3.0.dev
 signing_key: 
 specification_version: 4
 summary: An xUnit family unit testing framework for Ruby.
-test_files:
-- test/collector/test-descendant.rb
-- test/collector/test-load.rb
-- test/collector/test_dir.rb
-- test/collector/test_objectspace.rb
-- test/fixtures/header-label.csv
-- test/fixtures/header-label.tsv
-- test/fixtures/header.csv
-- test/fixtures/header.tsv
-- test/fixtures/no-header.csv
-- test/fixtures/no-header.tsv
-- test/fixtures/plus.csv
-- test/run-test.rb
-- test/test-assertions.rb
-- test/test-attribute-matcher.rb
-- test/test-attribute.rb
-- test/test-code-snippet.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-error.rb
-- test/test-failure.rb
-- test/test-fault-location-detector.rb
-- test/test-fixture.rb
-- test/test-notification.rb
-- test/test-omission.rb
-- test/test-pending.rb
-- test/test-priority.rb
-- test/test-test-case.rb
-- test/test-test-result.rb
-- test/test-test-suite-creator.rb
-- test/test-test-suite.rb
-- test/testunit-test-util.rb
-- test/ui/test_testrunmediator.rb
-- test/util/test-method-owner-finder.rb
-- test/util/test-output.rb
-- test/util/test_backtracefilter.rb
-- test/util/test_observable.rb
-- test/util/test_procwrapper.rb
+test_files: []

data/test/collector/test-descendant.rb

@@ -1,182 +0,0 @@
-require 'test/unit'
-require 'test/unit/collector/descendant'
-
-class TestUnitCollectorDescendant < Test::Unit::TestCase
-  def setup
-    @previous_descendants = Test::Unit::TestCase::DESCENDANTS.dup
-    Test::Unit::TestCase::DESCENDANTS.clear
-  end
-
-  def teardown
-    Test::Unit::TestCase::DESCENDANTS.replace(@previous_descendants)
-  end
-
-  private
-  def assert_collect(expected, *collect_args)
-    collector = Test::Unit::Collector::Descendant.new
-    yield(collector) if block_given?
-    assert_equal(expected, collector.send(:collect, *collect_args))
-  end
-
-  def default_name
-    Test::Unit::Collector::Descendant::NAME
-  end
-
-  def empty_suite(name=nil)
-    Test::Unit::TestSuite.new(name || default_name)
-  end
-
-  class TestCollect < self
-    def setup
-      super
-
-      @test_case1 = Class.new(Test::Unit::TestCase) do
-        self.test_order = :alphabetic
-
-        def self.name
-          "test-case1"
-        end
-
-        def test_1
-        end
-
-        def test_2
-        end
-      end
-
-      @test_case2 = Class.new(Test::Unit::TestCase) do
-        self.test_order = :alphabetic
-
-        def self.name
-          "test-case2"
-        end
-
-        def test_0
-        end
-      end
-
-      @no_test_case = Class.new do
-        def self.name
-          "no-test-case"
-        end
-
-        def test_4
-        end
-      end
-    end
-
-    def test_basic
-      assert_collect(full_suite("name"), "name")
-
-      assert_collect(full_suite("name"), "name") do |collector|
-        collector.filter = []
-      end
-    end
-
-    def test_filtered
-      assert_collect(empty_suite) do |collector|
-        collector.filter = Proc.new {false}
-      end
-
-      assert_collect(full_suite) do |collector|
-        collector.filter = Proc.new {true}
-      end
-
-      assert_collect(full_suite) do |collector|
-        collector.filter = Proc.new {nil}
-      end
-
-      assert_collect(empty_suite) do |collector|
-        collector.filter = [Proc.new {false}, Proc.new {true}]
-      end
-
-      assert_collect(empty_suite) do |collector|
-        collector.filter = [Proc.new {true}, Proc.new {false}]
-      end
-
-      assert_collect(empty_suite) do |collector|
-        collector.filter = [Proc.new {nil}, Proc.new {false}]
-      end
-
-      assert_collect(full_suite) do |collector|
-        collector.filter = [Proc.new {nil}, Proc.new {true}]
-      end
-
-      expected = empty_suite
-      suite1 = Test::Unit::TestSuite.new(@test_case1.name)
-      suite1 << @test_case1.new("test_1")
-      suite2 = Test::Unit::TestSuite.new(@test_case2.name)
-      suite2 << @test_case2.new("test_0")
-      expected << suite1 << suite2
-      assert_collect(expected) do |collector|
-        collector.filter = Proc.new do |test|
-          ['test_1', 'test_0'].include?(test.method_name)
-        end
-      end
-
-      suite1 = Test::Unit::TestSuite.new(@test_case1.name)
-      suite1 << @test_case1.new("test_1")
-      suite2 = Test::Unit::TestSuite.new(@test_case2.name)
-      suite2 << @test_case2.new("test_0")
-      assert_collect(empty_suite) do |collector|
-        filters = [Proc.new {|test| test.method_name == 'test_1' ? true : nil},
-                   Proc.new {|test| test.method_name == 'test_0' ? true : nil},
-                   Proc.new {false}]
-        collector.filter = filters
-      end
-    end
-
-    private
-    def full_suite(name=nil)
-      sub_suite1 = Test::Unit::TestSuite.new(@test_case1.name)
-      sub_suite1 << @test_case1.new('test_1')
-      sub_suite1 << @test_case1.new('test_2')
-
-      sub_suite2 = Test::Unit::TestSuite.new(@test_case2.name)
-      sub_suite2 << @test_case2.new('test_0')
-
-      suite = empty_suite(name)
-      suite << sub_suite1
-      suite << sub_suite2
-      suite
-    end
-  end
-
-  class TestModule < self
-    def test_included_in_child
-      tests = Module.new do
-        def test_in_module
-        end
-      end
-
-      parent_test_case = Class.new(Test::Unit::TestCase) do
-        class << self
-          def name
-            "Parent"
-          end
-        end
-      end
-
-      child_test_case = Class.new(parent_test_case) do
-        include tests
-
-        class << self
-          def name
-            "Child"
-          end
-        end
-      end
-
-      child_suite = Test::Unit::TestSuite.new(child_test_case.name)
-      child_suite << child_test_case.new("test_in_module")
-
-      parent_suite = Test::Unit::TestSuite.new(parent_test_case.name)
-      parent_suite << child_suite
-
-      suite = empty_suite("all")
-      suite << parent_suite
-
-      assert_collect(suite, "all")
-    end
-  end
-end