diff options
Diffstat (limited to 'test/ruby')
| -rw-r--r-- | test/ruby/envutil.rb | 4 | ||||
| -rw-r--r-- | test/ruby/test_literal.rb | 3 | ||||
| -rw-r--r-- | test/ruby/test_parse.rb | 2 | ||||
| -rw-r--r-- | test/ruby/test_rubyoptions.rb | 12 | ||||
| -rw-r--r-- | test/ruby/test_stringchar.rb | 4 | ||||
| -rw-r--r-- | test/ruby/test_syntax.rb | 2 |
6 files changed, 13 insertions, 14 deletions
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index 3e04f55c0c..53dd210868 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -209,9 +209,9 @@ module Test "-v", "-", ] cmd = [ - 'END {STDERR.puts '"#{token_dump}"'"FINAL=#{Memory::Status.new.size}"}', + %Q[END {STDERR.puts #{token_dump}+"FINAL=\#{Memory::Status.new.size}"}], prepare, - 'STDERR.puts('"#{token_dump}"'"START=#{$initial_size = Memory::Status.new.size}")', + %Q[STDERR.puts(#{token_dump}+"START=\#{$initial_size = Memory::Status.new.size}")], code, ].join("\n") _, err, status = EnvUtil.invoke_ruby(args, cmd, true, true) diff --git a/test/ruby/test_literal.rb b/test/ruby/test_literal.rb index c34874e4a6..d9b999d22f 100644 --- a/test/ruby/test_literal.rb +++ b/test/ruby/test_literal.rb @@ -56,6 +56,7 @@ class TestRubyLiteral < Test::Unit::TestCase assert_equal "\n", "\n" bug2500 = '[ruby-core:27228]' bug5262 = '[ruby-core:39222]' + verbose, $VERBOSE = $VERBOSE, nil %w[c C- M-].each do |pre| ["u", %w[u{ }]].each do |open, close| ["?", ['"', '"']].each do |qopen, qclose| @@ -89,6 +90,8 @@ class TestRubyLiteral < Test::Unit::TestCase assert_equal "\u201c", eval(%[?\\\u{201c}]), bug6069 assert_equal "\u201c".encode("euc-jp"), eval(%[?\\\u{201c}].encode("euc-jp")), bug6069 assert_equal "\u201c".encode("iso-8859-13"), eval(%[?\\\u{201c}].encode("iso-8859-13")), bug6069 + ensure + $VERBOSE = verbose end def test_dstring diff --git a/test/ruby/test_parse.rb b/test/ruby/test_parse.rb index 8623960b42..f4d8644e6a 100644 --- a/test/ruby/test_parse.rb +++ b/test/ruby/test_parse.rb @@ -560,7 +560,7 @@ FOO end assert_nothing_raised do - eval "x = <<""FOO\r\n1\r\nFOO" + eval "x = <\<FOO\r\n1\r\nFOO" end assert_equal("1\n", x) end diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index c39a45afe8..9fedcc6ddf 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -303,9 +303,9 @@ class TestRubyOptions < Test::Unit::TestCase end bug4118 = '[ruby-dev:42680]' - assert_in_out_err(%w[], "#!/bin/sh\n""#!shebang\n""#!ruby\n""puts __LINE__\n", + assert_in_out_err(%w[], "#!/bin/sh\n#!shebang\n#!ruby\nputs __LINE__\n", %w[4], [], bug4118) - assert_in_out_err(%w[-x], "#!/bin/sh\n""#!shebang\n""#!ruby\n""puts __LINE__\n", + assert_in_out_err(%w[-x], "#!/bin/sh\n#!shebang\n#!ruby\nputs __LINE__\n", %w[4], [], bug4118) end @@ -498,22 +498,22 @@ class TestRubyOptions < Test::Unit::TestCase assert_in_out_err(["-we", "def foo\n eval('a=1')\nend"], "", [], [], feature3446) assert_in_out_err(["-we", "1.times do\n a=1\nend"], "", [], [], feature3446) assert_in_out_err(["-we", "def foo\n 1.times do\n a=1\n end\nend"], "", [], ["-e:3: warning: assigned but unused variable - a"], feature3446) - assert_in_out_err(["-we", "def foo\n"" 1.times do |a| end\n""end"], "", [], []) + assert_in_out_err(["-we", "def foo\n 1.times do |a| end\nend"], "", [], []) feature6693 = '[ruby-core:46160]' assert_in_out_err(["-we", "def foo\n _a=1\nend"], "", [], [], feature6693) end def test_shadowing_variable bug4130 = '[ruby-dev:42718]' - assert_in_out_err(["-we", "def foo\n"" a=1\n"" 1.times do |a| end\n"" a\n""end"], + assert_in_out_err(["-we", "def foo\n a=1\n 1.times do |a| end\n a\nend"], "", [], ["-e:3: warning: shadowing outer local variable - a"], bug4130) - assert_in_out_err(["-we", "def foo\n"" a=1\n"" 1.times do |a| end\n""end"], + assert_in_out_err(["-we", "def foo\n a=1\n 1.times do |a| end\nend"], "", [], ["-e:3: warning: shadowing outer local variable - a", "-e:2: warning: assigned but unused variable - a", ], bug4130) feature6693 = '[ruby-core:46160]' - assert_in_out_err(["-we", "def foo\n"" _a=1\n"" 1.times do |_a| end\n""end"], + assert_in_out_err(["-we", "def foo\n _a=1\n 1.times do |_a| end\nend"], "", [], [], feature6693) end diff --git a/test/ruby/test_stringchar.rb b/test/ruby/test_stringchar.rb index 4cae57f85f..7a4f77d967 100644 --- a/test/ruby/test_stringchar.rb +++ b/test/ruby/test_stringchar.rb @@ -5,10 +5,6 @@ class TestStringchar < Test::Unit::TestCase assert_equal("abcd", "abcd") assert_match(/abcd/, "abcd") assert("abcd" === "abcd") - # compile time string concatenation - assert_equal("abcd", "ab" "cd") - assert_equal("22aacd44", "#{22}aa" "cd#{44}") - assert_equal("22aacd445566", "#{22}aa" "cd#{44}" "55" "#{66}") assert("abc" !~ /^$/) assert("abc\n" !~ /^$/) assert("abc" !~ /^d*$/) diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 49522c42cd..eecc21e710 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -118,7 +118,7 @@ class TestSyntax < Test::Unit::TestCase def test_warn_unreachable assert_warn("test:3: warning: statement not reached\n") do - code = "loop do\n" "break\n" "foo\n" "end" + code = "loop do\nbreak\nfoo\nend" assert_valid_syntax(code, "test") {$VERBOSE = true} end end |