From d80e44deec77678fe2d72f94c17b2409b3e794d5 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Thu, 27 Jun 2019 21:02:36 +0200 Subject: Update to ruby/spec@8d74d49 --- spec/ruby/optional/capi/encoding_spec.rb | 32 ++++++++++++++++---------------- spec/ruby/optional/capi/string_spec.rb | 28 ++++++++++++++-------------- 2 files changed, 30 insertions(+), 30 deletions(-) (limited to 'spec/ruby/optional') diff --git a/spec/ruby/optional/capi/encoding_spec.rb b/spec/ruby/optional/capi/encoding_spec.rb index ce3bb9fa54..42e7899c9f 100644 --- a/spec/ruby/optional/capi/encoding_spec.rb +++ b/spec/ruby/optional/capi/encoding_spec.rb @@ -95,7 +95,7 @@ describe "C-API Encoding function" do end describe "rb_ascii8bit_encoding" do - it "returns the encoding for Encoding::ASCII_8BIT" do + it "returns the encoding for Encoding::BINARY" do @s.rb_ascii8bit_encoding.should == "ASCII-8BIT" end end @@ -125,16 +125,16 @@ describe "C-API Encoding function" do end describe "rb_enc_get" do - it "returns the encoding ossociated with an object" do - str = "abc".encode Encoding::ASCII_8BIT + it "returns the encoding associated with an object" do + str = "abc".encode Encoding::BINARY @s.rb_enc_get(str).should == "ASCII-8BIT" end end describe "rb_obj_encoding" do - it "returns the encoding ossociated with an object" do - str = "abc".encode Encoding::ASCII_8BIT - @s.rb_obj_encoding(str).should == Encoding::ASCII_8BIT + it "returns the encoding associated with an object" do + str = "abc".encode Encoding::BINARY + @s.rb_obj_encoding(str).should == Encoding::BINARY end end @@ -174,15 +174,15 @@ describe "C-API Encoding function" do end describe "rb_enc_str_coderange" do - describe "when the encoding is ASCII-8BIT" do + describe "when the encoding is BINARY" do it "returns ENC_CODERANGE_7BIT if there are no high bits set" do - result = @s.rb_enc_str_coderange("abc".force_encoding("ascii-8bit")) + result = @s.rb_enc_str_coderange("abc".force_encoding("binary")) result.should == :coderange_7bit end it "returns ENC_CODERANGE_VALID if there are high bits set" do xEE = [0xEE].pack('C').force_encoding('utf-8') - result = @s.rb_enc_str_coderange(xEE.force_encoding("ascii-8bit")) + result = @s.rb_enc_str_coderange(xEE.force_encoding("binary")) result.should == :coderange_valid end end @@ -283,7 +283,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 "ascii-8bit" + a = [0xff].pack('C').force_encoding "binary" b = "\u3042".encode("utf-8") @s.rb_enc_compatible(a, b).should == 0 end @@ -348,14 +348,14 @@ describe "C-API Encoding function" do end it "returns the encoding for Encoding.default_external" do - Encoding.default_external = "BINARY" + Encoding.default_external = "ASCII-8BIT" @s.rb_default_external_encoding.should == "ASCII-8BIT" end end describe "rb_enc_associate" do it "sets the encoding of a String to the encoding" do - @s.rb_enc_associate("string", "ASCII-8BIT").encoding.should == Encoding::ASCII_8BIT + @s.rb_enc_associate("string", "BINARY").encoding.should == Encoding::BINARY end it "raises a RuntimeError if the argument is Symbol" do @@ -363,19 +363,19 @@ describe "C-API Encoding function" do end it "sets the encoding of a Regexp to the encoding" do - @s.rb_enc_associate(/regexp/, "ASCII-8BIT").encoding.should == Encoding::ASCII_8BIT + @s.rb_enc_associate(/regexp/, "BINARY").encoding.should == Encoding::BINARY end it "sets the encoding of a String to a default when the encoding is NULL" do - @s.rb_enc_associate("string", nil).encoding.should == Encoding::ASCII_8BIT + @s.rb_enc_associate("string", nil).encoding.should == Encoding::BINARY end end describe "rb_enc_associate_index" do it "sets the encoding of a String to the encoding" do - index = @s.rb_enc_find_index("ASCII-8BIT") + index = @s.rb_enc_find_index("BINARY") enc = @s.rb_enc_associate_index("string", index).encoding - enc.should == Encoding::ASCII_8BIT + enc.should == Encoding::BINARY end it "sets the encoding of a Regexp to the encoding" do diff --git a/spec/ruby/optional/capi/string_spec.rb b/spec/ruby/optional/capi/string_spec.rb index 79cdb524ad..2c8263d22a 100644 --- a/spec/ruby/optional/capi/string_spec.rb +++ b/spec/ruby/optional/capi/string_spec.rb @@ -35,7 +35,7 @@ describe :rb_str_new2, shared: true do end it "encodes the string with ASCII_8BIT" do - @s.send(@method, "hello").encoding.should == Encoding::ASCII_8BIT + @s.send(@method, "hello").encoding.should == Encoding::BINARY end end @@ -159,8 +159,8 @@ describe "C-API String function" do end describe "rb_str_new" do - it "creates a new String with ASCII-8BIT Encoding" do - @s.rb_str_new("", 0).encoding.should == Encoding::ASCII_8BIT + it "creates a new String with BINARY Encoding" do + @s.rb_str_new("", 0).encoding.should == Encoding::BINARY end it "returns a new string object from a char buffer of len characters" do @@ -676,10 +676,10 @@ describe :rb_external_str_new, shared: true do @s.send(@method, "abc").encoding.should == Encoding::UTF_8 end - it "returns an ASCII-8BIT encoded string if any non-ascii bytes are present and default external is US-ASCII" do + it "returns an BINARY encoded string if any non-ascii bytes are present and default external is US-ASCII" do Encoding.default_external = "US-ASCII" x80 = [0x80].pack('C') - @s.send(@method, "#{x80}abc").encoding.should == Encoding::ASCII_8BIT + @s.send(@method, "#{x80}abc").encoding.should == Encoding::BINARY end it "returns a tainted String" do @@ -735,10 +735,10 @@ describe "C-API String function" do s.encoding.should == Encoding::UTF_8 end - it "returns an ASCII-8BIT encoded String if any non-ascii bytes are present and the specified encoding is US-ASCII" do + it "returns an BINARY encoded String if any non-ascii bytes are present and the specified encoding is US-ASCII" do x80 = [0x80].pack('C') s = @s.rb_external_str_new_with_enc("#{x80}abc", 4, Encoding::US_ASCII) - s.encoding.should == Encoding::ASCII_8BIT + s.encoding.should == Encoding::BINARY end @@ -750,7 +750,7 @@ describe "C-API String function" do # s = @s.rb_external_str_new_with_enc(a, a.bytesize, Encoding::UTF_8) # - # - s.should == "\xA4\xA2\xA4\xEC".force_encoding("euc-jp") -# + x = [0xA4, 0xA2, 0xA4, 0xEC].pack('C4')#.force_encoding('ascii-8bit') +# + x = [0xA4, 0xA2, 0xA4, 0xEC].pack('C4')#.force_encoding('binary') # + s.should == x # s.encoding.should equal(Encoding::EUC_JP) # end @@ -817,9 +817,9 @@ describe "C-API String function" do @s.rb_str_conv_enc(a, Encoding::UTF_8, Encoding::US_ASCII).should equal(a) end - it "returns the origin String if the destination encoding is ASCII-8BIT" do - a = "abc".force_encoding("ascii-8bit") - @s.rb_str_conv_enc(a, Encoding::US_ASCII, Encoding::ASCII_8BIT).should equal(a) + it "returns the origin String if the destination encoding is BINARY" do + a = "abc".force_encoding("binary") + @s.rb_str_conv_enc(a, Encoding::US_ASCII, Encoding::BINARY).should equal(a) end end end @@ -857,10 +857,10 @@ describe "C-API String function" do Encoding::US_ASCII, 0, nil).should equal(a) end - it "returns the origin String if the destination encoding is ASCII-8BIT" do - a = "abc".force_encoding("ascii-8bit") + it "returns the origin String if the destination encoding is BINARY" do + a = "abc".force_encoding("binary") @s.rb_str_conv_enc_opts(a, Encoding::US_ASCII, - Encoding::ASCII_8BIT, 0, nil).should equal(a) + Encoding::BINARY, 0, nil).should equal(a) end end end -- cgit v1.2.3