diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-29 03:18:05 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-29 03:18:05 +0000 |
commit | 97a1c88a0376eeeb5f1651696f235ca12e157b3c (patch) | |
tree | 0b7fd1bd32f2e8b63f61f6172faa0b415383b586 /test/erb/test_erb.rb | |
parent | b8aeefbf721c2a654cc430b62e8c25679c07569a (diff) | |
download | ruby-97a1c88a0376eeeb5f1651696f235ca12e157b3c.tar.gz |
test_erb.rb: improve assertions
* 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
Diffstat (limited to 'test/erb/test_erb.rb')
-rw-r--r-- | test/erb/test_erb.rb | 64 |
1 files changed, 26 insertions, 38 deletions
diff --git a/test/erb/test_erb.rb b/test/erb/test_erb.rb index 97f45af73d..f80e0e947b 100644 --- a/test/erb/test_erb.rb +++ b/test/erb/test_erb.rb @@ -203,13 +203,13 @@ EOS erb = @erb.new('hello') cls = erb.def_class assert_equal(Object, cls.superclass) - assert(cls.new.respond_to?('result')) + assert_respond_to(cls.new, 'result') cls = erb.def_class(Foo) assert_equal(Foo, cls.superclass) - assert(cls.new.respond_to?('result')) + assert_respond_to(cls.new, 'result') cls = erb.def_class(Object, 'erb') assert_equal(Object, cls.superclass) - assert(cls.new.respond_to?('erb')) + assert_respond_to(cls.new, 'erb') end def test_percent @@ -262,21 +262,21 @@ EOS fname = File.join(File.dirname(File.expand_path(__FILE__)), 'hello.erb') def_erb_method('hello', fname) 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') klass.module_eval do def_erb_method('hello_world', erb) end - assert(klass.new.respond_to?('hello_world')) + assert_respond_to(klass.new, 'hello_world') end def test_def_method_without_filename klass = Class.new erb = ERB.new("<% raise ::TestERB::MyError %>") 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') e = assert_raise(::TestERB::MyError) { klass.new.my_error @@ -288,7 +288,7 @@ EOS klass = Class.new erb = ERB.new("<% raise ::TestERB::MyError %>") 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') e = assert_raise(::TestERB::MyError) { klass.new.my_error @@ -342,12 +342,10 @@ Hello,\s EOS erb = ERB.new(src, nil, '%') - begin + e = assert_raise(RuntimeError) { erb.result - assert(false) - rescue - assert_match(/\A\(erb\):4\b/, $@[0].to_s) - end + } + assert_match(/\A\(erb\):4\b/, e.backtrace[0].to_s) src = <<EOS %> @@ -389,28 +387,22 @@ Hello,\s EOS erb = ERB.new(src) - begin + e = assert_raise(RuntimeError) { erb.result - assert(false) - rescue - assert_match(/\A\(erb\):5\b/, $@[0].to_s) - end + } + assert_match(/\A\(erb\):5\b/, e.backtrace[0].to_s) erb = ERB.new(src, nil, '>') - begin + e = assert_raise(RuntimeError) { erb.result - assert(false) - rescue - assert_match(/\A\(erb\):5\b/, $@[0].to_s) - end + } + assert_match(/\A\(erb\):5\b/, e.backtrace[0].to_s) erb = ERB.new(src, nil, '<>') - begin + e = assert_raise(RuntimeError) { erb.result - assert(false) - rescue - assert_match(/\A\(erb\):5\b/, $@[0].to_s) - end + } + assert_match(/\A\(erb\):5\b/, e.backtrace[0].to_s) src = <<EOS % y = 'Hello' @@ -421,20 +413,16 @@ EOS EOS erb = ERB.new(src, nil, '-') - begin + e = assert_raise(RuntimeError) { erb.result - assert(false) - rescue - assert_match(/\A\(erb\):5\b/, $@[0].to_s) - end + } + assert_match(/\A\(erb\):5\b/, e.backtrace[0].to_s) erb = ERB.new(src, nil, '%-') - begin + e = assert_raise(RuntimeError) { erb.result - assert(false) - rescue - assert_match(/\A\(erb\):5\b/, $@[0].to_s) - end + } + assert_match(/\A\(erb\):5\b/, e.backtrace[0].to_s) end def test_explicit |