Skip to content

Quick fix for issue 302 #303

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

Closed
wants to merge 1 commit into from
Closed

Quick fix for issue 302 #303

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...kotlin/de/mannodermaus/gradle/plugins/junit5/internal/extensions/ConfigurableReportExt.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package de.mannodermaus.gradle.plugins.junit5.internal.extensions

import org.gradle.api.file.FileSystemLocationProperty
import org.gradle.api.reporting.ConfigurableReport
import org.gradle.api.reporting.DirectoryReport
import org.gradle.api.reporting.SingleFileReport

internal val ConfigurableReport.outputLocationFile
internal val DirectoryReport.outputLocationFile
get() = outputLocation as? FileSystemLocationProperty<*>

internal val SingleFileReport.outputLocationFile
get() = outputLocation as? FileSystemLocationProperty<*>
28 changes: 17 additions & 11 deletions .../src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/tasks/AndroidJUnit5JacocoReport.kt
View file
Original file line number Diff line number Diff line change
@@ -15,8 +15,6 @@ import de.mannodermaus.gradle.plugins.junit5.internal.providers.mainSourceDirect
import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.api.file.FileCollection
import org.gradle.api.file.FileSystemLocationProperty
import org.gradle.api.reporting.ConfigurableReport
import org.gradle.api.tasks.CacheableTask
import org.gradle.api.tasks.TaskProvider
import org.gradle.api.tasks.testing.Test
@@ -90,15 +88,23 @@ public abstract class AndroidJUnit5JacocoReport : JacocoReport() {

// Apply JUnit 5 configuration parameters
val junit5Jacoco = project.junitPlatform.jacocoOptions
val allReports = listOf(
junit5Jacoco.csv to reportTask.reports.csv,
junit5Jacoco.xml to reportTask.reports.xml,
junit5Jacoco.html to reportTask.reports.html
)

allReports.forEach { (from, to) ->
to.required.set(from.enabled)
from.destination?.let { to.outputLocationFile?.set(it) }
junit5Jacoco.csv.also { from ->
reportTask.reports.csv.also { to ->
to.required.set(from.enabled)
from.destination?.let { to.outputLocationFile?.set(it) }
}
}
junit5Jacoco.xml.also { from ->
reportTask.reports.xml.also { to ->
to.required.set(from.enabled)
from.destination?.let { to.outputLocationFile?.set(it) }
}
}
junit5Jacoco.html.also { from ->
reportTask.reports.html.also { to ->
to.required.set(from.enabled)
from.destination?.let { to.outputLocationFile?.set(it) }
}
}

// Task-level Configuration
8 changes: 6 additions & 2 deletions ...junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/plugin/AgpJacocoBaseTests.kt
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,8 @@ import de.mannodermaus.gradle.plugins.junit5.tasks.AndroidJUnit5JacocoReport
import de.mannodermaus.gradle.plugins.junit5.tasks.JACOCO_TASK_NAME
import de.mannodermaus.gradle.plugins.junit5.util.assertAll
import de.mannodermaus.gradle.plugins.junit5.util.evaluate
import org.gradle.api.reporting.ConfigurableReport
import org.gradle.api.reporting.DirectoryReport
import org.gradle.api.reporting.SingleFileReport
import org.gradle.testing.jacoco.tasks.JacocoReport
import org.junit.jupiter.api.DynamicTest
import org.junit.jupiter.api.DynamicTest.dynamicTest
@@ -106,6 +107,9 @@ interface AgpJacocoBaseTests : AgpVariantAwareTests {

/* Private */

private val ConfigurableReport.outputLocationFilePath get() =
private val SingleFileReport.outputLocationFilePath get() =
outputLocationFile?.asFile?.get()?.absolutePath

private val DirectoryReport.outputLocationFilePath get() =
outputLocationFile?.asFile?.get()?.absolutePath
}