petitest 0.2.1 → 0.3.0

data/lib/petitest/{test_case.rb → test_runner.rb}

@@ -1,5 +1,5 @@
 module Petitest
-  class TestCase
+  class TestRunner
     # @return [StandardError, nil]
     attr_accessor :error
 
@@ -9,22 +9,28 @@ module Petitest
     # @return [Time, nil]
     attr_accessor :started_at
 
-    # @return [Class]
-    attr_reader :test_group_class
+    # @return [Petitest::Test]
+    attr_reader :test
 
-    # @return [Petitest::TestMethod]
-    attr_reader :test_method
+    # @return [Petitest::TestGroup]
+    attr_reader :test_group
+
+    # @return [Symbol]
+    attr_reader :test_method_name
 
-    # @param test_group_class [Class]
-    # @param test_method [Petitest::TestMethod]
+    # @param test [Petitest::Test]
+    # @param test_group [Petitest::TestGroup]
+    # @param test_method_name [Symbol]
     def initialize(
-      test_group_class:,
-      test_method:
+      test:,
+      test_group:,
+      test_method_name:
     )
       @duration = nil
       @processed = false
-      @test_group_class = test_group_class
-      @test_method = test_method
+      @test = test
+      @test_group = test_group
+      @test_method_name = test_method_name
     end
 
     # @return [Array<String>, nil]
@@ -36,13 +42,13 @@ module Petitest
 
     # @return [String]
     def description
-      @description ||= "##{method_name}"
+      test.class.description_by_method_name[test_method_name] || "##{test_method_name}"
     end
 
     # @return [String]
     def full_description
       [
-        test_group_class.full_description,
+        test_group.full_description,
         description,
       ].join(" ")
     end
@@ -63,7 +69,7 @@ module Petitest
 
     # @return [Boolean]
     def failed?
-      processed? && !error.nil?
+      processed? && !skipped? && !error.nil?
     end
 
     # @return [Array<String>, nil]
@@ -81,9 +87,14 @@ module Petitest
       end
     end
 
+    # @note Override
+    def inspect
+      "#<#{self.class}>"
+    end
+
     # @return [Boolean]
     def passed?
-      processed? && error.nil?
+      processed? && !skipped? && !failed?
     end
 
     # @return [Boolean]
@@ -93,7 +104,7 @@ module Petitest
 
     def run
       self.started_at = ::Time.now
-      test_group_class.new.send(test_method.method_name)
+      test.send(test_method_name)
       true
     rescue => error
       self.error = error
@@ -103,15 +114,21 @@ module Petitest
       @processed = true
     end
 
-    # @todo
     # @return [Boolean]
     def skipped?
-      false
+      processed? && error.is_a?(::Petitest::AssertionSkipError)
     end
 
-    # @return [String]
-    def test_signature
-      [test_group_class, test_method.method_name].join("#")
+    # @return [Petitest::TestMethod]
+    def test_method
+      @test_method ||= begin
+        source_location = test.public_method(test_method_name).source_location
+        ::Petitest::TestMethod.new(
+          line_number: source_location[0],
+          method_name: test_method_name,
+          path: source_location[1],
+        )
+      end
     end
   end
 end

data/lib/petitest/texts/error_message_text.rb

@@ -3,19 +3,19 @@ require "petitest/texts/base_text"
 module Petitest
   module Texts
     class ErrorMessageText < ::Petitest::Texts::BaseText
-      # @return [Petitest::TestCase]
-      attr_reader :test_case
+      # @return [Petitest::Test]
+      attr_reader :test
 
-      # @param test_case [Petitest::TestCase]
-      def initialize(test_case:)
-        @test_case = test_case
+      # @param test [Petitest::Test]
+      def initialize(test:)
+        @test = test
       end
 
       # @note Override
       def to_s
         elements = []
-        elements << test_case.error_class_name unless test_case.error.is_a?(::Petitest::AssertionFailureError)
-        elements << test_case.error_message unless test_case.error_message.empty?
+        elements << test.runner.error_class_name unless test.runner.error.is_a?(::Petitest::AssertionFailureError)
+        elements << test.runner.error_message unless test.runner.error_message.empty?
         string = elements.join("\n")
         colorize(string, :error)
       end

data/lib/petitest/texts/failures_element_text.rb

@@ -6,14 +6,14 @@ module Petitest
       # @return [Integer]
       attr_reader :index
 
-      # @return [Petitest::TestCase]
-      attr_reader :test_case
+      # @return [Petitest::Test]
+      attr_reader :test
 
       # @param index [Integer]
