You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2022/04/22 20:42:06 UTC
[maven-archiver] 01/03: Bump junit to 5.8.3
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSHARED-1003a
in repository https://gitbox.apache.org/repos/asf/maven-archiver.git
commit 7769e4e00770918a4f0fca5c0be53ea689db8fb3
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri Apr 22 01:03:25 2022 +0200
Bump junit to 5.8.3
---
pom.xml | 6 +++---
.../maven/archiver/ManifestConfigurationTest.java | 8 ++++----
.../archiver/MavenArchiveConfigurationTest.java | 14 +++++++-------
.../org/apache/maven/archiver/MavenArchiverTest.java | 20 ++++++++++----------
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index 84890cd..b385640 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,9 +123,9 @@
Test dependencies
-->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>5.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/test/java/org/apache/maven/archiver/ManifestConfigurationTest.java b/src/test/java/org/apache/maven/archiver/ManifestConfigurationTest.java
index 7c166d3..dce5c4e 100644
--- a/src/test/java/org/apache/maven/archiver/ManifestConfigurationTest.java
+++ b/src/test/java/org/apache/maven/archiver/ManifestConfigurationTest.java
@@ -21,15 +21,15 @@ package org.apache.maven.archiver;
import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
-public class ManifestConfigurationTest
+class ManifestConfigurationTest
{
private ManifestConfiguration manifestConfiguration;
- @Before
+ @BeforeEach
public void before()
{
this.manifestConfiguration = new ManifestConfiguration();
diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiveConfigurationTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiveConfigurationTest.java
index 27021c8..3939bc2 100644
--- a/src/test/java/org/apache/maven/archiver/MavenArchiveConfigurationTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiveConfigurationTest.java
@@ -24,18 +24,18 @@ import static org.assertj.core.api.Assertions.entry;
import java.util.Map;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* @author Karl Heinz Marbaise <a href="mailto:khmarbaise@apache.org">khmarbaise@apache.org</a>.
*/
-public class MavenArchiveConfigurationTest
+class MavenArchiveConfigurationTest
{
private MavenArchiveConfiguration archive;
- @Before
+ @BeforeEach
public void before()
{
archive = new MavenArchiveConfiguration();
@@ -46,7 +46,7 @@ public class MavenArchiveConfigurationTest
}
@Test
- public void addingSingleEntryShouldBeReturned()
+ void addingSingleEntryShouldBeReturned()
{
archive.addManifestEntry( "key1", "value1" );
Map<String, String> manifestEntries = archive.getManifestEntries();
@@ -54,7 +54,7 @@ public class MavenArchiveConfigurationTest
}
@Test
- public void addingTwoEntriesShouldBeReturnedInInsertOrder()
+ void addingTwoEntriesShouldBeReturnedInInsertOrder()
{
archive.addManifestEntry( "key1", "value1" );
archive.addManifestEntry( "key2", "value2" );
@@ -63,7 +63,7 @@ public class MavenArchiveConfigurationTest
}
@Test
- public void addingThreeEntriesShouldBeReturnedInInsertOrder()
+ void addingThreeEntriesShouldBeReturnedInInsertOrder()
{
archive.addManifestEntry( "key1", "value1" );
archive.addManifestEntry( "key2", "value2" );
diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
index 029d3fb..698f0c8 100644
--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
@@ -39,7 +39,7 @@ import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.jar.ManifestException;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystemSession;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException;
@@ -62,9 +62,9 @@ import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.fail;
-public class MavenArchiverTest
+class MavenArchiverTest
{
static class ArtifactComparator
implements Comparator<Artifact>
@@ -81,7 +81,7 @@ public class MavenArchiverTest
}
@Test
- public void testInvalidModuleNames()
+ void testInvalidModuleNames()
{
assertThat( MavenArchiver.isValidModuleName( "" ) ).isFalse();
assertThat( MavenArchiver.isValidModuleName( "." ) ).isFalse();
@@ -94,7 +94,7 @@ public class MavenArchiverTest
}
@Test
- public void testValidModuleNames()
+ void testValidModuleNames()
{
assertThat( MavenArchiver.isValidModuleName( "a" ) ).isTrue();
assertThat( MavenArchiver.isValidModuleName( "a.b" ) ).isTrue();
@@ -105,7 +105,7 @@ public class MavenArchiverTest
}
@Test
- public void testGetManifestExtensionList()
+ void testGetManifestExtensionList()
throws Exception
{
MavenArchiver archiver = new MavenArchiver();
@@ -189,7 +189,7 @@ public class MavenArchiverTest
}
@Test
- public void testMultiClassPath()
+ void testMultiClassPath()
throws Exception
{
final File tempFile = File.createTempFile( "maven-archiver-test-", ".jar" );
@@ -240,7 +240,7 @@ public class MavenArchiverTest
}
@Test
- public void testRecreation()
+ void testRecreation()
throws Exception
{
File jarFile = new File( "target/test/dummy.jar" );
@@ -278,7 +278,7 @@ public class MavenArchiverTest
}
@Test
- public void testNotGenerateImplementationVersionForMANIFESTMF()
+ void testNotGenerateImplementationVersionForMANIFESTMF()
throws Exception
{
File jarFile = new File( "target/test/dummy.jar" );
@@ -303,7 +303,7 @@ public class MavenArchiverTest
}
@Test
- public void testGenerateImplementationVersionForMANIFESTMF()
+ void testGenerateImplementationVersionForMANIFESTMF()
throws Exception
{
File jarFile = new File( "target/test/dummy.jar" );