mrubyc-test 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 160ab8e14780603229e59811a6dc2c387cacf4a9e9037d271d41b2e9746fea37
-  data.tar.gz: 598655a35c67729fe21fb90f4b9920428148eb59ed385ccfe32178b82cf38e65
+  metadata.gz: cc5bc4e134fa8b9f118adf8aaa0048fa728524e2add9d4b1563115a0829f1c23
+  data.tar.gz: 1cf62ac75d14e2c2dfaf43f4081152665310b319348a95fc40fede060e831aca
 SHA512:
-  metadata.gz: 7a846f95b6cd76f38febef344e34ed912d396376e233c704f2a2bb4c436d30433524b01bcb860ec218cab9306f6afa1395d0e09c741bc72686ab27889d0751f2
-  data.tar.gz: 1ee0ffe96570e29fa18a6f668adbc7dc604d4087b2312c01852b8db0c9876f6548e4b4baa0cc08bccba16971964cd6a515a98d0ae2838e455f7553ab9baefdd6
+  metadata.gz: 767dceb63110ea84b2a817c8762f6939ebf65adcf066f73ee31a53322ad30898467ad2ec5a64c586288ac7e94973c8b96c2d34864ddbd6142740cdee9b7f3a8b
+  data.tar.gz: 96e922f553d5e8eeda9fb1e96c1909375b778c87264ec3e98376ddf55631366441c0e55c770e57154d7ef57c41750d17755c9fdec5f711d1b0bcd484767ce4af

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mrubyc-test (0.1.0)
+    mrubyc-test (0.2.0)
       activesupport (~> 5.2)
       rufo (~> 0.4)
       thor (~> 0.20)

data/README.md

@@ -8,11 +8,12 @@ The API design and implementation of this gem is greatly inspired by [test-unit]
 
 ## Features
 
-- Tests are applicable to mruby code. C code will not be covered
+- Tests are applicable to class and its instance methods written with mruby
+- C code will not be covered directly though, you can test your C implementation if you write mruby wrapper class. In this case, your test class (it also written with mruby) will test an integrated circumstance of C and mruby
 - Tests will run on your PC (POSIX) hereby you can write *business logic* with mruby/c apart from C API matters like microcontroler peripherals
 - Simple assertions ... enough for almost firmware development though, I will increase the number of assertion
 - Stub ... You can write your mruby code without peripheral implementation by C
-- Mock ... You can call any method sill doesn't exist
+- Mock ... You can call any method still doesn't exist
 - The implementation of your application and test code will be analyzed by CRuby program, then comlpiled into mruby byte code and executed on mruby/c VM
 
 ## Installation
@@ -31,19 +32,23 @@ Or install it yourself as:
 
     $ gem install mrubyc-test
 
