1 files changed, 106 insertions, 37 deletions

diff --git a/spec/ruby/optional/capi/encoding_spec.rb b/spec/ruby/optional/capi/encoding_spec.rb
index 1529e012b0..b77a967b1e 100644
--- a/spec/ruby/optional/capi/encoding_spec.rb
+++ b/spec/ruby/optional/capi/encoding_spec.rb
@@ -36,7 +36,7 @@ describe :rb_enc_set_index, shared: true do
     obj = Object.new
     -> {
       result = @s.send(@method, obj, 1)
-    }.should raise_error(ArgumentError, "cannot set encoding on non-encoding capable object")
+    }.should.raise(ArgumentError, "cannot set encoding on non-encoding capable object")
   end
 end
 
@@ -165,13 +165,13 @@ describe "C-API Encoding function" do
 
   describe "rb_enc_from_index" do
     it "returns an Encoding" do
-      @s.rb_enc_from_index(0).should be_an_instance_of(String)
+      @s.rb_enc_from_index(0).should.instance_of?(String)
     end
   end
 
   describe "rb_enc_mbc_to_codepoint" do
     it "returns the correct codepoint for the given character and size" do
-       @s.rb_enc_mbc_to_codepoint("é").should == 0xE9
+      @s.rb_enc_mbc_to_codepoint("é").should == 0xE9
     end
 
     it "returns 0 if p == e" do
@@ -298,7 +298,7 @@ describe "C-API Encoding function" do
     it "returns a String in US-ASCII encoding when high bits are set" do
       xEE = [0xEE].pack('C').force_encoding('utf-8')
       result = @s.rb_enc_str_new(xEE, 1, Encoding::US_ASCII)
-      result.encoding.should equal(Encoding::US_ASCII)
+      result.encoding.should.equal?(Encoding::US_ASCII)
     end
   end
 
@@ -389,12 +389,12 @@ describe "C-API Encoding function" do
     it "returns true if the object encoding is only ASCII" do
       str = "abc".force_encoding("us-ascii")
       str.valid_encoding? # make sure to set the coderange
-      @s.ENC_CODERANGE_ASCIIONLY(str).should be_true
+      @s.ENC_CODERANGE_ASCIIONLY(str).should == true
     end
 
     it "returns false if the object encoding is not ASCII only" do
       str = "ありがとう".force_encoding("utf-8")
-      @s.ENC_CODERANGE_ASCIIONLY(str).should be_false
+      @s.ENC_CODERANGE_ASCIIONLY(str).should == false
     end
   end
 
@@ -421,7 +421,7 @@ describe "C-API Encoding function" do
     describe "when the rb_encoding struct is stored in native memory" do
       it "can still read the name of the encoding" do
         address = @s.rb_to_encoding_native_store(Encoding::UTF_8)
-        address.should be_kind_of(Integer)
+        address.should.is_a?(Integer)
         @s.rb_to_encoding_native_name(address).should == "UTF-8"
       end
     end
@@ -452,7 +452,7 @@ describe "C-API Encoding function" do
   describe "rb_enc_compatible" do
     it "returns 0 if the encodings of the Strings are not compatible" do
       a = [0xff].pack('C').force_encoding "binary"
-      b = "\u3042".encode("utf-8")
+      b = "あ"
       @s.rb_enc_compatible(a, b).should == 0
     end
 
@@ -461,11 +461,25 @@ describe "C-API Encoding function" do
     # Encoding.compatible?
     it "returns the same value as Encoding.compatible? if the Strings have a compatible encoding" do
       a = "abc".force_encoding("us-ascii")
-      b = "\u3042".encode("utf-8")
+      b = "あ"
       @s.rb_enc_compatible(a, b).should == Encoding.compatible?(a, b)
     end
   end
 
+  describe "rb_enc_check" do
+    it "returns the compatible encoding of the two Strings" do
+      a = "abc".force_encoding("us-ascii")
+      b = "あ"
+      @s.rb_enc_check(a, b).should == Encoding::UTF_8
+    end
+
+    it "raises Encoding::CompatibilityError if the encodings are not compatible" do
+      a = [0xff].pack('C').b
+      b = "あ"
+      -> { @s.rb_enc_check(a, b) }.should.raise(Encoding::CompatibilityError)
+    end
+  end
+
   describe "rb_enc_copy" do
     before :each do
       @obj = "rb_enc_copy".encode(Encoding::US_ASCII)
