Skip to content

Start migration to JUnit 5 #93

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

Merged
garydgregory merged 2 commits into from
Mar 19, 2022
Merged

Start migration to JUnit 5 #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
732c154
test: update to junit5
SethFalco Jul 19, 2021
4ebdc97
test: remove dependency on junit 4
SethFalco Jul 22, 2021
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
20 changes: 13 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
<email>ggregory at apache.org</email>
<url>https://www.garygregory.com</url>
<organization>The Apache Software Foundation</organization>
<organizationUrl>https://www.apache.org/</organizationUrl>
<organizationUrl>https://www.apache.org/</organizationUrl>
<roles>
<role>PMC Member</role>
</roles>
Expand Down Expand Up @@ -345,9 +345,15 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.7.2</version>
<scope>test</scope>
</dependency>
<dependency>
Copy link
Member

@garydgregory garydgregory Jul 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JUnit 4 should be removed.

Copy link
Contributor Author

@SethFalco SethFalco Jul 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I thought we'd have to keep the JUnit 4 dependency until all tests were migrated to JUnit 5.
I guess junit-vintage-engine doesn't require that.

At least that's the impression the docs gave me.

The JUnit Platform can run JUnit 4 based tests as long as you configure a testImplementation dependency on JUnit 4 and a testRuntimeOnly dependency on the JUnit Vintage TestEngine implementation similar to the following.

dependencies {
    testImplementation("junit:junit:4.13")
    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.7.2")
}

- https://junit.org/junit5/docs/current/user-guide/#running-tests-build-gradle-engines-configure

Just tried now and it worked perfectly fine without the JUnit 4 dependency, though. 🤔

<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.7.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -522,9 +528,9 @@
</file>
</newVersion>
<parameter>
<!--
to support "mvn site" (no japicmp report)
as well as "mvn package site" (with japicmp report)
<!--
to support "mvn site" (no japicmp report)
as well as "mvn package site" (with japicmp report)
-->
<ignoreMissingNewVersion>true</ignoreMissingNewVersion>
</parameter>
Expand Down
34 changes: 0 additions & 34 deletions src/test/java/org/apache/commons/beanutils2/A.java
View file
Open in desktop

This file was deleted.

26 changes: 14 additions & 12 deletions src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
*/
package org.apache.commons.beanutils2;

import java.io.OutputStream;
import java.io.PrintStream;
import static org.junit.jupiter.api.Assertions.assertAll;

import java.lang.reflect.Method;
import java.lang.reflect.Modifier;

Expand Down Expand Up @@ -570,16 +570,18 @@ public void testPublicSub() throws Exception {
}

public void testParentMethod() throws Exception {
final OutputStream os = new PrintStream(System.out);
final PrintStream ps = new PrintStream(System.out);

A a = new A();
MethodUtils.invokeMethod(a, "foo", os);
assertTrue("Method Invoked(1)", a.called);

a = new A();
MethodUtils.invokeMethod(a, "foo", ps);
assertTrue("Method Invoked(2)", a.called);
final String a = "A";

assertAll(
() -> {
final String actual1 = (String) MethodUtils.invokeMethod(a, "toLowerCase", null);
assertEquals("a", actual1);
},
() -> {
final char actual2 = (char) MethodUtils.invokeMethod(a, "charAt", 0);
assertEquals('A', actual2);
}
);
}

/**
Expand Down
Loading