mrubyc-test 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dad9926d29fed5ffda435cb6720d24b1924674abeeed146791e96b048f3f9c70
-  data.tar.gz: 423ecbe09c5a3564696bdf2c904bba1ee6c7d0b919b9e4958f3d9710893bca9a
+  metadata.gz: d22552c0a71b7399d7eae38faa8ae82b48b6553f8059e42f210dce7d75f127ae
+  data.tar.gz: 90bcd3c1c4c76f1f1db76582bf181dd2550e6a78230e9ced1f5ed9f96abfdca8
 SHA512:
-  metadata.gz: 8edcb2a5b1ca99ecb4cd9a1fca0800ef0c7ab60e051899d4a211a387bad069bf3f4d62d1ae629e47200e77e23666681c09ea1532a7a7187d67a7fa51bca2fdf8
-  data.tar.gz: c616940f20e5365d0f239a328cc23660831fa1c74dd66c7d62539a3ac74b6a8d01f6675291205da6f0f37567793fd9aa17eeb92b61f901cd1da0cbf4ea9b0384
+  metadata.gz: 454e1ba5ee921f0829c5f44cf42f34c82c812585144ff703fee4042c1bba9f7953e0480ea21e14cc361c8acf75861f125299f3b4b2993c8c884b7a21d76b451a
+  data.tar.gz: db8fdcfbf31995e6c3c9ca9964ebf813c09f4ad0757f9b0d5ef69f19f09e68ceb431ee1111bf5f83ce2d5d48451f3fb0a6a04519d42d1d88a7a95cabc2d7e8c6

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

@@ -19,16 +19,15 @@ module Mrubyc
                 Module.const_get(class_name.upcase)
               end
               unless model_class
-                # Deprecate 2022-06-01
-                #print "\e[33m"
-                #puts "[WARN] #{model_file} doesn't have corresponding class `#{class_name}`."
-                #print "\e[m"
                 next
               end
               model_class.class_eval do
                 def method_missing(_method_name, *_args)
                   # do nothing
                 end
+                def respond_to_missing?(_sym, _include_private)
+                  super
+                end
               end
             end
             # get information from test files

data/lib/mrubyc/test/init.rb

@@ -54,12 +54,18 @@ module Mrubyc
           erb = ERB.new(File.read(File.expand_path('../../../templates/sample_test.rb.erb', __FILE__)), nil, '-')
           File.write(File.join(config['test_dir'], 'sample_test.rb'), erb.result(binding))
 
