mrubyc-test 0.7.0.pre.rc0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3999a4b4fc42b7080d1e1923475b9b175c0bfefb9f7438aab342a61d2693de38
-  data.tar.gz: d734e7f81126a95414c4aff68175f57410653a45e15b4b3d72f5a6ef1cc69e9c
+  metadata.gz: 42dad60691e5384546bea0da13394891c4b0a18ca96033542e9674f2cc6637c3
+  data.tar.gz: 5c36b3b893edb879b94acdb752a60a892c9b38b0b7d018ecb2b6fca67cf657ff
 SHA512:
-  metadata.gz: a28f63efee86b0222ad4c316cf90023fefa18331179f591251d45f5f7145c3bdb102650386a93332869e5bb454f4e8fec6fb5a414233d516e8279aff0a3e6c28
-  data.tar.gz: e8ffe7d3cd5f3414bf91d37a2dcd8f5da9dc79261f9fc733dda0faf085bdca5f13f4c93452b43b583848560cb3fb7aeb10454c8571c0d398e975c984fc84d812
+  metadata.gz: 00bd3455fca3ae3336f263ec19881c8007e3c6dffb24e47082e82f86228e4143989ea122f8dbb9220d8108ff726f786daeed31085346cafdb2f87532f7a3adc6
+  data.tar.gz: 3bbf2aeb541bd4bfc6e5109049103a5b9a09a39195594295db5fac490d1d1c6bb687e72589b78de761307b9dbe01e1d930e3874568f6a2d1f6309b421e98acf1

data/Gemfile.lock

@@ -1,52 +1,50 @@
 PATH
   remote: .
   specs:
-    mrubyc-test (0.6.2)
-      activesupport (~> 6.0)
+    mrubyc-test (0.7.1)
+      activesupport (~> 7.0)
       rufo (~> 0.12)
-      thor (~> 1.0)
+      thor (~> 1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
-    i18n (1.8.10)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
+    minitest (5.15.0)
     rake (13.0.6)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     rufo (0.13.0)
-    thor (1.1.0)
+    thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.0)
+  bundler (~> 2)
   mrubyc-test!
-  rake (~> 13.0)
+  rake (~> 13)
   rspec (~> 3.9)
 
 BUNDLED WITH

data/README.md

@@ -119,17 +119,17 @@ end
 ```ruby
 class Sample
   def do_other_thing
-    is_to_be_hit()
+    is_to_be_hit(1, 2) # Two args for example
   end
 end
 ```
 
-You can test whether `#is_to_be_hit` method will be called:
+You can test whether `#is_to_be_hit(v1, v2)` method will be called:
 
 ```ruby
 def mock_case
   sample_obj = Sample.new
-  mock(sample_obj).is_to_be_hit
+  mock(sample_obj).is_to_be_hit(2) # `2` should be count of parameters
   sample_obj.do_other_thing
 end
 ```

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

@@ -13,12 +13,16 @@ module Mrubyc
               puts "loading #{model_file}"
               load model_file
               class_name = File.basename(model_file, '.rb').camelize
-              begin
-                model_class = Module.const_get(class_name)
-              rescue NameError => e
-                print "\e[33m"
-                puts "[WARN] #{model_file} doesn't have corresponding class `#{class_name}`."
-                print "\e[m"
+              model_class = if Module.const_defined?(class_name)
+                Module.const_get(class_name)
+              elsif Module.const_defined?(class_name.upcase)
+                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

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

@@ -17,11 +17,13 @@ module Mrubyc
         end
 
         def method_missing(method_name, *args)
