mrubyc-test 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6b6e64b49572a4c4a90f6a5a43d25309c42c91e004f6b6fc4e31ad84555d9c8
-  data.tar.gz: 1df134d8e5a19dc3b1c46e6ee97f5a25c89df2cf4287cac84589383b831dcb3b
+  metadata.gz: 134dba24482cd854d18c548f67c6884f29762de6c5cff34c8dd16b33349cfc49
+  data.tar.gz: 16c91f515cc2507629df555eef9222be0c92fccf0e5a11b72883854e99ceb7e7
 SHA512:
-  metadata.gz: fcb5ed97c767cb27084ccb99b5108e9556f196be113770369162362391304b46997ead657bf290b91eacb0aced27dc06051a11848b2a2570a9d69a3928d714a2
-  data.tar.gz: a7dc49998b925f0871819bcbd2d15eeb821d35ce2a7ebb48402a412f20cfa6c57012e8cd64cd556e8d91947ed96e4546e0a8400998d316f0832eca4deb99ed5c
+  metadata.gz: a83d79c076b05e91f452293501776ab70d590214c84169bdb65a5c329ff10a554135077ad814b91846361a7658a9b40f919ff765a333b5cbe2be9d95c13b173a
+  data.tar.gz: db81ffe8ca22180eb7ac156c39d3bbaeac5c2048c60f38aa9020c5a642c0fc9f8e48d5924accd81488828224383ec4dd754c88baeb9221b55677b9a5ec0904d4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mrubyc-test (0.6.0)
+    mrubyc-test (0.7.0)
       activesupport (~> 6.0)
       rufo (~> 0.12)
       thor (~> 1.0)
@@ -9,36 +9,36 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.1)
+    activesupport (6.1.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    concurrent-ruby (1.1.7)
-    diff-lcs (1.4.4)
-    i18n (1.8.7)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.3)
-    rake (13.0.3)
-    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)
+    minitest (5.15.0)
+    rake (13.0.6)
+    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.1)
+      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.1)
-    rufo (0.12.0)
-    thor (1.0.1)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rufo (0.13.0)
+    thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby

data/README.md

@@ -4,9 +4,9 @@
 
 mrubyc-test is an unit test framework for [mruby/c](https://github.com/mrubyc/mrubyc), supporting basic assertions, stub and mock.
 
-## Acknowledgements
+## Dependency
 
-The API design and implementation of this gem is greatly inspired by [test-unit](https://github.com/test-unit/test-unit). Thank the great work.
+- mrubyc-test 0.7.0+ depends on mrubyc 3.0+
 
 ## Features
 
@@ -38,7 +38,7 @@ Or install it yourself as:
 ## 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` and `.ruby-version` in the top directory of your project.
+It means you have `Mrubycfile` 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`
 
@@ -49,8 +49,8 @@ This is an example of ESP32 project:
 ```
 ~/your_project $ tree
 .
-├── .mrubycconfig               # Created by mrubyc-utils
-├── .ruby-version               # It should be mruby's version something like 'mruby-1.4.1'
+├── Mrubycfile                # Created by mrubyc-utils
+├── .ruby-version             # It should be mruby's version like 'mruby-3.0.0'
 ├── Makefile
 ├── build
 ├── components
@@ -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
 ```
@@ -144,6 +144,10 @@ end
 - Other assertions like LT(<), GTE(>=), include?, ...etc.
 - bla bla bla
 
+## Acknowledgements
+
+The API design and implementation of this gem is greatly inspired by [test-unit](https://github.com/test-unit/test-unit). Thank the great work.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/mrubyc/mrubyc-test. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/lib/mrubyc/test/config.rb

@@ -8,21 +8,31 @@ module Mrubyc
     class Config
       class << self
         def read(check: true)
-          FileUtils.touch('.mrubycconfig')
-          config = YAML.load_file('.mrubycconfig')
+          config = YAML.load_file(mrubycfile)
           if check
             if !config || config == [] || !config['test_dir']
-              raise 'Check if `.mrubycconfig` exists.'
+              raise 'Check if `Mrubycfile or .mrubycconfig` exists.'
             end
           end
           config || {}
         end
 
         def write(config)
-          File.open('.mrubycconfig', 'r+') do |file|
+          File.open(mrubycfile, 'r+') do |file|
             file.write(config.to_yaml)
           end
         end
+
+        def mrubycfile
+          if File.exists? 'Mrubycfile'
+            'Mrubycfile'
+          elsif  File.exists? '.mrubycconfig'
+            '.mrubycconfig'
+          else
+            FileUtils.touch 'Mrubycfile'
+            'Mrubycfile'
+          end
+        end
       end
     end
   end

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

@@ -13,9 +13,12 @@ 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
+              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
                 print "\e[33m"
                 puts "[WARN] #{model_file} doesn't have corresponding class `#{class_name}`."
                 print "\e[m"

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/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/init.rb

@@ -11,12 +11,12 @@ module Mrubyc
           puts 'Initializing...'
           puts
 
-          puts '  touch .mrubycconfig'
+          puts '  touch Mrubycfile'
           config = Mrubyc::Test::Config.read(check: false)
           config['test_dir'] = 'test'
           config['test_tmp_dir'] = 'test/tmp'
           config['mruby_lib_dir'] = 'mrblib'
-          puts '  add config to .mrubycconfig'
+          puts '  add config to Mrubycfile'
           Mrubyc::Test::Config.write(config)
 
           hal_dir = "#{config['test_tmp_dir']}/hal"

data/lib/mrubyc/test/version.rb

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

data/lib/mrubyc-ext/mrubyc_test_case.rb

@@ -86,9 +86,9 @@ class MrubycTestCase
     end
   end
 
-  def self.description(text)
+  def description(text)
   end
-  def self.desc(text)
+  def desc(text)
   end
   def setup
   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

@@ -56,9 +56,9 @@ module Mrubyc::Test
           FileUtils.ln_s "#{pwd}/#{config['test_tmp_dir']}/hal", "#{pwd}/#{config['mrubyc_src_dir']}/hal"
           Dir.chdir(tmp_dir) do
             [
-             "#{mrbc_path} -E -B test test.rb",
-             "#{mrbc_path} -E -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 #{ENV["CFLAGS"]} #{ENV["LDFLAGS"]}",
+             "#{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|
                puts cmd
                puts
@@ -115,15 +115,15 @@ module Mrubyc::Test
       DESC
     def test(testfilepath = "test/*.rb")
       init_env
+      config = Mrubyc::Test::Config.read
       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
-      mrbc_path = if options[:mrbc_path]
-        options[:mrbc_path]
-      else
+      mrbc_path = options[:mrbc_path] || config['mrbc_path']
+      unless mrbc_path
         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`'

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

@@ -7,7 +7,7 @@
 # For more information, see <%= Gem.loaded_specs['mrubyc-test']&.homepage %>
 #
 
-if RUBY_VERSION == '1.9' && MRUBYC_VERSION
+if RUBY_ENGINE == 'mruby/c'
   class Math
   end
   class Numeric
@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mrubyc-test
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - HASUMI Hitoshi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2022-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Test Framework for mruby/c