Skip to content

Fix for the absolute paths issue #44

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

Open
anenviousguest wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for the absolute paths issue #44

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
bef8852
Use latest `scoverage-maven-plugin` in samples.
Oct 2, 2017
878327a
Accounted for absolute paths in a sensor and in sequence matcher's code.
Oct 2, 2017
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
8 changes: 6 additions & 2 deletions ...src/main/scala/com/buransky/plugins/scoverage/pathcleaner/BruteForceSequenceMatcher.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,12 @@ class BruteForceSequenceMatcher(baseDir: File, sourcePath: String) extends PathS
// mock able helpers that allow us to remove the dependency to the real file system during tests

private[pathcleaner] def initSourceDir(): File = {
val sourceDir = new File(baseDir, sourcePath)
sourceDir
val sourceDir = new File(sourcePath)
if (sourceDir.isAbsolute) {
sourceDir
} else {
new File(baseDir, sourcePath)
}
}

private[pathcleaner] def initFilesMap(): Map[String, Seq[PathSeq]] = {
Expand Down
5 changes: 4 additions & 1 deletion plugin/src/main/scala/com/buransky/plugins/scoverage/sensor/ScoverageSensor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
*/
package com.buransky.plugins.scoverage.sensor

import java.io.File

import com.buransky.plugins.scoverage.language.Scala
import com.buransky.plugins.scoverage.measure.ScalaMetrics
import com.buransky.plugins.scoverage.pathcleaner.{BruteForceSequenceMatcher, PathSanitizer}
Expand Down Expand Up @@ -183,8 +185,9 @@ class ScoverageSensor(settings: Settings, pathResolver: PathResolver, fileSystem

val inputOption: Option[InputPath] = if (isFile) {
val p = fileSystem.predicates()
val pathPredicate = if (new File(path).isAbsolute) p.hasAbsolutePath(path) else p.hasRelativePath(path)
Option(fileSystem.inputFile(p.and(
p.hasRelativePath(path),
pathPredicate,
p.hasLanguage(Scala.key),
p.hasType(InputFile.Type.MAIN))))
} else {
Expand Down
2 changes: 1 addition & 1 deletion samples/maven/combined-scala-java-multi-module-sonar/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<plugin>
<groupId>org.scoverage</groupId>
<artifactId>scoverage-maven-plugin</artifactId>
<version>1.0.4</version>
<version>1.3.0</version>
<configuration>
<highlighting>true</highlighting>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion samples/maven/combined-scala-java-sonar/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<plugin>
<groupId>org.scoverage</groupId>
<artifactId>scoverage-maven-plugin</artifactId>
<version>1.0.4</version>
<version>1.3.0</version>
<configuration>
<highlighting>true</highlighting>
</configuration>
Expand Down