@@ -475,12 +489,20 @@ describe "C-API Encoding function" do
       @s.rb_enc_copy("string", @obj).encoding.should == Encoding::US_ASCII
     end
 
-    it "raises a RuntimeError if the second argument is a Symbol" do
-      -> { @s.rb_enc_copy(:symbol, @obj) }.should raise_error(RuntimeError)
+    it "raises a RuntimeError if the first argument is a Symbol" do
+      -> { @s.rb_enc_copy(:symbol, @obj) }.should.raise(RuntimeError)
     end
 
-    it "sets the encoding of a Regexp to that of the second argument" do
-      @s.rb_enc_copy(/regexp/.dup, @obj).encoding.should == Encoding::US_ASCII
+    ruby_version_is "4.1" do
+      it "raises a FrozenError if the first argument is a Regexp" do
+        -> { @s.rb_enc_copy(/regexp/.dup, @obj) }.should.raise(FrozenError)
+      end
+    end
+
+    ruby_version_is ""..."4.1" do
+      it "sets the encoding of a Regexp to that of the second argument" do
+        @s.rb_enc_copy(/regexp/.dup, @obj).encoding.should == Encoding::US_ASCII
+      end
     end
   end
 
@@ -495,7 +517,7 @@ describe "C-API Encoding function" do
 
     it "returns 0 if Encoding.default_internal is nil" do
       Encoding.default_internal = nil
-      @s.rb_default_internal_encoding.should be_nil
+      @s.rb_default_internal_encoding.should == nil
     end
 
     it "returns the encoding for Encoding.default_internal" do
@@ -527,11 +549,19 @@ describe "C-API Encoding function" do
     end
 
     it "raises a RuntimeError if the argument is Symbol" do
-      -> { @s.rb_enc_associate(:symbol, "US-ASCII") }.should raise_error(RuntimeError)
+      -> { @s.rb_enc_associate(:symbol, "US-ASCII") }.should.raise(RuntimeError)
+    end
+
+    ruby_version_is "4.1" do
+      it "raises a FrozenError if the argument is a Regexp" do
+        -> { @s.rb_enc_associate(/regexp/.dup, "BINARY") }.should.raise(FrozenError)
+      end
     end
 
-    it "sets the encoding of a Regexp to the encoding" do
-      @s.rb_enc_associate(/regexp/.dup, "BINARY").encoding.should == Encoding::BINARY
+    ruby_version_is ""..."4.1" do
+      it "sets the encoding of a Regexp to the encoding" do
+        @s.rb_enc_associate(/regexp/.dup, "BINARY").encoding.should == Encoding::BINARY
+      end
     end
 
     it "sets the encoding of a String to a default when the encoding is NULL" do
@@ -546,15 +576,24 @@ describe "C-API Encoding function" do
       enc.should == Encoding::BINARY
     end
 
-    it "sets the encoding of a Regexp to the encoding" do
-      index = @s.rb_enc_find_index("UTF-8")
-      enc = @s.rb_enc_associate_index(/regexp/.dup, index).encoding
-      enc.should == Encoding::UTF_8
+    ruby_version_is "4.1" do
+      it "raises a FrozenError if the argument is a Regexp" do
+        index = @s.rb_enc_find_index("UTF-8")
+        -> { @s.rb_enc_associate_index(/regexp/.dup, index) }.should.raise(FrozenError)
+      end
+    end
+
+    ruby_version_is ""..."4.1" do
+      it "sets the encoding of a Regexp to the encoding" do
+        index = @s.rb_enc_find_index("UTF-8")
+        enc = @s.rb_enc_associate_index(/regexp/.dup, index).encoding
+        enc.should == Encoding::UTF_8
+      end
     end
 
     it "sets the encoding of a Symbol to the encoding" do
       index = @s.rb_enc_find_index("UTF-8")
-      -> { @s.rb_enc_associate_index(:symbol, index) }.should raise_error(RuntimeError)
+      -> { @s.rb_enc_associate_index(:symbol, index) }.should.raise(RuntimeError)
     end
   end
 
