diff options
author | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-28 15:15:48 +0000 |
---|---|---|
committer | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-28 15:15:48 +0000 |
commit | 8c5b60eb22d6d661e87992a65d54e3a5bc0aeed4 (patch) | |
tree | 7905b284cb5b3d62c17ad8a939e339621a498a2c /spec/ruby/core/encoding | |
parent | 6530b14cee76e2512424d225e64d3c61dd1f6511 (diff) | |
download | ruby-8c5b60eb22d6d661e87992a65d54e3a5bc0aeed4.tar.gz |
Update to ruby/spec@a6b8805
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec/ruby/core/encoding')
7 files changed, 8 insertions, 11 deletions
diff --git a/spec/ruby/core/encoding/converter/primitive_convert_spec.rb b/spec/ruby/core/encoding/converter/primitive_convert_spec.rb index b9d6288bb2..ed479c6b13 100644 --- a/spec/ruby/core/encoding/converter/primitive_convert_spec.rb +++ b/spec/ruby/core/encoding/converter/primitive_convert_spec.rb @@ -89,7 +89,7 @@ with_feature :encoding do @ec.primitive_convert("","",nil,nil, {after_output: true}).should == :finished end - it "sets the destination buffer's encoding to the destination encoding if the conversion suceeded" do + it "sets the destination buffer's encoding to the destination encoding if the conversion succeeded" do dest = "".force_encoding('utf-8') dest.encoding.should == Encoding::UTF_8 @ec.primitive_convert("\u{98}",dest).should == :finished diff --git a/spec/ruby/core/encoding/converter/primitive_errinfo_spec.rb b/spec/ruby/core/encoding/converter/primitive_errinfo_spec.rb index f92c95c6d5..cba654b9fe 100644 --- a/spec/ruby/core/encoding/converter/primitive_errinfo_spec.rb +++ b/spec/ruby/core/encoding/converter/primitive_errinfo_spec.rb @@ -16,15 +16,13 @@ with_feature :encoding do it "returns [:source_buffer_empty,nil,nil,nil, nil] when #convert last succeeded" do ec = Encoding::Converter.new('ascii','utf-8') - ec.convert("a".force_encoding('ascii')).should == "a".\ - force_encoding('utf-8') + ec.convert("a".force_encoding('ascii')).should == "a".force_encoding('utf-8') ec.primitive_errinfo.should == [:source_buffer_empty, nil, nil, nil, nil] end it "returns [:destination_buffer_full,nil,nil,nil,nil] when #primitive_convert last returned :destination_buffer_full" do ec = Encoding::Converter.new("utf-8", "iso-2022-jp") - ec.primitive_convert("\u{9999}", "", 0, 0, partial_input: false) \ - .should == :destination_buffer_full + ec.primitive_convert("\u{9999}", "", 0, 0, partial_input: false).should == :destination_buffer_full ec.primitive_errinfo.should == [:destination_buffer_full, nil, nil, nil, nil] end diff --git a/spec/ruby/core/encoding/converter/putback_spec.rb b/spec/ruby/core/encoding/converter/putback_spec.rb index 69ce59e89b..3ed1ad9956 100644 --- a/spec/ruby/core/encoding/converter/putback_spec.rb +++ b/spec/ruby/core/encoding/converter/putback_spec.rb @@ -40,8 +40,7 @@ with_feature :encoding do src = "\x00\xd8\x61\x00" dst = "" ec.primitive_convert(src, dst).should == :invalid_byte_sequence - ec.primitive_errinfo.should == - [:invalid_byte_sequence, "UTF-16LE", "UTF-8", "\x00\xD8", "a\x00"] + ec.primitive_errinfo.should == [:invalid_byte_sequence, "UTF-16LE", "UTF-8", "\x00\xD8", "a\x00"] ec.putback(1).should == "\x00".force_encoding("utf-16le") ec.putback.should == "a".force_encoding("utf-16le") ec.putback.should == "" diff --git a/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_name_spec.rb b/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_name_spec.rb index 41320c5207..428b292c68 100644 --- a/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_name_spec.rb +++ b/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_name_spec.rb @@ -23,7 +23,7 @@ with_feature :encoding do # conversion from ISO-8859-1 -> UTF-8 succeeded, but the conversion from # UTF-8 to EUC-JP failed. IOW, it failed when the source encoding was # UTF-8, so UTF-8 is regarded as the source encoding. - it "is equal to the source encoding at the stage of the conversion path where the error occured" do + it "is equal to the source encoding at the stage of the conversion path where the error occurred" do @exception2.source_encoding_name.should == 'UTF-8' end end diff --git a/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_spec.rb b/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_spec.rb index 75514e5229..09379acc5d 100644 --- a/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_spec.rb +++ b/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_spec.rb @@ -28,7 +28,7 @@ with_feature :encoding do # FIXME: Derive example where the failure occurs at the UTF-8 -> # ISO-8859-1 case so as to better illustrate the issue - it "is equal to the source encoding at the stage of the conversion path where the error occured" do + it "is equal to the source encoding at the stage of the conversion path where the error occurred" do @exception2.source_encoding.should == Encoding::EUC_JP end end diff --git a/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_name_spec.rb b/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_name_spec.rb index 4a7aba2044..742184250f 100644 --- a/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_name_spec.rb +++ b/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_name_spec.rb @@ -23,7 +23,7 @@ with_feature :encoding do # conversion from ISO-8859-1 -> UTF-8 succeeded, but the conversion from # UTF-8 to EUC-JP failed. IOW, it failed when the source encoding was # UTF-8, so UTF-8 is regarded as the source encoding. - it "is equal to the source encoding at the stage of the conversion path where the error occured" do + it "is equal to the source encoding at the stage of the conversion path where the error occurred" do @exception2.source_encoding_name.should == 'UTF-8' end end diff --git a/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_spec.rb b/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_spec.rb index 984862646c..0489ad82bf 100644 --- a/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_spec.rb +++ b/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_spec.rb @@ -24,7 +24,7 @@ with_feature :encoding do # conversion from ISO-8859-1 -> UTF-8 succeeded, but the conversion from # UTF-8 to EUC-JP failed. IOW, it failed when the source encoding was # UTF-8, so UTF-8 is regarded as the source encoding. - it "is equal to the source encoding at the stage of the conversion path where the error occured" do + it "is equal to the source encoding at the stage of the conversion path where the error occurred" do @exception2.source_encoding.should == Encoding::UTF_8 end end |