oktest 1.0.2 → 1.2.1

data/oktest.gemspec

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.2 $
+### $Release: 1.2.1 $
 ### $License: MIT License $
 ### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
 ###
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.name        = "oktest"
   s.author      = "kwatch"
   s.email       = "kwatch@gmail.com"
-  s.version     = "$Release: 1.0.2 $".split()[1]
+  s.version     = "$Release: 1.2.1 $".split()[1]
   s.license     = "MIT"
   s.platform    = Gem::Platform::RUBY
   s.homepage    = "https://github.com/kwatch/oktest/tree/ruby"
@@ -30,7 +30,7 @@ Oktest.rb is a new-style testing library for Ruby.
 
 See https://github.com/kwatch/oktest/tree/ruby/ruby for details.
 END
-  s.required_ruby_version = ">= 2.3"
+  s.required_ruby_version = ">= 2.0"
   s.add_dependency "diff-lcs", "~> 1.0"
   s.add_dependency "benry-recorder", "~> 1.0"
 

data/test/assertion_test.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.2 $
+### $Release: 1.2.1 $
 ### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -170,6 +170,15 @@ END
                "    $<expected>: \"str\""
       FAIL!(errmsg) { ok {String}.NOT === 'str' }
     end
+    it "[!mjh4d] raises error when combination of 'not_ok()' and matcher object." do
+      errmsg = "negative `===` is not available with matcher object."
+      assert_exc(Oktest::OktestError, errmsg) do
+        not_ok {Oktest::JsonMatcher.new({})} === {}
+      end
+      assert_exc(Oktest::OktestError, errmsg) do
+        ok {Oktest::JsonMatcher.new({})}.NOT === {}
+      end
+    end
   end
 
   describe '>' do
@@ -423,11 +432,11 @@ describe '#method_missing()' do
         assert NoMethodError < NameError, "NoMethodError extends NameError"
         ERROR!(NoMethodError, /foobar/) { ok {pr}.raise?(NameError) }
       end
-      it "[!hwg0z] compares error class with '.is_a?' if 'subclass: true' specified." do
+      it "[!hwg0z] compares error class with '.is_a?' if '_subclass: true' specified." do
         pr = proc { "SOS".foobar }
         PASS! { ok {pr}.raise?(NoMethodError, nil) }
         assert NoMethodError < NameError, "NoMethodError extends NameError"
-        PASS! { ok {pr}.raise?(NameError, nil, subclass: true) }
+        PASS! { ok {pr}.raise?(NameError, nil, _subclass: true) }
       end
       it "[!4n3ed] reraises if exception is not matched to specified error class." do
         pr = proc { "SOS".sos }
@@ -483,11 +492,11 @@ describe '#method_missing()' do
         assert NoMethodError < NameError, "NoMethodError extends NameError"
         ERROR!(NoMethodError) { ok {pr}.NOT.raise?(NameError) }
       end
-      it "[!34nd8] compares error class with '.is_a?' if 'subclass: true' specified." do
+      it "[!34nd8] compares error class with '.is_a?' if '_subclass: true' specified." do
         pr = proc { "SOS".foobar }
         FAIL!(/foobar/) { ok {pr}.NOT.raise?(NoMethodError, nil) }
         assert NoMethodError < NameError, "NoMethodError extends NameError"
-        FAIL!(/foobar/) { ok {pr}.NOT.raise?(NameError, nil, subclass: true) }
+        FAIL!(/foobar/) { ok {pr}.NOT.raise?(NameError, nil, _subclass: true) }
       end
       it "[!shxne] reraises exception if different from specified error class." do
         pr = proc { 1/0 }
@@ -814,4 +823,60 @@ describe '#method_missing()' do
     end
   end
 
