Update to ruby/spec@ab32a1a

author: Benoit Daloze <[email protected]> 2022-06-26 14:50:14 +0200
committer: Benoit Daloze <[email protected]> 2022-06-26 14:50:14 +0200
commit: d3d5ef0cca160fca538c7f556c5a6e08df5847e6 (patch)
tree: 57358b4b9cdd6f429d0383005ac393cb74dd3bff /spec/ruby/optional
parent: f616e816372d14e605879d2e43c7fbdda29ef837 (diff)
10 files changed, 109 insertions, 78 deletions
diff --git a/spec/ruby/optional/capi/class_spec.rb b/spec/ruby/optional/capi/class_spec.rb
index a57b8f644f..8e678c9111 100644
--- a/spec/ruby/optional/capi/class_spec.rb
+++ b/spec/ruby/optional/capi/class_spec.rb
@@ -196,16 +196,6 @@ describe "C-API Class function" do
     end
   end
 
-  describe "rb_define_method" do
-    it "defines a method taking variable arguments as a C array if the argument count is -1" do
-      @s.rb_method_varargs_1(1, 3, 7, 4).should == [1, 3, 7, 4]
-    end
-
-    it "defines a method taking variable arguments as a Ruby array if the argument count is -2" do
-      @s.rb_method_varargs_2(1, 3, 7, 4).should == [1, 3, 7, 4]
-    end
-  end
-
   describe "rb_class2name" do
     it "returns the class name" do
       @s.rb_class2name(CApiClassSpecs).should == "CApiClassSpecs"
diff --git a/spec/ruby/optional/capi/encoding_spec.rb b/spec/ruby/optional/capi/encoding_spec.rb
index 66c2dd40de..e18108c022 100644
--- a/spec/ruby/optional/capi/encoding_spec.rb
+++ b/spec/ruby/optional/capi/encoding_spec.rb
@@ -613,15 +613,15 @@ describe "C-API Encoding function" do
     it 'converts a Unicode codepoint to a UTF-8 C string' do
       str = ' ' * 6
       {
-        0  => "\x01",
-        0x7f => "\xC2\x80",
-        0x7ff => "\xE0\xA0\x80",
-        0xffff => "\xF0\x90\x80\x80",
-        0x1fffff => "\xF8\x88\x80\x80\x80",
-        0x3ffffff => "\xFC\x84\x80\x80\x80\x80",
+        1  => "\x01",
+        0x80 => "\xC2\x80",
+        0x800 => "\xE0\xA0\x80",
+        0x10000 => "\xF0\x90\x80\x80",
+        0x200000 => "\xF8\x88\x80\x80\x80",
+        0x4000000 => "\xFC\x84\x80\x80\x80\x80",
       }.each do |num, result|
-        len = @s.rb_uv_to_utf8(str, num + 1)
-        str[0..len-1].should == result
+        len = @s.rb_uv_to_utf8(str, num)
+        str.byteslice(0, len).should == result
       end
     end
   end
diff --git a/spec/ruby/optional/capi/ext/class_spec.c b/spec/ruby/optional/capi/ext/class_spec.c
index b860742906..589025f677 100644
--- a/spec/ruby/optional/capi/ext/class_spec.c
+++ b/spec/ruby/optional/capi/ext/class_spec.c
@@ -142,19 +142,6 @@ static VALUE class_spec_include_module(VALUE self, VALUE klass, VALUE module) {
   return klass;
 }
 
