oktest 1.1.1 → 1.2.0

data/test/mainapp_test.rb

@@ -1,5 +1,5 @@
 ###
-### $Release: 1.1.1 $
+### $Release: 1.2.0 $
 ### $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,6 +187,32 @@ 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>...]
@@ -204,9 +221,8 @@ Usage: #{File.basename($0)} [<options>] [<file-or-directory>...]
   -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.1.1 $'.split()[1] + "\n"
+      expected = '$Release: 1.2.0 $'.split()[1] + "\n"
       #
       ret, sout, serr = run("--version")
       assert_eq ret, 0
@@ -254,11 +270,11 @@ 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
       #
@@ -276,9 +292,9 @@ END
     it "[!zfdr5] '-s simple' or '-ss' option prints test results in simple mode." do
       expected = <<END
 ## _tmp_test.rb
-* <b>Parent</b>: <B>.</B><B>.</B>
-  * <b>Child1</b>: <B>.</B><B>.</B>
-  * <b>Child2</b>: <R>f</R><R>E</R>
+* <b>Parent</b>: <C>.</C><C>.</C>
+  * <b>Child1</b>: <C>.</C><C>.</C>
+  * <b>Child2</b>: <R>f</R><E>E</E>
 ----------------------------------------------------------------------
 END
       #
@@ -295,7 +311,7 @@ END
 
     it "[!ef5v7] '-s compact' or '-sc' option prints test results in compact 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>
+#{@testfile}: <C>.</C><C>.</C><R>f</R><E>E</E><Y>s</Y><Y>t</Y><C>.</C><C>.</C>
 ----------------------------------------------------------------------
 END
       #
@@ -312,7 +328,7 @@ 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
       #
@@ -329,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
       #
@@ -349,9 +365,9 @@ 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)
@@ -365,8 +381,8 @@ 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)
@@ -380,13 +396,13 @@ 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)
@@ -400,8 +416,8 @@ 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)
@@ -415,11 +431,11 @@ 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)
@@ -450,7 +466,7 @@ END
         [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, ""
@@ -463,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, ""
@@ -476,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, ""
@@ -490,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, ""

data/test/matcher_test.rb

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

data/test/misc_test.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.1.1 $
+### $Release: 1.2.0 $
 ### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -69,11 +69,11 @@ class Color_TC < TC
 
   describe '.status()' do
     it "[!yev5y] returns string containing color escape sequence." do
-      assert_eq Oktest::Color.status(:PASS , "Pass" ), "\e[1;34mPass\e[0m"
-      assert_eq Oktest::Color.status(:FAIL , "Fail" ), "\e[1;31mFail\e[0m"
+      assert_eq Oktest::Color.status(:PASS , "Pass" ), "\e[0;36mPass\e[0m"
+      assert_eq Oktest::Color.status(:FAIL , "Fail" ), "\e[0;31mFail\e[0m"
       assert_eq Oktest::Color.status(:ERROR, "Error"), "\e[1;31mError\e[0m"
-      assert_eq Oktest::Color.status(:SKIP , "Skip" ), "\e[1;33mSkip\e[0m"
-      assert_eq Oktest::Color.status(:TODO , "Todo" ), "\e[1;33mTodo\e[0m"
+      assert_eq Oktest::Color.status(:SKIP , "Skip" ), "\e[0;33mSkip\e[0m"
+      assert_eq Oktest::Color.status(:TODO , "Todo" ), "\e[0;33mTodo\e[0m"
     end
   end
 

data/test/node_test.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.1.1 $
+### $Release: 1.2.0 $
 ### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -315,13 +315,25 @@ class ScopeFunctions_TC < TC
     Oktest::THE_GLOBAL_SCOPE.clear_children()
   end
 
+  class DummyLocation # < Thread::Backtrace::Location
+    def initialize(string)
+      string =~ /([^:]+):(\d+)/
+      @path = $1
+      @lineno = $2
+    end
+    attr_reader :path, :lineno
+  end
+
   def with_dummy_location(location)
     $_dummy_location = location
     Oktest.module_eval do
       class << self
-        def caller(n)
+        def caller(n, len=nil)
           return [$_dummy_location]
         end
+        def caller_locations(n, len=nil)
+          return [DummyLocation.new($_dummy_location)]
+        end
       end
     end
     yield
@@ -329,6 +341,7 @@ class ScopeFunctions_TC < TC
     Oktest.module_eval do
       class << self
         remove_method :caller
+        remove_method :caller_locations
       end
     end
     $_dummy_location = nil
@@ -533,6 +546,16 @@ class Context_TC < TC
       assert_eq sp.tag, "exp"
       assert_eq sp._prefix, "-"
     end
+    it "[!4vkbl] error when `fixture:` keyword arg is not a Hash object." do
+      new_node_with() do
+        spec "example #2", fixture: {x: 1} do end   # not raise anything
+      end
+      assert_exc(ArgumentError, 'spec(fixture: "x: 1"): fixture argument should be a Hash object, but got String object.') do
+        new_node_with() do
+          spec "example #2", fixture: "x: 1" do end
+        end
+      end
+    end
     it "[!ala78] provides raising TodoException block if block not given." do
       node = new_node_with() do
         spec "example #3"
@@ -552,7 +575,7 @@ class Context_TC < TC
       sp1, sp2 = node.each_child.to_a
       assert_eq sp1.location, nil
       assert sp2.location != nil, "not nil"
-      assert sp2.location.start_with?("#{__FILE__}:#{lineno}:in")
+      assert sp2.location.to_s.start_with?("#{__FILE__}:#{lineno}:in")
     end
   end
 
@@ -568,7 +591,7 @@ class Context_TC < TC
       assert    node.fixtures.key?(:alice), "key not registerd"
       assert    node.fixtures[:alice][0].is_a?(Proc), "block expected"
       assert_eq node.fixtures[:alice][1], nil
-      assert    node.fixtures[:alice][2].start_with?("#{__FILE__}:#{lineno}:in ")
+      assert    node.fixtures[:alice][2].to_s.start_with?("#{__FILE__}:#{lineno}:in ")
     end
     it "[!y3ks3] retrieves block parameter names." do
       node = new_node_with() do

data/test/reporter_test.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.1.1 $
+### $Release: 1.2.0 $
 ### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -11,15 +11,6 @@ require_relative './initialize'
 
 module ReporterTestHelper
 
-  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/, '')
@@ -145,7 +136,11 @@ class BaseReporter_TC < TC
       sout, serr = capture do
         r.__send__(:print_exc_message, exc, :FAIL)
       end
