Skip to content

Commit 21f80fb

Browse files
committed
Update TestNG to 7.10.1
Issue: #116
1 parent e25a980 commit 21f80fb

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
:junit-platform-version: 1.8.2
55
:surefire-version: 3.0.0-M7
66
:testng-min-version: 6.14.3
7-
:testng-max-version: 7.9.0
7+
:testng-max-version: 7.10.1
88
:testng-engine-version: 1.0.5
99

1010
Allows executing https://testng.org[TestNG] tests on the JUnit Platform

build.gradle.kts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,16 @@ val supportedTestNGVersions = listOf(
5353
"7.6.1" to 11,
5454
"7.7.1" to 11,
5555
"7.8.0" to 11,
56-
"7.9.0" to 11 // Keep in sync with TestContext.java and README.MD
56+
"7.9.0" to 11,
57+
"7.10.1" to 11, // Keep in sync with TestContext.java and README.adoc
5758
).associateBy({ Version(it.first) }, { JavaLanguageVersion.of(it.second) })
5859

5960
val lastJdk8CompatibleRelease = supportedTestNGVersions.entries.last { it.value == JavaLanguageVersion.of(8) }.key
6061

61-
val snapshotTestNGVersion = Version("7.10.0-SNAPSHOT")
62+
val snapshotTestNGVersion = Version("7.11.0-SNAPSHOT")
6263

6364
val allTestNGVersions = supportedTestNGVersions.keys + listOf(snapshotTestNGVersion)
6465

65-
fun versionSuffix(version: String) =
66-
if (version.endsWith("-SNAPSHOT")) "snapshot" else version.replace('.', '_')
67-
6866
val testRuntimeClasspath: Configuration by configurations.getting
6967
val testNGTestConfigurationsByVersion = allTestNGVersions.associateWith { version ->
7068
configurations.create("testRuntimeClasspath_${version.suffix}") {
@@ -211,6 +209,7 @@ tasks {
211209
}
212210
systemProperty("testng.version", version.value)
213211
systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
212+
ignoreFailures = version.isSnapshot() // TODO remove this line once a new 7.11.0-SNAPSHOT artifact is available
214213
}
215214
}
216215
test {
@@ -301,5 +300,7 @@ data class Version(val value: String) {
301300
value.replace(pattern, "_")
302301
}
303302

303+
fun isSnapshot() : Boolean = value.endsWith("-SNAPSHOT")
304+
304305
override fun toString() = value
305306
}

src/test/java/org/junit/support/testng/engine/TestContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
class TestContext {
1818

1919
static ComparableVersion testNGVersion() {
20-
return new ComparableVersion(removeEnd(System.getProperty("testng.version", "7.9.0"), "-SNAPSHOT"));
20+
return new ComparableVersion(removeEnd(System.getProperty("testng.version", "7.10.1"), "-SNAPSHOT"));
2121
}
2222
}

0 commit comments

Comments
 (0)