-      # @param test_case [Petitest::TestCase]
-      def initialize(index:, test_case:)
+      # @param test [Petitest::Test]
+      def initialize(index:, test:)
         @index = index
-        @test_case = test_case
+        @test = test
       end
 
       # @note Override
@@ -29,26 +29,21 @@ module Petitest
       # @return [String]
       def body
         [
-          ::Petitest::Texts::RaisedCodeText.new(test_case: test_case),
-          ::Petitest::Texts::ErrorMessageText.new(test_case: test_case),
-          ::Petitest::Texts::FilteredBacktraceText.new(test_case: test_case),
+          ::Petitest::Texts::RaisedCodeText.new(test: test),
+          ::Petitest::Texts::ErrorMessageText.new(test: test),
+          ::Petitest::Texts::FilteredBacktraceText.new(test: test),
         ].join("\n")
       end
 
       # @return [String]
       def heading
-        "#{ordinal_number}) #{test_signature}"
+        "#{ordinal_number}) #{test.class}##{test.runner.test_method_name}"
       end
 
       # @return [Integer]
       def ordinal_number
         index + 1
       end
-
-      # @return [String]
-      def test_signature
-        test_case.test_signature
-      end
     end
   end
 end

data/lib/petitest/texts/failures_text.rb

@@ -3,12 +3,12 @@ require "petitest/texts/base_text"
 module Petitest
   module Texts
     class FailuresText < ::Petitest::Texts::BaseText
-      # @return [Array<Petitest::TestCase>]
-      attr_reader :test_cases
+      # @return [Array<Petitest::Test>]
+      attr_reader :tests
 
-      # @param test_cases [Array<Petitest::TestCase>]
-      def initialize(test_cases:)
-        @test_cases = test_cases
+      # @param tests [Array<Petitest::Test>]
+      def initialize(tests:)
+        @tests = tests
       end
 
       # @note Override
@@ -28,10 +28,10 @@ module Petitest
 
       # @return [Array<Petitest::Textx::FailuresElementText>]
       def failures_element_texts
-        test_cases.map.with_index do |test_case, index|
+        tests.map.with_index do |test, index|
           ::Petitest::Texts::FailuresElementText.new(
             index: index,
-            test_case: test_case,
+            test: test,
           )
         end
       end

data/lib/petitest/texts/filtered_backtrace_text.rb

@@ -3,17 +3,17 @@ require "petitest/texts/base_text"
 module Petitest
   module Texts
     class FilteredBacktraceText < ::Petitest::Texts::BaseText
-      # @return [Petitest::TestCase]
-      attr_reader :test_case
+      # @return [Petitest::Test]
+      attr_reader :test
 
-      # @param test_case [Petitest::TestCase]
-      def initialize(test_case:)
-        @test_case = test_case
+      # @param test [Petitest::Test]
+      def initialize(test:)
+        @test = test
       end
 
       # @note Override
       def to_s
-        colorize(test_case.filtered_backtrace.join("\n").gsub(/^/, "# "), :detail)
+        colorize(test.runner.filtered_backtrace.join("\n").gsub(/^/, "# "), :detail)
       end
     end
   end

data/lib/petitest/texts/raised_code_text.rb

@@ -3,12 +3,12 @@ require "petitest/texts/base_text"
 module Petitest
   module Texts
     class RaisedCodeText < ::Petitest::Texts::BaseText
-      # @return [Petitest::TestCase]
-      attr_reader :test_case
+      # @return [Petitest::Test]
+      attr_reader :test
 
-      # @param test_case [Petitest::TestCase]
-      def initialize(test_case:)
-        @test_case = test_case
+      # @param test [Petitest::Test]
+      def initialize(test:)
+        @test = test
       end
 
       # @note Override
@@ -44,8 +44,8 @@ module Petitest
       # @return [Array<String>]
       def caller_segments
         @caller_segments ||= begin
-          if test_case.filtered_backtrace[0]
-            test_case.filtered_backtrace[0].split(":", 3)
+          if test.runner.filtered_backtrace[0]
+            test.runner.filtered_backtrace[0].split(":", 3)
           else
             []
           end

data/lib/petitest/texts/test_counts_text.rb

@@ -3,12 +3,12 @@ require "petitest/texts/base_text"
 module Petitest
   module Texts
     class TestCountsText < ::Petitest::Texts::BaseText
-      # @return [Array<Petitest::TestCase>]
-      attr_reader :test_cases
+      # @return [Array<Petitest::Test>]
+      attr_reader :tests
 
