Skip to content

Use filter in coverage tests #14969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 19, 2022
Merged

Use filter in coverage tests #14969

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
837be45
Use filter in coverage tests
nicolasstucki Apr 19, 2022
318f610
Update compiler/test/dotty/tools/dotc/coverage/CoverageTests.scala
nicolasstucki Apr 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions compiler/test/dotty/tools/dotc/coverage/CoverageTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,24 @@ class CoverageTests:
lines
end fixWindowsPaths

Files.walk(dir).filter(scalaFile.matches).forEach(p => {
val path = p
val fileName = path.getFileName.toString.stripSuffix(".scala")
val targetDir = computeCoverageInTmp(path, dir, run)
val targetFile = targetDir.resolve(s"scoverage.coverage")
val expectFile = p.resolveSibling(s"$fileName.scoverage.check")

if updateCheckFiles then
Files.copy(targetFile, expectFile, StandardCopyOption.REPLACE_EXISTING)
else
val expected = fixWindowsPaths(Files.readAllLines(expectFile).asScala)
val obtained = fixWindowsPaths(Files.readAllLines(targetFile).asScala)
if expected != obtained then
for ((exp, actual),i) <- expected.zip(obtained).filter(_ != _).zipWithIndex do
Console.err.println(s"wrong line ${i+1}:")
Console.err.println(s" expected: $exp")
Console.err.println(s" actual : $actual")
fail(s"$targetFile differs from expected $expectFile")
Files.walk(dir).filter(scalaFile.matches).forEach(path => {
if Properties.testsFilter.isEmpty || Properties.testsFilter.exists(path.toString.contains) then
val fileName = path.getFileName.toString.stripSuffix(".scala")
val targetDir = computeCoverageInTmp(path, dir, run)
val targetFile = targetDir.resolve(s"scoverage.coverage")
val expectFile = path.resolveSibling(s"$fileName.scoverage.check")

if updateCheckFiles then
Files.copy(targetFile, expectFile, StandardCopyOption.REPLACE_EXISTING)
else
val expected = fixWindowsPaths(Files.readAllLines(expectFile).asScala)
val obtained = fixWindowsPaths(Files.readAllLines(targetFile).asScala)
if expected != obtained then
for ((exp, actual),i) <- expected.zip(obtained).filter(_ != _).zipWithIndex do
Console.err.println(s"wrong line ${i+1}:")
Console.err.println(s" expected: $exp")
Console.err.println(s" actual : $actual")
fail(s"$targetFile differs from expected $expectFile")

})

Expand Down