-      assert_eq sout, errmsg
+      assert_eq sout, plain2colored(<<END)
+<R>something failed</R>
+  expect: foo
+  actual: bar
+END
       assert_eq serr, ""
     end
     it "[!pd41p] prints detail of exception." do
@@ -155,7 +150,11 @@ class BaseReporter_TC < TC
       sout, serr = capture do
         r.__send__(:print_exc_message, exc, :ERROR)
       end
-      assert_eq sout, "Oktest::AssertionFailed: "+errmsg
+      assert_eq sout, plain2colored(<<END)
+<R>Oktest::AssertionFailed: something failed</R>
+  expect: foo
+  actual: bar
+END
       assert_eq serr, ""
     end
   end
@@ -246,7 +245,7 @@ END
       end
       #
       expected = <<END
-[<R>ERROR</R>] <b>Example > Array > When some condition > 1+1 shoould be 2.</b>
+[<E>ERROR</E>] <b>Example > Array > When some condition > 1+1 shoould be 2.</b>
     #{__FILE__}:#{lineno}:in `/'
         1/0
 END
@@ -283,7 +282,7 @@ END
       r = new_reporter_with_exceptions(exc)
       sep = "----------------------------------------------------------------------\n"
       expected1 = "[<R>Fail</R>] <b>Example > Array > When some condition > 1+1 shoould be 2.</b>\n"
-      expected2 = "[<R>ERROR</R>] <b>Example > Array > When some condition > 1+1 shoould be 2.</b>\n"
+      expected2 = "[<E>ERROR</E>] <b>Example > Array > When some condition > 1+1 shoould be 2.</b>\n"
       #
       sout, serr = capture { r.__send__(:print_exceptions) }
       assert sout.start_with?(sep + plain2colored(expected1)), "not matched"
@@ -349,7 +348,7 @@ END
     end
 
     it "[!gx0n2] builds footer line." do
