Merge pull request #4 from skinnyjames/feature/errors

Feature/errors

Author: skinnyjames

.gitignore

@@ -1,2 +1,3 @@
 mruby/
-tmp/
+tmp/
+.vscode/

build_config.rb.lock

@@ -5,28 +5,23 @@ mruby:
   git_commit: eb398971bfb43c38db3e04528b68ac9a7ce509bc
 builds:
   host:
+    https://github.com/ksss/mruby-file-stat.git:
+      url: https://github.com/ksss/mruby-file-stat.git
+      branch: master
+      commit: 7d0e63a95a38b34c635b708874ec624c7c860507
+      version: 0.0.0
     https://github.com/gromnitsky/mruby-dir-glob.git:
       url: https://github.com/gromnitsky/mruby-dir-glob.git
       branch: master
       commit: 334c040a2e2c4c2689f8c3440168011f64d57ada
       version: 0.0.1
-    https://github.com/ksss/mruby-file-stat.git:
-      url: https://github.com/ksss/mruby-file-stat.git
+    https://github.com/iij/mruby-regexp-pcre.git:
+      url: https://github.com/iij/mruby-regexp-pcre.git
       branch: master
-      commit: 7d0e63a95a38b34c635b708874ec624c7c860507
+      commit: 71bd16ba59239f04aefb73bb6d46d5b581f27b1b
       version: 0.0.0
     https://github.com/iij/mruby-process.git:
       url: https://github.com/iij/mruby-process.git
       branch: master
       commit: 95da206a5764f4e80146979b8e35bd7a9afd6850
       version: 0.0.0
-    https://github.com/WindProphet/mruby-pure-regexp.git:
-      url: https://github.com/WindProphet/mruby-pure-regexp.git
-      branch: master
-      commit: 9cee46e9afeaa18001467a1a25ea6c9d88612287
-      version: 0.0.0
-    https://github.com/iij/mruby-regexp-pcre.git:
-      url: https://github.com/iij/mruby-regexp-pcre.git
-      branch: master
-      commit: 71bd16ba59239f04aefb73bb6d46d5b581f27b1b
-      version: 0.0.0

lib/matchers.rb

@@ -1,10 +1,12 @@
 module Matchers
   class Expect
+    attr_reader :actual
+
     def initialize(actual)
       @actual = actual
     end
 
-    def to(matcher, error = "Assertion failed for #{matcher.class}")
+    def to(matcher, error = matcher.error(actual))
       raise StandardError.new(error) unless matcher.match(@actual)
     end
 
@@ -41,17 +43,44 @@ class Be < MatchBase
     def match(actual)
       @expected.object_id == actual.object_id
     end
+
+    def error(actual)
+      "#{actual.class}.object_id(#{actual.object_id}) does not equal #{@expected.class}.object_id(#{@expected.object_id})"
+    end
+  end
+
+  class Match < MatchBase
+    def match(actual)
+      @expected =~ actual
+    end
+
+    def error(actual)
+      "#{actual.inspect} does not match #{@expected.inspect}"
+    end
   end
 
   class Eql < MatchBase
     def match(actual)
       @expected == actual
     end
+
+    def error(actual)
+      "#{actual.inspect} does not equal #{@expected.inspect}"
+    end
   end
 
   class Include < MatchBase
     def match(actual)
-      actual.include?(@expected)
+      case @expected
+      when Array
+        (@expected - actual).size.zero?
+      else
+        actual.include?(@expected)
+      end
+    end
+
+    def error(actual)
+      "#{actual.inspect} does not include #{@expected.inspect}"
     end
   end
 
@@ -93,6 +122,10 @@ def expect(actual = nil,  &block)
     end
   end
 
+  def match(expected)
+    Match.new(expected)
+  end
+
   def eql(expected)
     Eql.new(expected)
   end

mrblib/theorem.rb

@@ -888,11 +888,13 @@ def report_failures(tests)
 end
 module Matchers
   class Expect
+    attr_reader :actual
+
     def initialize(actual)
       @actual = actual
     end
 
