Skip to content

Fix #112 - specific module in multi module project without normal compilation #113

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
Sep 14, 2019
Merged

Fix #112 - specific module in multi module project without normal compilation #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
433b79c
Fix #112 - report on specific module in a multi-module project withou…
eyalroth Sep 10, 2019
86fe8d2
Remove redundant functional test for Scala 2.11 (which is also failin…
eyalroth Sep 10, 2019
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
30 changes: 28 additions & 2 deletions src/functionalTest/java/org.scoverage/ScalaMultiModuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,38 @@ public void reportScoverageOnlyRoot() {
@Test
public void reportScoverageOnlyA() {

AssertableBuildResult result = dryRun("clean", ":a:" + ScoveragePlugin.getREPORT_NAME());
AssertableBuildResult result = run("clean", ":a:" + ScoveragePlugin.getREPORT_NAME());

result.assertTaskDoesntExist(ScoveragePlugin.getREPORT_NAME());
result.assertTaskExists("a:" + ScoveragePlugin.getREPORT_NAME());
result.assertTaskDoesntExist("b:" + ScoveragePlugin.getREPORT_NAME());
result.assertTaskDoesntExist("common:" + ScoveragePlugin.getREPORT_NAME());

result.assertTaskSucceeded("a:" + ScoveragePlugin.getCOMPILE_NAME());
result.assertTaskSucceeded("a:" + ScoveragePlugin.getREPORT_NAME());

assertAReportFilesExist();
}

@Test
public void reportScoverageOnlyAWithoutNormalCompilation() {

AssertableBuildResult result = run("clean", ":a:" + ScoveragePlugin.getREPORT_NAME(),
"-x", "compileScala");

result.assertTaskSkipped("compileScala");
result.assertTaskSkipped("a:compileScala");
result.assertTaskSkipped("common:compileScala");
result.assertTaskSucceeded("common:" + ScoveragePlugin.getCOMPILE_NAME());
result.assertTaskSucceeded("a:" + ScoveragePlugin.getCOMPILE_NAME());
result.assertTaskSucceeded("a:" + ScoveragePlugin.getREPORT_NAME());

assertAReportFilesExist();

Assert.assertTrue(resolve(buildDir(resolve(projectDir(), "a")), "classes/scala/main/org/hello/a/WorldA.class").exists());
Assert.assertFalse(resolve(buildDir(resolve(projectDir(), "a")), "classes/scala/scoverage/org/hello/a/WorldA.class").exists());

Assert.assertTrue(resolve(buildDir(resolve(projectDir(), "common")), "classes/scala/main/org/hello/common/WorldCommon.class").exists());
Assert.assertFalse(resolve(buildDir(resolve(projectDir(), "common")), "classes/scala/scoverage/org/hello/common/WorldCommon.class").exists());
}

@Test
Expand Down
9 changes: 0 additions & 9 deletions src/functionalTest/java/org.scoverage/ScalaSingleModuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,6 @@ public void reportScoverageWithoutNormalCompilationAndWithExcludedClasses() thro
Assert.assertFalse(resolve(buildDir(), "classes/scala/scoverage/org/hello/World.class").exists());
}

@Test
public void reportScoverageUnder2_11() throws Exception {
run("clean", ScoveragePlugin.getREPORT_NAME(),
"-PscalaVersionMinor=11",
"-PscalaVersionBuild=8",
"-Pscoverage.scoverageScalaVersion=2_11");
assertReportFilesExist();
}

private void assertReportFilesExist() {

Assert.assertTrue(resolve(reportDir(), "index.html").exists());
Expand Down
76 changes: 39 additions & 37 deletions src/main/groovy/org/scoverage/ScoveragePlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,51 +266,53 @@ class ScoveragePlugin implements Plugin<PluginAware> {
}
}
}
}

compileTask.configure {
if (!graph.hasTask(originalCompileTask)) {
destinationDir = originalCompileTask.destinationDir
} else {
doFirst {
destinationDir.deleteDir()
}
compileTask.configure {
if (!graph.hasTask(originalCompileTask)) {
project.logger.info("Making scoverage compilation the primary compilation task (instead of compileScala)")
destinationDir = originalCompileTask.destinationDir
} else {
doFirst {
destinationDir.deleteDir()
}

// delete non-instrumented classes by comparing normally compiled classes to those compiled with scoverage
doLast {
def originalCompileTaskName = project.sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME)
.getCompileTaskName("scala")
def originalDestinationDir = project.tasks[originalCompileTaskName].destinationDir

def findFiles = { File dir, Closure<Boolean> condition = null ->
def files = []

if (dir.exists()) {
dir.eachFileRecurse(FILES) { f ->
if (condition == null || condition(f)) {
def relativePath = dir.relativePath(f)
files << relativePath
}
// delete non-instrumented classes by comparing normally compiled classes to those compiled with scoverage
doLast {
project.logger.info("Deleting classes compiled by scoverage but non-instrumented (identical to normal compilation)")
def originalCompileTaskName = project.sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME)
.getCompileTaskName("scala")
def originalDestinationDir = project.tasks[originalCompileTaskName].destinationDir

def findFiles = { File dir, Closure<Boolean> condition = null ->
def files = []

if (dir.exists()) {
dir.eachFileRecurse(FILES) { f ->
if (condition == null || condition(f)) {
def relativePath = dir.relativePath(f)
files << relativePath
}
}

files
}

def isSameFile = { String relativePath ->
def fileA = new File(originalDestinationDir, relativePath)
def fileB = new File(destinationDir, relativePath)
FileUtils.contentEquals(fileA, fileB)
}
files
}

def originalClasses = findFiles(originalDestinationDir)
def identicalInstrumentedClasses = findFiles(destinationDir, { f ->
def relativePath = destinationDir.relativePath(f)
originalClasses.contains(relativePath) && isSameFile(relativePath)
})
def isSameFile = { String relativePath ->
def fileA = new File(originalDestinationDir, relativePath)
def fileB = new File(destinationDir, relativePath)
FileUtils.contentEquals(fileA, fileB)
}

identicalInstrumentedClasses.each { f ->
Files.deleteIfExists(destinationDir.toPath().resolve(f))
}
def originalClasses = findFiles(originalDestinationDir)
def identicalInstrumentedClasses = findFiles(destinationDir, { f ->
def relativePath = destinationDir.relativePath(f)
originalClasses.contains(relativePath) && isSameFile(relativePath)
})

identicalInstrumentedClasses.each { f ->
Files.deleteIfExists(destinationDir.toPath().resolve(f))
}
}
}
Expand Down