1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test_erb.rb: improve assertions

Browse Source 
* test/erb/test_erb.rb: improve failure messages with
  assert_respond_to and assert_not_respond_to.

* test/erb/test_erb.rb: use assert_raise instead of assert(false).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53683 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-01-29 03:18:05 +00:00
parent c55ad90a6e
commit f54b960d30
1 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
test/erb/test_erb.rb
View File

@ -203,13 +203,13 @@ EOS
erb = @erb.new('hello') erb = @erb.new('hello')
cls = erb.def_class cls = erb.def_class
assert_equal(Object, cls.superclass) assert_equal(Object, cls.superclass)
assert(cls.new.respond_to?('result')) assert_respond_to(cls.new, 'result')
cls = erb.def_class(Foo) cls = erb.def_class(Foo)
assert_equal(Foo, cls.superclass) assert_equal(Foo, cls.superclass)
assert(cls.new.respond_to?('result')) assert_respond_to(cls.new, 'result')
cls = erb.def_class(Object, 'erb') cls = erb.def_class(Object, 'erb')
assert_equal(Object, cls.superclass) assert_equal(Object, cls.superclass)
assert(cls.new.respond_to?('erb')) assert_respond_to(cls.new, 'erb')
end end
def test_percent def test_percent
@ -262,21 +262,21 @@ EOS
fname = File.join(File.dirname(File.expand_path(__FILE__)), 'hello.erb') fname = File.join(File.dirname(File.expand_path(__FILE__)), 'hello.erb')
def_erb_method('hello', fname) def_erb_method('hello', fname)
end end
assert(klass.new.respond_to?('hello')) assert_respond_to(klass.new, 'hello')
assert(! klass.new.respond_to?('hello_world')) assert_not_respond_to(klass.new, 'hello_world')
erb = @erb.new('hello, world') erb = @erb.new('hello, world')
klass.module_eval do klass.module_eval do
def_erb_method('hello_world', erb) def_erb_method('hello_world', erb)
end end
assert(klass.new.respond_to?('hello_world')) assert_respond_to(klass.new, 'hello_world')
end end
def test_def_method_without_filename def test_def_method_without_filename
klass = Class.new klass = Class.new
erb = ERB.new("<% raise ::TestERB::MyError %>") erb = ERB.new("<% raise ::TestERB::MyError %>")
erb.filename = "test filename" erb.filename = "test filename"
assert(! klass.new.respond_to?('my_error')) assert_not_respond_to(klass.new, 'my_error')
erb.def_method(klass, 'my_error') erb.def_method(klass, 'my_error')
e = assert_raise(::TestERB::MyError) { e = assert_raise(::TestERB::MyError) {
klass.new.my_error klass.new.my_error
@ -288,7 +288,7 @@ EOS
klass = Class.new klass = Class.new
erb = ERB.new("<% raise ::TestERB::MyError %>") erb = ERB.new("<% raise ::TestERB::MyError %>")
erb.filename = "test filename" erb.filename = "test filename"
assert(! klass.new.respond_to?('my_error')) assert_not_respond_to(klass.new, 'my_error')
erb.def_method(klass, 'my_error', 'test fname') erb.def_method(klass, 'my_error', 'test fname')
e = assert_raise(::TestERB::MyError) { e = assert_raise(::TestERB::MyError) {
klass.new.my_error klass.new.my_error
@ -342,12 +342,10 @@ Hello,\s
EOS EOS
erb = ERB.new(src, nil, '%') erb = ERB.new(src, nil, '%')
begin e = assert_raise(RuntimeError) {
erb.result erb.result
assert(false) }
rescue assert_match(/\A\(erb\):4\b/, e.backtrace[0].to_s)
assert_match(/\A\(erb\):4\b/, $@[0].to_s)
end
src = <<EOS src = <<EOS
%> %>
@ -389,28 +387,22 @@ Hello,\s
EOS EOS
erb = ERB.new(src) erb = ERB.new(src)
begin e = assert_raise(RuntimeError) {
erb.result erb.result
assert(false) }
rescue assert_match(/\A\(erb\):5\b/, e.backtrace[0].to_s)
assert_match(/\A\(erb\):5\b/, $@[0].to_s)
end
erb = ERB.new(src, nil, '>') erb = ERB.new(src, nil, '>')
begin e = assert_raise(RuntimeError) {
erb.result erb.result
assert(false) }
rescue assert_match(/\A\(erb\):5\b/, e.backtrace[0].to_s)
assert_match(/\A\(erb\):5\b/, $@[0].to_s)
end
erb = ERB.new(src, nil, '<>') erb = ERB.new(src, nil, '<>')
begin e = assert_raise(RuntimeError) {
erb.result erb.result
assert(false) }
rescue assert_match(/\A\(erb\):5\b/, e.backtrace[0].to_s)
assert_match(/\A\(erb\):5\b/, $@[0].to_s)
end
src = <<EOS src = <<EOS
% y = 'Hello' % y = 'Hello'
@ -421,20 +413,16 @@ EOS
EOS EOS
erb = ERB.new(src, nil, '-') erb = ERB.new(src, nil, '-')
begin e = assert_raise(RuntimeError) {
erb.result erb.result
assert(false) }
rescue assert_match(/\A\(erb\):5\b/, e.backtrace[0].to_s)
assert_match(/\A\(erb\):5\b/, $@[0].to_s)
end
erb = ERB.new(src, nil, '%-') erb = ERB.new(src, nil, '%-')
begin e = assert_raise(RuntimeError) {
erb.result erb.result
assert(false) }
rescue assert_match(/\A\(erb\):5\b/, e.backtrace[0].to_s)
assert_match(/\A\(erb\):5\b/, $@[0].to_s)
end
end end
def test_explicit def test_explicit