+          param_size = args[0] || 0
           @@double_method_locations << {
             type: @type,
             class: @klass,
             method_name: method_name,
             args: args.to_s,
+            method_parameters: Array.new(param_size).map.with_index{|_, i| ('a'.ord + i).chr }.join(','),
             block: (block_given? ? yield : nil),
             label: @location.label,
             path: @location.absolute_path || @location.path,

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

@@ -13,12 +13,12 @@ module Mrubyc
             test_erb = ERB.new(
               File.read(
                 File.expand_path('../../../../templates/test.rb.erb', __FILE__)
-              ), nil, '-'
+              ), trim_mode: '-'
             )
             models_erb = ERB.new(
               File.read(
                 File.expand_path('../../../../templates/models.rb.erb', __FILE__)
-              ), nil, '-'
+              ), trim_mode: '-'
             )
             mrubyc_class_dir = File.expand_path('../../../../mrubyc-ext/', __FILE__)
             File.write(File.join(

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

@@ -31,6 +31,7 @@ module Mrubyc
                         instance_variables: nil, # TODO
                         method_name: double[:method_name].to_s,
                         args: double[:args],
+                        method_parameters: double[:method_parameters],
                         return_value: double[:block],
                         line: double[:line]
                       }

data/lib/mrubyc/test/version.rb

@@ -1,5 +1,5 @@
 module Mrubyc
   module Test
-    VERSION = "0.7.0-rc0"
+    VERSION = "0.7.1"
   end
 end

data/lib/mrubyc-ext/object.rb

@@ -16,8 +16,8 @@ class Object
       'Array'
     when FalseClass
       'FalseClass'
-    when Fixnum
-      'Fixnum'
+    when Integer
+      'Integer'
     when Float
       'Float'
     when Hash

data/lib/mrubyc-test.rb

@@ -47,34 +47,30 @@ module Mrubyc::Test
         tmp_dir = File.join(Dir.pwd, config['test_tmp_dir'])
         puts "cd #{tmp_dir}"
         puts
-        exit_code = 0
         pwd = Dir.pwd
         hal_path = "#{pwd}/#{config['mrubyc_src_dir']}/hal"
         hal_bak_path = "#{pwd}/#{config['mrubyc_src_dir']}/~hal"
         FileUtils.mv(hal_path, hal_bak_path) if FileTest.exist?(hal_path)
+        exit_code = 0
         begin
           FileUtils.ln_s "#{pwd}/#{config['test_tmp_dir']}/hal", "#{pwd}/#{config['mrubyc_src_dir']}/hal"
           Dir.chdir(tmp_dir) do
             [
-             "#{mrbc_path} -B test test.rb",
-             "#{mrbc_path} -B models models.rb",
-             "cc -O0 -g3 -Wall -I #{pwd}/#{config['mrubyc_src_dir']} -o test main.c #{pwd}/#{config['mrubyc_src_dir']}/*.c #{pwd}/#{config['mrubyc_src_dir']}/hal/*.c -DMRBC_USE_HAL_POSIX #{ENV["CFLAGS"]} #{ENV["LDFLAGS"]}",
-             "./test"].each do |cmd|
+              "#{mrbc_path} -B test test.rb",
+              "#{mrbc_path} -B models models.rb",
+              "cc -O0 -g3 -Wall -I #{pwd}/#{config['mrubyc_src_dir']} -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"]}",
+              "./test"
+             ].each do |cmd|
                puts cmd
                puts
-               exit_code = system(cmd) ? 0 : 1
-               if exit_code > 0
-                 print "\e[31m"
-                 puts "exit code: #{exit_code}"
-                 puts "\e[0m"
-                 exit(exit_code)
-               end
+               exit_code = 1 unless system(cmd)
             end
           end
         ensure
           FileUtils.rm hal_path
           FileUtils.mv(hal_bak_path, hal_path) if FileTest.exist?(hal_bak_path)
         end
+        return exit_code
       end
 
       def init_env
@@ -132,10 +128,16 @@ module Mrubyc::Test
         end
         "RBENV_VERSION=#{mruby_version} mrbc"
       end
+      exit_code = 0
       Dir.glob(test_path).each_slice(options[:every]) do |test_files|
         prepare(test_files, options[:verbose], method_name_pattern)
-        make(mrbc_path)
+        exit_code += make(mrbc_path)
+      end
+      if exit_code > 0
+        puts "\e[31mFinished with error(s)\e[0m"
+        exit 1
       end
