archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[Bug #20984] Fix test with locale encoding

Browse source
This commit is contained in:
Nobuyoshi Nakada 2024-12-26 23:48:05 +09:00 • committed by Nobuyoshi Nakada
parent f459d8dfb7
commit d78ff6a767
Notes: git 2024-12-26 15:22:01 +00:00
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
test/ruby/test_env.rb
View file

@ -2,7 +2,9 @@
require 'test/unit' require 'test/unit'
class TestEnv < Test::Unit::TestCase class TestEnv < Test::Unit::TestCase
IGNORE_CASE = /bccwin|mswin|mingw/ =~ RUBY_PLATFORM windows = /bccwin|mswin|mingw/ =~ RUBY_PLATFORM
IGNORE_CASE = windows
ENCODING = windows ? Encoding::UTF_8 : Encoding.find("locale")
PATH_ENV = "PATH" PATH_ENV = "PATH"
INVALID_ENVVARS = [ INVALID_ENVVARS = [
"foo\0bar", "foo\0bar",
@ -361,7 +363,7 @@ class TestEnv < Test::Unit::TestCase
ENV.clear ENV.clear
key = "VAR\u{e5 e1 e2 e4 e3 101 3042}" key = "VAR\u{e5 e1 e2 e4 e3 101 3042}"
ENV[key] = "foo" ENV[key] = "foo"
assert_equal(%{{"VAR\u{e5 e1 e2 e4 e3 101 3042}" => "foo"}}, ENV.inspect) assert_equal(%{{#{(key.encode(ENCODING) rescue key.b).inspect} => "foo"}}, ENV.inspect)
end end
def test_to_a def test_to_a
@ -409,8 +411,7 @@ class TestEnv < Test::Unit::TestCase
assert_equal("foo", v) assert_equal("foo", v)
end end
assert_invalid_env {|var| ENV.assoc(var)} assert_invalid_env {|var| ENV.assoc(var)}
encoding = /mswin|mingw/ =~ RUBY_PLATFORM ? Encoding::UTF_8 : Encoding.find("locale") assert_equal(ENCODING, v.encoding)
assert_equal(encoding, v.encoding)
end end
def test_has_value2 def test_has_value2
@ -524,7 +525,7 @@ class TestEnv < Test::Unit::TestCase
assert_equal(huge_value, ENV["foo"]) assert_equal(huge_value, ENV["foo"])
end end
if /mswin|mingw/ =~ RUBY_PLATFORM if windows
def windows_version def windows_version
@windows_version ||= %x[ver][/Version (\d+)/, 1].to_i @windows_version ||= %x[ver][/Version (\d+)/, 1].to_i
end end