Skip to content

Commit c962ec6

Browse files
committed
refactor: migrate JUnit 3 tests to JUnit 5, remove JUnit 4 test dependency
Now we have only JUnit 5 on the test compilation classpath, and IDE no longer suggests multiple different @test and assertEquals implementations.
1 parent ae75354 commit c962ec6

27 files changed

Lines changed: 632 additions & 976 deletions

File tree

build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,14 @@ plugins {
2323
}
2424

2525
dependencies {
26-
testImplementation("junit:junit")
2726
testImplementation("org.junit.jupiter:junit-jupiter")
2827
testImplementation("org.hamcrest:hamcrest")
29-
testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
28+
}
29+
30+
plugins.withId("java-test-fixtures") {
31+
dependencies {
32+
"testFixturesImplementation"("org.junit.jupiter:junit-jupiter")
33+
}
3034
}
3135

3236
tasks.configureEach<Test> {

src/bom-testing/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ dependencies {
3939
// to make runtime classpath consistent with the compile one.
4040
api("com.github.tomakehurst:wiremock-jre8:2.35.1")
4141
api("io.mockk:mockk:1.13.7")
42-
api("junit:junit:4.13.2")
4342
api("net.bytebuddy:byte-buddy:1.14.11")
4443
api("nl.jqno.equalsverifier:equalsverifier:3.15.5")
4544
// activemq-all should not be used as it provides secondary slf4j binding

src/components/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ dependencies {
8989
testImplementation("nl.jqno.equalsverifier:equalsverifier")
9090
testImplementation(testFixtures(projects.src.testkitWiremock))
9191
testFixturesImplementation(testFixtures(projects.src.core))
92-
testFixturesImplementation("junit:junit")
9392
testImplementation("io.mockk:mockk")
9493
}
9594

src/components/src/main/java/org/apache/jmeter/config/KeystoreConfigBeanInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public KeystoreConfigBeanInfo() {
4444

4545
PropertyDescriptor p = property(PRELOAD);
4646
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
47-
p.setValue(DEFAULT, "true"); // $NON-NLS-1$
47+
p.setValue(DEFAULT, "True"); // $NON-NLS-1$
4848
p.setValue(NOT_EXPRESSION, Boolean.TRUE);
4949
p.setValue(NOT_OTHER, Boolean.TRUE);
5050
p.setValue(TAGS, new String[]{"True", "False"}); // $NON-NLS-1$ $NON-NLS-2$

src/components/src/test/java/org/apache/jmeter/extractor/json/jmespath/TestJMESPathExtractor.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.junit.jupiter.params.ParameterizedTest;
3333
import org.junit.jupiter.params.provider.Arguments;
3434
import org.junit.jupiter.params.provider.MethodSource;
35-
import org.junit.runners.Parameterized.Parameters;
3635

3736
class TestJMESPathExtractor {
3837
private static final String DEFAULT_VALUE = "NONE"; // $NON-NLS-1$
@@ -151,7 +150,6 @@ private void testMultipleMatchesOnAllExtractedValues(boolean fromVars, String da
151150
+ " {\"missing\": \"different\"}\r\n" + " ],\r\n" + " \"foo\": {\"bar\": \"baz\"}\r\n"
152151
+ "}";
153152

154-
@Parameters
155153
private static Stream<Arguments> dataMatchNumberMoreThanZero() {
156154
return Stream.of(
157155
Arguments.of(TEST_DATA, "people[:3].first", "1", "James", "3"),

src/core/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ dependencies {
123123
testImplementation("io.mockk:mockk")
124124

125125
testFixturesApi(testFixtures(projects.src.jorphan))
126-
testFixturesImplementation("junit:junit")
127126
testFixturesImplementation(projects.src.testkit)
128127
testFixturesImplementation("org.junit.jupiter:junit-jupiter")
129128
}

src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import java.util.List;
3434
import java.util.Locale;
3535
import java.util.Map;
36+
import java.util.Objects;
3637
import java.util.ResourceBundle;
3738

3839
import javax.swing.JPopupMenu;
@@ -152,7 +153,7 @@ public TestBeanGUI() {
152153
}
153154

154155
public TestBeanGUI(Class<?> testBeanClass) {
155-
super();
156+
Objects.requireNonNull(testBeanClass, "testBeanClass");
156157
log.debug("testing class: {}", testBeanClass);
157158
// A quick verification, just in case:
158159
if (!TestBean.class.isAssignableFrom(testBeanClass)) {

src/core/src/test/java/org/apache/jmeter/threads/JMeterContextServiceHelper.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCaseJUnit.java

Lines changed: 0 additions & 131 deletions
This file was deleted.

src/core/src/testFixtures/java/org/apache/jmeter/junit/categories/ExcludeCategoryFilter.java

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)