+  describe '#JSON()' do
+    it "[!n0k03] creates JsonMatcher object." do
+      o = JSON({})
+      assert_eq o.class, Oktest::JsonMatcher
+    end
+  end
+
+  describe '#Enum()' do
+    it "[!fbfr0] creates Enum object which is a subclass of Set." do
+      o = Enum("a", "b", "c")
+      assert_eq o.class, Oktest::JsonMatcher::Enum
+      assert    o.class < Set
+      assert_eq (o === "a"), true
+      assert_eq (o === "b"), true
+      assert_eq (o === "c"), true
+      assert_eq (o === "d"), false
+    end
+  end
+
+  describe '#Bool()' do
+    it "[!vub5j] creates a set of true and false." do
+      assert_eq Bool().class, Oktest::JsonMatcher::Enum
+      assert Bool() === true
+      assert Bool() === false
+      assert_eq (Bool() === 1), false
+      assert_eq (Bool() === 0), false
+    end
+  end
+
+  describe '#OR()' do
+    it "[!9e8im] creates `OR` object." do
+      o = OR(1, 2, 3)
+      assert_eq o.class, Oktest::JsonMatcher::OR
+    end
+  end
+
+  describe '#AND()' do
+    it "[!38jln] creates `AND` object." do
+      o = AND(4, 5, 6)
+      assert_eq o.class, Oktest::JsonMatcher::AND
+    end
+  end
+
+  describe '#Length()' do
+    it "[!qqas3] creates Length object." do
+      o = Length(3)
+      assert_eq o.class, Oktest::JsonMatcher::Length
+    end
+  end
+
+  describe '#Any()' do
+    it "[!dlo1o] creates an 'Any' object." do
+      assert_eq Any().class, Oktest::JsonMatcher::Any
+    end
+  end
+
 end

data/test/filter_test.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.2 $
+### $Release: 1.2.1 $
 ### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -188,7 +188,7 @@ class Filter_TC < TC
       Oktest::Runner.new(reporter).start()
     end
     assert_eq serr, ""