+          init_main_c
+
+          puts
+          puts "\e[32mWelcome to mrubyc-test, the world\'s first TDD tool for mruby/c microcontroller development.\e[0m"
+        end
+
+        def init_main_c
+          config = Mrubyc::Test::Config.read(check: false)
           puts '  cp test/tmp/main.c'
           erb = ERB.new(File.read(File.expand_path('../../../templates/main.c.erb', __FILE__)), nil, '-')
           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[0m"
         end
       end
     end

data/lib/mrubyc/test/version.rb

@@ -1,5 +1,5 @@
 module Mrubyc
   module Test
-    VERSION = "0.7.4"
+    VERSION = "0.8.0"
   end
 end

data/lib/mrubyc-ext/mrubyc_test_case.rb

@@ -14,7 +14,7 @@ class MrubycTestCase
       print $colors[:success] + '.' + $colors[:reset]
     end
   end
-  def failure(assertion, expected, actual, message)
+  def failure(assertion, expected, actual, message, error = nil)
     $failures << {
       class_and_method: $current_class_and_method,
       path: @information[:path].to_s,
@@ -23,7 +23,8 @@ class MrubycTestCase
       message: message,
       assertion: assertion.to_s,
       expected: expected.to_s,
-      actual: actual.to_ss
+      actual: actual.to_ss,
+      error: error
     }
     if @puts_failure_message
       puts $colors[:failure] + '  ' + actual.to_ss + " (:" + assertion.to_s + ")" + $colors[:reset]
@@ -41,6 +42,25 @@ class MrubycTestCase
     print $colors[:pending] + '.' + $colors[:reset]
   end
 
+  def assert_raise(*errors, &block)
+    assertion = :assert_raise
+    e = nil
+    begin
+      block.call
+    rescue => e
+      errors.each do |error|
+        if error == e.class || (error.class == e.class && error.message == e.message)
+          success(assertion, errors, error)
+          return
+        end
+      end
+    end
+    expected = errors.map {|error|
+      error.message.length > 0 ? "#<#{error.class}: #{error.message}>" : "#{error.class}"
+    }.join(" || ")
+    failure(assertion, expected, (e || "[No error]"), "")
+  end
+
   def assert_equal(expected, actual, message = nil)
     assertion = :assert_equal
     actual == expected ? success(assertion, expected, actual) : failure(assertion, expected, actual, message)
@@ -86,9 +106,9 @@ class MrubycTestCase
     end
   end
 
-  def description(text)
+  def self.description(text)
   end
-  def desc(text)
+  def self.desc(text)
   end
   def setup
   end

data/lib/mrubyc-ext/object.rb

@@ -4,6 +4,8 @@ class Object
       'nil [NilClass]'
     elsif self == ''
       '[NULL String]'
+    elsif self.class.to_s.end_with? "Error"
+      "#<#{self.class}: #{self.message}>"
     else
       self.to_s + ' [' + self.class_name + ']'
     end

data/lib/mrubyc-test.rb

@@ -50,6 +50,7 @@ module Mrubyc::Test
         pwd = Dir.pwd
         hal_path = "#{pwd}/#{config['mrubyc_src_dir']}/hal"
         hal_bak_path = "#{pwd}/#{config['mrubyc_src_dir']}/~hal"
+        FileUtils.rm_rf hal_bak_path
         FileUtils.mv(hal_path, hal_bak_path) if FileTest.exist?(hal_path)
         exit_code = 0
         cc = ENV['CC'].to_s.length > 0 ? ENV['CC'] : "gcc"
@@ -60,12 +61,12 @@ module Mrubyc::Test
             [
               "#{mrbc_path} -B test test.rb",
               "#{mrbc_path} -B models models.rb",
-              "#{cc} -O0 -g3 -Wall -I #{pwd}/#{config['mrubyc_src_dir']} -static -o test main.c #{pwd}/#{config['mrubyc_src_dir']}/*.c #{pwd}/#{config['mrubyc_src_dir']}/hal/*.c -DMRBC_USE_MATH=1 -DMRBC_USE_HAL_POSIX #{ENV["CFLAGS"]} #{ENV["LDFLAGS"]}",
+              "#{cc} -O0 -g3 -Wall -I #{pwd}/#{config['mrubyc_src_dir']} -static -o test main.c #{pwd}/#{config['mrubyc_src_dir']}/*.c #{pwd}/#{config['mrubyc_src_dir']}/hal/*.c -DMRBC_INT64 -DMAX_SYMBOLS_COUNT=1000 -DMRBC_USE_MATH=1 -DMRBC_USE_HAL_POSIX #{ENV["CFLAGS"]} #{ENV["LDFLAGS"]}",
               "#{qemu} ./test"
-             ].each do |cmd|
-               puts cmd
-               puts
-               exit_code = 1 unless system(cmd)
+            ].each do |cmd|
+              puts cmd
+              puts
+              exit_code = 1 unless Kernel.system(cmd)
             end
           end
         ensure
@@ -112,6 +113,7 @@ module Mrubyc::Test
                RBENV_VERSION will be ignored if you specify this option.
       DESC
     def test(testfilepath = "test/*.rb")
+      Mrubyc::Test::Init.init_main_c
       init_env
       config = Mrubyc::Test::Config.read
       method_name_pattern = (%r{\A/(.*)/\Z} =~ options[:name] ? Regexp.new($1) : options[:name])

data/lib/templates/main.c.erb

@@ -1,6 +1,7 @@
 #include "mrubyc.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include "models.c"
 #include "test.c"
 
@@ -9,15 +10,28 @@ static uint8_t my_memory_pool[MEMORY_SIZE];
 
 int exit_code = 0;
 
-static void c_exit(struct VM *vm, mrbc_value v[], int argc)
+static void
+c_exit(struct VM *vm, mrbc_value v[], int argc)
 {
   exit_code = GET_INT_ARG(1);
 }
 
+//================================================================
+/*! Object#require
+ *  (for PRK Firmware)
+*/
+static void
+c_require(struct VM *vm, mrbc_value v[], int argc)
+{
+  /* Nothing to do */
+  SET_NIL_RETURN();
+}
+
 //================================================================
 /*! Object#instance_variable_get
 */
-static void c_instance_variable_get(struct VM *vm, mrbc_value v[], int argc)
+static void
+c_instance_variable_get(struct VM *vm, mrbc_value v[], int argc)
 {
   mrbc_kv_handle *kvh = &v[0].instance->ivar;
   const char *name = (const char *)GET_STRING_ARG(1);
@@ -34,7 +48,8 @@ static void c_instance_variable_get(struct VM *vm, mrbc_value v[], int argc)
 //================================================================
 /*! DEBUG PRINT
 */
-static void c_debugprint(struct VM *vm, mrbc_value v[], int argc)
+static void
+c_debugprint(struct VM *vm, mrbc_value v[], int argc)
 {
   console_putchar('\n');
   for( int i = 0; i < 79; i++ ) { console_putchar('='); }
@@ -50,13 +65,34 @@ static void c_debugprint(struct VM *vm, mrbc_value v[], int argc)
   console_putchar('\n');
 }
 
-int main(void) {
+bool
+mrbc_load_model(const uint8_t *mrb)
+{
+  mrbc_vm *vm = mrbc_vm_open(NULL);
+  if( vm == 0 ) {
+    console_printf("Error: Can't open VM.\n");
+    exit_code++;
+    return false;
+  }
+  if( mrbc_load_mrb(vm, mrb) != 0 ) {
+    mrbc_print_exception(&vm->exception);
+    exit_code++;
+    return false;
+  }
+  mrbc_vm_begin(vm);
+  mrbc_vm_run(vm);
+  mrbc_raw_free(vm);
+  return true;
+}
+
+int
+main(void) {
   mrbc_init(my_memory_pool, MEMORY_SIZE);
+  mrbc_define_method(0, mrbc_class_object, "require", c_require);
   mrbc_define_method(0, mrbc_class_object, "debugprint", c_debugprint);
   mrbc_define_method(0, mrbc_class_object, "exit", c_exit);
   mrbc_define_method(0, mrbc_class_object, "instance_variable_get", c_instance_variable_get);
-  mrbc_create_task( models, 0 );
-  mrbc_create_task( test, 0 );
-  mrbc_run();
+  mrbc_load_model(models);
+  mrbc_load_model(test);
   return exit_code;
 }

data/lib/templates/models.rb.erb

@@ -1,3 +1,5 @@
 <% model_files.each do |file_name| -%>
   <%= File.read(file_name) %>
 <% end -%>
+
+$mutex = true

data/lib/templates/test.rb.erb

@@ -56,9 +56,10 @@ def summerize
       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]
+      puts "  expected    : " + failure[:expected] if failure[:expected].length > 0
+      puts "  actual      : " + failure[:actual] if failure[:actual]
+      puts "  error       : " + failure[:error] if failure[:error]
+      puts "  message     : " + failure[:message] if failure[:message]
       print $colors[:info]
       puts "  # " + failure[:path] + ":" + failure[:line]
       print $colors[:reset]
@@ -136,13 +137,17 @@ end
   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
+  begin
+    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
+  rescue => e
+    my_case.failure(nil, nil, "", e.message, e.class.to_s)
+  end
   puts
 
 <% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mrubyc-test
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - HASUMI Hitoshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler