Skip to content

Commit 4c5b610

Browse files
committed
Update to RC3
* Version numbers include RC3 * Support for JUnitPlatformExtension.configurationParameters * Support for FiltersExtension.excludeClassNamePatterns
1 parent bda967a commit 4c5b610

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

android-junit5/src/main/groovy/de/mannodermaus/gradle/plugins/android_junit5/AndroidJUnit5Test.groovy

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ class AndroidJUnit5Test extends JavaExec {
116116
private void configureTaskInputs(AndroidJUnit5Test task, AndroidJUnitPlatformExtension junitExtension) {
117117
// Setup JUnit 5 properties
118118
task.inputs.property("enableStandardTestTask", junitExtension.enableStandardTestTask)
119+
task.inputs.property("configurationParameters", junitExtension.configurationParameters)
119120
task.inputs.property("selectors.uris", junitExtension.selectors.uris)
120121
task.inputs.property("selectors.files", junitExtension.selectors.files)
121122
task.inputs.property("selectors.directories", junitExtension.selectors.directories)
@@ -176,11 +177,17 @@ class AndroidJUnit5Test extends JavaExec {
176177
private List<String> buildArgs(project, junitExtension, reportsDir, testRootDirs) {
177178
def args = []
178179

179-
args.addAll(["--details", junitExtension.details.toString()])
180+
if (junitExtension.details) {
181+
args.addAll(["--details", junitExtension.details.name()])
182+
}
180183

181184
addSelectors(project, junitExtension.selectors, testRootDirs, args)
182185
addFilters(junitExtension.filters, args)
183186

187+
junitExtension.configurationParameters.each { key, value ->
188+
args.addAll("--config", "${key}=${value}")
189+
}
190+
184191
args.addAll(["--reports-dir", reportsDir.getAbsolutePath()])
185192

186193
return args
@@ -190,6 +197,9 @@ class AndroidJUnit5Test extends JavaExec {
190197
filters.includeClassNamePatterns.each { pattern ->
191198
args.addAll(["-n", pattern])
192199
}
200+
filters.excludeClassNamePatterns.each { pattern ->
201+
args.addAll(['-N', pattern])
202+
}
193203
filters.packages.include.each { includedPackage ->
194204
args.addAll(["--include-package", includedPackage])
195205
}

android-junit5/src/main/groovy/de/mannodermaus/gradle/plugins/android_junit5/AndroidJUnitPlatformExtension.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import org.junit.platform.gradle.plugin.JUnitPlatformExtension
99
*/
1010
class AndroidJUnitPlatformExtension extends JUnitPlatformExtension {
1111

12-
private static final String PLATFORM_VERSION = "1.0.0-RC2"
12+
private static final String PLATFORM_VERSION = "1.0.0-RC3"
1313

1414
AndroidJUnitPlatformExtension(Project project) {
1515
super(project)
@@ -19,10 +19,10 @@ class AndroidJUnitPlatformExtension extends JUnitPlatformExtension {
1919
/**
2020
* The version of JUnit Jupiter to use.
2121
*/
22-
String jupiterVersion = "5.0.0-RC2"
22+
String jupiterVersion = "5.0.0-RC3"
2323

2424
/**
2525
* The version of JUnit Vintage Engine to use.
2626
*/
27-
String vintageVersion = "4.12.0-RC2"
27+
String vintageVersion = "4.12.0-RC3"
2828
}

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ android.injected.build.model.only.versioned = 3
66
# Artifact configuration
77
GROUP_ID = de.mannodermaus.gradle.plugins
88
ARTIFACT_ID = android-junit5
9-
VERSION_NAME = 1.0.0-RC2
9+
VERSION_NAME = 1.0.0-RC3-SNAPSHOT
1010
LICENCE_NAME = EPL-1.0
1111
DESCRIPTION = Unit Testing with JUnit 5 for Android.
1212
VCS_URL = https://github.com/aurae/android-junit5
@@ -17,7 +17,7 @@ ANDROID_PLUGIN_VERSION_3X = 3.0.0-beta2
1717
BINTRAY_PLUGIN_VERSION = 1.7.3
1818

1919
# Dependency versions
20-
JUNIT_PLATFORM_VERSION = 1.0.0-RC2
20+
JUNIT_PLATFORM_VERSION = 1.0.0-RC3
2121

2222
JUNIT4_VERSION = 4.12
2323
SPOCK_VERSION = 1.0-groovy-2.4

0 commit comments

Comments
 (0)