-    return sout.sub(/^## total:.*\n/, '')
+    return sout.sub(/^## total:.*\n/, '').sub(/^## test\/filter_test\.rb\n/, '')
   end
 
   def uncolor(s)

data/test/fixture_test.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.2 $
+### $Release: 1.2.1 $
 ### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -116,6 +116,19 @@ END
       assert_eq sout, expected
     end
 
+    it "[!gyyst] overwrites keyword params by fixture values." do
+      Oktest.scope do
+        topic "topic#1" do
+          fixture(:x) {|y, z: 3| {y: y, z: z} }
+          fixture(:y) { 2 }
+          spec("not overwrite") {|x| p x }
+          spec("overwrite", fixture: {y: 4, z: 5}) {|x| p x }
+        end
+      end
+      sout = run_all()
+      assert_eq sout, "{:y=>2, :z=>3}\n{:y=>4, :z=>5}\n"
+    end
+
     it "[!4xghy] calls fixture block with context object as self." do
       Oktest.scope do
         topic "Parent" do

data/test/generator_test.rb

@@ -1,5 +1,5 @@
 ###
-### $Release: 1.0.2 $
+### $Release: 1.2.1 $
 ### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###

data/test/helper_test.rb

@@ -1,5 +1,5 @@
 ###
-### $Release: 1.0.2 $
+### $Release: 1.2.1 $
 ### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -36,7 +36,7 @@ class SpecHelper_TC < TC
     it "[!bc3l2] records invoked location." do
       lineno = __LINE__ + 1
       o = ok {"bar"}
-      assert o.location.start_with?("#{__FILE__}:#{lineno}:")
+      assert o.location.to_s.start_with?("#{__FILE__}:#{lineno}:")
     end
     it "[!mqtdy] not record invoked location when `Config.ok_location == false`." do
       bkup = Oktest::Config.ok_location
@@ -60,7 +60,7 @@ class SpecHelper_TC < TC
     it "[!agmx8] records invoked location." do
       lineno = __LINE__ + 1
       o = not_ok {"bar"}
-      assert o.location.start_with?("#{__FILE__}:#{lineno}:")
+      assert o.location.to_s.start_with?("#{__FILE__}:#{lineno}:")
     end
     it "[!a9508] not record invoked location when `Config.ok_location == false`." do
       bkup = Oktest::Config.ok_location
@@ -129,17 +129,17 @@ class SpecHelper_TC < TC
     it "[!l2mcx] accepts block arguments." do
       val = nil
       Oktest.scope() do
-        fixture :foo do |x, y|
-          {x: x, y: y}
+        fixture :foo do |x, y, z: 0|
+          {x: x, y: y, z: z}
         end
         topic 'Example' do
           spec 'sample' do
-            val = fixture(:foo, 10, 20)
+            val = fixture(:foo, 10, 20, z: 30)
           end
         end
       end
       capture { Oktest.run() }
-      assert_eq val, {x: 10, y: 20}
+      assert_eq val, {x: 10, y: 20, z: 30}
     end
     it "[!wxcsp] raises error when fixture not found." do
       exc = nil

data/test/initialize.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.2 $
+### $Release: 1.2.1 $
 ### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -12,3 +12,10 @@ end
 
 require_relative './tc'
 require 'oktest'
+
+
+# for Ruby 2.4 or older
+require 'set'
+unless Set.instance_methods(false).include?(:===)
+  class Set; alias === include?; end
+end

data/test/mainapp_test.rb

@@ -1,5 +1,5 @@
 ###
-### $Release: 1.0.2 $
+### $Release: 1.2.1 $
 ### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -73,15 +73,6 @@ end
 
 END
 
-  def plain2colored(str)
-    str = str.gsub(/<R>(.*?)<\/R>/) { Oktest::Color.red($1) }
-    str = str.gsub(/<G>(.*?)<\/G>/) { Oktest::Color.green($1) }
-    str = str.gsub(/<B>(.*?)<\/B>/) { Oktest::Color.blue($1) }
-    str = str.gsub(/<Y>(.*?)<\/Y>/) { Oktest::Color.yellow($1) }
-    str = str.gsub(/<b>(.*?)<\/b>/) { Oktest::Color.bold($1) }
-    return str
-  end
-
   def edit_actual(output)
     bkup = output.dup
     output = output.gsub(/^.*\r/, '')
@@ -165,7 +156,7 @@ END
 
     it "[!18qpe] runs test scripts." do
       expected = <<'END'
-## total:8 (<B>pass:4</B>, <R>fail:1</R>, <R>error:1</R>, <Y>skip:1</Y>, <Y>todo:1</Y>) in 0.000s
+## total:8 (<C>pass:4</C>, <R>fail:1</R>, <E>error:1</E>, <Y>skip:1</Y>, <Y>todo:1</Y>) in 0.000s
 END
       ret, sout, serr = run(@testfile)
       assert_eq ret, 2
@@ -180,7 +171,7 @@ END
 
     it "[!hiu5b] finds test scripts in directory and runs them." do
       expected = <<'END'
-## total:8 (<B>pass:4</B>, <R>fail:1</R>, <R>error:1</R>, <Y>skip:1</Y>, <Y>todo:1</Y>) in 0.000s
+## total:8 (<C>pass:4</C>, <R>fail:1</R>, <E>error:1</E>, <Y>skip:1</Y>, <Y>todo:1</Y>) in 0.000s
 END
       dir = "_tmpdir.d"
       dirs = [dir, "#{dir}/d1", "#{dir}/d1/d2"]
@@ -196,17 +187,42 @@ END
       end
     end
 
+    it "[!v5xie] parses $OKTEST_RB environment variable." do
+      ret, sout, serr = run(@testfile, tty: false)
+      expected = plain2colored(<<'END')
+## _tmp_test.rb
+* <b>Parent</b>
+  * <b>Child1</b>
+    - [<C>pass</C>] 1+1 should be 2
+    - [<C>pass</C>] 1-1 should be 0
+END
+      assert sout.start_with?(expected), "expected verbose-style, but not."
+      #
+      begin
+        ENV['OKTEST_RB'] = "-ss"
+        ret, sout, serr = run(@testfile, tty: false)
+        expected = plain2colored(<<'END')
+## _tmp_test.rb
+* <b>Parent</b>: <C>.</C><C>.</C>
+  * <b>Child1</b>: <C>.</C><C>.</C>
+  * <b>Child2</b>: <R>f</R><E>E</E>
+END
+        assert sout.start_with?(expected), "expected simple-style, but not."
+      ensure
+        ENV.delete('OKTEST_RB')
+      end
+    end
+
     #HELP_MESSAGE = Oktest::MainApp::HELP_MESSAGE % {command: File.basename($0)}
     HELP_MESSAGE = <<"END"
 Usage: #{File.basename($0)} [<options>] [<file-or-directory>...]
   -h, --help             : show help
       --version          : print version
-  -s <STYLE>             : report style (verbose/simple/plain/quiet, or v/s/p/q)
+  -s <REPORT-STYLE>      : verbose/simple/compact/plain/quiet, or v/s/c/p/q
   -F <PATTERN>           : filter topic or spec with pattern (see below)
       --color[={on|off}] : enable/disable output coloring forcedly
-  -C, --create           : print test code skeleton
+  -S, --skeleton         : print test code skeleton
   -G, --generate         : generate test code skeleton from ruby file
-      --faster           : make 'ok{}' faster (for very large project)
 
 Filter examples:
   $ oktest -F topic=Hello            # filter by topic
@@ -241,7 +257,7 @@ END
     end
 
     it "[!qqizl] '--version' option prints version number." do
-      expected = '$Release: 1.0.2 $'.split()[1] + "\n"
+      expected = '$Release: 1.2.1 $'.split()[1] + "\n"
       #
       ret, sout, serr = run("--version")
       assert_eq ret, 0
@@ -251,13 +267,14 @@ END
 
     it "[!0qd92] '-s verbose' or '-sv' option prints test results in verbose mode." do
       expected = <<END
+## _tmp_test.rb
 * <b>Parent</b>
   * <b>Child1</b>
-    - [<B>pass</B>] 1+1 should be 2
-    - [<B>pass</B>] 1-1 should be 0
+    - [<C>pass</C>] 1+1 should be 2
+    - [<C>pass</C>] 1-1 should be 0
   * <b>Child2</b>
     - [<R>Fail</R>] 1*1 should be 1
-    - [<R>ERROR</R>] 1/1 should be 1
+    - [<E>ERROR</E>] 1/1 should be 1
 ----------------------------------------------------------------------
 END
       #
@@ -272,9 +289,12 @@ END
       assert_eq serr, ""
     end
 
-    it "[!ef5v7] '-s simple' or '-ss' option prints test results in simple mode." do
+    it "[!zfdr5] '-s simple' or '-ss' option prints test results in simple mode." do
       expected = <<END
-#{@testfile}: <B>.</B><B>.</B><R>f</R><R>E</R><Y>s</Y><Y>t</Y><B>.</B><B>.</B>
+## _tmp_test.rb
+* <b>Parent</b>: <C>.</C><C>.</C>
+  * <b>Child1</b>: <C>.</C><C>.</C>
+  * <b>Child2</b>: <R>f</R><E>E</E>
 ----------------------------------------------------------------------
 END
       #
@@ -289,9 +309,26 @@ END
       assert_eq serr, ""
     end
 
+    it "[!ef5v7] '-s compact' or '-sc' option prints test results in compact mode." do
+      expected = <<END
+#{@testfile}: <C>.</C><C>.</C><R>f</R><E>E</E><Y>s</Y><Y>t</Y><C>.</C><C>.</C>
+----------------------------------------------------------------------
+END
+      #
+      ret, sout, serr = run("-sc", @testfile)
+      assert_eq ret, 2
+      assert edit_actual(sout).start_with?(edit_expected(expected)), "invalid testcase output"
+      assert_eq serr, ""
+      #
+      ret, sout, serr = run("-s", "compact", @testfile)
+      assert_eq ret, 2
+      assert edit_actual(sout).start_with?(edit_expected(expected)), "invalid testcase output"
+      assert_eq serr, ""
+    end
+
     it "[!244te] '-s plain' or '-sp' option prints test results in plain mode." do
       expected = <<END
-<B>.</B><B>.</B><R>f</R><R>E</R><Y>s</Y><Y>t</Y><B>.</B><B>.</B>
+<C>.</C><C>.</C><R>f</R><E>E</E><Y>s</Y><Y>t</Y><C>.</C><C>.</C>
 ----------------------------------------------------------------------
 END
       #
@@ -308,7 +345,7 @@ END
 
     it "[!ai61w] '-s quiet' or '-sq' option prints test results in quiet mode." do
       expected = <<END
-<R>f</R><R>E</R><Y>s</Y><Y>t</Y>
+<R>f</R><E>E</E><Y>s</Y><Y>t</Y>
 ----------------------------------------------------------------------
 END
       #
@@ -325,11 +362,12 @@ END
 
     it "[!yz7g5] '-F topic=...' option filters topics." do
       expected = <<END
+## _tmp_test.rb
 * <b>Parent</b>
   * <b>Child1</b>
-    - [<B>pass</B>] 1+1 should be 2
-    - [<B>pass</B>] 1-1 should be 0
-## total:2 (<B>pass:2</B>, fail:0, error:0, skip:0, todo:0) in 0.000s
+    - [<C>pass</C>] 1+1 should be 2
+    - [<C>pass</C>] 1-1 should be 0
+## total:2 (<C>pass:2</C>, fail:0, error:0, skip:0, todo:0) in 0.000s
 END
       #
       ret, sout, serr = run("-F", "topic=Child1", @testfile)
@@ -340,10 +378,11 @@ END
 
     it "[!ww2mp] '-F spec=...' option filters specs." do
       expected = <<END
+## _tmp_test.rb
 * <b>Parent</b>
   * <b>Child1</b>
-    - [<B>pass</B>] 1-1 should be 0
-## total:1 (<B>pass:1</B>, fail:0, error:0, skip:0, todo:0) in 0.000s
+    - [<C>pass</C>] 1-1 should be 0
+## total:1 (<C>pass:1</C>, fail:0, error:0, skip:0, todo:0) in 0.000s
 END
       #
       ret, sout, serr = run("-F", "spec=*1-1*", @testfile)
@@ -354,15 +393,16 @@ END
 
     it "[!8uvib] '-F tag=...' option filters by tag name." do
       expected = <<'END'
+## _tmp_test.rb
 * <b>Parent</b>
   * <b>Child1</b>
-    - [<B>pass</B>] 1-1 should be 0
+    - [<C>pass</C>] 1-1 should be 0
   * <b>Child3</b>
     - [<Y>Skip</Y>] skip example <Y>(reason: a certain condition)</Y>
     - [<Y>TODO</Y>] todo example
   - <b>When x is negative</b>
-    - [<B>pass</B>] [!6hs1j] x*x is positive.
-## total:4 (<B>pass:2</B>, fail:0, error:0, <Y>skip:1</Y>, <Y>todo:1</Y>) in 0.000s
+    - [<C>pass</C>] [!6hs1j] x*x is positive.
+## total:4 (<C>pass:2</C>, fail:0, error:0, <Y>skip:1</Y>, <Y>todo:1</Y>) in 0.000s
 END
       #
       ret, sout, serr = run("-F", "tag={new,exp}", @testfile)
@@ -373,10 +413,11 @@ END
 
     it "[!m0iwm] '-F sid=...' option filters by spec id." do
       expected = <<'END'
+## _tmp_test.rb
 * <b>Parent</b>
   - <b>When x is negative</b>
-    - [<B>pass</B>] [!6hs1j] x*x is positive.
-## total:1 (<B>pass:1</B>, fail:0, error:0, skip:0, todo:0) in 0.000s
+    - [<C>pass</C>] [!6hs1j] x*x is positive.
+## total:1 (<C>pass:1</C>, fail:0, error:0, skip:0, todo:0) in 0.000s
 END
       #
       ret, sout, serr = run("-F", "sid=6hs1j", @testfile)
@@ -387,13 +428,14 @@ END
 
     it "[!noi8i] '-F' option supports negative filter." do
       expected = <<'END'
+## _tmp_test.rb
 * <b>Parent</b>
   * <b>Child1</b>
-    - [<B>pass</B>] 1+1 should be 2
-    - [<B>pass</B>] 1-1 should be 0
+    - [<C>pass</C>] 1+1 should be 2
+    - [<C>pass</C>] 1-1 should be 0
   - <b>Else</b>
-    - [<B>pass</B>] [!pwiq7] x*x is also positive.
-## total:3 (<B>pass:3</B>, fail:0, error:0, skip:0, todo:0) in 0.000s
+    - [<C>pass</C>] [!pwiq7] x*x is also positive.
+## total:3 (<C>pass:3</C>, fail:0, error:0, skip:0, todo:0) in 0.000s
 END
       #
       ret, sout, serr = run("-F", "tag!={fail,err,exp}", @testfile)
@@ -408,12 +450,23 @@ END
       end
     end
 
+    it "[!j01y7] if filerting by '-F' matched nothing, then prints zero result." do
+      expected = <<'END'
+## total:0 (pass:0, fail:0, error:0, skip:0, todo:0) in 0.000s
+END
+      #
+      ret, sout, serr = run("-F", "tag=blablabla", @testfile)
+      assert_eq ret, 0
+      assert_eq edit_actual(sout), edit_expected(expected)
+      assert_eq serr, ""
+    end
+
     it "[!6ro7j] '--color=on' option enables output coloring forcedly." do
       [true, false].each do |bool|
         [true, false].each do |tty|
           Oktest::Config.color_enabled = bool
           _, sout, serr = run("--color=on", @testfile, tty: tty)
-          assert sout.include?(edit_expected("[<B>pass</B>]")), "should contain blue string"
+          assert sout.include?(edit_expected("[<C>pass</C>]")), "should contain blue string"
           assert sout.include?(edit_expected("[<R>Fail</R>]")), "should contain red string"
           assert sout.include?(edit_expected("[<Y>Skip</Y>]")), "should contain yellos string"
           assert_eq serr, ""
@@ -426,7 +479,7 @@ END
         [true, false].each do |tty|
           Oktest::Config.color_enabled = bool
           _, sout, serr = run("--color", @testfile, tty: tty)
-          assert sout.include?(edit_expected("[<B>pass</B>]")), "should contain blue string"
+          assert sout.include?(edit_expected("[<C>pass</C>]")), "should contain blue string"
           assert sout.include?(edit_expected("[<R>Fail</R>]")), "should contain red string"
           assert sout.include?(edit_expected("[<Y>Skip</Y>]")), "should contain yellos string"
           assert_eq serr, ""
@@ -439,7 +492,7 @@ END
         [true, false].each do |tty|
           Oktest::Config.color_enabled = bool
           _, sout, serr = run("--color=off", @testfile, tty: tty)
-          assert !sout.include?(edit_expected("[<B>pass</B>]")), "should not contain blue string"
+          assert !sout.include?(edit_expected("[<C>pass</C>]")), "should not contain blue string"
           assert !sout.include?(edit_expected("[<R>Fail</R>]")), "should not contain red string"
           assert !sout.include?(edit_expected("[<Y>Skip</Y>]")), "should not contain yellos string"
           assert_eq serr, ""
@@ -453,8 +506,8 @@ END
       end
     end
 
-    it "[!dk8eg] '-C' or '--create' option prints test code skeleton." do
-      ret, sout, serr = run("-C")
+    it "[!dk8eg] '-S' or '--skeleton' option prints test code skeleton." do
+      ret, sout, serr = run("-S")
       assert_eq ret, 0
       assert_eq sout, Oktest::MainApp::SKELETON
       assert_eq serr, ""