easytest 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42389cdde1ebd51de0f636f3c5ec0e67ffe842ff91029f71617795799841d47b
-  data.tar.gz: 559dadc55a86bfc6da11234b05f1fd9a5477311379f94ea41565731516271405
+  metadata.gz: ea89da5a0f2aba7252ea69be567591284bfcc1f53aa089e4824eb54773881b0b
+  data.tar.gz: b9bb01188ce657b918cdffe80cb962fd4e3c011fa9a4556b832d49eeed8fef5d
 SHA512:
-  metadata.gz: e4d9cc9b6bc5a76ecccf5f98d076e123eeddabe7a16c42a093050e154c3c32565a80c99301ed615ab0be95e2b7b7e0773088d3d5dc621ddc2fda3f69e28ed184
-  data.tar.gz: 8a8612f4baf5bc8bc026ecb20fbbe906ad32044f22c9232137dc68b5bb32940d634aed10703d6455f339518bba18c8a433bee66d2ed30afbcff2c93cbe03ec57
+  metadata.gz: 6b1539eeef25d6343a411a05afbfcff6143d9f33798fb5f3d13dbf8f3d742ea79247ced5c5da1a994bc0d77b41787ec8c7477ed06b26664ef30987007291ad26
+  data.tar.gz: c5e5ebe81739839785eab40d24a3d4e529d7c33f0d2ac5fd5cc20bf2984b65849d6b99f18b46848f6d17d362dfdc95fb16ae7d0f3403b77913a6b182b0f1fc9a

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## 0.2.0
+
+- Add many matchers.
+
 ## 0.1.2
 
 - Fix the `easytest` command exit code.

data/README.md

@@ -46,7 +46,7 @@ $ bundle exec easytest
     Expected: 2
     Received: 3
 
-    at test/addition_test.rb:6:in `block in <top (required)>'
+    # test/addition_test.rb:6:in `block in <top (required)>'
 
 
  Tests:  1 failed, 0 passed, 1 total (1 files)

data/lib/easytest/case.rb

@@ -15,10 +15,23 @@ module Easytest
     def run
       block.call
       true
-    rescue UnmatchedError => error
-      loc = error.backtrace_locations[2]
-      self.report = Reporter.new(error: error, file: loc.absolute_path, location: loc.to_s).report(name)
+    rescue MatchError, FatalError => error
+      loc = find_location(error) or raise
+
+      self.report = Reporter.new(
+        name: name,
+        error: error,
+        file: loc.absolute_path,
+        location: loc.to_s,
+      ).report or raise
+
       false
     end
+
+    private
+
+    def find_location(error)
+      error.backtrace_locations.find { |loc| loc.path.end_with?("_test.rb") }
+    end
   end
 end

data/lib/easytest/errors.rb

@@ -1,7 +1,9 @@
 module Easytest
   class Error < StandardError; end
 
-  class UnmatchedError < Error
+  class FatalError < Error; end
+
+  class MatchError < Error
     attr_reader :actual
     attr_reader :expected
 

data/lib/easytest/expectation.rb

@@ -2,40 +2,63 @@ module Easytest
   class Expectation
     attr_reader :actual
     attr_reader :block
+    attr_reader :negate
+    alias negate? negate
 
-    def initialize(actual, &block)
+    def initialize(actual, negate: false, &block)
       @actual = actual
       @block = block
+      @negate = negate
+    end
+
+    def not
+      self.class.new(actual, negate: true, &block)
     end
 
     def to_eq(expected)
-      Matcher::Equal.new(actual: eval_actual, expected: expected).match!
+      Matcher::Equal.new(actual: actual, expected: expected, negate: negate).match!
     end
+    alias to_equal to_eq
 
     def to_be(expected)
-      Matcher::Be.new(actual: eval_actual, expected: expected).match!
+      Matcher::Be.new(actual: actual, expected: expected, negate: negate).match!
     end
 
     def to_be_nil
-      Matcher::BeNil.new(actual: eval_actual).match!
+      Matcher::Nil.new(actual: actual, negate: negate).match!
     end
 
-    def to_raise(exception_class)
+    def to_be_true
+      Matcher::True.new(actual: actual, negate: negate).match!
+    end
+
+    def to_be_false
+      Matcher::False.new(actual: actual, negate: negate).match!
+    end
 
+    def to_be_a(expected)
+      Matcher::BeA.new(actual: actual, expected: expected, negate: negate).match!
     end
 
-    def to_not_raise(exception_class)
+    def to_be_kind_of(expected)
+      Matcher::KindOf.new(actual: actual, expected: expected, negate: negate).match!
+    end
+
+    def to_be_instance_of(expected)
+      Matcher::InstanceOf.new(actual: actual, expected: expected, negate: negate).match!
+    end
+
+    def to_raise(exception_class)
+      raise FatalError, "`to_raise` requires a block like `expect { ... }.to_raise`" unless block
+      raise FatalError, "`not.to_raise` can cause a false positive, so use `to_not_raise` instead" if negate?
 