@@ -610,13 +649,13 @@ describe "C-API Encoding function" do
     it "raises ArgumentError if an empty string is given" do
       -> do
         @s.rb_enc_codepoint_len("")
-      end.should raise_error(ArgumentError)
+      end.should.raise(ArgumentError)
     end
 
     it "raises ArgumentError if an invalid byte sequence is given" do
       -> do
         @s.rb_enc_codepoint_len([0xa0, 0xa1].pack('CC').force_encoding('utf-8')) # Invalid sequence identifier
-      end.should raise_error(ArgumentError)
+      end.should.raise(ArgumentError)
     end
 
     it "returns codepoint 0x24 and length 1 for character '$'" do
@@ -650,11 +689,11 @@ describe "C-API Encoding function" do
 
   describe "rb_enc_str_asciionly_p" do
     it "returns true for an ASCII string" do
-      @s.rb_enc_str_asciionly_p("hello").should be_true
+      @s.rb_enc_str_asciionly_p("hello").should == true
     end
 
     it "returns false for a non-ASCII string" do
-      @s.rb_enc_str_asciionly_p("hüllo").should be_false
+      @s.rb_enc_str_asciionly_p("hüllo").should == false
     end
   end
 
@@ -664,7 +703,7 @@ describe "C-API Encoding function" do
 
       -> {
         @s.rb_enc_raise(Encoding::UTF_8, RuntimeError, utf_8_incompatible_string)
-      }.should raise_error { |e|
+      }.should.raise { |e|
         e.message.encoding.should == Encoding::UTF_8
         e.message.valid_encoding?.should == false
         e.message.bytes.should == utf_8_incompatible_string.bytes
@@ -724,25 +763,55 @@ describe "C-API Encoding function" do
   end
 
   describe "rb_define_dummy_encoding" do
+    run = 0
+
     it "defines the dummy encoding" do
-      @s.rb_define_dummy_encoding("FOO")
-      enc = Encoding.find("FOO")
+      @s.rb_define_dummy_encoding("FOO#{run += 1}")
+      enc = Encoding.find("FOO#{run}")
       enc.should.dummy?
     end
 
     it "returns the index of the dummy encoding" do
-      index = @s.rb_define_dummy_encoding("BAR")
+      index = @s.rb_define_dummy_encoding("BAR#{run += 1}")
       index.should == Encoding.list.size - 1
     end
 
-    ruby_version_is "3.2" do
-      it "raises EncodingError if too many encodings" do
-        code = <<-RUBY
-          require #{extension_path.dump}
-          1_000.times {|i| CApiEncodingSpecs.new.rb_define_dummy_encoding("R_\#{i}") }
-        RUBY
-        ruby_exe(code, args: "2>&1", exit_status: 1).should.include?('too many encoding (> 256) (EncodingError)')
+    it "raises EncodingError if too many encodings" do
+      code = <<-RUBY
+        require #{extension_path.dump}
+        1_000.times {|i| CApiEncodingSpecs.new.rb_define_dummy_encoding("R_\#{i}") }
+      RUBY
+      ruby_exe(code, args: "2>&1", exit_status: 1).should.include?('too many encoding (> 256) (EncodingError)')
+    end
+  end
+
+  describe "ONIGENC_IS_UNICODE" do
+    it "is true only for select UTF-related encodings" do
+      unicode = [
+        Encoding::UTF_8,
+        Encoding::UTF8_DOCOMO,
+        Encoding::UTF8_KDDI,
+        Encoding::UTF8_MAC,
+        Encoding::UTF8_SOFTBANK,
+        Encoding::CESU_8,
+        Encoding::UTF_16LE,
+        Encoding::UTF_16BE,
+        Encoding::UTF_32LE,
+        Encoding::UTF_32BE
+      ]
+      unicode.each do |enc|
+        @s.should.ONIGENC_IS_UNICODE(enc)
       end
+
+      (Encoding.list - unicode).each { |enc|
+        @s.should_not.ONIGENC_IS_UNICODE(enc)
+      }
+    end
+
+    # Redundant with the above but more explicit
+    it "is false for the dummy UTF-16 and UTF-32 encodings" do
+      @s.should_not.ONIGENC_IS_UNICODE(Encoding::UTF_16)
+      @s.should_not.ONIGENC_IS_UNICODE(Encoding::UTF_32)
     end
   end
 end