summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-14 06:40:55 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-14 06:40:55 +0000
commitc81b224edca453ed8ea3030cc74b2ede5ac9e63a (patch)
tree91fad68f293185c4ac2ee01e568b91896ae04bb9
parentfcb4ab8d1c917b3f2a998f9b6eab3d9cec27670a (diff)
test: use String#b instead of dup.force_encoding
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53109 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/cgi/test_cgi_multipart.rb3
-rw-r--r--test/lib/test/unit/assertions.rb6
-rw-r--r--test/open-uri/test_open-uri.rb2
-rw-r--r--test/ruby/test_dir_m17n.rb2
-rw-r--r--test/ruby/test_econv.rb12
-rw-r--r--test/ruby/test_io_m17n.rb5
-rw-r--r--test/ruby/test_m17n.rb6
-rw-r--r--test/ruby/test_m17n_comb.rb4
8 files changed, 17 insertions, 23 deletions
diff --git a/test/cgi/test_cgi_multipart.rb b/test/cgi/test_cgi_multipart.rb
index 989c054..b3df694 100644
--- a/test/cgi/test_cgi_multipart.rb
+++ b/test/cgi/test_cgi_multipart.rb
@@ -45,8 +45,7 @@ class MultiPart
buf << "Content-Disposition: form-data: name=\"#{name}\"#{s}\r\n"
buf << "Content-Type: #{content_type}\r\n" if content_type
buf << "\r\n"
- value = value.dup.force_encoding(::Encoding::ASCII_8BIT) if defined?(::Encoding)
- buf << value
+ buf << value.b
buf << "\r\n"
return self
end
diff --git a/test/lib/test/unit/assertions.rb b/test/lib/test/unit/assertions.rb
index 65c467b..201e245 100644
--- a/test/lib/test/unit/assertions.rb
+++ b/test/lib/test/unit/assertions.rb
@@ -447,7 +447,7 @@ EOT
end
def assert_valid_syntax(code, fname = caller_locations(1, 1)[0], mesg = fname.to_s, verbose: nil)
- code = code.dup.force_encoding("ascii-8bit")
+ code = code.b
code.sub!(/\A(?:\xef\xbb\xbf)?(\s*\#.*$)*(\n)?/n) {
"#$&#{"\n" if $1 && !$2}BEGIN{throw tag, :ok}\n"
}
@@ -470,11 +470,11 @@ EOT
end
def assert_syntax_error(code, error, fname = caller_locations(1, 1)[0], mesg = fname.to_s)
- code = code.dup.force_encoding("ascii-8bit")
+ code = code.b
code.sub!(/\A(?:\xef\xbb\xbf)?(\s*\#.*$)*(\n)?/n) {
"#$&#{"\n" if $1 && !$2}BEGIN{throw tag, :ng}\n"
}
- code.force_encoding("us-ascii")
+ code.force_encoding(Encoding::US_ASCII)
verbose, $VERBOSE = $VERBOSE, nil
yield if defined?(yield)
case
diff --git a/test/open-uri/test_open-uri.rb b/test/open-uri/test_open-uri.rb
index 19451e2..b3702e6 100644
--- a/test/open-uri/test_open-uri.rb
+++ b/test/open-uri/test_open-uri.rb
@@ -601,7 +601,7 @@ class TestOpenURI < Test::Unit::TestCase
def test_content_encoding
with_http {|srv, dr, url|
content = "abc" * 10000
- Zlib::GzipWriter.wrap(StringIO.new(content_gz="".dup.force_encoding("ascii-8bit"))) {|z| z.write content }
+ Zlib::GzipWriter.wrap(StringIO.new(content_gz="".b)) {|z| z.write content }
srv.mount_proc("/data/") {|req, res| res.body = content_gz; res['content-encoding'] = 'gzip' }
srv.mount_proc("/data2/") {|req, res| res.body = content_gz; res['content-encoding'] = 'gzip'; res.chunked = true }
srv.mount_proc("/noce/") {|req, res| res.body = content_gz }
diff --git a/test/ruby/test_dir_m17n.rb b/test/ruby/test_dir_m17n.rb
index 4063c83..bb60b0a 100644
--- a/test/ruby/test_dir_m17n.rb
+++ b/test/ruby/test_dir_m17n.rb
@@ -208,7 +208,7 @@ class TestDir_M17N < Test::Unit::TestCase
when /darwin/
filename = filename.encode("utf-8", "euc-jp").b
when /mswin|mingw/
- if ents.include?(win_expected_filename.dup.force_encoding("ASCII-8BIT"))
+ if ents.include?(win_expected_filename.b)
ents = Dir.entries(".", {:encoding => Encoding.find("filesystem")})
filename = win_expected_filename
end
diff --git a/test/ruby/test_econv.rb b/test/ruby/test_econv.rb
index f423ebf..073355f 100644
--- a/test/ruby/test_econv.rb
+++ b/test/ruby/test_econv.rb
@@ -3,12 +3,8 @@ require 'test/unit'
class TestEncodingConverter < Test::Unit::TestCase
def check_ec(edst, esrc, eres, dst, src, ec, off, len, opts=nil)
res = ec.primitive_convert(src, dst, off, len, opts)
- assert_equal([edst.dup.force_encoding("ASCII-8BIT"),
- esrc.dup.force_encoding("ASCII-8BIT"),
- eres],
- [dst.dup.force_encoding("ASCII-8BIT"),
- src.dup.force_encoding("ASCII-8BIT"),
- res])
+ assert_equal([edst.b, esrc.b, eres],
+ [dst.b, src.b, res])
end
def assert_econv(converted, eres, obuf_bytesize, ec, consumed, rest, opts=nil)
@@ -22,8 +18,8 @@ class TestEncodingConverter < Test::Unit::TestCase
def assert_errinfo(e_res, e_enc1, e_enc2, e_error_bytes, e_readagain_bytes, ec)
assert_equal([e_res, e_enc1, e_enc2,
- e_error_bytes && e_error_bytes.dup.force_encoding("ASCII-8BIT"),
- e_readagain_bytes && e_readagain_bytes.dup.force_encoding("ASCII-8BIT")],
+ e_error_bytes && e_error_bytes.b,
+ e_readagain_bytes && e_readagain_bytes.b],
ec.primitive_errinfo)
end
diff --git a/test/ruby/test_io_m17n.rb b/test/ruby/test_io_m17n.rb
index a91fcce..ed8ac99 100644
--- a/test/ruby/test_io_m17n.rb
+++ b/test/ruby/test_io_m17n.rb
@@ -1711,8 +1711,7 @@ EOT
args.each {|arg| f.print arg }
}
content = File.read("t", :mode=>"rb:ascii-8bit")
- assert_equal(expected.dup.force_encoding("ascii-8bit"),
- content.force_encoding("ascii-8bit"))
+ assert_equal(expected.b, content.b)
}
end
@@ -1892,7 +1891,7 @@ EOT
with_tmpdir {
src = "\u3042\r\n"
generate_file("t.txt", src)
- srcbin = src.dup.force_encoding("ascii-8bit")
+ srcbin = src.b
open("t.txt", "rt:utf-8:euc-jp") {|f|
f.binmode
result = f.read
diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb
index 4efe181..a9cb86a 100644
--- a/test/ruby/test_m17n.rb
+++ b/test/ruby/test_m17n.rb
@@ -8,7 +8,7 @@ class TestM17N < Test::Unit::TestCase
module AESU
def ua(str) str.dup.force_encoding("US-ASCII") end
- def a(str) str.dup.force_encoding("ASCII-8BIT") end
+ def a(str) str.b end
def e(str) str.dup.force_encoding("EUC-JP") end
def s(str) str.dup.force_encoding("Windows-31J") end
def u(str) str.dup.force_encoding("UTF-8") end
@@ -1130,7 +1130,7 @@ class TestM17N < Test::Unit::TestCase
def test_dup_scan
s1 = e("\xa4\xa2")*100
- s2 = s1.dup.force_encoding("ascii-8bit")
+ s2 = s1.b
s2.scan(/\A./n) {|f|
assert_equal(Encoding::ASCII_8BIT, f.encoding)
}
@@ -1138,7 +1138,7 @@ class TestM17N < Test::Unit::TestCase
def test_dup_aref
s1 = e("\xa4\xa2")*100
- s2 = s1.dup.force_encoding("ascii-8bit")
+ s2 = s1.b
assert_equal(Encoding::ASCII_8BIT, s2[10..-1].encoding)
end
diff --git a/test/ruby/test_m17n_comb.rb b/test/ruby/test_m17n_comb.rb
index 83c3f8a..cf00e52 100644
--- a/test/ruby/test_m17n_comb.rb
+++ b/test/ruby/test_m17n_comb.rb
@@ -1575,8 +1575,8 @@ class TestM17NComb < Test::Unit::TestCase
assert_raise(Encoding::CompatibilityError, desc) { s1.start_with?(s2) }
next
end
- s1 = s1.dup.force_encoding("ASCII-8BIT")
- s2 = s2.dup.force_encoding("ASCII-8BIT")
+ s1 = s1.b
+ s2 = s2.b
if s1.length < s2.length
assert_equal(false, enccall(s1, :start_with?, s2), desc)
next