* test/*: should not depend on $KCODE.

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

ChangeLog

@@ -1,3 +1,7 @@
+Wed Feb 18 22:03:11 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
+
+	* test/*: should not depend on $KCODE.
+
 Wed Feb 18 18:07:09 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* test/ruby/test_sprintf.rb: added tests.

test/ruby/test_alias.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestAlias < Test::Unit::TestCase
   class Alias0
     def foo; "foo" end

test/ruby/test_array.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestArray < Test::Unit::TestCase
   def test_array
     assert_equal([1, 2, 3, 4], [1, 2] + [3, 4])

test/ruby/test_assignment.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestAssignment < Test::Unit::TestCase
   def test_assign
     a=[]; a[0] ||= "bar";

test/ruby/test_bignum.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestBignum < Test::Unit::TestCase
   def fact(n)
     return 1 if n == 0

test/ruby/test_call.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestCall < Test::Unit::TestCase
   def aaa(a, b=100, *rest)
     res = [a, b]

test/ruby/test_case.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestCase < Test::Unit::TestCase
   def test_case
     case 5

test/ruby/test_clone.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestClone < Test::Unit::TestCase
   module M001; end
   module M002; end

test/ruby/test_condition.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestCondition < Test::Unit::TestCase
 
   # [should] first test to see if we can run the tests.

test/ruby/test_const.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestConst < Test::Unit::TestCase
   TEST1 = 1
   TEST2 = 2

test/ruby/test_defined.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestDefined < Test::Unit::TestCase
   class Foo
     def foo

test/ruby/test_env.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestEnv < Test::Unit::TestCase
   IGNORE_CASE = /djgpp|bccwin|mswin|mingw/ =~ RUBY_PLATFORM
 

test/ruby/test_eval.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestEval < Test::Unit::TestCase
   # eval with binding
   def test_ev

test/ruby/test_exception.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestException < Test::Unit::TestCase
   def test_exception
     begin

test/ruby/test_file.rb

@@ -2,8 +2,6 @@ require 'test/unit'
 require 'tempfile'
 require 'ut_eof'
 
-$KCODE = 'none'
-
 class TestFile < Test::Unit::TestCase
 
   # I don't know Ruby's spec about "unlink-before-close" exactly.

test/ruby/test_float.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestFloat < Test::Unit::TestCase
   def test_float
     assert_equal(2, 2.6.floor)

test/ruby/test_gc.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestGc < Test::Unit::TestCase
   class S
     def initialize(a)

test/ruby/test_hash.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestHash < Test::Unit::TestCase
   def test_hash
     x = {1=>2, 2=>4, 3=>6}

test/ruby/test_ifunless.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestIfunless < Test::Unit::TestCase
   def test_if_unless
     $x = 'test';

test/ruby/test_iterator.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class Array
   def iter_test1
     collect{|e| [e, yield(e)]}.sort{|a,b|a[1]<=>b[1]}

test/ruby/test_marshal.rb

@@ -8,8 +8,6 @@ ensure
   $:.replace(orgpath)
 end
 
-$KCODE = 'none'
-
 class TestMarshal < Test::Unit::TestCase
   include MarshalTestLib
 

test/ruby/test_math.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestMath < Test::Unit::TestCase
   def test_math
     assert_equal(2, Math.sqrt(4))

test/ruby/test_pack.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestPack < Test::Unit::TestCase
   def test_pack
     $format = "c2x5CCxsdils_l_a6";

test/ruby/test_path.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestPath < Test::Unit::TestCase
   def test_path
     assert_equal("a", File.basename("a"))

test/ruby/test_pipe.rb

@@ -2,8 +2,6 @@ require 'test/unit'
 require 'ut_eof'
 require 'envutil'
 
-$KCODE = 'none'
-
 class TestPipe < Test::Unit::TestCase
   include TestEOF
   def open_file(content)

test/ruby/test_proc.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestProc < Test::Unit::TestCase
   def test_proc
     p1 = proc{|i| i}

test/ruby/test_range.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestRange < Test::Unit::TestCase
   def test_range_string
     # XXX: Is this really the test of Range?

test/ruby/test_signal.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestSignal < Test::Unit::TestCase
   def test_signal
     defined?(Process.kill) or return

test/ruby/test_sprintf.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestSprintf < Test::Unit::TestCase
   def test_binary
     assert_equal("0", sprintf("%b", 0))

test/ruby/test_stringchar.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestStringchar < Test::Unit::TestCase
   def test_string
     assert_equal("abcd", "abcd")

test/ruby/test_struct.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestStruct < Test::Unit::TestCase
   def test_struct
     struct_test = Struct.new("Test", :foo, :bar)

test/ruby/test_system.rb

@@ -1,8 +1,6 @@
 require 'test/unit'
 require 'envutil'
 
-$KCODE = 'none'
-
 class TestSystem < Test::Unit::TestCase
   def valid_syntax?(code, fname)
     eval("BEGIN {return true}\n#{code}", nil, fname, 0)

test/ruby/test_trace.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestTrace < Test::Unit::TestCase
   def test_trace
     $x = 1234

test/ruby/test_variable.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestVariable < Test::Unit::TestCase
   class Gods
     @@rule = "Uranus"

test/ruby/test_whileuntil.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$KCODE = 'none'
-
 class TestWhileuntil < Test::Unit::TestCase
   def test_while
     tmp = open("while_tmp", "w")

test/strscan/test_stringscanner.rb

@@ -240,11 +240,15 @@ class TestStringScanner < Test::Unit::TestCase
     assert_equal true, s.getch.tainted?
     assert_nil s.getch
 
-    $KCODE = 'EUC'
+    kc_backup = $KCODE
-    s = StringScanner.new("\244\242")
+    begin
-    assert_equal "\244\242", s.getch
+      $KCODE = 'EUC'
-    assert_nil s.getch
+      s = StringScanner.new("\244\242")
-    $KCODE = 'NONE'
+      assert_equal "\244\242", s.getch
+      assert_nil s.getch
+    ensure
+      $KCODE = kc_backup
+    end
 
     s = StringScanner.new('test')
     s.scan(/te/)
@@ -270,12 +274,16 @@ class TestStringScanner < Test::Unit::TestCase
     assert_equal true, s.get_byte.tainted?
     assert_nil s.get_byte
 
-    $KCODE = 'EUC'
+    kc_backup = $KCODE
-    s = StringScanner.new("\244\242")
+    begin
-    assert_equal "\244", s.get_byte
+      $KCODE = 'EUC'
-    assert_equal "\242", s.get_byte
+      s = StringScanner.new("\244\242")
-    assert_nil s.get_byte
+      assert_equal "\244", s.get_byte
-    $KCODE = 'NONE'
+      assert_equal "\242", s.get_byte
+      assert_nil s.get_byte
+    ensure
+      $KCODE = kc_backup
+    end
 
     s = StringScanner.new('test')
     s.scan(/te/)
@@ -368,11 +376,15 @@ class TestStringScanner < Test::Unit::TestCase
     assert_nil           s[0]
 
 
-    $KCODE = 'EUC'
+    kc_backup = $KCODE
-    s = StringScanner.new("\244\242")
+    begin
-    s.getch
+      $KCODE = 'EUC'
-    assert_equal "\244\242", s[0]
+      s = StringScanner.new("\244\242")
-    $KCODE = 'NONE'
+      s.getch
+      assert_equal "\244\242", s[0]
+    ensure
+      $KCODE = kc_backup
+    end
 
 
     str = 'test'