oktest 1.0.0 → 1.1.1

data/test/misc_test.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.0 $
+### $Release: 1.1.1 $
 ### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###

data/test/node_test.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.0 $
+### $Release: 1.1.1 $
 ### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -315,6 +315,25 @@ class ScopeFunctions_TC < TC
     Oktest::THE_GLOBAL_SCOPE.clear_children()
   end
 
+  def with_dummy_location(location)
+    $_dummy_location = location
+    Oktest.module_eval do
+      class << self
+        def caller(n)
+          return [$_dummy_location]
+        end
+      end
+    end
+    yield
+  ensure
+    Oktest.module_eval do
+      class << self
+        remove_method :caller
+      end
+    end
+    $_dummy_location = nil
+  end
+
   describe 'Oktest.scope()' do
     it "[!vxoy1] creates new scope object." do
       x = Oktest.scope() { nil }
@@ -341,6 +360,20 @@ class ScopeFunctions_TC < TC
       assert_eq Oktest::THE_GLOBAL_SCOPE.has_child?, true
       assert_eq Oktest::THE_GLOBAL_SCOPE.each_child.to_a, [so]
     end
+    it "[!kem4y] detects test script filename." do
+      sc = Oktest.scope() { nil }
+      assert_eq sc.filename, "test/node_test.rb"
+    end
+    it "[!6ullm] changes test script filename from absolute path to relative path." do
+      with_dummy_location(Dir.pwd + "/tests/foo_test.rb:123") do
+        sc = Oktest.scope() { nil }
+        assert_eq sc.filename, "tests/foo_test.rb"
+      end
+      with_dummy_location("./t/bar_test.rb:456") do
+        sc = Oktest.scope() { nil }
+        assert_eq sc.filename, "t/bar_test.rb"
+      end
+    end
   end
 
   describe '#global_scope()' do

data/test/reporter_test.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.0 $
+### $Release: 1.1.1 $
 ### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -418,6 +418,10 @@ Oktest.scope do
       end
     end
 
+    spec "last spec" do
+      ok {1+1} == 2
+    end
+
   end
 
 end
@@ -443,10 +447,11 @@ ZeroDivisionError: divided by 0
 END
 
   FOOTER = <<'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:9 (<B>pass:5</B>, <R>fail:1</R>, <R>error:1</R>, <Y>skip:1</Y>, <Y>todo:1</Y>) in 0.000s
 END
 
   VERBOSE_PART = <<'END'
+## _test.tmp
 * <b>Parent</b>
   * <b>Child1</b>
     - [<B>pass</B>] 1+1 should be 2
@@ -463,16 +468,28 @@ END
     - [<B>pass</B>] x*x is positive.
   - <b>Else</b>
     - [<B>pass</B>] x*x is also positive.
+  - [<B>pass</B>] last spec
 END
   VERBOSE_OUTPUT = VERBOSE_PART + ERROR_PART + VERBOSE_PART2 + FOOTER
 
   SIMPLE_PART = <<'END'
-_test.tmp: <B>.</B><B>.</B><R>f</R><R>E</R><Y>s</Y><Y>t</Y><B>.</B><B>.</B>
+## _test.tmp
+* <b>Parent</b>: <B>.</B><B>.</B><B>.</B>
+  * <b>Child1</b>: <B>.</B><B>.</B>
+  * <b>Child2</b>: <R>f</R><R>E</R>
 END
-  SIMPLE_OUTPUT = SIMPLE_PART + ERROR_PART + FOOTER
+  SIMPLE_PART2 = <<'END'
+  * <b>Child3</b>: <Y>s</Y><Y>t</Y>
+END
+  SIMPLE_OUTPUT = SIMPLE_PART + ERROR_PART + SIMPLE_PART2 + FOOTER
+
+  COMPACT_PART = <<'END'
+_test.tmp: <B>.</B><B>.</B><R>f</R><R>E</R><Y>s</Y><Y>t</Y><B>.</B><B>.</B><B>.</B>
+END
+  COMPACT_OUTPUT = COMPACT_PART + ERROR_PART + FOOTER
 
   PLAIN_PART = <<'END'
-<B>.</B><B>.</B><R>f</R><R>E</R><Y>s</Y><Y>t</Y><B>.</B><B>.</B>
+<B>.</B><B>.</B><R>f</R><R>E</R><Y>s</Y><Y>t</Y><B>.</B><B>.</B><B>.</B>
 END
   PLAIN_OUTPUT = PLAIN_PART + ERROR_PART + FOOTER
 
@@ -516,7 +533,7 @@ end
 
 class SimpleReporter_TC < Reporter_TC
 
-  it "[!xfd5o] reports filename." do
+  it "[!jxa1b] reports topics and progress." do
     sout, serr = run("-ss", @filename)
     assert_eq edit_actual(sout), edit_expected(SIMPLE_OUTPUT)
     assert_eq serr, ""
@@ -525,6 +542,17 @@ class SimpleReporter_TC < Reporter_TC
 end
 
 
+class CompactReporter_TC < Reporter_TC
+
+  it "[!xfd5o] reports filename." do
+    sout, serr = run("-sc", @filename)
+    assert_eq edit_actual(sout), edit_expected(COMPACT_OUTPUT)
+    assert_eq serr, ""
+  end
+
+end
+
+
 class PlainReporter_TC < Reporter_TC
 
   it "[!w842j] reports progress." do