-      expected = "## total:15 (<B>pass:5</B>, <R>fail:4</R>, <R>error:3</R>, <Y>skip:2</Y>, <Y>todo:1</Y>) in 0.500s"
+      expected = "## total:15 (<C>pass:5</C>, <R>fail:4</R>, <E>error:3</E>, <Y>skip:2</Y>, <Y>todo:1</Y>) in 0.500s"
       assert new_footer(), plain2colored(expected)
     end
   end
@@ -434,49 +433,49 @@ END
     _test.tmp:18:in `block (4 levels) in <top (required)>'
         ok {1*1} == 2
 %%%
-$<actual> == $<expected>: failed.
+<R>$<actual> == $<expected>: failed.</R>
     $<actual>:   1
     $<expected>: 2
 ----------------------------------------------------------------------
-[<R>ERROR</R>] <b>Parent > Child2 > 1/1 should be 1</b>
+[<E>ERROR</E>] <b>Parent > Child2 > 1/1 should be 1</b>
     _test.tmp:21:in `/'
         ok {1/0} == 1
 %%%
-ZeroDivisionError: divided by 0
+<R>ZeroDivisionError: divided by 0</R>
 ----------------------------------------------------------------------
 END
 
   FOOTER = <<'END'
-## 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
+## total:9 (<C>pass:5</C>, <R>fail:1</R>, <E>error:1</E>, <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
-    - [<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
   VERBOSE_PART2 = <<'END'
   * <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>] x*x is positive.
+    - [<C>pass</C>] x*x is positive.
   - <b>Else</b>
-    - [<B>pass</B>] x*x is also positive.
-  - [<B>pass</B>] last spec
+    - [<C>pass</C>] x*x is also positive.
+  - [<C>pass</C>] last spec
 END
   VERBOSE_OUTPUT = VERBOSE_PART + ERROR_PART + VERBOSE_PART2 + FOOTER
 
   SIMPLE_PART = <<'END'
 ## _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>
+* <b>Parent</b>: <C>.</C><C>.</C><C>.</C>
+  * <b>Child1</b>: <C>.</C><C>.</C>
+  * <b>Child2</b>: <R>f</R><E>E</E>
 END
   SIMPLE_PART2 = <<'END'
   * <b>Child3</b>: <Y>s</Y><Y>t</Y>
@@ -484,17 +483,17 @@ 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>
+_test.tmp: <C>.</C><C>.</C><R>f</R><E>E</E><Y>s</Y><Y>t</Y><C>.</C><C>.</C><C>.</C>
 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>
+<C>.</C><C>.</C><R>f</R><E>E</E><Y>s</Y><Y>t</Y><C>.</C><C>.</C><C>.</C>
 END
   PLAIN_OUTPUT = PLAIN_PART + ERROR_PART + FOOTER
 
   QUIET_PART = <<'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
   QUIET_OUTPUT = QUIET_PART + ERROR_PART + FOOTER
 

data/test/runner_test.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.1.1 $
+### $Release: 1.2.0 $
 ### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -521,15 +521,6 @@ class RunnerFunctions_TC < TC
     Oktest::THE_GLOBAL_SCOPE.clear_children()
   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/, '')
@@ -561,17 +552,17 @@ class RunnerFunctions_TC < TC
   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
+  - [<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
   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
+test/runner_test.rb: <C>.</C><C>.</C>
+## total:2 (<C>pass:2</C>, fail:0, error:0, skip:0, todo:0) in 0.000s
 END
   PLAIN_OUTPUT = <<'END'
-<B>.</B><B>.</B>
-## total:2 (<B>pass:2</B>, fail:0, error:0, skip:0, todo:0) in 0.000s
+<C>.</C><C>.</C>
+## total:2 (<C>pass:2</C>, fail:0, error:0, skip:0, todo:0) in 0.000s
 END
 
 

data/test/tc.rb

@@ -109,6 +109,18 @@ class TC
     $stdin, $stdout, $stderr = stdin, stdout, stderr
   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(/<C>(.*?)<\/C>/) { Oktest::Color.cyan($1) }
+    str = str.gsub(/<M>(.*?)<\/M>/) { Oktest::Color.magenta($1) }
+    str = str.gsub(/<Y>(.*?)<\/Y>/) { Oktest::Color.yellow($1) }
+    str = str.gsub(/<b>(.*?)<\/b>/) { Oktest::Color.bold($1) }
+    str = str.gsub(/<E>(.*?)<\/E>/) { Oktest::Color.red_b($1) }
+    return str
+  end
+
 end