This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-ejb-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new fc11657 Cleanup tests (#198)
fc11657 is described below
commit fc11657dc54f675aabb1ff7e7d8a7ec8a857689a
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sun Dec 21 16:16:05 2025 +0100
Cleanup tests (#198)
Co-authored-by: Moderne <[email protected]>
---
pom.xml | 10 +++--
.../apache/maven/plugins/ejb/EjbHelperTest.java | 49 ++++++++++++----------
.../maven/plugins/ejb/IncludesExcludesTest.java | 20 ++++-----
3 files changed, 43 insertions(+), 36 deletions(-)
diff --git a/pom.xml b/pom.xml
index 38e0ab0..2ac41be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,9 +147,13 @@ under the License.
<version>2.21.0</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/test/java/org/apache/maven/plugins/ejb/EjbHelperTest.java
b/src/test/java/org/apache/maven/plugins/ejb/EjbHelperTest.java
index af3bc42..138da61 100644
--- a/src/test/java/org/apache/maven/plugins/ejb/EjbHelperTest.java
+++ b/src/test/java/org/apache/maven/plugins/ejb/EjbHelperTest.java
@@ -20,58 +20,61 @@ package org.apache.maven.plugins.ejb;
import java.io.File;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class EjbHelperTest {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class EjbHelperTest {
@Test
- public void validClassifier() {
- Assert.assertTrue(EjbHelper.isClassifierValid("anton"));
+ void validClassifier() {
+ assertTrue(EjbHelper.isClassifierValid("anton"));
}
@Test
- public void anOtherValidClassifier() {
- Assert.assertTrue(EjbHelper.isClassifierValid("jdk15"));
+ void anOtherValidClassifier() {
+ assertTrue(EjbHelper.isClassifierValid("jdk15"));
}
@Test
- public void moreValidClassifier() {
- Assert.assertTrue(EjbHelper.isClassifierValid("client-classifier"));
+ void moreValidClassifier() {
+ assertTrue(EjbHelper.isClassifierValid("client-classifier"));
}
@Test
- public void
isClassifierValidShouldReturnFalseIfClassifierIsPrefixedByDash() {
- Assert.assertFalse(EjbHelper.isClassifierValid("-anton"));
+ void isClassifierValidShouldReturnFalseIfClassifierIsPrefixedByDash() {
+ assertFalse(EjbHelper.isClassifierValid("-anton"));
}
@Test
- public void isClassifierValidShouldReturnFalseIfClassifierIsNull() {
- Assert.assertFalse(EjbHelper.isClassifierValid(null));
+ void isClassifierValidShouldReturnFalseIfClassifierIsNull() {
+ assertFalse(EjbHelper.isClassifierValid(null));
}
@Test
- public void hasClassifierShouldReturnFalseForNull() {
- Assert.assertFalse(EjbHelper.hasClassifier(null));
+ void hasClassifierShouldReturnFalseForNull() {
+ assertFalse(EjbHelper.hasClassifier(null));
}
@Test
- public void hasClassifierShouldReturnFalseForEmptyString() {
- Assert.assertFalse(EjbHelper.hasClassifier(""));
+ void hasClassifierShouldReturnFalseForEmptyString() {
+ assertFalse(EjbHelper.hasClassifier(""));
}
@Test
- public void hasClassifierShouldReturnTrueForNonEmptyString() {
- Assert.assertTrue(EjbHelper.hasClassifier("x"));
+ void hasClassifierShouldReturnTrueForNonEmptyString() {
+ assertTrue(EjbHelper.hasClassifier("x"));
}
@Test
- public void getJarFileNameShouldReturnFileNameWithoutClassifier() {
- Assert.assertEquals(new File("base/test.jar"),
EjbHelper.getJarFile(new File("base"), "test", null));
+ void getJarFileNameShouldReturnFileNameWithoutClassifier() {
+ assertEquals(new File("base/test.jar"), EjbHelper.getJarFile(new
File("base"), "test", null));
}
@Test
- public void getJarFileNameShouldReturnFileNameWithClassifier() {
- Assert.assertEquals(new File("base/test-alpha.jar"),
EjbHelper.getJarFile(new File("base"), "test", "alpha"));
+ void getJarFileNameShouldReturnFileNameWithClassifier() {
+ assertEquals(new File("base/test-alpha.jar"), EjbHelper.getJarFile(new
File("base"), "test", "alpha"));
}
}
diff --git
a/src/test/java/org/apache/maven/plugins/ejb/IncludesExcludesTest.java
b/src/test/java/org/apache/maven/plugins/ejb/IncludesExcludesTest.java
index 1930c0c..faf5929 100644
--- a/src/test/java/org/apache/maven/plugins/ejb/IncludesExcludesTest.java
+++ b/src/test/java/org/apache/maven/plugins/ejb/IncludesExcludesTest.java
@@ -21,14 +21,14 @@ package org.apache.maven.plugins.ejb;
import java.util.Arrays;
import java.util.Collections;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-public class IncludesExcludesTest {
+class IncludesExcludesTest {
@Test
- public void emptyListsShouldResultInZeroSizeResults() {
+ void emptyListsShouldResultInZeroSizeResults() {
IncludesExcludes ie = new IncludesExcludes(
Collections.<String>emptyList(),
Collections.<String>emptyList(),
Collections.<String>emptyList(),
Collections.<String>emptyList());
@@ -38,7 +38,7 @@ public class IncludesExcludesTest {
}
@Test
- public void nullForIncludesShouldResultInZeroSizeResults() {
+ void nullForIncludesShouldResultInZeroSizeResults() {
IncludesExcludes ie = new IncludesExcludes(
null,
Collections.<String>emptyList(),
@@ -50,7 +50,7 @@ public class IncludesExcludesTest {
}
@Test
- public void nullForExcludesShouldResultInZeroSizeResults() {
+ void nullForExcludesShouldResultInZeroSizeResults() {
IncludesExcludes ie = new IncludesExcludes(
Collections.<String>emptyList(),
null,
@@ -62,7 +62,7 @@ public class IncludesExcludesTest {
}
@Test
- public void
nonNullForDefaultExcludesShouldResultInExcludesWithDefaultExcludes() {
+ void nonNullForDefaultExcludesShouldResultInExcludesWithDefaultExcludes() {
IncludesExcludes ie =
new IncludesExcludes(null, null,
Collections.<String>emptyList(), Arrays.asList("**/package.html"));
@@ -71,7 +71,7 @@ public class IncludesExcludesTest {
}
@Test
- public void
nonNullForDefaultIncludesShouldResultInIncludesWithDefaultIncludes() {
+ void nonNullForDefaultIncludesShouldResultInIncludesWithDefaultIncludes() {
IncludesExcludes ie =
new IncludesExcludes(null, null,
Arrays.asList("**/package.html"), Collections.<String>emptyList());
@@ -80,7 +80,7 @@ public class IncludesExcludesTest {
}
@Test
- public void nonNullIncludesShouldResultInTheSameIncludes() {
+ void nonNullIncludesShouldResultInTheSameIncludes() {
IncludesExcludes ie = new IncludesExcludes(
Arrays.asList("**/package.html"), null,
Arrays.asList("**/site.html"), null);
@@ -89,7 +89,7 @@ public class IncludesExcludesTest {
}
@Test
- public void nonNullExcludesShouldResultInTheSameExcludes() {
+ void nonNullExcludesShouldResultInTheSameExcludes() {
IncludesExcludes ie = new IncludesExcludes(
null, Arrays.asList("**/package.html"),
null, Arrays.asList("**/site.html"));
