👾 Release 0.1.1

Author: jesperancinha

ReleaseNotes.md

@@ -1,12 +1,22 @@
 # Omni Reporter Commons Release Notes
 
-#### Release 0.1.1 - Upcoming
+
+#### Release 0.1.2 - Upcoming
+
+###### Features
 
 1. ~~Reports in the same folder are merged and average, (We assume thart if there are different reports in the same folder, it only means that there are different brands in there.)~~ Unfortunately, by doing so, the results may become inconsistent for reports that do not report coverage for certain files. Please make sure not to have different report brands (i.e. Clover and LCov together) for the same files. In that case, line coverage will be reported duplicate.
 2. Exclude report option (Since the above, may be difficult to manage in some situations, we can then use this option to exclude a report that for some reason we don't want to consider for the overall coverage calculation)
 3. Support for Group Coverage with Branch Coverage (mostly Coveralls)
 4. Source encoding gets automatically chosen unless we configure flag `failOnNoEncoding` to `true`
 
+#### Release 0.1.1 - 2022/01/31
+
+###### Bugs
+
+1. Fix Reporting sending of test report files by default with `ignoreTestBuildDirectory`
+2. Fix Codacy not including TSX in TypeScript reports
+
 #### Release 0.1.0 - 2022/01/30
 
 ###### Features

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.jesperancinha.plugins</groupId>
     <artifactId>omni-coveragereporter-commons</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
 
     <packaging>jar</packaging>
 
@@ -36,7 +36,7 @@
         <connection>scm:git:git://github.com/JEsperancinhaOrg.git</connection>
         <developerConnection>scm:git:git://github.com/JEsperancinhaOrg.git</developerConnection>
         <url>https://github.com/JEsperancinhaOrg/omni-reporter-commons</url>
-        <tag>0.1.0</tag>
+        <tag>0.1.1</tag>
     </scm>
     <distributionManagement>
         <snapshotRepository>

src/main/kotlin/org/jesperancinha/plugins/omni/reporter/domain/reports/OmniReportAdapters.kt

@@ -1,6 +1,5 @@
 package org.jesperancinha.plugins.omni.reporter.domain.reports
 
-import org.jesperancinha.plugins.omni.reporter.LanguageNotConfiguredException
 import org.jesperancinha.plugins.omni.reporter.domain.api.CodacyFileReport
 import org.jesperancinha.plugins.omni.reporter.domain.api.CoverallsSourceFile
 import org.jesperancinha.plugins.omni.reporter.domain.api.isBranch
@@ -241,10 +240,7 @@ class OmniJacocoReportFileAdapter(
 
     override fun toCodacy(sourceCodeFile: SourceCodeFile, language: Language): CodacyFileReport? {
         val coverage = reportFile.lines.fromJacocoToCodacyCoverage
-        return if (coverage.isEmpty() || !reportFile.name.endsWith(
-                language.ext
-            )
-        ) {
+        return if (coverage.isEmpty() || language.ext.none { reportFile.name.endsWith(it) }) {
             null
         } else {
             CodacyFileReport(
@@ -301,7 +297,7 @@ class OmniLCovReportFileAdapter(
 
     override fun toCodacy(sourceCodeFile: SourceCodeFile, language: Language): CodacyFileReport? {
         val coverage = reportFile.lineData.fromLCovToCodacyCoverage
-        return if (coverage.isEmpty() || !reportFile.sourceFilePath.endsWith(language.ext)
+        return if (coverage.isEmpty() || language.ext.none { reportFile.sourceFilePath.endsWith(it) }
         ) {
             null
         } else {
@@ -368,7 +364,8 @@ class OmniCloverReportFileAdapter(
 
     override fun toCodacy(sourceCodeFile: SourceCodeFile, language: Language): CodacyFileReport? {
         val coverage = reportFile.cloverLines.fromCloverToCodacyCoverage
-        return if (coverage.isEmpty() || !reportFile.path.endsWith(language.ext)
+        return if (coverage.isEmpty() || language.ext.none { reportFile.path
+                .endsWith(it) }
         ) {
             null
         } else {
@@ -436,7 +433,7 @@ class OmniCoveragePyReportFileAdapter(
 
     override fun toCodacy(sourceCodeFile: SourceCodeFile, language: Language): CodacyFileReport? {
         val coverage = reportFile.value.fromCoveragePyToCodacyCoverage
-        return if (coverage.isEmpty() || !reportFile.key.endsWith(language.ext)
+        return if (coverage.isEmpty() || language.ext.none { reportFile.key.endsWith(it) }
         ) {
             null
         } else {

src/main/kotlin/org/jesperancinha/plugins/omni/reporter/parsers/Parsers.kt

@@ -54,11 +54,11 @@ internal val String.toFileDigest: String
         .joinToString(separator = "") { byte -> "%02x".format(byte) }
         .uppercase()
 
-enum class Language(val ext: String, val lang: String) {
-    JAVA("java", "Java"),
-    KOTLIN("kt", "Kotlin"),
-    SCALA("scala", "Scala"),
-    PYTHON("py", "Python"),
-    JAVASCRIPT("js", "JavaScript"),
-    TYPESCRIPT("ts", "TypeScript")
+enum class Language(val ext: List<String>, val lang: String) {
+    JAVA(listOf("java"), "Java"),
+    KOTLIN(listOf("kt"), "Kotlin"),
+    SCALA(listOf("scala"), "Scala"),
+    PYTHON(listOf("py"), "Python"),
+    JAVASCRIPT(listOf("js"), "JavaScript"),
+    TYPESCRIPT(listOf("ts", "tsx"), "TypeScript")
 }

src/main/kotlin/org/jesperancinha/plugins/omni/reporter/processors/Processor.kt

@@ -18,6 +18,10 @@ private val CODECOV_SUPPORTED_REPORTS = arrayOf(
     "clover" to "xml"
 )
 
+
+private val KNOWN_TEST_DIRECTORIES = arrayOf(
+    "test-classes"
+)
 private val CODECOV_UNSUPPORTED_REPORTS = arrayOf(
     "coverage-final" to "json"
 )
@@ -39,10 +43,20 @@ abstract class Processor(
 
 
     companion object {
+
+        val nonGenericTestDirectoryPredicate =
+            { report: File -> KNOWN_TEST_DIRECTORIES.none { report.absolutePath.contains(it) } }
+
+
+        val nonTestDirectoryPredicate = { testDirectory: String, report: File ->
+            (report.parentFile.absolutePath == testDirectory ||
+                    !report.absolutePath.contains(testDirectory))
+        }
+
         fun supportedPredicate(ignoreTestBuildDirectory: Boolean) =
             if (ignoreTestBuildDirectory) { testDirectory: String, report: File ->
-                (report.parentFile.absolutePath == testDirectory ||
-                        !report.absolutePath.contains(testDirectory))
+                nonGenericTestDirectoryPredicate(report) &&
+                        nonTestDirectoryPredicate(testDirectory, report)
             } else { _, _ -> true }
     }
 }

src/test/kotlin/org/jesperancinha/plugins/omni/reporter/processors/ProcessorKtTest.kt

@@ -4,7 +4,7 @@ import io.kotest.matchers.collections.shouldHaveSize
 import io.kotest.matchers.nulls.shouldNotBeNull
 import org.jesperancinha.plugins.omni.reporter.OmniBuild
 import org.jesperancinha.plugins.omni.reporter.OmniProject
-import org.jesperancinha.plugins.omni.reporter.processors.Processor.Companion.supportedPredicate
+import org.jesperancinha.plugins.omni.reporter.processors.Processor.Companion.nonTestDirectoryPredicate
 import org.junit.jupiter.api.Test
 import java.io.File
 import kotlin.io.path.toPath
@@ -19,7 +19,7 @@ internal class ProcessorKtTest {
         val test3Folder = File(rootFolder, "test3").absolutePath
         val omniProject = MavenOmniProject(listOf(test3Folder), MavenOmniBuild(test3Folder, test3Folder))
 
-        val supportedPredicate = { _:String, _:File -> true }
+        val supportedPredicate = { _: String, _: File -> true }
         val toReportFiles = listOf(omniProject).toReportFiles(supportedPredicate, false, rootFolder)
         toReportFiles.shouldNotBeNull()
         toReportFiles.entries.first().value.shouldHaveSize(1)
@@ -33,7 +33,7 @@ internal class ProcessorKtTest {
         val test3Folder = File(rootFolder, "test3").absolutePath
         val omniProject = MavenOmniProject(listOf(test3Folder), MavenOmniBuild(test3Folder, test3Folder))
 
-        val toReportFiles = listOf(omniProject).toReportFiles(supportedPredicate(true), false, rootFolder)
+        val toReportFiles = listOf(omniProject).toReportFiles(nonTestDirectoryPredicate, false, rootFolder)
         toReportFiles.shouldNotBeNull()
         toReportFiles.entries.first().value.shouldHaveSize(1)
     }