Skip to content

Commit 8648643

Browse files
authored
MINOR: Use Gradle's JUnitPlatform for upgrade-system-tests modules (apache#9922)
Add a runtime dependency on the jupiter engine to avoid failures during `./gradlew unitTest/integrationTest/test` for `upgrade-system-tests-*`. Also remove `connect` and `examples` from the JUnit 5 blocklist since they contains no tests. Reviewers: Chia-Ping Tsai <[email protected]>
1 parent f2ac0c6 commit 8648643

File tree

1 file changed

+22
-9
lines changed

1 file changed

+22
-9
lines changed

build.gradle

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,7 @@ subprojects {
242242
}
243243

244244
// Remove the relevant project name once it's converted to JUnit 5
245-
def shouldUseJUnit5 = !(["connect", "generator", "runtime", "examples", "streams-scala",
246-
"streams"].contains(it.project.name) || it.project.name.startsWith("upgrade-system-tests-"))
245+
def shouldUseJUnit5 = !(["generator", "runtime", "streams-scala", "streams"].contains(it.project.name))
247246

248247
def testLoggingEvents = ["passed", "skipped", "failed"]
249248
def testShowStandardStreams = false
@@ -1599,6 +1598,7 @@ project(':streams:upgrade-system-tests-0100') {
15991598

16001599
dependencies {
16011600
testCompile libs.kafkaStreams_0100
1601+
testRuntime libs.junitJupiter
16021602
}
16031603

16041604
systemTestLibs {
@@ -1611,6 +1611,7 @@ project(':streams:upgrade-system-tests-0101') {
16111611

16121612
dependencies {
16131613
testCompile libs.kafkaStreams_0101
1614+
testRuntime libs.junitJupiter
16141615
}
16151616

16161617
systemTestLibs {
@@ -1623,6 +1624,7 @@ project(':streams:upgrade-system-tests-0102') {
16231624

16241625
dependencies {
16251626
testCompile libs.kafkaStreams_0102
1627+
testRuntime libs.junitJupiter
16261628
}
16271629

16281630
systemTestLibs {
@@ -1635,6 +1637,7 @@ project(':streams:upgrade-system-tests-0110') {
16351637

16361638
dependencies {
16371639
testCompile libs.kafkaStreams_0110
1640+
testRuntime libs.junitJupiter
16381641
}
16391642

16401643
systemTestLibs {
@@ -1647,6 +1650,7 @@ project(':streams:upgrade-system-tests-10') {
16471650

16481651
dependencies {
16491652
testCompile libs.kafkaStreams_10
1653+
testRuntime libs.junitJupiter
16501654
}
16511655

16521656
systemTestLibs {
@@ -1659,6 +1663,7 @@ project(':streams:upgrade-system-tests-11') {
16591663

16601664
dependencies {
16611665
testCompile libs.kafkaStreams_11
1666+
testRuntime libs.junitJupiter
16621667
}
16631668

16641669
systemTestLibs {
@@ -1671,6 +1676,7 @@ project(':streams:upgrade-system-tests-20') {
16711676

16721677
dependencies {
16731678
testCompile libs.kafkaStreams_20
1679+
testRuntime libs.junitJupiter
16741680
}
16751681

16761682
systemTestLibs {
@@ -1683,6 +1689,7 @@ project(':streams:upgrade-system-tests-21') {
16831689

16841690
dependencies {
16851691
testCompile libs.kafkaStreams_21
1692+
testRuntime libs.junitJupiter
16861693
}
16871694

16881695
systemTestLibs {
@@ -1695,6 +1702,7 @@ project(':streams:upgrade-system-tests-22') {
16951702

16961703
dependencies {
16971704
testCompile libs.kafkaStreams_22
1705+
testRuntime libs.junitJupiter
16981706
}
16991707

17001708
systemTestLibs {
@@ -1707,6 +1715,7 @@ project(':streams:upgrade-system-tests-23') {
17071715

17081716
dependencies {
17091717
testCompile libs.kafkaStreams_23
1718+
testRuntime libs.junitJupiter
17101719
}
17111720

17121721
systemTestLibs {
@@ -1719,6 +1728,7 @@ project(':streams:upgrade-system-tests-24') {
17191728

17201729
dependencies {
17211730
testCompile libs.kafkaStreams_24
1731+
testRuntime libs.junitJupiter
17221732
}
17231733

17241734
systemTestLibs {
@@ -1731,6 +1741,7 @@ project(':streams:upgrade-system-tests-25') {
17311741

17321742
dependencies {
17331743
testCompile libs.kafkaStreams_25
1744+
testRuntime libs.junitJupiter
17341745
}
17351746

17361747
systemTestLibs {
@@ -1743,6 +1754,7 @@ project(':streams:upgrade-system-tests-26') {
17431754

17441755
dependencies {
17451756
testCompile libs.kafkaStreams_26
1757+
testRuntime libs.junitJupiter
17461758
}
17471759

17481760
systemTestLibs {
@@ -1751,15 +1763,16 @@ project(':streams:upgrade-system-tests-26') {
17511763
}
17521764

17531765
project(':streams:upgrade-system-tests-27') {
1754-
archivesBaseName = "kafka-streams-upgrade-system-tests-27"
1766+
archivesBaseName = "kafka-streams-upgrade-system-tests-27"
17551767

1756-
dependencies {
1757-
testCompile libs.kafkaStreams_27
1758-
}
1768+
dependencies {
1769+
testCompile libs.kafkaStreams_27
1770+
testRuntime libs.junitJupiter
1771+
}
17591772

1760-
systemTestLibs {
1761-
dependsOn testJar
1762-
}
1773+
systemTestLibs {
1774+
dependsOn testJar
1775+
}
17631776
}
17641777

17651778
project(':jmh-benchmarks') {

0 commit comments

Comments
 (0)