-static VALUE class_spec_method_var_args_1(int argc, VALUE *argv, VALUE self) {
-  VALUE ary = rb_ary_new();
-  int i;
-  for (i = 0; i < argc; i++) {
-    rb_ary_push(ary, argv[i]);
-  }
-  return ary;
-}
-
-static VALUE class_spec_method_var_args_2(VALUE self, VALUE argv) {
-  return argv;
-}
-
 void Init_class_spec(void) {
   VALUE cls = rb_define_class("CApiClassSpecs", rb_cObject);
   rb_define_method(cls, "define_call_super_method", class_spec_define_call_super_method, 2);
@@ -185,8 +172,6 @@ void Init_class_spec(void) {
   rb_define_method(cls, "rb_define_class_id_under", class_spec_rb_define_class_id_under, 3);
   rb_define_method(cls, "rb_define_class_variable", class_spec_define_class_variable, 3);
   rb_define_method(cls, "rb_include_module", class_spec_include_module, 2);
-  rb_define_method(cls, "rb_method_varargs_1", class_spec_method_var_args_1, -1);
-  rb_define_method(cls, "rb_method_varargs_2", class_spec_method_var_args_2, -2);
 }
 
 #ifdef __cplusplus
diff --git a/spec/ruby/optional/capi/ext/encoding_spec.c b/spec/ruby/optional/capi/ext/encoding_spec.c
index cde4d0c351..68c4161bab 100644
--- a/spec/ruby/optional/capi/ext/encoding_spec.c
+++ b/spec/ruby/optional/capi/ext/encoding_spec.c
@@ -275,7 +275,9 @@ static VALUE encoding_spec_rb_enc_str_asciionly_p(VALUE self, VALUE str) {
 }
 
 static VALUE encoding_spec_rb_uv_to_utf8(VALUE self, VALUE buf, VALUE num) {
-  return INT2NUM(rb_uv_to_utf8(RSTRING_PTR(buf), NUM2INT(num)));
+  int len = rb_uv_to_utf8(RSTRING_PTR(buf), NUM2INT(num));
+  RB_ENC_CODERANGE_CLEAR(buf);
+  return INT2NUM(len);
 }
 
 static VALUE encoding_spec_ONIGENC_MBC_CASE_FOLD(VALUE self, VALUE str) {
diff --git a/spec/ruby/optional/capi/ext/module_spec.c b/spec/ruby/optional/capi/ext/module_spec.c
index 7475994fa1..12bcf99983 100644
--- a/spec/ruby/optional/capi/ext/module_spec.c
+++ b/spec/ruby/optional/capi/ext/module_spec.c
@@ -9,18 +9,6 @@ static VALUE module_specs_test_method(VALUE self) {
   return ID2SYM(rb_intern("test_method"));
 }
 
-static VALUE module_specs_test_method_2required(VALUE self, VALUE arg1, VALUE arg2) {
-    return ID2SYM(rb_intern("test_method_2required"));
-}
-
-static VALUE module_specs_test_method_c_array(int argc, VALUE *argv, VALUE self) {
-    return ID2SYM(rb_intern("test_method_c_array"));
-}
-
-static VALUE module_specs_test_method_ruby_array(VALUE self, VALUE args) {
-    return ID2SYM(rb_intern("test_method_ruby_array"));
-}
-
 static VALUE module_specs_const_defined(VALUE self, VALUE klass, VALUE id) {
   return rb_const_defined(klass, SYM2ID(id)) ? Qtrue : Qfalse;
 }
@@ -88,19 +76,25 @@ static VALUE module_specs_rb_define_method(VALUE self, VALUE cls, VALUE str_name
   return Qnil;
 }
 
-static VALUE module_specs_rb_define_method_2required(VALUE self, VALUE cls, VALUE str_name) {
-  rb_define_method(cls, RSTRING_PTR(str_name), module_specs_test_method_2required, 2);
-  return Qnil;
+static VALUE module_specs_method_var_args_1(int argc, VALUE *argv, VALUE self) {
+  VALUE ary = rb_ary_new();
+  int i;
+  for (i = 0; i < argc; i++) {
+    rb_ary_push(ary, argv[i]);
+  }
+  return ary;
 }
 
-static VALUE module_specs_rb_define_method_c_array(VALUE self, VALUE cls, VALUE str_name) {
-  rb_define_method(cls, RSTRING_PTR(str_name), module_specs_test_method_c_array, -1);
-  return Qnil;
+static VALUE module_specs_method_var_args_2(VALUE self, VALUE argv) {
+  return argv;
 }
 
-static VALUE module_specs_rb_define_method_ruby_array(VALUE self, VALUE cls, VALUE str_name) {
-  rb_define_method(cls, RSTRING_PTR(str_name), module_specs_test_method_ruby_array, -2);
-  return Qnil;
+static VALUE module_specs_rb_define_method_1required(VALUE self, VALUE arg1) {
+    return arg1;
+}
+
+static VALUE module_specs_rb_define_method_2required(VALUE self, VALUE arg1, VALUE arg2) {
+    return arg2;
 }
 
 static VALUE module_specs_rb_define_module_function(VALUE self, VALUE cls, VALUE str_name) {
@@ -155,25 +149,21 @@ void Init_module_spec(void) {
   rb_define_method(cls, "rb_define_module_under", module_specs_rb_define_module_under, 2);
   rb_define_method(cls, "rb_define_const", module_specs_define_const, 3);
   rb_define_method(cls, "rb_define_global_const", module_specs_define_global_const, 2);
-  rb_define_method(cls, "rb_define_global_function",
-      module_specs_rb_define_global_function, 1);
+  rb_define_method(cls, "rb_define_global_function", module_specs_rb_define_global_function, 1);
 
   rb_define_method(cls, "rb_define_method", module_specs_rb_define_method, 2);
+  rb_define_method(cls, "rb_define_method_varargs_1", module_specs_method_var_args_1, -1);
+  rb_define_method(cls, "rb_define_method_varargs_2", module_specs_method_var_args_2, -2);
+  rb_define_method(cls, "rb_define_method_1required", module_specs_rb_define_method_1required, 1);
   rb_define_method(cls, "rb_define_method_2required", module_specs_rb_define_method_2required, 2);
-  rb_define_method(cls, "rb_define_method_c_array", module_specs_rb_define_method_c_array, 2);
-  rb_define_method(cls, "rb_define_method_ruby_array", module_specs_rb_define_method_ruby_array, 2);
 
-  rb_define_method(cls, "rb_define_module_function",
-      module_specs_rb_define_module_function, 2);
+  rb_define_method(cls, "rb_define_module_function", module_specs_rb_define_module_function, 2);
 
-  rb_define_method(cls, "rb_define_private_method",
-      module_specs_rb_define_private_method, 2);
+  rb_define_method(cls, "rb_define_private_method", module_specs_rb_define_private_method, 2);
 
-  rb_define_method(cls, "rb_define_protected_method",
-      module_specs_rb_define_protected_method, 2);
+  rb_define_method(cls, "rb_define_protected_method", module_specs_rb_define_protected_method, 2);
 
-  rb_define_method(cls, "rb_define_singleton_method",
-      module_specs_rb_define_singleton_method, 2);
+  rb_define_method(cls, "rb_define_singleton_method", module_specs_rb_define_singleton_method, 2);
 
   rb_define_method(cls, "rb_undef_method", module_specs_rb_undef_method, 2);
   rb_define_method(cls, "rb_undef", module_specs_rb_undef, 2);
diff --git a/spec/ruby/optional/capi/ext/object_spec.c b/spec/ruby/optional/capi/ext/object_spec.c
index 2670f24661..967b355c4a 100644
--- a/spec/ruby/optional/capi/ext/object_spec.c
+++ b/spec/ruby/optional/capi/ext/object_spec.c
@@ -301,6 +301,13 @@ static VALUE so_is_rb_type_p_data(VALUE self, VALUE obj) {
   return Qfalse;
 }
 
+static VALUE so_is_rb_type_p_file(VALUE self, VALUE obj) {
+  if(rb_type_p(obj, T_FILE)) {
+    return Qtrue;
+  }
+  return Qfalse;
+}
+
 static VALUE so_is_builtin_type_object(VALUE self, VALUE obj) {
   if(BUILTIN_TYPE(obj) == T_OBJECT) {
     return Qtrue;
@@ -478,6 +485,7 @@ void Init_object_spec(void) {
   rb_define_method(cls, "rb_is_rb_type_p_module", so_is_rb_type_p_module, 1);
   rb_define_method(cls, "rb_is_rb_type_p_class", so_is_rb_type_p_class, 1);
   rb_define_method(cls, "rb_is_rb_type_p_data", so_is_rb_type_p_data, 1);
+  rb_define_method(cls, "rb_is_rb_type_p_file", so_is_rb_type_p_file, 1);
   rb_define_method(cls, "rb_is_builtin_type_object", so_is_builtin_type_object, 1);
   rb_define_method(cls, "rb_is_builtin_type_array", so_is_builtin_type_array, 1);
   rb_define_method(cls, "rb_is_builtin_type_module", so_is_builtin_type_module, 1);
diff --git a/spec/ruby/optional/capi/ext/regexp_spec.c b/spec/ruby/optional/capi/ext/regexp_spec.c
index 0a62616f33..9de7982b50 100644
--- a/spec/ruby/optional/capi/ext/regexp_spec.c
+++ b/spec/ruby/optional/capi/ext/regexp_spec.c
@@ -49,6 +49,12 @@ VALUE regexp_spec_match(VALUE self, VALUE regexp, VALUE str) {
   return rb_funcall(regexp, rb_intern("match"), 1, str);
 }
 
+VALUE regexp_spec_memcicmp(VALUE self, VALUE str1, VALUE str2) {
+  long l1 = RSTRING_LEN(str1);
+  long l2 = RSTRING_LEN(str2);
+  return INT2FIX(rb_memcicmp(RSTRING_PTR(str1), RSTRING_PTR(str2), l1 < l2 ? l1 : l2));
+}
+
 void Init_regexp_spec(void) {
   VALUE cls = rb_define_class("CApiRegexpSpecs", rb_cObject);
   rb_define_method(cls, "match", regexp_spec_match, 2);
@@ -60,6 +66,7 @@ void Init_regexp_spec(void) {
   rb_define_method(cls, "rb_reg_match_backref_get", regexp_spec_reg_match_backref_get, 2);
   rb_define_method(cls, "rb_reg_options", regexp_spec_rb_reg_options, 1);
   rb_define_method(cls, "rb_reg_regcomp", regexp_spec_rb_reg_regcomp, 1);
+  rb_define_method(cls, "rb_memcicmp", regexp_spec_memcicmp, 2);
 }
 
 #ifdef __cplusplus
diff --git a/spec/ruby/optional/capi/module_spec.rb b/spec/ruby/optional/capi/module_spec.rb
index acf4d1fe48..d7c0ab9c52 100644
--- a/spec/ruby/optional/capi/module_spec.rb
+++ b/spec/ruby/optional/capi/module_spec.rb
@@ -252,22 +252,30 @@ describe "CApiModule" do
       cls.new.method(:test_method).arity.should == 0
     end
 
+    it "returns the correct arity when argc of the method in class is 1" do
+      @m.rb_define_method_1required(42).should == 42
+      @m.method(:rb_define_method_1required).arity.should == 1
+    end
+
+    it "returns the correct arity when argc of the method in class is 2" do
+      @m.rb_define_method_2required(1, 2).should == 2
+      @m.method(:rb_define_method_2required).arity.should == 2
+    end
+
+    it "defines a method taking variable arguments as a C array if the argument count is -1" do
+      @m.rb_define_method_varargs_1(1, 3, 7, 4).should == [1, 3, 7, 4]
+    end
+
     it "returns the correct arity when argc of the method in class is -1" do
-      cls = Class.new
-      @m.rb_define_method_c_array(cls, "test_method_c_array")
-      cls.new.method(:test_method_c_array).arity.should == -1
+      @m.method(:rb_define_method_varargs_1).arity.should == -1
     end
 
-    it "returns the correct arity when argc of the method in class is -2" do
-      cls = Class.new
-      @m.rb_define_method_ruby_array(cls, "test_method_ruby_array")
-      cls.new.method(:test_method_ruby_array).arity.should == -1
+    it "defines a method taking variable arguments as a Ruby array if the argument count is -2" do
+      @m.rb_define_method_varargs_2(1, 3, 7, 4).should == [1, 3, 7, 4]
     end
 
-    it "returns the correct arity when argc of the method in class is 2" do
-      cls = Class.new
-      @m.rb_define_method_2required(cls, "test_method_2required")
-      cls.new.method(:test_method_2required).arity.should == 2
+    it "returns the correct arity when argc of the method in class is -2" do
+      @m.method(:rb_define_method_varargs_2).arity.should == -1
     end
 
     it "defines a method on a module" do
diff --git a/spec/ruby/optional/capi/object_spec.rb b/spec/ruby/optional/capi/object_spec.rb
index 294247910b..b0f8a1f891 100644
--- a/spec/ruby/optional/capi/object_spec.rb
+++ b/spec/ruby/optional/capi/object_spec.rb
@@ -30,6 +30,7 @@ describe "CApiObject" do
   class ObjectTest
     def initialize
       @foo = 7
+      yield if block_given?
     end
 
     def foo
@@ -88,6 +89,15 @@ describe "CApiObject" do
       o.initialized.should be_true
       o.arguments.should == [:one, :two]
     end
+
+    it "passes the block to #initialize" do
+      v = nil
+      o = @o.rb_obj_alloc(ObjectTest)
+      @o.rb_obj_call_init(o, 0, []) do
+        v = :foo
+      end
+      v.should == :foo
+    end
   end
 
   describe "rb_is_instance_of" do
@@ -513,6 +523,21 @@ describe "CApiObject" do
       @o.rb_is_type_class(ObjectTest).should == true
       @o.rb_is_type_data(Time.now).should == true
     end
+
+    it "returns T_FILE for instances of IO and subclasses" do
+      STDERR.class.should == IO
+      @o.rb_is_rb_type_p_file(STDERR).should == true
+
+      File.open(__FILE__) do |f|
+        f.class.should == File
+        @o.rb_is_rb_type_p_file(f).should == true
+      end
+
+      require 'socket'
+      TCPServer.open(0) do |s|
+        @o.rb_is_rb_type_p_file(s).should == true
+      end
+    end
   end
 
   describe "rb_check_type" do
diff --git a/spec/ruby/optional/capi/regexp_spec.rb b/spec/ruby/optional/capi/regexp_spec.rb
index 81844e2a6e..af366e17a2 100644
--- a/spec/ruby/optional/capi/regexp_spec.rb
+++ b/spec/ruby/optional/capi/regexp_spec.rb
@@ -109,4 +109,20 @@ describe "C-API Regexp function" do
       thr.join
     end
   end
+
+  describe "rb_memicmp" do
+    it "returns 0 for identical strings" do
+      @p.rb_memcicmp('Hello', 'Hello').should == 0
+    end
+
+    it "returns 0 for strings which only differ in case" do
+      @p.rb_memcicmp('Hello', 'HELLO').should == 0
+      @p.rb_memcicmp('HELLO', 'Hello').should == 0
+    end
+
+    it "returns the difference between the first non matching characters" do
+      @p.rb_memcicmp('Hello', 'HELLP').should == -1
+      @p.rb_memcicmp('HELLp', 'Hello').should == 1
+    end
+  end
 end
author	Benoit Daloze <[email protected]>	2022-06-26 14:50:14 +0200
committer	Benoit Daloze <[email protected]>	2022-06-26 14:50:14 +0200
commit	d3d5ef0cca160fca538c7f556c5a6e08df5847e6 (patch)
tree	57358b4b9cdd6f429d0383005ac393cb74dd3bff /spec/ruby/optional
parent	f616e816372d14e605879d2e43c7fbdda29ef837 (diff)