+      Matcher::Raise.new(actual: block, expected: exception_class, negate: negate).match!
     end
 
-    private
+    def to_not_raise
+      raise FatalError, "`to_not_raise` requires a block like `expect { ... }.to_not_raise`" unless block
 
-    def eval_actual
-      if block
-        block.call
-      else
-        actual
-      end
+      Matcher::NotRaise.new(actual: block).match!
     end
   end
 end

data/lib/easytest/matcher/base.rb

@@ -2,9 +2,14 @@ module Easytest
   module Matcher
     class Base
       attr_reader :actual
+      attr_reader :expected
+      attr_reader :negate
+      alias negate? negate
 
-      def initialize(actual:)
+      def initialize(actual:, expected:, negate: false)
         @actual = actual
+        @expected = expected
+        @negate = negate
       end
 
       def match?
@@ -12,17 +17,22 @@ module Easytest
       end
 
       def match!
-        unless match?
-          raise UnmatchedError.new(message: message, actual: actual, expected: expected)
-        end
+        matched = match?
+        matched = !matched if negate?
+        raise_match_error unless matched
       end
 
-      def expected
+      def message
         raise NotImplementedError
       end
 
-      def message
-        raise NotImplementedError
+      def build_error_message
+        prefix = negate? ? "not " : ""
+        "#{prefix}#{message}"
+      end
+
+      def raise_match_error
+        raise MatchError.new(message: build_error_message, actual: actual, expected: expected)
       end
     end
   end

data/lib/easytest/matcher/be.rb

@@ -1,19 +1,12 @@
 module Easytest
   module Matcher
     class Be < Base
-      attr_reader :expected
-
-      def initialize(actual:, expected:)
-        super(actual: actual)
-        @expected = expected
-      end
-
       def match?
         actual.equal? expected
       end
 
       def message
-        "should be same"
+        "same"
       end
     end
   end

data/lib/easytest/matcher/be_a.rb

@@ -0,0 +1,13 @@
+module Easytest
+  module Matcher
+    class BeA < Base
+      def match?
+        actual.is_a? expected
+      end
+
+      def message
+        "be a"
+      end
+    end
+  end
+end

data/lib/easytest/matcher/equal.rb

@@ -1,26 +1,13 @@
 module Easytest
   module Matcher
     class Equal < Base
-      attr_reader :expected
-
-      def initialize(actual:, expected:)
-        super(actual: actual)
-        @expected = expected
-      end
-
       def match?
         actual == expected
       end
 
       def message
-        "should equal"
+        "equal"
       end
-
-      #  def match!
-      #   unless match?
-      #     raise UnmatchedError.new(message: "should equal", actual: actual, expected: expected)
-      #   end
-      # end
     end
   end
 end

data/lib/easytest/matcher/false.rb

@@ -0,0 +1,17 @@
+module Easytest
+  module Matcher
+    class False < Base
+      def initialize(actual:, negate:)
+        super(actual: actual, expected: false, negate: negate)
+      end
+
+      def match?
+        actual == expected
+      end
+
+      def message
+        "false"
+      end
+    end
+  end
+end

data/lib/easytest/matcher/instance_of.rb

@@ -0,0 +1,13 @@
+module Easytest
+  module Matcher
+    class InstanceOf < Base
+      def match?
+        actual.instance_of? expected
+      end
+
+      def message
+        "instance of"
+      end
+    end
+  end
+end

data/lib/easytest/matcher/kind_of.rb

@@ -0,0 +1,13 @@
+module Easytest
+  module Matcher
+    class KindOf < Base
+      def match?
+        actual.kind_of? expected
+      end
+
+      def message
+        "kind of"
+      end
+    end
+  end
+end

data/lib/easytest/matcher/{be_nil.rb → nil.rb}

@@ -1,16 +1,16 @@
 module Easytest
   module Matcher
-    class BeNil < Base
-      def match?
-        actual.nil?
+    class Nil < Base
+      def initialize(actual:, negate:)
+        super(actual: actual, expected: nil, negate: negate)
       end
 
-      def expected
-        nil
+      def match?
+        actual.nil?
       end
 
       def message
-        "should be nil"
+        "nil"
       end
     end
   end

data/lib/easytest/matcher/not_raise.rb

@@ -0,0 +1,27 @@
+module Easytest
+  module Matcher
+    class NotRaise < Base
+      def initialize(actual:)
+        super(actual: actual, expected: nil)
+      end
+
+      def match?
+        begin
+          actual.call
+          true
+        rescue => error
+          @raised_error = error
+          false
+        end
+      end
+
+      def raise_match_error
+        raise MatchError.new(message: build_error_message, actual: @raised_error, expected: expected)
+      end
+
+      def message
+        "not raise"
+      end
+    end
+  end
+end

data/lib/easytest/matcher/raise.rb

@@ -0,0 +1,38 @@
+module Easytest
+  module Matcher
+    class Raise < Base
+      def match?
+        begin
+          actual.call
+          false
+        rescue => error
+          @raised_error = error
+          match_error?(actual: error, expected: expected)
+        end
+      end
+
+      def raise_match_error
+        raise MatchError.new(message: build_error_message, actual: @raised_error, expected: expected)
+      end
+
+      def message
+        "raise"
+      end
+
+      private
+
+      def match_error?(actual:, expected:)
+        case expected
+        when Class
+          actual.class == expected
+        when String
+          actual.message == expected
+        when Regexp
+          actual.message.match? expected
+        else
+          raise TypeError.new "Class, String, or Regexp is allowed: #{expected}"
+        end
+      end
+    end
+  end
+end

data/lib/easytest/matcher/true.rb

@@ -0,0 +1,17 @@
+module Easytest
+  module Matcher
+    class True < Base
+      def initialize(actual:, negate:)
+        super(actual: actual, expected: true, negate: negate)
+      end
+
+      def match?
+        actual == expected
+      end
+
+      def message
+        "true"
+      end
+    end
+  end
+end

data/lib/easytest/reporter.rb

@@ -1,19 +1,46 @@
 module Easytest
   class Reporter
-    def initialize(error:, file:, location:)
+    attr_reader :name
+    attr_reader :error
+    attr_reader :file
+    attr_reader :location
+
+    def initialize(name:, error:, file:, location:)
+      @name = name
       @error = error
       @file = file
       @location = location
     end
 
-    def report(test_name)
+    def report
+      case error
+      when MatchError
+        report_match_error
+      when FatalError
+        report_fatal_error
+      end
+    end
+
+    private
+
+    def report_match_error
+      <<~MSG
+        #{Rainbow("● #{name}").red.bright}  #{Rainbow("(#{error.message})").dimgray}
+
+          #{Rainbow("Expected: #{error.expected.inspect}").green}
+          #{Rainbow("Received: #{error.actual.inspect}").red}
+
+          #{Rainbow("# #{location}").dimgray}
+      MSG
+    end
+
+    def report_fatal_error
       <<~MSG
-        #{Rainbow("● #{test_name}").red.bright}  #{Rainbow("(#{@error.message})").dimgray}
+        #{Rainbow("● #{name}").red.bright}
 
-          #{Rainbow("Expected: #{@error.expected.inspect}").green}
-          #{Rainbow("Received: #{@error.actual.inspect}").red}
+          #{Rainbow(error.message).red}
 
-          #{Rainbow("at #{@location}").dimgray}
+          #{Rainbow("# #{location}").dimgray}
       MSG
     end
   end

data/lib/easytest/version.rb

@@ -1,3 +1,3 @@
 module Easytest
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/easytest.rb

@@ -8,14 +8,23 @@ require_relative "easytest/cli"
 require_relative "easytest/dsl"
 require_relative "easytest/errors"
 require_relative "easytest/expectation"
-require_relative "easytest/matcher/base"
-require_relative "easytest/matcher/be"
-require_relative "easytest/matcher/be_nil"
-require_relative "easytest/matcher/equal"
 require_relative "easytest/reporter"
 require_relative "easytest/runner"
 require_relative "easytest/utils"
 
+# Matcher
+require_relative "easytest/matcher/base"
+require_relative "easytest/matcher/be"
+require_relative "easytest/matcher/be_a"
+require_relative "easytest/matcher/equal"
+require_relative "easytest/matcher/false"
+require_relative "easytest/matcher/instance_of"
+require_relative "easytest/matcher/kind_of"
+require_relative "easytest/matcher/nil"
+require_relative "easytest/matcher/not_raise"
+require_relative "easytest/matcher/raise"
+require_relative "easytest/matcher/true"
+
 module Easytest
   def self.start
     @runner = Runner.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easytest
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Masafumi Koba
@@ -44,8 +44,15 @@ files:
 - lib/easytest/expectation.rb
 - lib/easytest/matcher/base.rb
 - lib/easytest/matcher/be.rb
-- lib/easytest/matcher/be_nil.rb
+- lib/easytest/matcher/be_a.rb
 - lib/easytest/matcher/equal.rb
+- lib/easytest/matcher/false.rb
+- lib/easytest/matcher/instance_of.rb
+- lib/easytest/matcher/kind_of.rb
+- lib/easytest/matcher/nil.rb
+- lib/easytest/matcher/not_raise.rb
+- lib/easytest/matcher/raise.rb
+- lib/easytest/matcher/true.rb
 - lib/easytest/reporter.rb
 - lib/easytest/runner.rb
 - lib/easytest/utils.rb