From 8a3201dae6addec4f5c7d8717f9a34851a4d3e75 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 20 Apr 2010 01:46:52 +0000
Subject: [PATCH] * test/ruby: make more ruby-mode.el friendly.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
test/ruby/test_parse.rb | 10 +++++-----
test/ruby/test_regexp.rb | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/test/ruby/test_parse.rb b/test/ruby/test_parse.rb
index 5dc3caf561..49ecfc56ed 100644
--- a/test/ruby/test_parse.rb
+++ b/test/ruby/test_parse.rb
@@ -517,8 +517,8 @@ class TestParse < Test::Unit::TestCase
x = nil
assert_raise(SyntaxError) do
- eval %q(
-<<FOO
+ eval %Q(
+<\<FOO
)
end
@@ -531,8 +531,8 @@ FOO
end
assert_raise(SyntaxError) do
- eval %q(
-<<"
+ eval %Q(
+<\<\"
)
end
@@ -558,7 +558,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_regexp.rb b/test/ruby/test_regexp.rb
index 06c6d1c633..1ef1380078 100644
--- a/test/ruby/test_regexp.rb
+++ b/test/ruby/test_regexp.rb
@@ -145,7 +145,7 @@ class TestRegexp < Test::Unit::TestCase
assert_equal('//', //.inspect)
assert_equal('//i', //i.inspect)
assert_equal('/\//i', /\//i.inspect)
- assert_equal('/\//i', /#{'/'}/i.inspect)
+ assert_equal('/\//i', %r"#{'/'}"i.inspect)
assert_equal('/\/x/i', /\/x/i.inspect)
assert_equal('/\x00/i', /#{"\0"}/i.inspect)
assert_equal("/\n/i", /#{"\n"}/i.inspect)
@@ -477,7 +477,7 @@ class TestRegexp < Test::Unit::TestCase
end.value
assert(m.tainted?)
assert_nothing_raised('[ruby-core:26137]') {
- m = proc {$SAFE = 4; /#{}/o}.call
+ m = proc {$SAFE = 4; %r"#{}"o}.call
}
assert(m.tainted?)
end
@@ -496,7 +496,7 @@ class TestRegexp < Test::Unit::TestCase
end
def failcheck(re)
- assert_raise(RegexpError) { /#{ re }/ }
+ assert_raise(RegexpError) { %r"#{ re }" }
end
def test_parse