mrubyc-test 0.7.0.pre.rc0 → 0.7.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3999a4b4fc42b7080d1e1923475b9b175c0bfefb9f7438aab342a61d2693de38
-  data.tar.gz: d734e7f81126a95414c4aff68175f57410653a45e15b4b3d72f5a6ef1cc69e9c
+  metadata.gz: a7ba5b056b71ff5fc5377dda272e651a3784dfdc7627f3a746e7ce6bb30ff975
+  data.tar.gz: 2d587b1e8d998ba84434634ff0f7599ccec2bd69b41a41ac80693b057593fb67
 SHA512:
-  metadata.gz: a28f63efee86b0222ad4c316cf90023fefa18331179f591251d45f5f7145c3bdb102650386a93332869e5bb454f4e8fec6fb5a414233d516e8279aff0a3e6c28
-  data.tar.gz: e8ffe7d3cd5f3414bf91d37a2dcd8f5da9dc79261f9fc733dda0faf085bdca5f13f4c93452b43b583848560cb3fb7aeb10454c8571c0d398e975c984fc84d812
+  metadata.gz: a0c73ee66679987cc53adc9631e500f3cec3a70107807c3bebede1f3310dc2846db4e367a9eb215172b72c2535ddd7353a350bf50eeb45760d911ed7366ba6a5
+  data.tar.gz: a8a29d343d482ce81c2d83221f788d3cf9997739cafee556b2d3cd0342dee43d6e8a28880d5504e00fdc9465e68013e3da3c63dac754bd397ea72b4ad443e0c8

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,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/version.rb

@@ -1,5 +1,5 @@
 module Mrubyc
   module Test
-    VERSION = "0.7.0-rc0"
+    VERSION = "0.7.0-rc1"
   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/templates/main.c.erb

@@ -4,19 +4,37 @@
 #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);
+      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');
@@ -34,6 +52,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

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.0.pre.rc1
 platform: ruby
 authors:
 - HASUMI Hitoshi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler