oktest 1.3.1 → 1.5.0

data/test/visitor_test.rb

@@ -1,15 +1,17 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 ###
-### $Release: 1.3.1 $
+### $Release: 1.5.0 $
 ### $Copyright: copyright(c) 2011-2024 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 
-require_relative './initialize'
+require_relative './init'
 
 
-class Visitor_TC < TC
+class Visitor__Test
+  extend NanoTest
 
   class DummyVisitor0 < Oktest::Visitor
     def initialize
@@ -36,7 +38,7 @@ class Visitor_TC < TC
     end
   end
 
-  def prepare()
+  def self.prepare()
     Oktest.scope do
       topic 'Example1' do
         topic 'sample1-1' do
@@ -47,15 +49,15 @@ class Visitor_TC < TC
     end
   end
 
-  def setup
-  end
-
-  def teardown
+  def self.test_subject(desc, &b)
+    super
+  ensure
     Oktest::THE_GLOBAL_SCOPE.clear_children()
   end
 
-  describe '#visit_spec()' do
-    it "[!9f7i9] do something on spec." do
+
+  test_target 'Oktest::Visitor#visit_spec()' do
+    test_subject "[!9f7i9] do something on spec." do
       expected = <<'END'
 spec: sample {
 }
@@ -63,12 +65,12 @@ END
       sp = Oktest::SpecLeaf.new(nil, "sample")
       visitor = DummyVisitor0.new
       visitor.visit_spec(sp, 0, nil)
-      assert_eq visitor.log.join(), expected
+      test_eq? visitor.log.join(), expected
     end
   end
 
