test/coverage/test_coverage.rb: Refactor coverage tests.
Add `assert_coverage` to invoke Ruby script under coverage measurement and to compare the result with an expected value. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame
parent
8c59fdb8d8
commit
6975993882
@ -176,31 +176,16 @@ class TestCoverage < Test::Unit::TestCase
|
|||||||
end;
|
end;
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_branch_coverage_for_if_statement
|
def assert_coverage(code, opt, stdout)
|
||||||
|
stdout = [stdout] unless stdout.is_a?(Array)
|
||||||
|
stdout = stdout.map {|s| s.to_s }
|
||||||
Dir.mktmpdir {|tmp|
|
Dir.mktmpdir {|tmp|
|
||||||
Dir.chdir(tmp) {
|
Dir.chdir(tmp) {
|
||||||
File.open("test.rb", "w") do |f|
|
File.write("test.rb", code)
|
||||||
f.puts 'def foo(x)'
|
|
||||||
f.puts ' if x == 0'
|
|
||||||
f.puts ' 0'
|
|
||||||
f.puts ' else'
|
|
||||||
f.puts ' 1'
|
|
||||||
f.puts ' end'
|
|
||||||
f.puts ''
|
|
||||||
f.puts ' unless x == 0'
|
|
||||||
f.puts ' 0'
|
|
||||||
f.puts ' else'
|
|
||||||
f.puts ' 1'
|
|
||||||
f.puts ' end'
|
|
||||||
f.puts 'end'
|
|
||||||
f.puts 'foo(0)'
|
|
||||||
f.puts 'foo(0)'
|
|
||||||
f.puts 'foo(1)'
|
|
||||||
end
|
|
||||||
|
|
||||||
assert_in_out_err(%w[-W0 -rcoverage], <<-"end;", ["{:branches=>{[:if, 0, 2]=>{[:then, 1, 3]=>2, [:else, 2, 5]=>1}, [:unless, 3, 8]=>{[:else, 4, 11]=>2, [:then, 5, 9]=>1}}}"], [])
|
assert_in_out_err(%w[-W0 -rcoverage], <<-"end;", stdout, [])
|
||||||
ENV["COVERAGE_EXPERIMENTAL_MODE"] = "true"
|
ENV["COVERAGE_EXPERIMENTAL_MODE"] = "true"
|
||||||
Coverage.start(branches: true)
|
Coverage.start(#{ opt })
|
||||||
tmp = Dir.pwd
|
tmp = Dir.pwd
|
||||||
require tmp + '/test.rb'
|
require tmp + '/test.rb'
|
||||||
p Coverage.result[tmp + "/test.rb"]
|
p Coverage.result[tmp + "/test.rb"]
|
||||||
@ -209,127 +194,134 @@ class TestCoverage < Test::Unit::TestCase
|
|||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_branch_coverage_for_if_statement
|
||||||
|
result = {
|
||||||
|
:branches => {
|
||||||
|
[:if , 0, 2] => {[:then, 1, 3]=>2, [:else, 2, 5]=>1},
|
||||||
|
[:unless, 3, 8] => {[:else, 4, 11]=>2, [:then, 5, 9]=>1},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
assert_coverage(<<-"end;", { branches: true }, result)
|
||||||
|
def foo(x)
|
||||||
|
if x == 0
|
||||||
|
0
|
||||||
|
else
|
||||||
|
1
|
||||||
|
end
|
||||||
|
|
||||||
|
unless x == 0
|
||||||
|
0
|
||||||
|
else
|
||||||
|
1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
foo(0)
|
||||||
|
foo(0)
|
||||||
|
foo(1)
|
||||||
|
end;
|
||||||
|
end
|
||||||
|
|
||||||
def test_branch_coverage_for_while_statement
|
def test_branch_coverage_for_while_statement
|
||||||
Dir.mktmpdir {|tmp|
|
result = {
|
||||||
Dir.chdir(tmp) {
|
:branches => {
|
||||||
File.open("test.rb", "w") do |f|
|
[:while, 0, 2] => {[:body, 1, 3]=> 3},
|
||||||
f.puts 'x = 3'
|
[:until, 2, 5] => {[:body, 3, 6]=>10},
|
||||||
f.puts 'while x > 0'
|
}
|
||||||
f.puts ' x -= 1'
|
}
|
||||||
f.puts 'end'
|
assert_coverage(<<-"end;", { branches: true }, result)
|
||||||
f.puts 'until x == 10'
|
x = 3
|
||||||
f.puts ' x += 1'
|
while x > 0
|
||||||
f.puts 'end'
|
x -= 1
|
||||||
|
end
|
||||||
|
until x == 10
|
||||||
|
x += 1
|
||||||
end
|
end
|
||||||
|
|
||||||
assert_in_out_err(%w[-W0 -rcoverage], <<-"end;", ["{:branches=>{[:while, 0, 2]=>{[:body, 1, 3]=>3}, [:until, 2, 5]=>{[:body, 3, 6]=>10}}}"], [])
|
|
||||||
ENV["COVERAGE_EXPERIMENTAL_MODE"] = "true"
|
|
||||||
Coverage.start(branches: true)
|
|
||||||
tmp = Dir.pwd
|
|
||||||
require tmp + '/test.rb'
|
|
||||||
p Coverage.result[tmp + "/test.rb"]
|
|
||||||
end;
|
end;
|
||||||
}
|
|
||||||
}
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_branch_coverage_for_case_statement
|
def test_branch_coverage_for_case_statement
|
||||||
Dir.mktmpdir {|tmp|
|
result = {
|
||||||
Dir.chdir(tmp) {
|
:branches => {
|
||||||
File.open("test.rb", "w") do |f|
|
[:case, 0, 2] => {[:when, 1, 4]=>2, [:when, 2, 6]=>0, [:else, 3, 2]=>1},
|
||||||
f.puts 'def foo(x)'
|
[:case, 4, 9] => {[:when, 5, 11]=>2, [:when, 6, 13]=>0, [:else, 7, 9]=>1},
|
||||||
f.puts ' case x'
|
[:case, 8, 16] => {[:when, 9, 18]=>2, [:when, 10, 20]=>0, [:else, 11, 22]=>1},
|
||||||
f.puts ' when 0'
|
[:case, 12, 25] => {[:when, 13, 27]=>2, [:when, 14, 29]=>0, [:else, 15, 31]=>1},
|
||||||
f.puts ' 0'
|
}
|
||||||
f.puts ' when 1'
|
}
|
||||||
f.puts ' 1'
|
assert_coverage(<<-"end;", { branches: true }, result)
|
||||||
f.puts ' end'
|
def foo(x)
|
||||||
f.puts ''
|
case x
|
||||||
f.puts ' case'
|
when 0
|
||||||
f.puts ' when x == 0'
|
0
|
||||||
f.puts ' 0'
|
when 1
|
||||||
f.puts ' when x == 1'
|
1
|
||||||
f.puts ' 1'
|
|
||||||
f.puts ' end'
|
|
||||||
f.puts ''
|
|
||||||
f.puts ' case x'
|
|
||||||
f.puts ' when 0'
|
|
||||||
f.puts ' 0'
|
|
||||||
f.puts ' when 1'
|
|
||||||
f.puts ' 1'
|
|
||||||
f.puts ' else'
|
|
||||||
f.puts ' :other'
|
|
||||||
f.puts ' end'
|
|
||||||
f.puts ''
|
|
||||||
f.puts ' case'
|
|
||||||
f.puts ' when x == 0'
|
|
||||||
f.puts ' 0'
|
|
||||||
f.puts ' when x == 1'
|
|
||||||
f.puts ' 1'
|
|
||||||
f.puts ' else'
|
|
||||||
f.puts ' :other'
|
|
||||||
f.puts ' end'
|
|
||||||
f.puts 'end'
|
|
||||||
f.puts ''
|
|
||||||
f.puts 'foo(0)'
|
|
||||||
f.puts 'foo(0)'
|
|
||||||
f.puts 'foo(2)'
|
|
||||||
end
|
end
|
||||||
|
|
||||||
assert_in_out_err(%w[-W0 -rcoverage], <<-"end;", ["{:branches=>{[:case, 0, 2]=>{[:when, 1, 4]=>2, [:when, 2, 6]=>0, [:else, 3, 2]=>1}, [:case, 4, 9]=>{[:when, 5, 11]=>2, [:when, 6, 13]=>0, [:else, 7, 9]=>1}, [:case, 8, 16]=>{[:when, 9, 18]=>2, [:when, 10, 20]=>0, [:else, 11, 22]=>1}, [:case, 12, 25]=>{[:when, 13, 27]=>2, [:when, 14, 29]=>0, [:else, 15, 31]=>1}}}"], [])
|
case
|
||||||
ENV["COVERAGE_EXPERIMENTAL_MODE"] = "true"
|
when x == 0
|
||||||
Coverage.start(branches: true)
|
0
|
||||||
tmp = Dir.pwd
|
when x == 1
|
||||||
require tmp + '/test.rb'
|
1
|
||||||
p Coverage.result[tmp + "/test.rb"]
|
end
|
||||||
|
|
||||||
|
case x
|
||||||
|
when 0
|
||||||
|
0
|
||||||
|
when 1
|
||||||
|
1
|
||||||
|
else
|
||||||
|
:other
|
||||||
|
end
|
||||||
|
|
||||||
|
case
|
||||||
|
when x == 0
|
||||||
|
0
|
||||||
|
when x == 1
|
||||||
|
1
|
||||||
|
else
|
||||||
|
:other
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
foo(0)
|
||||||
|
foo(0)
|
||||||
|
foo(2)
|
||||||
end;
|
end;
|
||||||
}
|
|
||||||
}
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_branch_coverage_for_safe_method_invocation
|
def test_branch_coverage_for_safe_method_invocation
|
||||||
Dir.mktmpdir {|tmp|
|
result = {
|
||||||
Dir.chdir(tmp) {
|
:branches=>{
|
||||||
File.open("test.rb", "w") do |f|
|
[:"&.", 0, 3] => {[:then, 1, 3]=>1, [:else, 2, 3]=>0},
|
||||||
f.puts 'a = 10'
|
[:"&.", 3, 4] => {[:then, 4, 4]=>0, [:else, 5, 4]=>1},
|
||||||
f.puts 'b = nil'
|
}
|
||||||
f.puts 'a&.abs'
|
}
|
||||||
f.puts 'b&.hoo'
|
assert_coverage(<<-"end;", { branches: true }, result)
|
||||||
end
|
a = 10
|
||||||
|
b = nil
|
||||||
assert_in_out_err(%w[-W0 -rcoverage], <<-"end;", ["{:branches=>{[:\"&.\", 0, 3]=>{[:then, 1, 3]=>1, [:else, 2, 3]=>0}, [:\"&.\", 3, 4]=>{[:then, 4, 4]=>0, [:else, 5, 4]=>1}}}"], [])
|
a&.abs
|
||||||
ENV["COVERAGE_EXPERIMENTAL_MODE"] = "true"
|
b&.hoo
|
||||||
Coverage.start(branches: true)
|
|
||||||
tmp = Dir.pwd
|
|
||||||
require tmp + '/test.rb'
|
|
||||||
p Coverage.result[tmp + "/test.rb"]
|
|
||||||
end;
|
end;
|
||||||
}
|
|
||||||
}
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_method_coverage
|
def test_method_coverage
|
||||||
Dir.mktmpdir {|tmp|
|
result = {
|
||||||
Dir.chdir(tmp) {
|
:methods => {
|
||||||
File.open("test.rb", "w") do |f|
|
[:foo, 0, 1] => 2,
|
||||||
f.puts 'def foo; end'
|
[:bar, 1, 2] => 1,
|
||||||
f.puts 'def bar'
|
[:baz, 2, 4] => 0,
|
||||||
f.puts 'end'
|
}
|
||||||
f.puts 'def baz; end'
|
}
|
||||||
f.puts ''
|
assert_coverage(<<-"end;", { methods: true }, result)
|
||||||
f.puts 'foo'
|
def foo; end
|
||||||
f.puts 'foo'
|
def bar
|
||||||
f.puts 'bar'
|
|
||||||
end
|
end
|
||||||
|
def baz; end
|
||||||
|
|
||||||
assert_in_out_err(%w[-W0 -rcoverage], <<-"end;", ["{:methods=>{[:foo, 0, 1]=>2, [:bar, 1, 2]=>1, [:baz, 2, 4]=>0}}"], [])
|
foo
|
||||||
ENV["COVERAGE_EXPERIMENTAL_MODE"] = "true"
|
foo
|
||||||
Coverage.start(methods: true)
|
bar
|
||||||
tmp = Dir.pwd
|
|
||||||
require tmp + '/test.rb'
|
|
||||||
p Coverage.result[tmp + "/test.rb"]
|
|
||||||
end;
|
end;
|
||||||
}
|
|
||||||
}
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user