-    def to(matcher, error = "Assertion failed for #{matcher.class}")
+    def to(matcher, error = matcher.error(actual))
       raise StandardError.new(error) unless matcher.match(@actual)
     end
 
@@ -929,17 +931,44 @@ class Be < MatchBase
     def match(actual)
       @expected.object_id == actual.object_id
     end
+
+    def error(actual)
+      "#{actual.class}.object_id(#{actual.object_id}) does not equal #{@expected.class}.object_id(#{@expected.object_id})"
+    end
+  end
+
+  class Match < MatchBase
+    def match(actual)
+      @expected =~ actual
+    end
+
+    def error(actual)
+      "#{actual.inspect} does not match #{@expected.inspect}"
+    end
   end
 
   class Eql < MatchBase
     def match(actual)
       @expected == actual
     end
+
+    def error(actual)
+      "#{actual.inspect} does not equal #{@expected.inspect}"
+    end
   end
 
   class Include < MatchBase
     def match(actual)
-      actual.include?(@expected)
+      case @expected
+      when Array
+        (@expected - actual).size.zero?
+      else
+        actual.include?(@expected)
+      end
+    end
+
+    def error(actual)
+      "#{actual.inspect} does not include #{@expected.inspect}"
     end
   end
 
@@ -981,6 +1010,10 @@ def expect(actual = nil,  &block)
     end
   end
 
+  def match(expected)
+    Match.new(expected)
+  end
+
   def eql(expected)
     Eql.new(expected)
   end

mruby-bin-theorem.gem

@@ -1,7 +1,8 @@
 name: mruby-bin-theorem
 description: A modern test library & runner toolkit for mruby
-author: Zero Stars
-website:https://github.com/skinnyjames/mruby-bin-theorem
+author: skinnyjames
+website: https://github.com/skinnyjames/mruby-bin-theorem
 protocol: git
-repository: https://github.com/skinnyjames/mruby-bin-theorem
-license: MIT
+repository: https://github.com/skinnyjames/mruby-bin-theorem.git
+license: MIT
+branch: main

src/mrb_theorem.c

@@ -1,14 +1,26 @@
 
 #include "mrb_theorem.h"
 #include "monotonic.h"
+#include <fcntl.h>
 
 mrb_value mrb_mruby_bin_theorem_monotonic(mrb_state* mrb, mrb_value self)
 {
   return mrb_float_value(mrb, monotonic_seconds());
 }
 
+mrb_value mrb_io_nonblock(mrb_state* mrb, mrb_value self)
+{
+  int fd = mrb_int(mrb, mrb_funcall(mrb, self, "fileno", 0, NULL));
+  int flags = fcntl(fd, F_GETFL, 0);
+  fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+  return mrb_nil_value();
+}
+
 void mrb_mruby_bin_theorem_gem_init(mrb_state* mrb)
 {
+  struct RClass* ioclass = mrb_class_get(mrb, "IO");
+  mrb_define_method(mrb, ioclass, "nonblock!", mrb_io_nonblock, MRB_ARGS_NONE());
+
   struct RClass* class = mrb_define_module(mrb, "Theorem");
   mrb_define_class_method(mrb, class, "monotonic", mrb_mruby_bin_theorem_monotonic, MRB_ARGS_NONE());
 }

test/theorem/matchers.rb

@@ -0,0 +1,29 @@
+module Tests
+  class MatchersTest < Base
+    let(:tests) do
+      Class.new do
+        include Fixture
+        include Matchers
+
+        test "errors - eql" do
+          expect("foo").to eql("bar")
+        end
+
+        test "errors - include" do
+          expect(%w[one two three]).to include(%w[one four])
+        end
+
+        test "errors - be" do
+          expect(true).to be(false)
+        end
+      end
+    end
+
+    test "errors" do
+      res = tests.run!
+      expect(res[0].error.message).to eql('"foo" does not equal "bar"')
+      expect(res[1].error.message).to eql('["one", "two", "three"] does not include ["one", "four"]')
+      expect(res[2].error.message).to match(/TrueClass\.object_id\(\d+\) does not equal FalseClass\.object_id\(\d+\)/)
+    end
+  end
+end