Skip to content

JUnit Jupiter migration from JUnit 4.x #102

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

Closed
wants to merge 1 commit into from
Closed

JUnit Jupiter migration from JUnit 4.x #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions source-release/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,26 @@ under the License.

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-verifier</artifactId>
<version>1.8.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Expand Down
6 changes: 3 additions & 3 deletions source-release/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@
import java.util.HashSet;
import java.util.Set;

import junit.framework.Assert;
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.junit.Test;
import org.junit.jupiter.api.Test;

import static org.apache.its.util.TestUtils.archivePathFromChild;
import static org.apache.its.util.TestUtils.archivePathFromProject;
import static org.apache.its.util.TestUtils.assertZipContents;
import static org.apache.its.util.TestUtils.createVerifier;
import static org.apache.its.util.TestUtils.getTestDir;
import static org.junit.jupiter.api.Assertions.assertFalse;

public class IT_000_BasicArchiveCreation {

Expand All @@ -53,7 +53,7 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept

// make sure the tar did NOT get created by default
File tarAssemblyFile = new File(testDir, "target/" + BASENAME + "-" + VERSION + "-source-release.tar.gz");
Assert.assertFalse("tar assembly should not have been created", tarAssemblyFile.exists());
assertFalse(tarAssemblyFile.exists(), "tar assembly should not have been created");

File assembly = new File(testDir, "target/" + BASENAME + "-" + VERSION + "-source-release.zip");

Expand Down
2 changes: 1 addition & 1 deletion source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.junit.Test;
import org.junit.jupiter.api.Test;

import static org.apache.its.util.TestUtils.archivePathFromChild;
import static org.apache.its.util.TestUtils.archivePathFromProject;
Expand Down
2 changes: 1 addition & 1 deletion source-release/src/test/java/org/apache/its/IT_002_IncludeSrcDirWithBuildOutputDirName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.junit.Test;
import org.junit.jupiter.api.Test;

import static org.apache.its.util.TestUtils.archivePathFromChild;
import static org.apache.its.util.TestUtils.archivePathFromProject;
Expand Down
2 changes: 1 addition & 1 deletion source-release/src/test/java/org/apache/its/IT_003_SharedResourceInclusion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.junit.Test;
import org.junit.jupiter.api.Test;

import static org.apache.its.util.TestUtils.archivePathFromChild;
import static org.apache.its.util.TestUtils.archivePathFromProject;
Expand Down
2 changes: 1 addition & 1 deletion source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.junit.Test;
import org.junit.jupiter.api.Test;

import static org.apache.its.util.TestUtils.archivePathFromChild;
import static org.apache.its.util.TestUtils.archivePathFromProject;
Expand Down
2 changes: 1 addition & 1 deletion source-release/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.junit.Test;
import org.junit.jupiter.api.Test;

import static org.apache.its.util.TestUtils.archivePathFromChild;
import static org.apache.its.util.TestUtils.archivePathFromProject;
Expand Down
2 changes: 1 addition & 1 deletion source-release/src/test/java/org/apache/its/IT_006_CiExcludes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.junit.Test;
import org.junit.jupiter.api.Test;

import static org.apache.its.util.TestUtils.archivePathFromProject;
import static org.apache.its.util.TestUtils.assertZipContents;
Expand Down
2 changes: 1 addition & 1 deletion source-release/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.junit.Test;
import org.junit.jupiter.api.Test;

import static org.apache.its.util.TestUtils.archivePathFromChild;
import static org.apache.its.util.TestUtils.archivePathFromProject;
Expand Down
2 changes: 1 addition & 1 deletion source-release/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.junit.Test;
import org.junit.jupiter.api.Test;

import static org.apache.its.util.TestUtils.archivePathFromChild;
import static org.apache.its.util.TestUtils.archivePathFromProject;
Expand Down
6 changes: 3 additions & 3 deletions source-release/src/test/java/org/apache/its/IT_SingleModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
import java.util.HashSet;
import java.util.Set;

import junit.framework.Assert;
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.junit.Test;
import org.junit.jupiter.api.Test;

import static org.apache.its.util.TestUtils.archivePathFromProject;
import static org.apache.its.util.TestUtils.assertZipContents;
import static org.apache.its.util.TestUtils.createVerifier;
import static org.apache.its.util.TestUtils.getTestDir;
import static org.junit.jupiter.api.Assertions.assertTrue;

public class IT_SingleModule {

Expand All @@ -51,7 +51,7 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept
verifier.resetStreams();

File zipAssemblyFile = new File(testDir, "target/" + BASENAME + "-" + VERSION + "-source-release.zip");
Assert.assertTrue("zip assembly should have been created", zipAssemblyFile.exists());
assertTrue(zipAssemblyFile.exists(), "zip assembly should have been created");

Set<String> required = new HashSet<>();

Expand Down
8 changes: 4 additions & 4 deletions source-release/src/test/java/org/apache/its/IT_ZipAndTarCreation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@
import java.util.HashSet;
import java.util.Set;

import junit.framework.Assert;
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.junit.Test;
import org.junit.jupiter.api.Test;

import static org.apache.its.util.TestUtils.archivePathFromChild;
import static org.apache.its.util.TestUtils.archivePathFromProject;
import static org.apache.its.util.TestUtils.assertTarContents;
import static org.apache.its.util.TestUtils.assertZipContents;
import static org.apache.its.util.TestUtils.createVerifier;
import static org.apache.its.util.TestUtils.getTestDir;
import static org.junit.jupiter.api.Assertions.assertTrue;

public class IT_ZipAndTarCreation {

Expand All @@ -54,10 +54,10 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept
verifier.resetStreams();

File tarAssemblyFile = new File(testDir, "target/" + BASENAME + "-" + VERSION + "-source-release.tar.gz");
Assert.assertTrue("tar assembly should have been created", tarAssemblyFile.exists());
assertTrue(tarAssemblyFile.exists(), "tar assembly should have been created");

File zipAssemblyFile = new File(testDir, "target/" + BASENAME + "-" + VERSION + "-source-release.zip");
Assert.assertTrue("zip assembly should have been created", zipAssemblyFile.exists());
assertTrue(zipAssemblyFile.exists(), "zip assembly should have been created");

Set<String> required = new HashSet<>();

Expand Down
8 changes: 4 additions & 4 deletions source-release/src/test/java/org/apache/its/util/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
import org.apache.maven.it.Verifier;
import org.codehaus.plexus.archiver.tar.GZipTarFile;

import static junit.framework.Assert.assertTrue;
import static junit.framework.Assert.fail;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;

public class TestUtils {

Expand Down Expand Up @@ -71,7 +71,7 @@ public static String archivePathFromProject(String artifactId, String version, S
}

public static void assertTarContents(Set<String> required, Set<String> banned, File assembly) throws IOException {
assertTrue("Assembly archive missing: " + assembly, assembly.isFile());
assertTrue(assembly.isFile(), "Assembly archive missing: " + assembly);

GZipTarFile tarFile = null;
try {
Expand All @@ -93,7 +93,7 @@ public static void assertTarContents(Set<String> required, Set<String> banned, F

public static void assertZipContents(Set<String> required, Set<String> banned, File assembly)
throws ZipException, IOException {
assertTrue("Assembly archive missing: " + assembly, assembly.isFile());
assertTrue(assembly.isFile(), "Assembly archive missing: " + assembly);

try (ZipFile zf = new ZipFile(assembly)) {
LinkedHashSet<String> pathSet = new LinkedHashSet<>();
Expand Down
Loading