Skip to content

Convert tests to JUnit 5 and shared-verifier 2 #104

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
merged 1 commit into from
Nov 10, 2025
Merged

Convert tests to JUnit 5 and shared-verifier 2 #104

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
23 changes: 14 additions & 9 deletions source-release/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,10 @@ under the License.
<!-- The (possibly instrumented copy of the) Maven distribution we actually use for the tests. -->
<preparedMavenHome>${mavenHome}</preparedMavenHome>
<!-- the version of maven-assembly-plugin to use in ITs -->
<assemblyPluginVersion>3.7.1</assemblyPluginVersion>
<assemblyPluginVersion>${version.maven-assembly-plugin}</assemblyPluginVersion>
</properties>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
Expand All @@ -59,13 +53,24 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-verifier</artifactId>
<version>1.8.0</version>
<version>2.0.0-M1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>4.10.3</version>
<version>4.10.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.21.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
14 changes: 7 additions & 7 deletions source-release/src/test/java/org/apache/its/IT000BasicArchiveCreation.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.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.shared.verifier.Verifier;
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 IT000BasicArchiveCreation {

Expand All @@ -46,14 +46,14 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept
File testDir = getTestDir(BASENAME);

Verifier verifier = createVerifier(testDir);
verifier.executeGoal("package");
verifier.addCliArgument("package");
verifier.execute();

verifier.verifyErrorFreeLog();
verifier.resetStreams();

// 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
10 changes: 5 additions & 5 deletions source-release/src/test/java/org/apache/its/IT001ExcludeBuildOutputDirectory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
import java.util.HashSet;
import java.util.Set;

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

import static org.apache.its.util.TestUtils.archivePathFromChild;
import static org.apache.its.util.TestUtils.archivePathFromProject;
Expand All @@ -45,10 +45,10 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept

Verifier verifier = createVerifier(testDir);

verifier.executeGoal("package");
verifier.addCliArgument("package");
verifier.execute();

verifier.verifyErrorFreeLog();
verifier.resetStreams();

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

Expand Down
10 changes: 5 additions & 5 deletions source-release/src/test/java/org/apache/its/IT002IncludeSrcDirWithBuildOutputDirName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
import java.util.HashSet;
import java.util.Set;

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

import static org.apache.its.util.TestUtils.archivePathFromChild;
import static org.apache.its.util.TestUtils.archivePathFromProject;
Expand All @@ -45,10 +45,10 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept

Verifier verifier = createVerifier(testDir);

verifier.executeGoal("package");
verifier.addCliArgument("package");
verifier.execute();

verifier.verifyErrorFreeLog();
verifier.resetStreams();

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

Expand Down
10 changes: 5 additions & 5 deletions source-release/src/test/java/org/apache/its/IT003SharedResourceInclusion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
import java.util.HashSet;
import java.util.Set;

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

import static org.apache.its.util.TestUtils.archivePathFromChild;
import static org.apache.its.util.TestUtils.archivePathFromProject;
Expand All @@ -45,10 +45,10 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept

Verifier verifier = createVerifier(testDir);

verifier.executeGoal("package");
verifier.addCliArgument("package");
verifier.execute();

verifier.verifyErrorFreeLog();
verifier.resetStreams();

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

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

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

import static org.apache.its.util.TestUtils.archivePathFromChild;
import static org.apache.its.util.TestUtils.archivePathFromProject;
Expand All @@ -46,10 +46,10 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept

Verifier verifier = createVerifier(testDir);

verifier.executeGoal("package");
verifier.addCliArgument("package");
verifier.execute();

verifier.verifyErrorFreeLog();
verifier.resetStreams();

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

Expand Down
10 changes: 5 additions & 5 deletions source-release/src/test/java/org/apache/its/IT005MiscellaneousExcludes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
import java.util.HashSet;
import java.util.Set;

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

import static org.apache.its.util.TestUtils.archivePathFromChild;
import static org.apache.its.util.TestUtils.archivePathFromProject;
Expand All @@ -45,10 +45,10 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept

Verifier verifier = createVerifier(testDir);

verifier.executeGoal("package");
verifier.addCliArgument("package");
verifier.execute();

verifier.verifyErrorFreeLog();
verifier.resetStreams();

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

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

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

import static org.apache.its.util.TestUtils.archivePathFromProject;
import static org.apache.its.util.TestUtils.assertZipContents;
Expand All @@ -45,10 +45,10 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept

Verifier verifier = createVerifier(testDir);

verifier.executeGoal("package");
verifier.addCliArgument("package");
verifier.execute();

verifier.verifyErrorFreeLog();
verifier.resetStreams();

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

Expand Down
10 changes: 5 additions & 5 deletions source-release/src/test/java/org/apache/its/ITExcludeSrcDirWithinBuildOutputDir.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
import java.util.HashSet;
import java.util.Set;

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

import static org.apache.its.util.TestUtils.archivePathFromChild;
import static org.apache.its.util.TestUtils.archivePathFromProject;
Expand All @@ -45,10 +45,10 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept

Verifier verifier = createVerifier(testDir);

verifier.executeGoal("package");
verifier.addCliArgument("package");
verifier.execute();

verifier.verifyErrorFreeLog();
verifier.resetStreams();

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

Expand Down
10 changes: 5 additions & 5 deletions source-release/src/test/java/org/apache/its/ITIncludeIdeFilesWithinSrcDir.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
import java.util.HashSet;
import java.util.Set;

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

import static org.apache.its.util.TestUtils.archivePathFromChild;
import static org.apache.its.util.TestUtils.archivePathFromProject;
Expand All @@ -45,10 +45,10 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept

Verifier verifier = createVerifier(testDir);

verifier.executeGoal("package");
verifier.addCliArgument("package");
verifier.execute();

verifier.verifyErrorFreeLog();
verifier.resetStreams();

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

Expand Down
14 changes: 7 additions & 7 deletions source-release/src/test/java/org/apache/its/ITSingleModule.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.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.shared.verifier.Verifier;
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 ITSingleModule {

Expand All @@ -45,13 +45,13 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept

Verifier verifier = createVerifier(testDir);

verifier.executeGoal("package");
verifier.addCliArgument("package");
verifier.execute();

verifier.verifyErrorFreeLog();
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
20 changes: 12 additions & 8 deletions source-release/src/test/java/org/apache/its/ITZipAndTarCreation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,22 @@
import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.nio.file.Files;
import java.util.Collections;
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.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.shared.verifier.Verifier;
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 ITZipAndTarCreation {

Expand All @@ -47,17 +48,20 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept
File testDir = getTestDir(BASENAME);

Verifier verifier = createVerifier(testDir);
// to avoid saving logs in current project dir
Files.createDirectories(testDir.toPath().resolve("target"));
verifier.setLogFileName("target/log.txt");

verifier.executeGoal("package");
verifier.addCliArgument("package");
verifier.execute();

verifier.verifyErrorFreeLog();
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
Loading