+      puts "\e[32mFinished without error\e[0m"
     end
 
     desc "version", "Print the version"

data/lib/templates/main.c.erb

@@ -4,27 +4,47 @@
 #include "models.c"
 #include "test.c"
 
-#define MEMORY_SIZE (1024*64)-1
+#define MEMORY_SIZE (1024*640)-1
 static uint8_t my_memory_pool[MEMORY_SIZE];
 
-int exit_code;
+int exit_code = 0;
 
-static void c_exit(mrb_vm *vm, mrb_value *v, int argc){
+static void c_exit(struct VM *vm, mrbc_value v[], int argc)
+{
   exit_code = GET_INT_ARG(1);
 }
 
+//================================================================
+/*! Object#instance_variable_get
+*/
+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);
+  for(int i = 0; i < kvh->n_stored; i++) {
+    if (strncmp(&name[1], symid_to_str(kvh->data[i].sym_id), strlen(name) - 1) == 0) {
+      SET_RETURN(kvh->data[i].value);
+      mrbc_incref(&kvh->data[i].value);
+      return;
+    }
+  }
+  SET_NIL_RETURN();
+}
+
 //================================================================
 /*! DEBUG PRINT
 */
-static void c_debugprint(mrb_vm *vm, mrb_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('='); }
   console_putchar('\n');
   unsigned char *message = GET_STRING_ARG(1);
   console_printf("%s\n", message);
-  int total, used, free, fragment;
-  mrbc_alloc_statistics( &total, &used, &free, &fragment );
-  console_printf("Memory total:%d, used:%d, free:%d, fragment:%d\n", total, used, free, fragment );
+
+  struct MRBC_ALLOC_STATISTICS mem;
+  mrbc_alloc_statistics( &mem );
+  console_printf("Memory total:%d, used:%d, free:%d, fragment:%d\n", mem.total, mem.used, mem.free, mem.fragmentation );
   for( int i = 0; i < 79; i++ ) { console_putchar('='); }
   console_putchar('\n');
   console_putchar('\n');
@@ -34,6 +54,7 @@ int main(void) {
   mrbc_init(my_memory_pool, MEMORY_SIZE);
   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();

data/lib/templates/test.rb.erb

@@ -108,7 +108,7 @@ end
   <% end -%>
   <% test_case[:mocks].each do |mock| -%>
     class <%= mock[:class_name] %>
-      def <%= mock[:method_name] %>
+      def <%= mock[:method_name] %>(<%= mock[:method_parameters] %>)
         $mock.actual.add_by_key :<%= mock[:method_name] %>
       end
     end
@@ -126,7 +126,7 @@ end
     end
     <% test_case[:mocks].each do |mock| -%>
       class <%= mock[:class_name] %>Double
-        def <%= mock[:method_name] %>
+        def <%= mock[:method_name] %>(_param_size = 0)
           $mock.expected.add_by_key :<%= mock[:method_name] %>
         end
       end

data/mrubyc-test.gemspec

@@ -23,11 +23,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "bundler", "~> 2"
+  spec.add_development_dependency "rake", "~> 13"
   spec.add_development_dependency "rspec", "~> 3.9"
 
-  spec.add_dependency "thor", "~> 1.0"
-  spec.add_dependency "activesupport", "~> 6.0"
+  spec.add_dependency "thor", "~> 1.2"
+  spec.add_dependency "activesupport", "~> 7.0"
   spec.add_dependency "rufo", "~> 0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mrubyc-test
 version: !ruby/object:Gem::Version
-  version: 0.7.0.pre.rc0
+  version: 0.7.1
 platform: ruby
 authors:
 - HASUMI Hitoshi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2022-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rufo
   requirement: !ruby/object:Gem::Requirement
@@ -148,11 +148,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.17
+rubygems_version: 3.3.14
 signing_key:
 specification_version: 4
 summary: Test Framework for mruby/c