Skip to content

Bump parent pom to 45 and migrate to JUnit5 #103

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

Bump parent pom to 45 and migrate to JUnit5 #103

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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
<version>43</version>
<version>45</version>
<relativePath />
</parent>

Expand Down
9 changes: 4 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,9 +46,8 @@ under the License.

<dependencies>
<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>
Expand All @@ -59,7 +58,7 @@ 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>
Expand Down Expand Up @@ -128,7 +127,7 @@ under the License.
</goals>
<configuration>
<includes>
<include>**/IT*.java</include>
<include>**/*Test.java</include>
</includes>
<excludes>
<exclude>**/util/*</exclude>
Expand Down
16 changes: 8 additions & 8 deletions ...ache/its/IT_000_BasicArchiveCreation.java → .../apache/its/BasicArchiveCreationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
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 IT_000_BasicArchiveCreation {
public class BasicArchiveCreationTest {

private static final String BASENAME = "basics";
private static final String VERSION = "1";
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
12 changes: 6 additions & 6 deletions ...ava/org/apache/its/IT_006_CiExcludes.java → ...t/java/org/apache/its/CiExcludesTest.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 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;

public class IT_006_CiExcludes {
public class CiExcludesTest {

private static final String BASENAME = "ci-excludes";
private static final String VERSION = "1";
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
8 changes: 4 additions & 4 deletions ...s/IT_001_ExcludeBuildOutputDirectory.java → .../its/ExcludeBuildOutputDirectoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
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;
import static org.apache.its.util.TestUtils.assertZipContents;
import static org.apache.its.util.TestUtils.createVerifier;
import static org.apache.its.util.TestUtils.getTestDir;

public class IT_001_ExcludeBuildOutputDirectory {
public class ExcludeBuildOutputDirectoryTest {

private static final String BASENAME = "build-output-dir";
private static final String VERSION = "1";
Expand Down
8 changes: 4 additions & 4 deletions ...IT_ExcludeSrcDirWithinBuildOutputDir.java → ...xcludeSrcDirWithinBuildOutputDirTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
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;
import static org.apache.its.util.TestUtils.assertZipContents;
import static org.apache.its.util.TestUtils.createVerifier;
import static org.apache.its.util.TestUtils.getTestDir;

public class IT_ExcludeSrcDirWithinBuildOutputDir {
public class ExcludeSrcDirWithinBuildOutputDirTest {

private static final String BASENAME = "output-dir-contains-src-name";
private static final String VERSION = "1";
Expand Down
8 changes: 4 additions & 4 deletions ...va/org/apache/its/IT_004_IdeExcludes.java → .../java/org/apache/its/IdeExcludesTest.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 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;

public class IT_004_IdeExcludes {
public class IdeExcludesTest {

private static final String BASENAME = "ide-excludes";
private static final String VERSION = "1";
Expand Down
8 changes: 4 additions & 4 deletions ...e/its/IT_IncludeIdeFilesWithinSrcDir.java → .../its/IncludeIdeFilesWithinSrcDirTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
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;
import static org.apache.its.util.TestUtils.assertZipContents;
import static org.apache.its.util.TestUtils.createVerifier;
import static org.apache.its.util.TestUtils.getTestDir;

public class IT_IncludeIdeFilesWithinSrcDir {
public class IncludeIdeFilesWithinSrcDirTest {

private static final String BASENAME = "src-contains-ide-files";
private static final String VERSION = "1";
Expand Down
8 changes: 4 additions & 4 deletions ..._IncludeSrcDirWithBuildOutputDirName.java → ...ludeSrcDirWithBuildOutputDirNameTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
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;
import static org.apache.its.util.TestUtils.assertZipContents;
import static org.apache.its.util.TestUtils.createVerifier;
import static org.apache.its.util.TestUtils.getTestDir;

public class IT_002_IncludeSrcDirWithBuildOutputDirName {
public class IncludeSrcDirWithBuildOutputDirNameTest {

private static final String BASENAME = "src-contains-output-dir-name";
private static final String VERSION = "1";
Expand Down
8 changes: 4 additions & 4 deletions ...che/its/IT_005_MiscellaneousExcludes.java → ...apache/its/MiscellaneousExcludesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
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;
import static org.apache.its.util.TestUtils.assertZipContents;
import static org.apache.its.util.TestUtils.createVerifier;
import static org.apache.its.util.TestUtils.getTestDir;

public class IT_005_MiscellaneousExcludes {
public class MiscellaneousExcludesTest {

private static final String BASENAME = "misc-excludes";
private static final String VERSION = "1";
Expand Down
8 changes: 4 additions & 4 deletions ...e/its/IT_003_SharedResourceInclusion.java → ...ache/its/SharedResourceInclusionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
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;
import static org.apache.its.util.TestUtils.assertZipContents;
import static org.apache.its.util.TestUtils.createVerifier;
import static org.apache.its.util.TestUtils.getTestDir;

public class IT_003_SharedResourceInclusion {
public class SharedResourceInclusionTest {

private static final String BASENAME = "shared-resources";
private static final String VERSION = "1";
Expand Down
16 changes: 8 additions & 8 deletions .../java/org/apache/its/IT_SingleModule.java → ...java/org/apache/its/SingleModuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,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.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 IT_SingleModule {
public class SingleModuleTest {

private static final String BASENAME = "single-module";
private static final String VERSION = "1";
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
18 changes: 9 additions & 9 deletions .../org/apache/its/IT_ZipAndTarCreation.java → ...org/apache/its/ZipAndTarCreationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@
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 IT_ZipAndTarCreation {
public class ZipAndTarCreationTest {

private static final String BASENAME = "zip-and-tar";
private static final String VERSION = "1";
Expand All @@ -48,16 +48,16 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept

Verifier verifier = createVerifier(testDir);

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
Loading