fixed issue #1

openbakery · Oct 20, 2016 · 58168fa · 58168fa
1 parent 4bb1dcd
commit 58168fa
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/source/main/groovy/org/openbakery/coverage/Report.groovy b/source/main/groovy/org/openbakery/coverage/Report.groovy
@@ -204,6 +204,7 @@ class Report implements OutputAppender {
 
 	def getReportData() {
 		if (sourceFiles != null) {
+			logger.debug("create report data with source files: {}", sourceFiles)
 			return new ReportData(getFilteredSourceFiles(), title)
 		}
 		return null

diff --git a/source/main/groovy/org/openbakery/coverage/model/SourceFile.groovy b/source/main/groovy/org/openbakery/coverage/model/SourceFile.groovy
@@ -24,8 +24,12 @@ class SourceFile {
 			}
 
 
-			if (index == 0) {
-				filename = parseFilename(value, baseDirectory)
+			if (filename == null) {
+				File file = new File(parseFilename(value))
+				// make sure that the given path is a file path, because the value is a absolute path test if it is really, otherwise the string is not a file
+				if (file.isAbsolute()) {
+					filename = file.absolutePath - baseDirectory
+				}
 			} else {
 				SourceLine sourceLine = new SourceLine(value)
 				if (currentMethod == null && sourceLine.hits != SourceLine.NOT_A_NUMBER) {
@@ -43,11 +47,11 @@ class SourceFile {
 
 	}
 
-	String parseFilename(String line, String baseDirectory) {
+	String parseFilename(String line) {
 		if (line.endsWith(":")) {
-			return line[0..-2]  - baseDirectory
+			return line[0..-2]
 		}
-		return line - baseDirectory
+		return line
 	}
 
 	String getFileBasename() {

diff --git a/source/test/groovy/org/openbakery/coverage/model/SourceFileSpecification.groovy b/source/test/groovy/org/openbakery/coverage/model/SourceFileSpecification.groovy
@@ -146,6 +146,24 @@ class SourceFileSpecification extends Specification {
 
 		then:
 		data.fileBasename == "Core_Source_OBTableViewSection"
+	}
+
+
+	def "data is not a file"() {
+		given:
+		def reportData = getReportLines("OBTableViewSection.txt");
+		def wrongInputLines = [
+						"^[[0;31mwarning...",
+						"^[[0;31mwarning...",
+						"foobar"
+		]
+		wrongInputLines.addAll(reportData)
+
+		when:
+		SourceFile data = new SourceFile(wrongInputLines, "/Users/rene/workspace/openbakery/OBTableViewController/");
+
+		then:
+		data.filename == "Core/Source/OBTableViewSection.m"
 
 	}