* time.c: zone encoding should be US-ASCII if all 7-bits. Fix r46907.

* test/ruby/test_time.rb, test/ruby/test_time_tz.rb: Update tests.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 7 insertions, 3 deletions

diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb
index d0ded0ddf2..f4fb5bf3b3 100644
--- a/test/ruby/test_time.rb
+++ b/test/ruby/test_time.rb
@@ -527,9 +527,12 @@ class TestTime < Test::Unit::TestCase
   def assert_zone_encoding(time)
     zone = time.zone
     assert_predicate(zone, :valid_encoding?)
-    return if zone.ascii_only?
-    enc = Encoding.default_internal || Encoding.find('locale')
-    assert_equal(enc, zone.encoding)
+    if zone.ascii_only?
+      assert_equal(Encoding::US_ASCII, zone.encoding)
+    else
+      enc = Encoding.default_internal || Encoding.find('locale')
+      assert_equal(enc, zone.encoding)
+    end
   end
 
   def test_zone
diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb
index 736a3c16db..a73bd86f0b 100644
--- a/test/ruby/test_time_tz.rb
+++ b/test/ruby/test_time_tz.rb
@@ -267,6 +267,7 @@ class TestTimeTZ < Test::Unit::TestCase
           assert_equal(format_gmtoff(gmtoff), t.strftime("%z"))
           assert_equal(format_gmtoff(gmtoff, true), t.strftime("%:z"))
           assert_equal(format_gmtoff2(gmtoff), t.strftime("%::z"))
+          assert_equal(Encoding::US_ASCII, t.zone.encoding)
         }
       }
     }