From 816aba88d6fc3eac52bb9b217edb17f04f0f015b Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 14 Nov 2007 07:03:39 +0000
Subject: * test/socket/test_socket.rb: update not to use 1.8 assignment to  
 external local variable in the block parameters.  [ruby-dev:32251]

* test/strscan/test_stringscanner.rb: avoid $KCODE, and use
  String#force_encoding().  [ruby-dev:32251]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/strscan/test_stringscanner.rb | 39 ++++++++++----------------------------
 1 file changed, 10 insertions(+), 29 deletions(-)

(limited to 'test/strscan')

diff --git a/test/strscan/test_stringscanner.rb b/test/strscan/test_stringscanner.rb
index 5b0fd53c7..c91836843 100644
--- a/test/strscan/test_stringscanner.rb
+++ b/test/strscan/test_stringscanner.rb
@@ -288,15 +288,9 @@ class TestStringScanner < Test::Unit::TestCase
     assert_equal true, s.getch.tainted?
     assert_nil s.getch
 
-    kc_backup = $KCODE
-    begin
-      $KCODE = 'EUC'
-      s = StringScanner.new("\244\242")
-      assert_equal "\244\242", s.getch
-      assert_nil s.getch
-    ensure
-      $KCODE = kc_backup
-    end
+    s = StringScanner.new("\244\242".force_encoding("euc-jp"))
+    assert_equal "\244\242", s.getch
+    assert_nil s.getch
 
     s = StringScanner.new('test')
     s.scan(/te/)
@@ -322,16 +316,10 @@ class TestStringScanner < Test::Unit::TestCase
     assert_equal true, s.get_byte.tainted?
     assert_nil s.get_byte
 
-    kc_backup = $KCODE
-    begin
-      $KCODE = 'EUC'
-      s = StringScanner.new("\244\242")
-      assert_equal "\244", s.get_byte
-      assert_equal "\242", s.get_byte
-      assert_nil s.get_byte
-    ensure
-      $KCODE = kc_backup
-    end
+    s = StringScanner.new("\244\242".force_encoding("euc-jp"))
+    assert_equal "\244", s.get_byte
+    assert_equal "\242", s.get_byte
+    assert_nil s.get_byte
 
     s = StringScanner.new('test')
     s.scan(/te/)
@@ -424,16 +412,9 @@ class TestStringScanner < Test::Unit::TestCase
     assert_nil           s[0]
 
 
-    kc_backup = $KCODE
-    begin
-      $KCODE = 'EUC'
-      s = StringScanner.new("\244\242")
-      s.getch
-      assert_equal "\244\242", s[0]
-    ensure
-      $KCODE = kc_backup
-    end
-
+    s = StringScanner.new("\244\242".force_encoding("euc-jp"))
+    s.getch
+    assert_equal "\244\242", s[0]
 
     str = 'test'
     str.taint
-- 
cgit