+
 ## Usage
 
 Assuming you are using [mrubyc-utils](https://github.com/hasumikin/mrubyc-utils) to manage your project and [rbenv](https://github.com/rbenv/rbenv) to manage Ruby versions.
-It means you have `.mrubycconfig` file in the top directory of your project.
+It means you have `.mrubycconfig` and `.ruby-version` in the top directory of your project.
 
 Besides, you have to locate mruby model files that are the target of testing like `mrblib/models/class_name.rb`
 
+And read [here](https://github.com/hasumikin/mrubyc-utils#wrapper-of-gem-mrubyc-test-and-mrubyc-debugger) about why you should use mrubyc-utils.
+
 This is an example of ESP32 project:
 
 ```
 ~/your_project $ tree
 .
-├── .mrubycconfig                # Created by mrubyc-utils
+├── .mrubycconfig               # Created by mrubyc-utils
+├── .ruby-version               # It should be mruby's version something like 'mruby-1.4.1'
 ├── Makefile
 ├── build
 ├── components
@@ -52,7 +57,7 @@ This is an example of ESP32 project:
 │      └── models               # Place your model class files here
 │            ├── class_name.rb  # The testing target `ClassName`
 │            └── my_class.rb    # The testing target `MyClass`
-│      └── tasks
+│      └── loops
 │            ├── main.rb        # Loop script isn't covered by mrubyc-test. use mrubyc-debugger
 │            └── sub.rb         # Loop script isn't covered by mrubyc-test. use mrubyc-debugger
 └── sdkconfig
@@ -60,15 +65,15 @@ This is an example of ESP32 project:
 
 In the same directory:
 
-    $ mrubyc-test init
+    $ mrubyc-utils test init
 
 Then, some directories and files will be created in your project.
 Now you can run test because a sample test code was also created.
 
-    $ mrubyc-test test
+    $ mrubyc-utils test
 
-You should get some assertion faulures.
-Take a look at `test/sample_test.rb` to handle the failures and know how to write your own test.
+You should get some assertion failures.
+Take a look at `test/sample_test.rb` to handle the failures and find how to write your own test.
 
 ### Asserions
 
@@ -131,12 +136,10 @@ end
 
 ## Known problems
 
-- `.ruby-version` should be set to a veriosn of CRuby to use mrubyc-test command although mruby/c developers want to set it like mruby-1.4.1
 - You have to write stub or mock test fot all the methods still do not exist otherwise your test won't turn green
 
 ## TODO (possibly)
 
-- Better solution of coexistence of CRuby and mruby. May be a kind of wrapper tool or rbenv plugin?
 - Assertion against arguments of mock
 - Other assertions like LT(<), GTE(>=), include?, ...etc.
 - bla bla bla

data/lib/mrubyc-ext/mrubyc_test_case.rb

@@ -1,51 +1,91 @@
 class MrubycTestCase
-  def initialize(information)
+  def initialize(information, verbose = true)
     @information = information
     $mock ||= Mock.new
-    @puts_success_message = true
-    @puts_failure_message = true
-  end
-  def puts_information
-    puts
-    puts @information[:test_class_name] + '#' + @information[:method_name]
+    @puts_success_message = verbose
+    @puts_failure_message = verbose
   end
+
   def success(assertion, expected, actual)
-    puts_information
     $success_count += 1
     if @puts_success_message
-      puts $colors[:success] + '  assertion : ' + assertion.to_s + $colors[:normal]
-      puts $colors[:success] + '  result    : ' + actual.to_ss + $colors[:normal]
+      puts $colors[:success] + '  ' + actual.to_ss + " (:" + assertion.to_s + ")" + $colors[:reset]
     else
-      print $colors[:success] + '.' + $colors[:normal]
+      print $colors[:success] + '.' + $colors[:reset]
     end
   end
   def failure(assertion, expected, actual, message)
-    puts_information
-    $failure_count += 1
+    $failures << {
+      class_and_method: $current_class_and_method,
+      path: @information[:path].to_s,
+      line: @information[:line].to_s,
+      description: @information[:description].to_s,
+      message: message,
+      assertion: assertion.to_s,
+      expected: expected.to_s,
+      actual: actual.to_ss
+    }
     if @puts_failure_message
-      puts $colors[:failure] + '  path       : ' + @information[:path].to_s
-      puts $colors[:failure] + '  line       : ' + @information[:line].to_s
-      puts $colors[:failure] + '  description: ' + @information[:description].to_s
-      puts $colors[:failure] + '  ' + message if message
-      puts $colors[:failure] + '  assertion  : ' + assertion.to_s + $colors[:normal]
-      puts $colors[:failure] + '  expected   : ' + expected.to_ss + $colors[:normal]
-      puts $colors[:failure] + '  actual     : ' + actual.to_ss + $colors[:normal]
+      puts $colors[:failure] + '  ' + actual.to_ss + " (:" + assertion.to_s + ")" + $colors[:reset]
     else
-      print $colors[:failure] + '.' + $colors[:normal]
+      print $colors[:failure] + '.' + $colors[:reset]
     end
   end
+
+  def pend
+    $pendings << {
+      class_and_method: $current_class_and_method,
+      path: @information[:path].to_s,
+      line: @information[:line].to_s,
+    }
+    print $colors[:pending] + '.' + $colors[:reset]
+  end
+
   def assert_equal(expected, actual, message = nil)
     assertion = :assert_equal
     actual == expected ? success(assertion, expected, actual) : failure(assertion, expected, actual, message)
   end
+
   def assert_not_equal(expected, actual, message = nil)
     assertion = :assert_not_equal
     actual != expected ? success(assertion, expected, actual) : failure(assertion, expected, actual, message)
   end
+
+  def assert_nil(expression, message = nil)
+    assertion = :assert_not_nil
+    expression == nil ? success(assertion, nil, expression) : failure(assertion, "nil", expression, message)
+  end
+
   def assert_not_nil(expression, message = nil)
     assertion = :assert_not_nil
-    expression != nil ? success(assertion, nil, expression) : failure(assertion, nil, expression, message)
+    expression != nil ? success(assertion, nil, expression) : failure(assertion, "!nil", expression, message)
+  end
+
+  def assert(expression, message = nil)
+    assertion = :assert
+    expression ? success(assertion, nil, expression) : failure(assertion, "!nil && !false", expression, message)
   end
+
+  def assert_true(expression, message = nil)
+    assertion = :assert_true
+    expression == true ? success(assertion, nil, expression) : failure(assertion, "true", expression, message)
+  end
+
+  def assert_false(expression, message = nil)
+    assertion = :assert_false
+    expression == false ? success(assertion, nil, expression) : failure(assertion, "false", expression, message)
+  end
+
+  def assert_in_delta(expected, actual, message = nil, delta = 0.001)
+    assertion = :assert_in_delta
+    dt = actual - expected
+    if -delta <= dt && dt <= delta
+      success(assertion, expected, actual)
+    else
+      failure(assertion, expected, actual, message)
+    end
+  end
+
   def self.description(text)
   end
   def self.desc(text)
@@ -68,5 +108,3 @@ class MrubycTestCase
     end
   end
 end
-
-

data/lib/mrubyc-test.rb

@@ -14,68 +14,107 @@ module Mrubyc::Test
   class Error < StandardError; end
 
   class Tool < Thor
+    default_command :test
+
     desc 'init', 'Initialize requirements for unit test of mruby/c. Some directories and files will be created. Note that existing objects may be overridden'
     def init
       Mrubyc::Test::Init.run
     end
 
-    desc 'prepare', 'Create a ruby script that has all the requirements of your test'
-    def prepare
-      config = Mrubyc::Test::Config.read
-      model_files = Dir.glob(File.join(Dir.pwd, config['mruby_lib_dir'], 'models', '*.rb'))
-      test_path = File.join(Dir.pwd, config['test_dir'], '*.rb')
-      test_files = Dir.glob(test_path)
-      if test_files.size == 0
-        puts 'Test not found'
-        puts 'search path: ' + test_path
-        exit(1)
+    no_commands do
+      def prepare(test_files, verbose, method_name_pattern)
+        config = Mrubyc::Test::Config.read
+        model_files = Dir.glob(File.join(Dir.pwd, config['mruby_lib_dir'], 'models', '*.rb'))
+
+        # gather attributes from your implementations and tests
+        attributes = Mrubyc::Test::Generator::Attribute.run(model_files: model_files, test_files: test_files)
+
+        # convert attributes into tast_cases
+        test_cases = Mrubyc::Test::Generator::TestCase.run(attributes)
+
+        # generate a ruby script that will be compiled by mrbc and executed in mruby/c VM
+        Mrubyc::Test::Generator::Script.run(model_files: model_files, test_files: test_files, test_cases: test_cases, verbose: verbose, method_name_pattern: method_name_pattern)
       end
 
-      # gather attributes from your implementations and tests
-      attributes = Mrubyc::Test::Generator::Attribute.run(model_files: model_files, test_files: test_files)
+      def make
+        config = Mrubyc::Test::Config.read
+        tmp_dir = File.join(Dir.pwd, config['test_tmp_dir'])
+        puts "cd #{tmp_dir}"
+        puts
+        exit_code = 0
+        pwd = Dir.pwd
+        mruby_version = File.read('.ruby-version').gsub("\n", '').chomp
+        unless mruby_version.index('mruby')
+          puts '.ruby-version doesn\'t set `mruby-x.x.x It is recommended to use the latest version of https://github.com/hasumikin/mrubyc-utils`'
+          print 'You can specify the version name of mruby [mruby-x.x.x]: '
+          mruby_version = STDIN.gets.chomp
+        end
+        FileUtils.mv "#{pwd}/#{config['mrubyc_src_dir']}/hal", "#{pwd}/#{config['mrubyc_src_dir']}/~hal"
+        begin
+          FileUtils.ln_s "#{pwd}/#{config['test_tmp_dir']}/hal", "#{pwd}/#{config['mrubyc_src_dir']}/hal"
+          Dir.chdir(tmp_dir) do
+            [
+             "RBENV_VERSION=#{mruby_version} mrbc -E -B test test.rb",
+             "cc #{ENV["CFLAGS"]} #{ENV["LDFLAGS"]} -I #{pwd}/#{config['mrubyc_src_dir']} -o test main.c #{pwd}/#{config['mrubyc_src_dir']}/*.c #{pwd}/#{config['mrubyc_src_dir']}/hal/*.c",
+             "./test"].each do |cmd|
+               puts cmd
+               puts
+               exit_code = system(cmd) ? 0 : 1
+               exit(exit_code) if exit_code > 0
+             end
+          end
+        ensure
+          FileUtils.rm "#{pwd}/#{config['mrubyc_src_dir']}/hal"
+          FileUtils.mv "#{pwd}/#{config['mrubyc_src_dir']}/~hal", "#{pwd}/#{config['mrubyc_src_dir']}/hal"
+        end
+      end
 
-      # convert attributes into tast_cases
-      test_cases = Mrubyc::Test::Generator::TestCase.run(attributes)
+      def init_env
+        ENV["CFLAGS"] ||= "-std=gnu99 -DMRBC_DEBUG -DMRBC_USE_MATH=1 -Wall"
+        ENV["LDFLAGS"] ||= "-Wl,--no-as-needed -lm"
+      end
 
-      # generate a ruby script that will be compiled by mrbc and executed in mruby/c VM
-      Mrubyc::Test::Generator::Script.run(model_files: model_files, test_files: test_files, test_cases: test_cases)
     end
 
-    desc 'make', 'compile test script into executable && run it'
-    def make
-      config = Mrubyc::Test::Config.read
-      tmp_dir = File.join(Dir.pwd, config['test_tmp_dir'])
-      puts "cd #{tmp_dir}"
-      puts
-      exit_code = 0
-      pwd = Dir.pwd
-      FileUtils.mv "#{pwd}/#{config['mrubyc_src_dir']}/hal", "#{pwd}/#{config['mrubyc_src_dir']}/~hal"
-      begin
-        FileUtils.ln_s "#{pwd}/#{config['test_tmp_dir']}/hal", "#{pwd}/#{config['mrubyc_src_dir']}/hal"
-        Dir.chdir(tmp_dir) do
-          ['~/.rbenv/versions/mruby-1.4.1/bin/mrbc -E -B test test.rb',
-           "cc -I #{pwd}/#{config['mrubyc_src_dir']} -DMRBC_DEBUG -o test main.c #{pwd}/#{config['mrubyc_src_dir']}/*.c #{pwd}/#{config['mrubyc_src_dir']}/hal/*.c",
-           './test'].each do |cmd|
-             puts cmd
-             puts
-             exit_code = system(cmd) ? 0 : 1
-           end
-          puts
-          puts "cd -"
-          puts
-        end
-      ensure
-        FileUtils.rm "#{pwd}/#{config['mrubyc_src_dir']}/hal"
-        FileUtils.mv "#{pwd}/#{config['mrubyc_src_dir']}/~hal", "#{pwd}/#{config['mrubyc_src_dir']}/hal"
+    desc 'test', '[Default command] Execute test. You can specify a test file like `mrubyc-test test test/array_test.rb`'
+    option :every, type: :numeric, default: 10, aliases: "-e", banner: "NUMBER - To avoid Out of Memory, test will be devided up to every specified NUMBER of xxx_test.rb files"
+    option :verbose, type: :boolean, default: false, aliases: "-v", banner: "[true/false] - Show test result verbosely"
+    option :name, type: :string, aliases: "-n", banner: "NAME - Specify the NAME of tests you want to run. If you write --name='/PATTERN/', it will be processed as a regular expression. It must be single-quoted and doubled-backslash. eg) --name='/a\\\\db/' will create Regexp object `/a\\db/` and match strings like `a1b`"
+    def test(testfilepath = "test/*.rb")
+      init_env
+      method_name_pattern = (%r{\A/(.*)/\Z} =~ options[:name] ? Regexp.new($1) : options[:name])
+      test_path = if testfilepath == ""
+        File.join(Dir.pwd, config['test_dir'], "*.rb")
+      else
+        File.join(Dir.pwd, testfilepath)
+      end
+      Dir.glob(test_path).each_slice(options[:every]) do |test_files|
+        prepare(test_files, options[:verbose], method_name_pattern)
+        make
       end
-      exit(exit_code)
     end
 
-    desc 'test', 'shortcut for `prepare` && `make`'
-    def test
-      prepare
-      make
+    desc "version", "Print the version"
+    def version
+      puts "mrubyc-test v#{Mrubyc::Test::VERSION}"
     end
+
+    def help(arg = nil)
+      super(arg)
+      init_env
+      if arg == "test"
+        puts
+        puts "Default environment variables you can change:"
+        puts "  CFLAGS='#{ENV['CFLAGS']}'"
+        puts "  LDFLAGS='#{ENV['LDFLAGS']}'"
+        puts
+      end
+      exit if arg
+      puts "\e[33m  Note:"
+      puts '  It is recommended to use mrubyc-utils as a wrapper of this gem'
+      puts '  see https://github.com/hasumikin/mrubyc-utils#wrapper-of-gem-mrubyc-test-and-mrubyc-debugger'
+      puts "\e[0m"
+    end
+
   end
 end
-

data/lib/mrubyc/test/generator/attribute.rb

@@ -11,7 +11,14 @@ module Mrubyc
             # get information from model files(application code)
             model_files.each do |model_file|
               load model_file
-              model_class = Module.const_get(File.basename(model_file, '.rb').camelize)
+              class_name = File.basename(model_file, '.rb').camelize
+              begin
+                model_class = Module.const_get(class_name)
+              rescue NameError => e
+                print "\e[33;1m"
+                puts "Could not find class named `#{class_name}`. The file #{model_file} will be ignored"
+                print "\e[m"
+              end
               model_class.class_eval do
                 def method_missing(_method_name, *_args)
                   # do nothing
@@ -22,6 +29,7 @@ module Mrubyc
             method_locations = {}
             description_locations = {}
             double_method_locations = {}
+            MrubycTestCase.init_class_variables
             test_files.each do |test_file|
               load test_file
               test_class = Module.const_get(File.basename(test_file, '.rb').camelize)

data/lib/mrubyc/test/generator/script.rb

@@ -8,7 +8,7 @@ module Mrubyc
     module Generator
       class Script
         class << self
-          def run(model_files: [], test_files:, test_cases:)
+          def run(model_files: [], test_files:, test_cases:, verbose:, method_name_pattern:)
             config = Mrubyc::Test::Config.read
             erb = ERB.new(File.read(File.expand_path('../../../../templates/test.rb.erb', __FILE__)), nil, '-')
             mrubyc_class_dir = File.expand_path('../../../../mrubyc-ext/', __FILE__)

data/lib/mrubyc/test/init.rb

@@ -23,6 +23,20 @@ module Mrubyc
           puts "  mikdir -p #{hal_dir}"
           FileUtils.mkdir_p(hal_dir)
 
+          puts "  write #{config['test_tmp_dir']}/.gitignore"
+          File.open("#{config['test_tmp_dir']}/.gitignore", "w") do |f|
+            f.puts "test"
+            f.puts "test.rb"
+            f.puts "test.c"
+          end
+
+          if config["cruby_version"]
+            puts "  write #{config['test_tmp_dir']}/.ruby-version"
+            File.open("#{config['test_tmp_dir']}/.ruby-version", "w") do |f|
+              f.puts config["cruby_version"]
+            end
+          end
+
           Dir.chdir(hal_dir) do
             puts "  download from https://raw.githubusercontent.com/mrubyc/mrubyc/master/src/hal_posix/hal.h"
             system 'wget https://raw.githubusercontent.com/mrubyc/mrubyc/master/src/hal_posix/hal.h'
@@ -43,12 +57,7 @@ module Mrubyc
           File.write(File.join(config['test_tmp_dir'], 'main.c'), erb.result(binding))
 
           puts
-          puts "\e[32mWelcome to mrubyc-test, the world\'s first TDD tool for mruby/c microcontroller development.\e[37m"
-          puts "\e[33m"
-          puts 'Caution:'
-          puts 'For the time being, mrubyc-test assumes you installed mruby-1.4.1 by rbenv. So you should have `~/.rbenv/versions/mruby-1.4.1/bin.mrbc`'
-          puts 'Sorry for the inconvenience. It will be fixed soon!'
-          puts "\e[37m"
+          puts "\e[32mWelcome to mrubyc-test, the world\'s first TDD tool for mruby/c microcontroller development.\e[0m"
         end
       end
     end

data/lib/mrubyc/test/version.rb

@@ -1,5 +1,5 @@
 module Mrubyc
   module Test
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/mrubyc_test_case/mrubyc_test_case.rb

@@ -41,14 +41,13 @@ class MrubycTestCase
       (@@added_method_names[self] ||= {}).keys
     end
 
-    private
+    def init_class_variables
+      @@description_locations = {}
+      @@method_locations = {}
+      @@added_method_names = {}
+    end
 
-      # for RSpec
-      def init_class_variables
-        @@description_locations = {}
-        @@method_locations = {}
-        @@added_method_names = {}
-      end
+    private
 
       def method_locations
         @@method_locations[self] ||= []

data/lib/templates/main.c.erb

@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include "test.c"
 
-#define MEMORY_SIZE (1024*63)
+#define MEMORY_SIZE (1024*64)-1
 static uint8_t my_memory_pool[MEMORY_SIZE];
 
 int exit_code;

data/lib/templates/test.rb.erb

@@ -4,7 +4,7 @@
 # Genarated at: <%= Time.now %>
 # Your RUBY_DESCRIPTION: <%= RUBY_DESCRIPTION %>
 #
-# For more information, see <%= Gem.loaded_specs['mrubyc_test']&.homepage %>
+# For more information, see <%= Gem.loaded_specs['mrubyc-test']&.homepage %>
 #
 
 if RUBY_VERSION == '1.9' && MRUBYC_VERSION
@@ -26,20 +26,56 @@ else
 end
 debugprint(RUBY_DESCRIPTION)
 $success_count = 0
-$failure_count = 0
+$failures = Array.new
+$pendings = Array.new
 $colors = {
-  normal: "\e[37m",
+  reset: "\e[0m",
   success: "\e[32m",
-  failure: "\e[31m"
+  failure: "\e[31m",
+  pending: "\e[33m",
+  info: "\e[36m"
 }
 def summerize
-  puts 'Finished'
-  print ($failure_count > 0) ? $colors[:failure] : $colors[:success]
-  print ($success_count + $failure_count).to_s + ' examples, '
-  print $failure_count.to_s + ' failures'
-  print $colors[:normal]
+  failure_count = $failures.count
+  pending_count = $pendings.count
+  if pending_count > 0
+    puts "Pendings:\n"
+    $pendings.each_with_index do |pending, index|
+      puts $colors[:pending]
+      puts "#{index+1}) " + pending[:class_and_method]
+      print $colors[:info]
+      puts "  # " + pending[:path] + ":" + pending[:line]
+      puts $colors[:reset]
+    end
+  end
+  color = if failure_count > 0
+    puts "Failures:\n"
+    $failures.each_with_index do |failure, index|
+      puts
+      puts "#{index+1}) " + failure[:class_and_method] + " (:" + failure[:assertion] + ")"
+      print $colors[:failure]
+      puts "  description : " + failure[:description]
+      puts "    " + failure[:message] if failure[:message]
+      puts "  expected    : " + failure[:expected]
+      puts "  actual      : " + failure[:actual]
+      print $colors[:info]
+      puts "  # " + failure[:path] + ":" + failure[:line]
+      print $colors[:reset]
+    end
+    $colors[:failure]
+  elsif pending_count > 0
+    $colors[:pending]
+  else
+    $colors[:success]
+  end
+  puts "\nFinished\n"
+  print color
+  print ($success_count + failure_count).to_s + ' examples, '
+  print failure_count.to_s + ' failures, '
+  print pending_count.to_s + ' (or more) pendings'
+  puts $colors[:reset]
   puts
-  ($failure_count > 0) ? 1 : 0
+  (failure_count > 0) ? 1 : 0
 end
 
 <% %w(object hash mock mrubyc_test_case).each do |basename| -%>
@@ -51,10 +87,16 @@ end
 <% end -%>
 
 <% test_files.each do |file_name| -%>
-  <%= File.read(file_name) %>
+  <%= File.read(file_name).gsub(/(\bpend\b)/, '\1;return') -%>
 <% end -%>
 
 <% test_cases.each do |test_case| -%>
+  <% case method_name_pattern
+  when Regexp
+    next unless method_name_pattern.match?(test_case[:information][:method_name])
+  when String
+    next unless method_name_pattern == test_case[:information][:method_name]
+  end -%>
   <% test_case[:stubs].each do |stub| -%>
     class <%= stub[:class_name] %>
       attr_accessor <%= stub[:instance_variables] %>
@@ -94,13 +136,17 @@ end
     <% end -%>
   <% end -%>
   information = <%= test_case[:information].to_s %>
-  my_case = <%= test_case[:information][:test_class_name] %>.new(information)
+  puts
+  $current_class_and_method = "<%= test_case[:information][:test_class_name] %>#<%= test_case[:information][:method_name] %>"
+  puts $current_class_and_method
+  my_case = <%= test_case[:information][:test_class_name] %>.new(information, <%= verbose.to_s %>)
   my_case.setup
   my_case.<%= test_case[:information][:method_name] %>
   <% if test_case[:mocks] -%>
     my_case.check_mock
   <% end -%>
   my_case.teardown
+  puts
 
 <% end -%>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mrubyc-test
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - HASUMI Hitoshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-14 00:00:00.000000000 Z
+date: 2019-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler