From f5b3969eda777ef41b8b0f5b397acee8e52d420c Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 16 Jun 2004 09:20:36 +0000 Subject: * test/ruby/test_array.rb: use local variables instead of a global variable. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_array.rb | 98 ++++++++++++++++++++++++------------------------- 1 file changed, 49 insertions(+), 49 deletions(-) (limited to 'test') diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 62582864e3..3e63dd2f54 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -12,19 +12,19 @@ class TestArray < Test::Unit::TestCase assert_equal([1,2,3,4], [1,2,3] | [2,3,4]) assert_equal([1,2,3] - [2,3], [1]) - $x = [0, 1, 2, 3, 4, 5] - assert_equal(2, $x[2]) - assert_equal([1, 2, 3], $x[1..3]) - assert_equal([1, 2, 3], $x[1,3]) + x = [0, 1, 2, 3, 4, 5] + assert_equal(2, x[2]) + assert_equal([1, 2, 3], x[1..3]) + assert_equal([1, 2, 3], x[1,3]) - $x[0, 2] = 10 - assert($x[0] == 10 && $x[1] == 2) + x[0, 2] = 10 + assert(x[0] == 10 && x[1] == 2) - $x[0, 0] = -1 - assert($x[0] == -1 && $x[1] == 10) + x[0, 0] = -1 + assert(x[0] == -1 && x[1] == 10) - $x[-1, 1] = 20 - assert($x[-1] == 20 && $x.pop == 20) + x[-1, 1] = 20 + assert(x[-1] == 20 && x.pop == 20) end def test_array_andor @@ -33,41 +33,41 @@ class TestArray < Test::Unit::TestCase end def test_compact - $x = [nil, 1, nil, nil, 5, nil, nil] - $x.compact! - assert_equal([1, 5], $x) + x = [nil, 1, nil, nil, 5, nil, nil] + x.compact! + assert_equal([1, 5], x) end def test_uniq - $x = [1, 1, 4, 2, 5, 4, 5, 1, 2] - $x.uniq! - assert_equal([1, 4, 2, 5], $x) + x = [1, 1, 4, 2, 5, 4, 5, 1, 2] + x.uniq! + assert_equal([1, 4, 2, 5], x) # empty? - assert(!$x.empty?) - $x = [] - assert($x.empty?) + assert(!x.empty?) + x = [] + assert(x.empty?) end def test_sort - $x = ["it", "came", "to", "pass", "that", "..."] - $x = $x.sort.join(" ") - assert_equal("... came it pass that to", $x) - $x = [2,5,3,1,7] - $x.sort!{|a,b| a<=>b} # sort with condition - assert_equal([1,2,3,5,7], $x) - $x.sort!{|a,b| b-a} # reverse sort - assert_equal([7,5,3,2,1], $x) + x = ["it", "came", "to", "pass", "that", "..."] + x = x.sort.join(" ") + assert_equal("... came it pass that to", x) + x = [2,5,3,1,7] + x.sort!{|a,b| a<=>b} # sort with condition + assert_equal([1,2,3,5,7], x) + x.sort!{|a,b| b-a} # reverse sort + assert_equal([7,5,3,2,1], x) end def test_split - $x = "The Boassert of Mormon" - assert_equal($x.reverse, $x.split(//).reverse!.join) - assert_equal($x.reverse, $x.reverse!) + x = "The Boassert of Mormon" + assert_equal(x.reverse, x.split(//).reverse!.join) + assert_equal(x.reverse, x.reverse!) assert_equal("g:n:i:r:t:s: :e:t:y:b: :1", "1 byte string".split(//).reverse.join(":")) - $x = "a b c d" - assert_equal(['a', 'b', 'c', 'd'], $x.split) - assert_equal(['a', 'b', 'c', 'd'], $x.split(' ')) + x = "a b c d" + assert_equal(['a', 'b', 'c', 'd'], x.split) + assert_equal(['a', 'b', 'c', 'd'], x.split(' ')) end def test_misc @@ -77,25 +77,25 @@ class TestArray < Test::Unit::TestCase # non-greedy match assert_equal([["a", "12"], ["b", "22"]], "a=12;b=22".scan(/(.*?)=(\d*);?/)) - $x = [1] - assert_equal('1:1:1:1:1', ($x * 5).join(":")) - assert_equal('1', ($x * 1).join(":")) - assert_equal('', ($x * 0).join(":")) + x = [1] + assert_equal('1:1:1:1:1', (x * 5).join(":")) + assert_equal('1', (x * 1).join(":")) + assert_equal('', (x * 0).join(":")) - *$x = *(1..7).to_a - assert_equal(7, $x.size) - assert_equal([1, 2, 3, 4, 5, 6, 7], $x) + *x = *(1..7).to_a + assert_equal(7, x.size) + assert_equal([1, 2, 3, 4, 5, 6, 7], x) - $x = [1,2,3] - $x[1,0] = $x - assert_equal([1,1,2,3,2,3], $x) + x = [1,2,3] + x[1,0] = x + assert_equal([1,1,2,3,2,3], x) - $x = [1,2,3] - $x[-1,0] = $x - assert_equal([1,2,1,2,3,3], $x) + x = [1,2,3] + x[-1,0] = x + assert_equal([1,2,1,2,3,3], x) - $x = [1,2,3] - $x.concat($x) - assert_equal([1,2,3,1,2,3], $x) + x = [1,2,3] + x.concat(x) + assert_equal([1,2,3,1,2,3], x) end end -- cgit v1.2.3