diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-31 03:18:30 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-31 03:18:30 +0000 |
| commit | 1ff0d08b200abd769978038e84afe656934ef361 (patch) | |
| tree | 04713cba6da6985401a20565ee3f1be58ff30ba1 /test | |
| parent | 60d976b3ddbbb77f378c34f6633efb2cf4331d15 (diff) | |
merges r29851 from trunk into ruby_1_9_2.
--
* time.c (time_zone): use rb_locale_str_new_cstr to set encoding
as locale and convert its content to internal encoding.
[ruby-core:33278]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31853 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/test_time.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb index 520d15971c..ec5395092f 100644 --- a/test/ruby/test_time.rb +++ b/test/ruby/test_time.rb @@ -469,6 +469,7 @@ class TestTime < Test::Unit::TestCase assert_equal(1, T2000.yday) assert_equal(false, T2000.isdst) assert_equal("UTC", T2000.zone) + assert_equal(Encoding.find("locale"), T2000.zone.encoding) assert_equal(0, T2000.gmt_offset) assert(!T2000.sunday?) assert(!T2000.monday?) @@ -490,6 +491,7 @@ class TestTime < Test::Unit::TestCase assert_equal(t.yday, Time.at(946684800).yday) assert_equal(t.isdst, Time.at(946684800).isdst) assert_equal(t.zone, Time.at(946684800).zone) + assert_equal(Encoding.find("locale"), Time.at(946684800).zone.encoding) assert_equal(t.gmt_offset, Time.at(946684800).gmt_offset) assert_equal(t.sunday?, Time.at(946684800).sunday?) assert_equal(t.monday?, Time.at(946684800).monday?) |