-  describe '#visit_topic()' do
-    it "[!mu3fn] visits each child of topic." do
+  test_target 'Oktest::Visitor#visit_topic()' do
+    test_subject "[!mu3fn] visits each child of topic." do
       expected = <<'END'
 topic: example {
   spec: sample {
@@ -79,12 +81,12 @@ END
       sp = Oktest::SpecLeaf.new(to, "sample")
       visitor = DummyVisitor0.new
       visitor.visit_topic(to, 0, nil)
-      assert_eq visitor.log.join(), expected
+      test_eq? visitor.log.join(), expected
     end
   end
 
-  describe '#visit_scope()' do
-    it "[!hebhz] visits each child scope." do
+  test_target 'Oktest::Visitor#visit_scope()' do
+    test_subject "[!hebhz] visits each child scope." do
       expected = <<'END'
 scope: file.rb {
   topic: example {
@@ -98,12 +100,12 @@ END
       sp = Oktest::SpecLeaf.new(sc, "sample")
       visitor = DummyVisitor0.new
       visitor.visit_scope(sc, 0, nil)
-      assert_eq visitor.log.join(), expected
+      test_eq? visitor.log.join(), expected
     end
   end
 
-  describe '#start()' do
-    it "[!8h8qf] start visiting tree." do
+  test_target 'Oktest::Visitor#start()' do
+    test_subject "[!8h8qf] start visiting tree." do
       expected = <<'END'
 scope: test/visitor_test.rb {
   topic: Example1 {
@@ -119,14 +121,15 @@ END
       prepare()
       visitor = DummyVisitor0.new
       visitor.start()
-      assert_eq visitor.log.join(), expected
+      test_eq? visitor.log.join(), expected
     end
   end
 
 end
 
 
-class Traverser_TC < TC
+class Traverser__Test
+  extend NanoTest
 
   class MyTraverser < Oktest::Traverser
     def on_scope(filename, tag, depth)
@@ -158,7 +161,7 @@ class Traverser_TC < TC
     end
   end
 
-  def prepare()
+  def self.prepare()
     Oktest.scope do
       topic 'Example' do
         topic Integer, tag: 'cls' do
@@ -179,13 +182,15 @@ class Traverser_TC < TC
     end
   end
 
-  def teardown()
+  def self.test_subject(desc, &b)
+    super
+  ensure
     Oktest::THE_GLOBAL_SCOPE.clear_children()
   end
 
 
-  describe '#start()' do
-    it "[!5zonp] visits topics and specs and calls callbacks." do
+  test_target 'Oktest::Traverser#start()' do
+    test_subject "[!5zonp] visits topics and specs and calls callbacks." do
       expected = <<'END'
 * scope: test/visitor_test.rb
   + topic: Example
@@ -201,22 +206,22 @@ class Traverser_TC < TC
       - spec: 1/1 should be 1. (tag: err)
 END
       prepare()
-      sout, serr = capture { MyTraverser.new.start() }
-      assert_eq sout, expected
-      assert_eq serr, ""
+      sout, serr = capture_output! { MyTraverser.new.start() }
+      test_eq? sout, expected
+      test_eq? serr, ""
     end
-    it "[!gkopz] doesn't change Oktest::THE_GLOBAL_SCOPE." do
+    test_subject "[!gkopz] doesn't change Oktest::THE_GLOBAL_SCOPE." do
       prepare()
       n = Oktest::THE_GLOBAL_SCOPE.each_child.to_a.length
-      sout, serr = capture do
+      sout, serr = capture_output! do
         MyTraverser.new.start()
       end
-      assert_eq Oktest::THE_GLOBAL_SCOPE.each_child.to_a.length, n
+      test_eq? Oktest::THE_GLOBAL_SCOPE.each_child.to_a.length, n
     end
   end
 
-  describe '#visit_scope()' do
-    it "[!ledj3] calls on_scope() callback on scope." do
+  test_target 'Oktest::Traverser#visit_scope()' do
+    test_subject "[!ledj3] calls on_scope() callback on scope." do
       expected = <<'END'
 * scope: test/visitor_test.rb
 * scope: test/visitor_test.rb
@@ -225,14 +230,14 @@ END
       end
       Oktest.scope do
       end
-      sout, serr = capture { MyTraverser.new.start() }
-      assert_eq sout, expected
-      assert_eq serr, ""
+      sout, serr = capture_output! { MyTraverser.new.start() }
+      test_eq? sout, expected
+      test_eq? serr, ""
     end
   end
 
-  describe '#visit_topic()' do
-    it "[!x8r9w] calls on_topic() callback on topic." do
+  test_target 'Oktest::Traverser#visit_topic()' do
+    test_subject "[!x8r9w] calls on_topic() callback on topic." do
       expected = <<'END'
 * scope: test/visitor_test.rb
   + topic: Parent
@@ -244,11 +249,11 @@ END
           end
         end
       end
-      sout, serr = capture { MyTraverser.new.start() }
-      assert_eq sout, expected
-      assert_eq serr, ""
+      sout, serr = capture_output! { MyTraverser.new.start() }
+      test_eq? sout, expected
+      test_eq? serr, ""
     end
-    it "[!qh0q3] calls on_case() callback on case_when or case_else." do
+    test_subject "[!qh0q3] calls on_case() callback on case_when or case_else." do
       expected = <<'END'
 * scope: test/visitor_test.rb
   + topic: Parent
@@ -263,14 +268,14 @@ END
           end
         end
       end
-      sout, serr = capture { MyTraverser.new.start() }
-      assert_eq sout, expected
-      assert_eq serr, ""
+      sout, serr = capture_output! { MyTraverser.new.start() }
+      test_eq? sout, expected
+      test_eq? serr, ""
     end
   end
 
-  describe '#visit_spec()' do
-    it "[!41uyj] calls on_spec() callback." do
+  test_target 'Oktest::Traverser#visit_spec()' do
+    test_subject "[!41uyj] calls on_spec() callback." do
       expected = <<'END'
 * scope: test/visitor_test.rb
   + topic: Example
@@ -283,9 +288,9 @@ END
           spec "sample #2" do ok {1-1} == 0 end
         end
       end
-      sout, serr = capture { MyTraverser.new.start() }
-      assert_eq sout, expected
-      assert_eq serr, ""
+      sout, serr = capture_output! { MyTraverser.new.start() }
+      test_eq? sout, expected
+      test_eq? serr, ""
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oktest
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.5.0
 platform: ruby
 authors:
 - kwatch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-16 00:00:00.000000000 Z
+date: 2024-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: benry-cmdopt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: benry-recorder
   requirement: !ruby/object:Gem::Requirement
@@ -62,20 +76,20 @@ files:
 - bin/oktest
 - lib/oktest.rb
 - oktest.gemspec
+- test/all.rb
 - test/assertion_test.rb
 - test/filter_test.rb
 - test/fixture_test.rb
 - test/generator_test.rb
 - test/helper_test.rb
-- test/initialize.rb
+- test/init.rb
 - test/mainapp_test.rb
 - test/matcher_test.rb
 - test/misc_test.rb
+- test/nanot.rb
 - test/node_test.rb
 - test/reporter_test.rb
-- test/run_all.rb
 - test/runner_test.rb
-- test/tc.rb
 - test/util_test.rb
 - test/utilhelper_test.rb
 - test/visitor_test.rb
@@ -98,9 +112,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: a new style testing library
 test_files:
-- test/run_all.rb
+- test/all.rb

data/test/initialize.rb

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-
-###
-### $Release: 1.3.1 $
-### $Copyright: copyright(c) 2011-2024 kuwata-lab.com all rights reserved $
-### $License: MIT License $
-###
-
-File.class_eval do
-  $LOAD_PATH << join(dirname(dirname(expand_path(__FILE__))), 'lib')
-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/tc.rb

@@ -1,127 +0,0 @@
-# -*- coding: utf-8 -*-
-
-## micro test case class
-class TC
-
-  COUNTS = {:ok => 0, :fail => 0, :error => 0}
-
-  def self.report_result()
-    ok, fail, error = COUNTS[:ok], COUNTS[:fail], COUNTS[:error]
-    COUNTS.keys.each {|k| COUNTS[k] = 0 }
-    red = proc {|s| "\033[0;31m#{s}\033[0m" }
-    fail_s  = "fail: #{fail}"   ; fail_s  = red.call(fail_s)  if fail > 0
-    error_s = "error: #{error}" ; error_s = red.call(error_s) if error > 0
-    STDOUT.puts "## total: #{ok+fail+error} (ok: #{ok}, #{fail_s}, #{error_s})"
-  end
-
-  def self.describe(target, &b)
-    prev, @curr_target = @curr_target, target
-    yield
-  ensure
-    @curr_target = prev
-  end
-
-  def self.curr_target()
-    @curr_target
-  end
-
-  def self.it(spec, &b)
-    t = @curr_target
-    print "[#{self.name}#{t ? ' > ' : ''}#{t}] #{spec} ... " unless ENV['TC_QUIET']
-    obj = self.new
-    obj.setup()
-    begin
-      obj.instance_eval(&b)
-    rescue => exc
-      if exc.is_a?(AssertionFailed)
-        COUNTS[:fail]  += 1; puts "\e[31mFAILED!\e[0m" unless ENV['TC_QUIET']
-      else
-        COUNTS[:error] += 1; puts "\e[31mERROR!\e[0m"  unless ENV['TC_QUIET']
-      end
-      puts "  #{exc.class.name}: #{exc.message}"
-      exc.backtrace.each do |bt|
-        puts "    #{bt}" if bt.index(__FILE__) == nil
-      end
-    else
-      COUNTS[:ok] += 1; puts "ok." unless ENV['TC_QUIET']
-    ensure
-      obj.teardown()
-    end
-  end
-
-  def setup
-  end
-
-  def teardown
-  end
-
-  class AssertionFailed < StandardError
-  end
-
-  def assert(cond, msg="assertion failed")
-    raise msg unless cond
-  end
-
-  def assert_eq(actual, expected)
-    return if actual == expected
-    multiline_p = actual.is_a?(String) && actual =~ /\n/ \
-                && expected.is_a?(String) && expected =~ /\n/
-    errmsg = (multiline_p \
-              ? "$<actual> == $<expected> : failed.\n" +
-                "    $<actual>:   <<END\n#{actual}END\n" +
-                "    $<expected>: <<END\n#{expected}END"
-              : "$<actual> == $<expected> : failed.\n" +
-                "    $<actual>:   #{actual.inspect}\n" +
-                "    $<expected>: #{expected.inspect}")
-    raise AssertionFailed, errmsg
-  end
-
-  def assert_exc(errcls, errmsg=nil, &b)
-    begin
-      yield
-    rescue NoMemoryError, SystemExit, SyntaxError, SignalException
-      raise
-    rescue Exception => exc
-      exc.class == errcls  or
-        raise AssertionFailed, "#{errcls} should be raised but got #{exc.inspect}"
-      errmsg.nil? || errmsg === exc.message  or
-        raise AssertionFailed, ("invalid error message.\n"\
-                                "  $<actual>:   #{exc.message.inspect}\n"\
-                                "  $<expected>: #{errmsg.inspect}")
-      return exc
-    else
-      raise AssertionFailed, "#{errcls.name} should be raised but not."
-    end
-  end
-
-  def capture(input="", tty: true, &b)
-    require 'stringio' unless defined?(StringIO)
-    stdin, stdout, stderr = $stdin, $stdout, $stderr
-    $stdin  = sin  = StringIO.new(input)
-    $stdout = sout = StringIO.new
-    $stderr = serr = StringIO.new
-    def sin.tty? ; true; end if tty
-    def sout.tty?; true; end if tty
-    def sout.tty?; true; end if tty
-    yield
-    return sout.string, serr.string
-  ensure
-    $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
-
-
-at_exit { TC.report_result() }