data/test/runner_test.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.0 $
+### $Release: 1.1.1 $
 ### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -44,6 +44,10 @@ class Runner_TC < TC
     def counts; {}; end
   end
 
+  class DummyReporter2 < DummyReporter
+    def order_policy; :spec_first; end
+  end
+
   describe "#start()" do
     build_topics = proc {
       Oktest.scope do
@@ -389,6 +393,47 @@ topic: "Parent"
 /topic
 [all] after_all
 /file
+END
+      assert_eq sout, expected
+      assert_eq serr, ""
+    end
+    it "[!p3a5o] run specs and case_when in advance of specs and topics when SimpleReporter." do
+      sout, serr = capture do
+        Oktest.scope do
+          topic "T1" do
+            topic "T2" do
+              spec("S1") { ok {1+1} == 2 }
+            end
+            spec("S2") { ok {1+1} == 2 }
+            topic "T3" do
+              spec("S3") { ok {1+1} == 2 }
+            end
+            case_when "T4" do
+              spec("S4") { ok {1+1} == 2 }
+            end
+          end
+        end
+        Oktest::Runner.new(DummyReporter2.new).start()
+      end
+      expected = <<'END'
+file: "test/runner_test.rb"
+topic: "T1"
+  spec: "S2"
+  /spec: status=:PASS
+  topic: "When T4"
+    spec: "S4"
+    /spec: status=:PASS
+  /topic
+  topic: "T2"
+    spec: "S1"
+    /spec: status=:PASS
+  /topic
+  topic: "T3"
+    spec: "S3"
+    /spec: status=:PASS
+  /topic
+/topic
+/file
 END
       assert_eq sout, expected
       assert_eq serr, ""
@@ -417,6 +462,46 @@ file: "test/runner_test.rb"
 [all] before_all#2
 [all] after_all#2
 /file
+END
+      assert_eq sout, expected
+      assert_eq serr, ""
+    end
+    it "[!c5cw0] run specs and case_when in advance of specs and topics when SimpleReporter." do
+      sout, serr = capture do
+        Oktest.scope do
+          topic "T1" do
+            spec("S1") { ok {1+1} == 2 }
+          end
+          spec("S2") { ok {1+1} == 2 }
+          case_when "T2" do
+            spec("S3") { ok {1+1} == 2 }
+          end
+          topic "T3" do
+            spec("S4") { ok {1+1} == 2 }
+          end
+          spec("S5") { ok {1+1} == 2 }
+        end
+        Oktest::Runner.new(DummyReporter2.new).start()
+      end
+      expected = <<'END'
+file: "test/runner_test.rb"
+spec: "S2"
+/spec: status=:PASS
+topic: "When T2"
+  spec: "S3"
+  /spec: status=:PASS
+/topic
+spec: "S5"
+/spec: status=:PASS
+topic: "T1"
+  spec: "S1"
+  /spec: status=:PASS
+/topic
+topic: "T3"
+  spec: "S4"
+  /spec: status=:PASS
+/topic
+/file
 END
       assert_eq sout, expected
       assert_eq serr, ""
@@ -474,12 +559,13 @@ class RunnerFunctions_TC < TC
   end
 
   VERBOSE_OUTPUT = <<'END'
+## test/runner_test.rb
 * <b>Example</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
 END
-  SIMPLE_OUTPUT = <<'END'
+  COMPACT_OUTPUT = <<'END'
 test/runner_test.rb: <B>.</B><B>.</B>
 ## total:2 (<B>pass:2</B>, fail:0, error:0, skip:0, todo:0) in 0.000s
 END
@@ -497,11 +583,6 @@ END
       assert_eq edit_actual(sout), edit_expected(expected)
       assert_eq serr, ""
     end
-    it "[!kfi8b] do nothing when 'Oktest.scope()' not called." do
-      sout, serr = capture { Oktest.run() }
-      assert_eq sout, ""
-      assert_eq serr, ""
-    end
     it "[!6xn3t] creates reporter object according to 'style:' keyword arg." do
       expected = VERBOSE_OUTPUT
       prepare()
@@ -509,9 +590,9 @@ END
       assert_eq edit_actual(sout), edit_expected(expected)
       assert_eq serr, ""
       #
-      expected = SIMPLE_OUTPUT
+      expected = COMPACT_OUTPUT
       prepare()
-      sout, serr = capture { Oktest.run(:style=>"simple") }
+      sout, serr = capture { Oktest.run(:style=>"compact") }
       assert_eq edit_actual(sout), edit_expected(expected)
       assert_eq serr, ""
       #

data/test/util_test.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.0 $
+### $Release: 1.1.1 $
 ### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###

data/test/visitor_test.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.0 $
+### $Release: 1.1.1 $
 ### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oktest
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - kwatch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-13 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -70,6 +70,7 @@ files:
 - test/helper_test.rb
 - test/initialize.rb
 - test/mainapp_test.rb
+- test/matcher_test.rb
 - test/misc_test.rb
 - test/node_test.rb
 - test/reporter_test.rb