-      # @param test_cases [Array<Petitest::TestCase>]
-      def initialize(test_cases:)
-        @test_cases = test_cases
+      # @param tests [Array<Petitest::Test>]
+      def initialize(tests:)
+        @tests = tests
       end
 
       # @note Override
@@ -24,31 +24,31 @@ module Petitest
       # @return [String]
       def body
         [
-          text_of_count_of_test_cases,
-          text_of_count_of_passed_test_cases,
-          text_of_count_of_failed_test_cases,
-          text_of_count_of_skipped_test_cases,
+          text_of_count_of_tests,
+          text_of_count_of_passed_tests,
+          text_of_count_of_failed_tests,
+          text_of_count_of_skipped_tests,
         ].join("\n")
       end
 
       # @return [Integer]
-      def count_of_failed_test_cases
-        test_cases.select(&:failed?).length
+      def count_of_failed_tests
+        tests.map(&:runner).select(&:failed?).length
       end
 
       # @return [Integer]
-      def count_of_passed_test_cases
-        test_cases.select(&:passed?).length
+      def count_of_passed_tests
+        tests.map(&:runner).select(&:passed?).length
       end
 
       # @return [Integer]
-      def count_of_skipped_test_cases
-        test_cases.select(&:skipped?).length
+      def count_of_skipped_tests
+        tests.map(&:runner).select(&:skipped?).length
       end
 
       # @return [Integer]
-      def count_of_test_cases
-        test_cases.length
+      def count_of_tests
+        tests.length
       end
 
       # @return [String]
@@ -58,27 +58,27 @@ module Petitest
 
       # @return [Integer]
       def max_digits_length
-        @max_digits_length ||= count_of_test_cases.to_s.length
+        @max_digits_length ||= count_of_tests.to_s.length
       end
 
       # @return [String]
-      def text_of_count_of_failed_test_cases
-        colorize("%#{max_digits_length}d failures" % count_of_failed_test_cases, :error)
+      def text_of_count_of_failed_tests
+        colorize("%#{max_digits_length}d failures" % count_of_failed_tests, :error)
       end
 
       # @return [String]
-      def text_of_count_of_passed_test_cases
-        colorize("%#{max_digits_length}d passes" % count_of_passed_test_cases, :pass)
+      def text_of_count_of_passed_tests
+        colorize("%#{max_digits_length}d passes" % count_of_passed_tests, :pass)
       end
 
       # @return [String]
-      def text_of_count_of_skipped_test_cases
-        colorize("%#{max_digits_length}d skips" % count_of_skipped_test_cases, :skip)
+      def text_of_count_of_skipped_tests
+        colorize("%#{max_digits_length}d skips" % count_of_skipped_tests, :skip)
       end
 
       # @return [String]
-      def text_of_count_of_test_cases
-        "%#{max_digits_length}d tests" % count_of_test_cases
+      def text_of_count_of_tests
+        "%#{max_digits_length}d tests" % count_of_tests
       end
     end
   end

data/lib/petitest/texts/test_result_character_text.rb

@@ -0,0 +1,27 @@
+require "petitest/texts/base_text"
+
+module Petitest
+  module Texts
+    class TestResultCharacterText < ::Petitest::Texts::BaseText
+      # @return [Petitest::Test]
+      attr_reader :test
+
+      # @param test [Petitest::Test]
+      def initialize(test:)
+        @test = test
+      end
+
+      # @note Override
+      def to_s
+        case
+        when test.runner.failed?
+          colorize("F", :error)
+        when test.runner.skipped?
+          colorize("*", :skip)
+        else
+          "."
+        end
+      end
+    end
+  end
+end

data/lib/petitest/texts/test_result_line_text.rb

@@ -0,0 +1,37 @@
+require "petitest/texts/base_text"
+
+module Petitest
+  module Texts
+    class TestResultLineText < ::Petitest::Texts::BaseText
+      # @return [Petitest::Test]
+      attr_reader :test
+
+      # @param test [Petitest::Test]
+      def initialize(test:)
+        @test = test
+      end
+
+      # @note Override
+      def to_s
+        indent(
+          colorize("##{test.runner.test_method_name}", color_type),
+          2 * (test.runner.test_group.nest_level + 1),
+        )
+      end
+
+      private
+
+      # @return [Symbol]
+      def color_type
+        case
+        when test.runner.failed?
+          :error
+        when test.runner.skipped?
+          :skip
+        else
+          :pass
+        end
+      end
+    end
+  end
+end