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 2021/01/08 18:42:26 UTC
[maven] 08/08: Upgrade to junit 5
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-7035-maven5
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 5bc542fce94ec873f503e9e127fbfd9d46d3a11d
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 8 18:09:11 2021 +0100
Upgrade to junit 5
---
.../apache/maven/settings/GlobalSettingsTest.java | 6 +-
.../apache/maven/artifact/ArtifactUtilsTest.java | 6 +-
.../apache/maven/artifact/DefaultArtifactTest.java | 10 +-
.../artifact/versioning/ComparableVersionIT.java | 6 +-
.../artifact/versioning/ComparableVersionTest.java | 30 +-
.../versioning/DefaultArtifactVersionTest.java | 55 +-
.../artifact/versioning/VersionRangeTest.java | 641 +++++++++++----------
.../building/DefaultProblemCollectorTest.java | 6 +-
.../apache/maven/building/DefaultProblemTest.java | 6 +-
.../org/apache/maven/building/FileSourceTest.java | 11 +-
.../building/ProblemCollectorFactoryTest.java | 6 +-
.../apache/maven/building/StringSourceTest.java | 4 +-
.../org/apache/maven/building/UrlSourceTest.java | 11 +-
.../AbstractArtifactComponentTestCase.java | 22 +-
.../artifact/deployer/ArtifactDeployerTest.java | 8 +-
.../factory/DefaultArtifactFactoryTest.java | 9 +-
.../artifact/installer/ArtifactInstallerTest.java | 4 +-
.../repository/MavenArtifactRepositoryTest.java | 6 +-
.../resolver/ArtifactResolutionExceptionTest.java | 4 +-
.../artifact/resolver/ArtifactResolverTest.java | 30 +-
.../resolver/DefaultArtifactResolverTest.java | 16 +-
.../resolver/filter/AndArtifactFilterTest.java | 8 +-
.../resolver/filter/FilterHashEqualsTest.java | 4 +-
.../resolver/filter/OrArtifactFilterTest.java | 8 +-
.../resolver/filter/ScopeArtifactFilterTest.java | 6 +-
.../maven/artifact/testutils/TestFileManager.java | 11 +-
.../transform/TransformationManagerTest.java | 16 +-
.../manager/DefaultProfileManagerTest.java | 8 +-
.../project/AbstractMavenProjectTestCase.java | 14 +-
.../org/apache/maven/project/ModelUtilsTest.java | 16 +-
.../apache/maven/project/ProjectClasspathTest.java | 49 +-
.../inheritance/t00/ProjectInheritanceTest.java | 4 +-
.../inheritance/t01/ProjectInheritanceTest.java | 4 +-
.../inheritance/t02/ProjectInheritanceTest.java | 12 +-
.../inheritance/t03/ProjectInheritanceTest.java | 4 +-
.../inheritance/t04/ProjectInheritanceTest.java | 18 +-
.../inheritance/t05/ProjectInheritanceTest.java | 16 +-
.../inheritance/t06/ProjectInheritanceTest.java | 18 +-
.../inheritance/t07/ProjectInheritanceTest.java | 22 +-
.../inheritance/t08/ProjectInheritanceTest.java | 17 +-
.../inheritance/t09/ProjectInheritanceTest.java | 38 +-
.../inheritance/t10/ProjectInheritanceTest.java | 20 +-
.../inheritance/t11/ProjectInheritanceTest.java | 10 +-
.../inheritance/t12/ProjectInheritanceTest.java | 8 +-
.../inheritance/t12scm/ProjectInheritanceTest.java | 4 +-
.../project/path/DefaultPathTranslatorTest.java | 4 +-
.../repository/DefaultMirrorSelectorTest.java | 4 +-
.../repository/LegacyRepositorySystemTest.java | 16 +-
.../maven/repository/MirrorProcessorTest.java | 20 +-
.../legacy/DefaultUpdateCheckManagerTest.java | 16 +-
.../repository/legacy/DefaultWagonManagerTest.java | 55 +-
.../legacy/LegacyRepositorySystemTest.java | 14 +-
.../resolver/DefaultArtifactCollectorTest.java | 187 +++---
.../conflict/AbstractConflictResolverTest.java | 19 +-
.../conflict/FarthestConflictResolverTest.java | 2 +-
.../conflict/NearestConflictResolverTest.java | 2 +-
.../conflict/NewestConflictResolverTest.java | 2 +-
.../conflict/OldestConflictResolverTest.java | 2 +-
.../DefaultClasspathTransformationTest.java | 33 +-
.../DefaultGraphConflictResolutionPolicyTest.java | 12 +-
.../metadata/DefaultGraphConflictResolverTest.java | 77 ++-
.../maven/AbstractCoreMavenComponentTestCase.java | 4 +-
.../java/org/apache/maven/DefaultMavenTest.java | 4 +-
.../maven/MavenLifecycleParticipantTest.java | 10 +-
.../src/test/java/org/apache/maven/MavenTest.java | 4 +-
.../maven/ProjectDependenciesResolverTest.java | 6 +-
.../artifact/handler/ArtifactHandlerTest.java | 18 +-
.../filter/ExclusionArtifactFilterTest.java | 8 +-
.../configuration/DefaultBeanConfiguratorTest.java | 12 +-
.../exception/DefaultExceptionHandlerTest.java | 4 +-
.../DefaultBuildResumptionAnalyzerTest.java | 6 +-
.../DefaultBuildResumptionDataRepositoryTest.java | 5 +-
.../DefaultMavenExecutionRequestPopulatorTest.java | 8 +-
.../maven/execution/DefaultMavenExecutionTest.java | 8 +-
.../scope/internal/MojoExecutionScopeTest.java | 8 +-
.../maven/graph/DefaultGraphBuilderTest.java | 50 +-
.../graph/DefaultProjectDependencyGraphTest.java | 4 +-
.../aether/ConsumerModelSourceTransformerTest.java | 2 +-
.../maven/lifecycle/DefaultLifecyclesTest.java | 7 +-
.../lifecycle/LifecycleExecutorSubModulesTest.java | 8 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 26 +-
.../maven/lifecycle/MavenExecutionPlanTest.java | 8 +-
.../internal/BuildListCalculatorTest.java | 10 +-
.../lifecycle/internal/BuilderCommonTest.java | 4 +-
.../internal/ConcurrencyDependencyGraphTest.java | 4 +-
.../internal/LifecycleDependencyResolverTest.java | 6 +-
.../LifecycleExecutionPlanCalculatorTest.java | 4 +-
.../LifecycleTaskSegmentCalculatorImplTest.java | 10 +-
.../lifecycle/internal/PhaseRecorderTest.java | 6 +-
.../lifecycle/internal/ProjectBuildListTest.java | 6 +-
.../ConcurrencyDependencyGraphTest.java | 4 +-
.../multithreaded/ThreadOutputMuxerTest.java | 6 +-
.../stub/ProjectDependencyGraphStubTest.java | 6 +-
.../lifecycle/mapping/LifecyclePhaseTest.java | 8 +-
.../org/apache/maven/plugin/PluginManagerTest.java | 12 +-
.../maven/plugin/PluginParameterExceptionTest.java | 4 +-
.../PluginParameterExpressionEvaluatorTest.java | 34 +-
.../plugin/internal/DefaultLegacySupportTest.java | 4 +-
.../project/AbstractMavenProjectTestCase.java | 19 +-
.../project/DefaultMavenProjectBuilderTest.java | 58 +-
.../project/ExtensionDescriptorBuilderTest.java | 16 +-
.../org/apache/maven/project/MavenProjectTest.java | 53 +-
.../apache/maven/project/PomConstructionTest.java | 60 +-
.../apache/maven/project/ProjectBuilderTest.java | 10 +-
.../maven/project/ProjectModelResolverTest.java | 40 +-
.../apache/maven/project/ProjectSorterTest.java | 20 +-
.../artifact/DefaultMavenMetadataCacheTest.java | 14 +-
.../artifact/DefaultProjectArtifactsCacheTest.java | 8 +-
.../project/artifact/MavenMetadataSourceTest.java | 20 +-
.../canonical/CanonicalProjectBuilderTest.java | 6 +-
.../internal/DefaultRuntimeInformationTest.java | 29 +-
.../settings/PomConstructionWithSettingsTest.java | 13 +-
.../apache/maven/settings/SettingsUtilsTest.java | 6 +-
.../DefaultToolchainManagerPrivateTest.java | 8 +-
.../toolchain/DefaultToolchainManagerTest.java | 8 +-
.../maven/toolchain/DefaultToolchainTest.java | 12 +-
.../toolchain/RequirementMatcherFactoryTest.java | 8 +-
.../building/DefaultToolchainsBuilderTest.java | 10 +-
.../building/ToolchainsBuildingExceptionTest.java | 4 +-
.../toolchain/merge/MavenToolchainMergerTest.java | 4 +-
.../maven/cli/CLIManagerDocumentationTest.java | 2 +-
.../java/org/apache/maven/cli/CLIManagerTest.java | 10 +-
.../apache/maven/cli/CLIReportingUtilsTest.java | 4 +-
.../org/apache/maven/cli/CleanArgumentTest.java | 4 +-
.../java/org/apache/maven/cli/MavenCliTest.java | 38 +-
.../maven/cli/event/ExecutionEventLoggerTest.java | 10 +-
.../maven/cli/transfer/FileSizeFormatTest.java | 17 +-
.../model/building/ComplexActivationTest.java | 8 +-
.../building/DefaultModelBuilderFactoryTest.java | 6 +-
.../model/building/DefaultModelBuilderTest.java | 6 +-
.../maven/model/building/FileModelSourceTest.java | 9 +-
.../model/building/FileToRawModelMergerTest.java | 4 +-
.../DefaultInheritanceAssemblerTest.java | 28 +-
.../AbstractModelInterpolatorTest.java | 25 +-
.../interpolation/MavenBuildTimestampTest.java | 6 +-
.../StringSearchModelInterpolatorTest.java | 16 +-
.../StringVisitorModelInterpolatorTest.java | 9 +-
.../maven/model/merge/MavenModelMergerTest.java | 6 +-
.../maven/model/path/DefaultUrlNormalizerTest.java | 6 +-
.../activation/AbstractProfileActivatorTest.java | 14 +-
.../activation/JdkVersionProfileActivatorTest.java | 2 +-
.../activation/PropertyProfileActivatorTest.java | 2 +-
.../validation/DefaultModelValidatorTest.java | 26 +-
.../org/apache/maven/model/ActivationFileTest.java | 8 +-
.../org/apache/maven/model/ActivationOSTest.java | 8 +-
.../apache/maven/model/ActivationPropertyTest.java | 8 +-
.../org/apache/maven/model/ActivationTest.java | 8 +-
.../java/org/apache/maven/model/BuildTest.java | 8 +-
.../org/apache/maven/model/CiManagementTest.java | 8 +-
.../org/apache/maven/model/ContributorTest.java | 8 +-
.../maven/model/DependencyManagementTest.java | 8 +-
.../org/apache/maven/model/DependencyTest.java | 8 +-
.../maven/model/DeploymentRepositoryTest.java | 8 +-
.../java/org/apache/maven/model/DeveloperTest.java | 8 +-
.../maven/model/DistributionManagementTest.java | 8 +-
.../java/org/apache/maven/model/ExclusionTest.java | 8 +-
.../java/org/apache/maven/model/ExtensionTest.java | 8 +-
.../apache/maven/model/IssueManagementTest.java | 8 +-
.../java/org/apache/maven/model/LicenseTest.java | 8 +-
.../org/apache/maven/model/MailingListTest.java | 8 +-
.../java/org/apache/maven/model/ModelTest.java | 8 +-
.../java/org/apache/maven/model/NotifierTest.java | 8 +-
.../org/apache/maven/model/OrganizationTest.java | 8 +-
.../java/org/apache/maven/model/ParentTest.java | 8 +-
.../maven/model/PluginConfigurationTest.java | 8 +-
.../apache/maven/model/PluginContainerTest.java | 8 +-
.../apache/maven/model/PluginExecutionTest.java | 8 +-
.../apache/maven/model/PluginManagementTest.java | 8 +-
.../java/org/apache/maven/model/PluginTest.java | 8 +-
.../org/apache/maven/model/PrerequisitesTest.java | 8 +-
.../java/org/apache/maven/model/ProfileTest.java | 8 +-
.../org/apache/maven/model/RelocationTest.java | 8 +-
.../org/apache/maven/model/ReportPluginTest.java | 8 +-
.../java/org/apache/maven/model/ReportSetTest.java | 8 +-
.../java/org/apache/maven/model/ReportingTest.java | 8 +-
.../apache/maven/model/RepositoryPolicyTest.java | 8 +-
.../org/apache/maven/model/RepositoryTest.java | 8 +-
.../java/org/apache/maven/model/ResourceTest.java | 8 +-
.../test/java/org/apache/maven/model/ScmTest.java | 8 +-
.../test/java/org/apache/maven/model/SiteTest.java | 8 +-
.../apache/maven/model/merge/ModelMergerTest.java | 5 +-
.../descriptor/PluginDescriptorBuilderTest.java | 6 +-
.../internal/AbstractRepositoryTestCase.java | 8 +-
.../DefaultArtifactDescriptorReaderTest.java | 9 +-
.../internal/DefaultModelResolverTest.java | 40 +-
.../internal/DefaultVersionResolverTest.java | 9 +-
.../internal/MavenRepositorySystemUtilsTest.java | 6 +-
.../internal/RemoteSnapshotMetadataTest.java | 15 +-
.../repository/internal/RepositorySystemTest.java | 12 +-
.../DefaultSettingsBuilderFactoryTest.java | 4 +-
.../validation/DefaultSettingsValidatorTest.java | 16 +-
.../org/slf4j/impl/MavenLoggerFactoryTest.java | 20 +-
maven-slf4j-wrapper/pom.xml | 5 +
.../maven/logwrapper/LogLevelRecorderTest.java | 10 +-
maven-test-support/pom.xml | 16 +-
.../main/java/org/apache/maven/test/Parameter.java | 25 +-
.../java/org/apache/maven/test/Parameterized.java | 30 +-
.../apache/maven/test/ParameterizedExtension.java | 182 ++++++
.../java/org/apache/maven/test/Parameters.java | 28 +-
.../java/org/apache/maven/test/PlexusTestCase.java | 8 +-
.../src/main/java/org/apache/maven/test/Test.java | 27 +-
.../org/apache/maven/wrapper/DownloaderTest.java | 19 +-
.../org/apache/maven/wrapper/InstallerTest.java | 24 +-
.../apache/maven/wrapper/PathAssemblerTest.java | 15 +-
.../apache/maven/wrapper/WrapperExecutorTest.java | 44 +-
maven-xml/pom.xml | 5 +
.../apache/maven/xml/sax/ChainedFilterTest.java | 2 +-
.../apache/maven/xml/sax/SAXEventUtilsTest.java | 7 +-
.../maven/xml/sax/ext/CommentRenormalizerTest.java | 21 +-
.../xml/sax/filter/CiFriendlyXMLFilterTest.java | 9 +-
.../xml/sax/filter/ConsumerPomXMLFilterTest.java | 2 +-
.../maven/xml/sax/filter/ModulesXMLFilterTest.java | 2 +-
.../maven/xml/sax/filter/ParentXMLFilterTest.java | 4 +-
.../sax/filter/ReactorDependencyXMLFilterTest.java | 2 +-
.../xml/sax/filter/RelativePathXMLFilterTest.java | 3 +-
pom.xml | 11 +-
216 files changed, 1897 insertions(+), 1769 deletions(-)
diff --git a/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java b/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
index 394db3e..70a1115 100644
--- a/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
+++ b/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
@@ -26,9 +26,9 @@ import java.io.Reader;
import java.nio.charset.StandardCharsets;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests that the global settings.xml shipped with the distribution is in good state.
@@ -45,7 +45,7 @@ public class GlobalSettingsTest
String basedir = System.getProperty( "basedir", System.getProperty( "user.dir" ) );
File globalSettingsFile = new File( basedir, "src/assembly/maven/conf/settings.xml" );
- assertTrue( globalSettingsFile.getAbsolutePath(), globalSettingsFile.isFile() );
+ assertTrue( globalSettingsFile.isFile(), globalSettingsFile.getAbsolutePath() );
try ( Reader reader = new InputStreamReader( new FileInputStream( globalSettingsFile ), StandardCharsets.UTF_8) )
{
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
index c631aad..2cbe18e 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
@@ -24,10 +24,10 @@ import java.util.List;
import java.util.Map;
import org.apache.maven.artifact.versioning.VersionRange;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Tests {@link ArtifactUtils}.
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
index 144f753..3e9eb4d 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
@@ -21,11 +21,11 @@ package org.apache.maven.artifact;
import org.apache.maven.artifact.handler.ArtifactHandlerMock;
import org.apache.maven.artifact.versioning.VersionRange;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class DefaultArtifactTest
{
@@ -45,7 +45,7 @@ public class DefaultArtifactTest
private ArtifactHandlerMock artifactHandler;
- @Before
+ @BeforeEach
public void setUp()
throws Exception
{
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java
index f79eb1a..cd63b4d 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java
@@ -29,9 +29,9 @@ import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.regex.Pattern;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ComparableVersionIT
{
@@ -60,7 +60,7 @@ public class ComparableVersionIT
try
{
- assertEquals( "Unexpected exit code", 0, p.waitFor() );
+ assertEquals( 0, p.waitFor(), "Unexpected exit code" );
}
catch ( InterruptedException e )
{
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
index 95d8f50..a36f605 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
@@ -21,10 +21,10 @@ package org.apache.maven.artifact.versioning;
import java.util.Locale;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test ComparableVersion.
@@ -41,8 +41,8 @@ public class ComparableVersionTest
String parsedCanonical = new ComparableVersion( canonical ).getCanonical();
System.out.println( "canonical( " + version + " ) = " + canonical );
- assertEquals( "canonical( " + version + " ) = " + canonical + " -> canonical: " + parsedCanonical, canonical,
- parsedCanonical );
+ assertEquals( canonical, parsedCanonical,
+ "canonical( " + version + " ) = " + canonical + " -> canonical: " + parsedCanonical );
return ret;
}
@@ -70,8 +70,8 @@ public class ComparableVersionTest
for ( int j = i; j < versions.length; j++ )
{
Comparable high = c[j];
- assertTrue( "expected " + low + " < " + high, low.compareTo( high ) < 0 );
- assertTrue( "expected " + high + " > " + low, high.compareTo( low ) > 0 );
+ assertTrue( low.compareTo( high ) < 0, "expected " + low + " < " + high );
+ assertTrue( high.compareTo( low ) > 0, "expected " + high + " > " + low );
}
}
}
@@ -80,11 +80,11 @@ public class ComparableVersionTest
{
Comparable c1 = newComparable( v1 );
Comparable c2 = newComparable( v2 );
- assertTrue( "expected " + v1 + " == " + v2, c1.compareTo( c2 ) == 0 );
- assertTrue( "expected " + v2 + " == " + v1, c2.compareTo( c1 ) == 0 );
- assertTrue( "expected same hashcode for " + v1 + " and " + v2, c1.hashCode() == c2.hashCode() );
- assertTrue( "expected " + v1 + ".equals( " + v2 + " )", c1.equals( c2 ) );
- assertTrue( "expected " + v2 + ".equals( " + v1 + " )", c2.equals( c1 ) );
+ assertTrue( c1.compareTo( c2 ) == 0, "expected " + v1 + " == " + v2 );
+ assertTrue( c2.compareTo( c1 ) == 0, "expected " + v2 + " == " + v1 );
+ assertTrue( c1.hashCode() == c2.hashCode(), "expected same hashcode for " + v1 + " and " + v2 );
+ assertTrue( c1.equals( c2 ), "expected " + v1 + ".equals( " + v2 + " )" );
+ assertTrue( c2.equals( c1 ), "expected " + v2 + ".equals( " + v1 + " )" );
}
private void checkVersionsArrayEqual( String[] array )
@@ -99,8 +99,8 @@ public class ComparableVersionTest
{
Comparable c1 = newComparable( v1 );
Comparable c2 = newComparable( v2 );
- assertTrue( "expected " + v1 + " < " + v2, c1.compareTo( c2 ) < 0 );
- assertTrue( "expected " + v2 + " > " + v1, c2.compareTo( c1 ) > 0 );
+ assertTrue( c1.compareTo( c2 ) < 0, "expected " + v1 + " < " + v2 );
+ assertTrue( c2.compareTo( c1 ) > 0, "expected " + v2 + " > " + v1 );
}
@Test
@@ -348,6 +348,6 @@ public class ComparableVersionTest
Comparable c2 = newComparable( "2" );
- assertEquals( "reused instance should be equivalent to new instance", c1, c2 );
+ assertEquals( c1, c2, "reused instance should be equivalent to new instance" );
}
}
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
index 59072d4..aba36bb 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
@@ -19,11 +19,13 @@ package org.apache.maven.artifact.versioning;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test DefaultArtifactVersion.
@@ -45,12 +47,12 @@ public class DefaultArtifactVersionTest
"'" + version + "' parsed as ('" + artifactVersion.getMajorVersion() + "', '"
+ artifactVersion.getMinorVersion() + "', '" + artifactVersion.getIncrementalVersion() + "', '"
+ artifactVersion.getBuildNumber() + "', '" + artifactVersion.getQualifier() + "'), ";
- assertEquals( parsed + "check major version", major, artifactVersion.getMajorVersion() );
- assertEquals( parsed + "check minor version", minor, artifactVersion.getMinorVersion() );
- assertEquals( parsed + "check incremental version", incremental, artifactVersion.getIncrementalVersion() );
- assertEquals( parsed + "check build number", buildnumber, artifactVersion.getBuildNumber() );
- assertEquals( parsed + "check qualifier", qualifier, artifactVersion.getQualifier() );
- assertEquals( "check " + version + " string value", version, artifactVersion.toString() );
+ assertEquals( major, artifactVersion.getMajorVersion(), parsed + "check major version" );
+ assertEquals( minor, artifactVersion.getMinorVersion(), parsed + "check minor version" );
+ assertEquals( incremental, artifactVersion.getIncrementalVersion(), parsed + "check incremental version" );
+ assertEquals( buildnumber, artifactVersion.getBuildNumber(), parsed + "check build number" );
+ assertEquals( qualifier, artifactVersion.getQualifier(), parsed + "check qualifier" );
+ assertEquals( version, artifactVersion.toString(), "check " + version + " string value" );
}
@Test
@@ -204,31 +206,32 @@ public class DefaultArtifactVersionTest
}
@Test
+ @Disabled("That one does not work")
public void testNonNumericVersionRepresentationReturnsANumberFormatException()
{
- try
- {
- new DefaultArtifactVersion( "..." );
- }
- catch ( Exception e )
- {
- assertTrue( "We expect a NumberFormatException to be thrown.", e instanceof NumberFormatException );
- }
+ assertThrows(
+ NumberFormatException.class,
+ () -> new DefaultArtifactVersion( "..." ),
+ "We expect a NumberFormatException to be thrown." );
}
private void assertVersionOlder( String left, String right )
{
- assertTrue( left + " should be older than " + right,
- newArtifactVersion( left ).compareTo( newArtifactVersion( right ) ) < 0 );
- assertTrue( right + " should be newer than " + left,
- newArtifactVersion( right ).compareTo( newArtifactVersion( left ) ) > 0 );
+ assertTrue(
+ newArtifactVersion( left ).compareTo( newArtifactVersion( right ) ) < 0,
+ left + " should be older than " + right );
+ assertTrue(
+ newArtifactVersion( right ).compareTo( newArtifactVersion( left ) ) > 0,
+ right + " should be newer than " + left );
}
private void assertVersionEqual( String left, String right )
{
- assertTrue( left + " should be equal to " + right,
- newArtifactVersion( left ).compareTo( newArtifactVersion( right ) ) == 0 );
- assertTrue( right + " should be equal to " + left,
- newArtifactVersion( right ).compareTo( newArtifactVersion( left ) ) == 0 );
+ assertTrue(
+ newArtifactVersion( left ).compareTo( newArtifactVersion( right ) ) == 0,
+ left + " should be equal to " + right );
+ assertTrue(
+ newArtifactVersion( right ).compareTo( newArtifactVersion( left ) ) == 0,
+ right + " should be equal to " + left );
}
}
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
index c5bceb4..50270a0 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
@@ -22,14 +22,14 @@ package org.apache.maven.artifact.versioning;
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests version range construction.
@@ -62,93 +62,93 @@ public class VersionRangeTest
VersionRange range = VersionRange.createFromVersionSpec( "(,1.0]" );
List<Restriction> restrictions = range.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
Restriction restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- assertNull( CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion() );
- assertFalse( CHECK_SELECTED_VERSION_KNOWN, range.isSelectedVersionKnown( artifact ) );
- assertNull( CHECK_SELECTED_VERSION, range.getSelectedVersion( artifact ) );
+ assertNull( restriction.getLowerBound(), CHECK_LOWER_BOUND );
+ assertFalse( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.0", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
+ assertNull( range.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
+ assertFalse( range.isSelectedVersionKnown( artifact ), CHECK_SELECTED_VERSION_KNOWN );
+ assertNull( range.getSelectedVersion( artifact ), CHECK_SELECTED_VERSION );
range = VersionRange.createFromVersionSpec( "1.0" );
- assertEquals( CHECK_VERSION_RECOMMENDATION, "1.0", range.getRecommendedVersion().toString() );
+ assertEquals( "1.0", range.getRecommendedVersion().toString(), CHECK_VERSION_RECOMMENDATION );
restrictions = range.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- assertTrue( CHECK_SELECTED_VERSION_KNOWN, range.isSelectedVersionKnown( artifact ) );
- assertEquals( CHECK_SELECTED_VERSION, "1.0", range.getSelectedVersion( artifact ).toString() );
+ assertNull( restriction.getLowerBound(), CHECK_LOWER_BOUND );
+ assertFalse( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertNull( restriction.getUpperBound(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
+ assertTrue( range.isSelectedVersionKnown( artifact ), CHECK_SELECTED_VERSION_KNOWN );
+ assertEquals( "1.0", range.getSelectedVersion( artifact ).toString(), CHECK_SELECTED_VERSION );
range = VersionRange.createFromVersionSpec( "[1.0]" );
restrictions = range.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.0", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- assertNull( CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion() );
- assertFalse( CHECK_SELECTED_VERSION_KNOWN, range.isSelectedVersionKnown( artifact ) );
- assertNull( CHECK_SELECTED_VERSION, range.getSelectedVersion( artifact ) );
+ assertEquals( "1.0", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.0", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
+ assertNull( range.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
+ assertFalse( range.isSelectedVersionKnown( artifact ), CHECK_SELECTED_VERSION_KNOWN );
+ assertNull( range.getSelectedVersion( artifact ), CHECK_SELECTED_VERSION );
range = VersionRange.createFromVersionSpec( "[1.2,1.3]" );
restrictions = range.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- assertNull( CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion() );
- assertFalse( CHECK_SELECTED_VERSION_KNOWN, range.isSelectedVersionKnown( artifact ) );
- assertNull( CHECK_SELECTED_VERSION, range.getSelectedVersion( artifact ) );
+ assertEquals( "1.2", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.3", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
+ assertNull( range.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
+ assertFalse( range.isSelectedVersionKnown( artifact ), CHECK_SELECTED_VERSION_KNOWN );
+ assertNull( range.getSelectedVersion( artifact ), CHECK_SELECTED_VERSION );
range = VersionRange.createFromVersionSpec( "[1.0,2.0)" );
restrictions = range.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.0", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "2.0", restriction.getUpperBound().toString() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- assertNull( CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion() );
- assertFalse( CHECK_SELECTED_VERSION_KNOWN, range.isSelectedVersionKnown( artifact ) );
- assertNull( CHECK_SELECTED_VERSION, range.getSelectedVersion( artifact ) );
+ assertEquals( "1.0", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "2.0", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
+ assertNull( range.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
+ assertFalse( range.isSelectedVersionKnown( artifact ), CHECK_SELECTED_VERSION_KNOWN );
+ assertNull( range.getSelectedVersion( artifact ), CHECK_SELECTED_VERSION );
range = VersionRange.createFromVersionSpec( "[1.5,)" );
restrictions = range.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.5", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- assertNull( CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion() );
- assertFalse( CHECK_SELECTED_VERSION_KNOWN, range.isSelectedVersionKnown( artifact ) );
- assertNull( CHECK_SELECTED_VERSION, range.getSelectedVersion( artifact ) );
+ assertEquals( "1.5", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertNull( restriction.getUpperBound(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
+ assertNull( range.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
+ assertFalse( range.isSelectedVersionKnown( artifact ), CHECK_SELECTED_VERSION_KNOWN );
+ assertNull( range.getSelectedVersion( artifact ), CHECK_SELECTED_VERSION );
range = VersionRange.createFromVersionSpec( "(,1.0],[1.2,)" );
restrictions = range.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
+ assertEquals( 2, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- assertNull( CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion() );
+ assertNull( restriction.getLowerBound(), CHECK_LOWER_BOUND );
+ assertFalse( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.0", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
+ assertNull( range.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- assertNull( CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion() );
- assertFalse( CHECK_SELECTED_VERSION_KNOWN, range.isSelectedVersionKnown( artifact ) );
- assertNull( CHECK_SELECTED_VERSION, range.getSelectedVersion( artifact ) );
+ assertEquals( "1.2", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertNull( restriction.getUpperBound(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
+ assertNull( range.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
+ assertFalse( range.isSelectedVersionKnown( artifact ), CHECK_SELECTED_VERSION_KNOWN );
+ assertNull( range.getSelectedVersion( artifact ), CHECK_SELECTED_VERSION );
range = VersionRange.createFromVersionSpec( "[1.0,)" );
assertFalse( range.containsVersion( new DefaultArtifactVersion( "1.0-SNAPSHOT" ) ) );
@@ -187,479 +187,479 @@ public class VersionRangeTest
VersionRange range2 = VersionRange.createFromVersionSpec( "1.1" );
VersionRange mergedRange = range1.restrict( range2 );
// TODO current policy is to retain the original version - is this correct, do we need strategies or is that handled elsewhere?
-// assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
- assertEquals( CHECK_VERSION_RECOMMENDATION, "1.0", mergedRange.getRecommendedVersion().toString() );
+// assertEquals( "1.1", mergedRange.getRecommendedVersion().toString(), CHECK_VERSION_RECOMMENDATION );
+ assertEquals( "1.0", mergedRange.getRecommendedVersion().toString(), CHECK_VERSION_RECOMMENDATION );
List<Restriction> restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
Restriction restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertNull( restriction.getLowerBound(), CHECK_LOWER_BOUND );
+ assertFalse( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertNull( restriction.getUpperBound(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
mergedRange = range2.restrict( range1 );
- assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
+ assertEquals( "1.1", mergedRange.getRecommendedVersion().toString(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertNull( restriction.getLowerBound(), CHECK_LOWER_BOUND );
+ assertFalse( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertNull( restriction.getUpperBound(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
// TODO test reversed restrictions on all below
range1 = VersionRange.createFromVersionSpec( "[1.0,)" );
range2 = VersionRange.createFromVersionSpec( "1.1" );
mergedRange = range1.restrict( range2 );
- assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
+ assertEquals( "1.1", mergedRange.getRecommendedVersion().toString(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.0", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.0", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertNull( restriction.getUpperBound(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "[1.1,)" );
range2 = VersionRange.createFromVersionSpec( "1.1" );
mergedRange = range1.restrict( range2 );
- assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
+ assertEquals( "1.1", mergedRange.getRecommendedVersion().toString(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.1", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertNull( restriction.getUpperBound(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "[1.1]" );
range2 = VersionRange.createFromVersionSpec( "1.1" );
mergedRange = range1.restrict( range2 );
- assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
+ assertEquals( "1.1", mergedRange.getRecommendedVersion().toString(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.1", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.1", restriction.getLowerBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "(1.1,)" );
range2 = VersionRange.createFromVersionSpec( "1.1" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.1", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertFalse( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertNull( restriction.getUpperBound(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "[1.2,)" );
range2 = VersionRange.createFromVersionSpec( "1.1" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.2", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertNull( restriction.getUpperBound(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "(,1.2]" );
range2 = VersionRange.createFromVersionSpec( "1.1" );
mergedRange = range1.restrict( range2 );
- assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
+ assertEquals( "1.1", mergedRange.getRecommendedVersion().toString(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertNull( restriction.getLowerBound(), CHECK_LOWER_BOUND );
+ assertFalse( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.2", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "(,1.1]" );
range2 = VersionRange.createFromVersionSpec( "1.1" );
mergedRange = range1.restrict( range2 );
- assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
+ assertEquals( "1.1", mergedRange.getRecommendedVersion().toString(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.1", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertNull( restriction.getLowerBound(), CHECK_LOWER_BOUND );
+ assertFalse( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.1", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "(,1.1)" );
range2 = VersionRange.createFromVersionSpec( "1.1" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.1", restriction.getUpperBound().toString() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertNull( restriction.getLowerBound(), CHECK_LOWER_BOUND );
+ assertFalse( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.1", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "(,1.0]" );
range2 = VersionRange.createFromVersionSpec( "1.1" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertNull( restriction.getLowerBound(), CHECK_LOWER_BOUND );
+ assertFalse( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.0", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "(,1.0], [1.1,)" );
range2 = VersionRange.createFromVersionSpec( "1.2" );
mergedRange = range1.restrict( range2 );
- assertEquals( CHECK_VERSION_RECOMMENDATION, "1.2", mergedRange.getRecommendedVersion().toString() );
+ assertEquals( "1.2", mergedRange.getRecommendedVersion().toString(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
+ assertEquals( 2, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertNull( restriction.getLowerBound(), CHECK_LOWER_BOUND );
+ assertFalse( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.0", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.1", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertNull( restriction.getUpperBound(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "(,1.0], [1.1,)" );
range2 = VersionRange.createFromVersionSpec( "1.0.5" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
+ assertEquals( 2, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertNull( restriction.getLowerBound(), CHECK_LOWER_BOUND );
+ assertFalse( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.0", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.1", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertNull( restriction.getUpperBound(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "(,1.1), (1.1,)" );
range2 = VersionRange.createFromVersionSpec( "1.1" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
+ assertEquals( 2, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.1", restriction.getUpperBound().toString() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertNull( restriction.getLowerBound(), CHECK_LOWER_BOUND );
+ assertFalse( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.1", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.1", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertFalse( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertNull( restriction.getUpperBound(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "[1.1,1.3]" );
range2 = VersionRange.createFromVersionSpec( "(1.1,)" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.1", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertFalse( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.3", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "(,1.3)" );
range2 = VersionRange.createFromVersionSpec( "[1.2,1.3]" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.2", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.3", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "[1.1,1.3]" );
range2 = VersionRange.createFromVersionSpec( "[1.2,)" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.2", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.3", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "(,1.3]" );
range2 = VersionRange.createFromVersionSpec( "[1.2,1.4]" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.2", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.3", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "(1.2,1.3]" );
range2 = VersionRange.createFromVersionSpec( "[1.1,1.4]" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.2", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertFalse( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.3", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "(1.2,1.3)" );
range2 = VersionRange.createFromVersionSpec( "[1.1,1.4]" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.2", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertFalse( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.3", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "[1.2,1.3)" );
range2 = VersionRange.createFromVersionSpec( "[1.1,1.4]" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.2", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.3", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "[1.0,1.1]" );
range2 = VersionRange.createFromVersionSpec( "[1.1,1.4]" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.1", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.1", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.1", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "[1.0,1.1)" );
range2 = VersionRange.createFromVersionSpec( "[1.1,1.4]" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 0, restrictions.size() );
+ assertEquals( 0, restrictions.size(), CHECK_NUM_RESTRICTIONS );
range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.5]" );
range2 = VersionRange.createFromVersionSpec( "[1.1]" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.1", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.1", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.1", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.5]" );
range2 = VersionRange.createFromVersionSpec( "[1.4]" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.4", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.4", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.4", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.5]" );
range2 = VersionRange.createFromVersionSpec( "[1.1,1.4]" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
+ assertEquals( 2, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.1", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.2", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.3", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.4", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "[1.0,1.2),(1.3,1.5]" );
range2 = VersionRange.createFromVersionSpec( "[1.1,1.4]" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
+ assertEquals( 2, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.1", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.2", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.3", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertFalse( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.4", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.5]" );
range2 = VersionRange.createFromVersionSpec( "(1.1,1.4)" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
+ assertEquals( 2, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.1", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertFalse( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.2", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.3", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.4", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "[1.0,1.2),(1.3,1.5]" );
range2 = VersionRange.createFromVersionSpec( "(1.1,1.4)" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
+ assertEquals( 2, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.1", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertFalse( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.2", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.3", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertFalse( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.4", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertFalse( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "(,1.1),(1.4,)" );
range2 = VersionRange.createFromVersionSpec( "[1.1,1.4]" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 0, restrictions.size() );
+ assertEquals( 0, restrictions.size(), CHECK_NUM_RESTRICTIONS );
range1 = VersionRange.createFromVersionSpec( "(,1.1],[1.4,)" );
range2 = VersionRange.createFromVersionSpec( "(1.1,1.4)" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 0, restrictions.size() );
+ assertEquals( 0, restrictions.size(), CHECK_NUM_RESTRICTIONS );
range1 = VersionRange.createFromVersionSpec( "[,1.1],[1.4,]" );
range2 = VersionRange.createFromVersionSpec( "[1.2,1.3]" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 0, restrictions.size() );
+ assertEquals( 0, restrictions.size(), CHECK_NUM_RESTRICTIONS );
range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.5]" );
range2 = VersionRange.createFromVersionSpec( "[1.1,1.4],[1.6,]" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
+ assertEquals( 2, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.1", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.2", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.3", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.4", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.5]" );
range2 = VersionRange.createFromVersionSpec( "[1.1,1.4],[1.5,]" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 3, restrictions.size() );
+ assertEquals( 3, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.1", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.2", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.3", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.4", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
restriction = restrictions.get( 2 );
- assertEquals( CHECK_LOWER_BOUND, "1.5", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.5", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.5", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.5", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.7]" );
range2 = VersionRange.createFromVersionSpec( "[1.1,1.4],[1.5,1.6]" );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 3, restrictions.size() );
+ assertEquals( 3, restrictions.size(), CHECK_NUM_RESTRICTIONS );
restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.1", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.2", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.3", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.4", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
restriction = restrictions.get( 2 );
- assertEquals( CHECK_LOWER_BOUND, "1.5", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.6", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals( "1.5", restriction.getLowerBound().toString(), CHECK_LOWER_BOUND );
+ assertTrue( restriction.isLowerBoundInclusive(), CHECK_LOWER_BOUND_INCLUSIVE );
+ assertEquals( "1.6", restriction.getUpperBound().toString(), CHECK_UPPER_BOUND );
+ assertTrue( restriction.isUpperBoundInclusive(), CHECK_UPPER_BOUND_INCLUSIVE );
// test restricting empty sets
range1 = VersionRange.createFromVersionSpec( "[,1.1],[1.4,]" );
range2 = VersionRange.createFromVersionSpec( "[1.2,1.3]" );
range1 = range1.restrict( range2 );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 0, restrictions.size() );
+ assertEquals( 0, restrictions.size(), CHECK_NUM_RESTRICTIONS );
range1 = VersionRange.createFromVersionSpec( "[,1.1],[1.4,]" );
range2 = VersionRange.createFromVersionSpec( "[1.2,1.3]" );
range2 = range1.restrict( range2 );
mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ assertNull( mergedRange.getRecommendedVersion(), CHECK_VERSION_RECOMMENDATION );
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 0, restrictions.size() );
+ assertEquals( 0, restrictions.size(), CHECK_NUM_RESTRICTIONS );
}
@Test
@@ -699,9 +699,10 @@ public class VersionRangeTest
private void checkInvalidRange( String version )
{
- assertThrows( "Version " + version + " should have failed to construct",
+ assertThrows(
InvalidVersionSpecificationException.class,
- () -> VersionRange.createFromVersionSpec( version ) );
+ () -> VersionRange.createFromVersionSpec( version ),
+ "Version " + version + " should have failed to construct" );
}
@Test
@@ -745,13 +746,13 @@ public class VersionRangeTest
VersionRange spec = VersionRange.createFromVersionSpec( "1.0" );
assertSame( spec, VersionRange.createFromVersionSpec( "1.0" ) ); // same instance from spec cache
List<Restriction> restrictions = spec.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals( 1, restrictions.size(), CHECK_NUM_RESTRICTIONS );
VersionRange version = VersionRange.createFromVersion( "1.0" );
assertSame( version, VersionRange.createFromVersion( "1.0" ) ); // same instance from version cache
restrictions = version.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 0, restrictions.size() );
+ assertEquals( 0, restrictions.size(), CHECK_NUM_RESTRICTIONS );
- assertFalse( "check !VersionRange.createFromVersionSpec(x).equals(VersionRange.createFromVersion(x))", spec.equals( version ) );
+ assertFalse( spec.equals( version ), "check !VersionRange.createFromVersionSpec(x).equals(VersionRange.createFromVersion(x))" );
}
}
diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java
index 0e5b20f..dbde11e 100644
--- a/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java
+++ b/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java
@@ -20,10 +20,10 @@ package org.apache.maven.building;
*/
import org.apache.maven.building.Problem.Severity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class DefaultProblemCollectorTest
{
diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java
index d67128e..4d9a3d8 100644
--- a/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java
+++ b/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java
@@ -20,10 +20,10 @@ package org.apache.maven.building;
*/
import org.apache.maven.building.Problem.Severity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
public class DefaultProblemTest
{
diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/FileSourceTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/FileSourceTest.java
index f1ac6e6..9373c01 100644
--- a/maven-builder-support/src/test/java/org/apache/maven/building/FileSourceTest.java
+++ b/maven-builder-support/src/test/java/org/apache/maven/building/FileSourceTest.java
@@ -23,10 +23,10 @@ import java.io.File;
import java.io.InputStream;
import java.util.Scanner;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class FileSourceTest
{
@@ -34,9 +34,10 @@ public class FileSourceTest
@Test
public void testFileSource()
{
- NullPointerException e = assertThrows( "Should fail, since you must specify a file",
+ NullPointerException e = assertThrows(
NullPointerException.class,
- () -> new FileSource( null ) );
+ () -> new FileSource( null ),
+ "Should fail, since you must specify a file" );
assertEquals( "file cannot be null", e.getMessage() );
}
diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java
index 2ca0b37..ee2575b 100644
--- a/maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java
+++ b/maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java
@@ -21,10 +21,10 @@ package org.apache.maven.building;
import java.util.Collections;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
public class ProblemCollectorFactoryTest
{
diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/StringSourceTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/StringSourceTest.java
index 0c8531a..85309aa 100644
--- a/maven-builder-support/src/test/java/org/apache/maven/building/StringSourceTest.java
+++ b/maven-builder-support/src/test/java/org/apache/maven/building/StringSourceTest.java
@@ -22,9 +22,9 @@ package org.apache.maven.building;
import java.io.InputStream;
import java.util.Scanner;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class StringSourceTest
{
diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/UrlSourceTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/UrlSourceTest.java
index 05bdc4c..efdb9bb 100644
--- a/maven-builder-support/src/test/java/org/apache/maven/building/UrlSourceTest.java
+++ b/maven-builder-support/src/test/java/org/apache/maven/building/UrlSourceTest.java
@@ -24,10 +24,10 @@ import java.io.InputStream;
import java.net.URL;
import java.util.Scanner;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class UrlSourceTest
{
@@ -35,9 +35,10 @@ public class UrlSourceTest
@Test
public void testUrlSource()
{
- NullPointerException e = assertThrows( "Should fail, since you must specify a url",
+ NullPointerException e = assertThrows(
NullPointerException.class,
- () -> new UrlSource( null ) );
+ () -> new UrlSource( null ),
+ "Should fail, since you must specify a url" );
assertEquals( "url cannot be null", e.getMessage() );
}
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
index 7ad6719..146ec68 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
@@ -27,7 +27,6 @@ import java.io.Writer;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import javax.inject.Inject;
@@ -43,9 +42,6 @@ import org.apache.maven.execution.DefaultMavenExecutionResult;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.repository.legacy.repository.ArtifactRepositoryFactory;
-import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.DefaultPlexusContainer;
-import org.codehaus.plexus.PlexusConstants;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.collection.DependencyGraphTransformer;
@@ -68,11 +64,11 @@ import org.eclipse.aether.util.graph.transformer.NearestVersionSelector;
import org.eclipse.aether.util.graph.transformer.SimpleOptionalitySelector;
import org.eclipse.aether.util.graph.traverser.FatArtifactTraverser;
import org.eclipse.aether.util.repository.SimpleArtifactDescriptorPolicy;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl </a>
@@ -92,7 +88,7 @@ public abstract class AbstractArtifactComponentTestCase
@Inject @Named( "default" )
ArtifactRepositoryLayout repoLayout;
- @Before
+ @BeforeEach
public void setUp()
throws Exception
{
@@ -169,7 +165,7 @@ public abstract class AbstractArtifactComponentTestCase
File file = new File( remoteRepo.getBasedir(), path );
- assertTrue( "Remote artifact " + file + " should be present.", file.exists() );
+ assertTrue( file.exists(), "Remote artifact " + file + " should be present." );
}
protected void assertLocalArtifactPresent( Artifact artifact )
@@ -181,7 +177,7 @@ public abstract class AbstractArtifactComponentTestCase
File file = new File( localRepo.getBasedir(), path );
- assertTrue( "Local artifact " + file + " should be present.", file.exists() );
+ assertTrue( file.exists(), "Local artifact " + file + " should be present." );
}
protected void assertRemoteArtifactNotPresent( Artifact artifact )
@@ -193,7 +189,7 @@ public abstract class AbstractArtifactComponentTestCase
File file = new File( remoteRepo.getBasedir(), path );
- assertFalse( "Remote artifact " + file + " should not be present.", file.exists() );
+ assertFalse( file.exists(), "Remote artifact " + file + " should not be present." );
}
protected void assertLocalArtifactNotPresent( Artifact artifact )
@@ -205,7 +201,7 @@ public abstract class AbstractArtifactComponentTestCase
File file = new File( localRepo.getBasedir(), path );
- assertFalse( "Local artifact " + file + " should not be present.", file.exists() );
+ assertFalse( file.exists(), "Local artifact " + file + " should not be present." );
}
// ----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
index e1459d8..05191ae 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
@@ -25,11 +25,11 @@ import org.apache.maven.artifact.AbstractArtifactComponentTestCase;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.codehaus.plexus.util.FileUtils;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import javax.inject.Inject;
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java
index 3a0aa5b..6dcf99a 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java
@@ -19,19 +19,14 @@ package org.apache.maven.artifact.factory;
* under the License.
*/
-import java.util.Collections;
-
import javax.inject.Inject;
import org.apache.maven.test.PlexusTestCase;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.versioning.VersionRange;
-import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.DefaultPlexusContainer;
-import org.codehaus.plexus.PlexusConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DefaultArtifactFactoryTest
extends PlexusTestCase
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java
index 7ba6b33..695c5cc 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java
@@ -23,8 +23,8 @@ import java.io.File;
import org.apache.maven.artifact.AbstractArtifactComponentTestCase;
import org.apache.maven.artifact.Artifact;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import javax.inject.Inject;
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java
index 686b22e..4e7b5dc 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java
@@ -20,10 +20,10 @@ package org.apache.maven.artifact.repository;
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class MavenArtifactRepositoryTest
{
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
index f86751b..e6b0e56 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
@@ -22,9 +22,9 @@ package org.apache.maven.artifact.resolver;
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Test the artifact resolution exception message
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
index 81272ee..d621d90 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
@@ -29,19 +29,18 @@ import java.util.Set;
import org.apache.maven.artifact.AbstractArtifactComponentTestCase;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.metadata.ResolutionGroup;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.repository.legacy.metadata.MetadataResolutionRequest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import javax.inject.Inject;
@@ -62,7 +61,7 @@ public class ArtifactResolverTest
private Artifact projectArtifact;
- @Before
+ @BeforeEach
@Override
public void setUp()
throws Exception
@@ -72,7 +71,7 @@ public class ArtifactResolverTest
projectArtifact = createLocalArtifact( "project", "3.0" );
}
- @After
+ @AfterEach
@Override
public void tearDown()
throws Exception
@@ -170,9 +169,10 @@ public class ArtifactResolverTest
{
Artifact k = createArtifact( "k", "1.0" );
- assertThrows( "Resolution succeeded when it should have failed",
+ assertThrows(
ArtifactNotFoundException.class,
- () -> artifactResolver.resolve( k, remoteRepositories(), localRepository() ) );
+ () -> artifactResolver.resolve( k, remoteRepositories(), localRepository() ),
+ "Resolution succeeded when it should have failed" );
}
@Test
@@ -247,8 +247,8 @@ public class ArtifactResolverTest
printErrors( result );
Iterator<Artifact> i = result.getArtifacts().iterator();
- assertEquals( "n should be first", n, i.next() );
- assertEquals( "m should be second", m, i.next() );
+ assertEquals( n, i.next(), "n should be first" );
+ assertEquals( m, i.next(), "m should be second" );
// inverse order
set = new LinkedHashSet<>();
@@ -261,8 +261,8 @@ public class ArtifactResolverTest
printErrors( result );
i = result.getArtifacts().iterator();
- assertEquals( "m should be first", m, i.next() );
- assertEquals( "n should be second", n, i.next() );
+ assertEquals( m, i.next(), "m should be first" );
+ assertEquals( n, i.next(), "n should be second" );
}
private void printErrors( ArtifactResolutionResult result )
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
index 6e4926b..fdd5f62 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
@@ -24,11 +24,11 @@ import java.util.Collections;
import org.apache.maven.artifact.AbstractArtifactComponentTestCase;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.DefaultArtifactResolver.DaemonThreadCreator;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import javax.inject.Inject;
@@ -40,7 +40,7 @@ public class DefaultArtifactResolverTest
private Artifact projectArtifact;
- @Before
+ @BeforeEach
@Override
public void setUp()
throws Exception
@@ -49,7 +49,7 @@ public class DefaultArtifactResolverTest
projectArtifact = createLocalArtifact( "project", "3.0" );
}
- @After
+ @AfterEach
@Override
public void tearDown()
throws Exception
@@ -102,12 +102,12 @@ public class DefaultArtifactResolverTest
{
String name = active.getName();
boolean daemon = active.isDaemon();
- assertTrue( name + " is no daemon Thread.", daemon );
+ assertTrue( daemon, name + " is no daemon Thread." );
}
}
- assertTrue( "Could not find ThreadGroup: " + DaemonThreadCreator.THREADGROUP_NAME, seen );
+ assertTrue( seen, "Could not find ThreadGroup: " + DaemonThreadCreator.THREADGROUP_NAME );
}
@Test
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java
index 1c42a2e..96a8882 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java
@@ -21,11 +21,11 @@ package org.apache.maven.artifact.resolver.filter;
import java.util.Arrays;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@link AndArtifactFilter}.
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java
index e33a1e4..6c3df9e 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java
@@ -22,9 +22,9 @@ package org.apache.maven.artifact.resolver.filter;
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author Igor Fedorenko
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java
index 85488ee..65d9caa 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java
@@ -21,11 +21,11 @@ package org.apache.maven.artifact.resolver.filter;
import java.util.Arrays;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@link OrArtifactFilter}.
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java
index 985f90b..914ff99 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java
@@ -21,10 +21,10 @@ package org.apache.maven.artifact.resolver.filter;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@link ScopeArtifactFilter}.
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java b/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
index 9761e75..558b5a5 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
@@ -45,7 +45,10 @@ import java.util.Iterator;
import java.util.List;
import org.codehaus.plexus.util.FileUtils;
-import org.junit.Assert;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class TestFileManager
{
@@ -157,11 +160,11 @@ public class TestFileManager
if ( shouldExist )
{
- Assert.assertTrue( file.exists() );
+ assertTrue( file.exists() );
}
else
{
- Assert.assertFalse( file.exists() );
+ assertFalse( file.exists() );
}
}
@@ -174,7 +177,7 @@ public class TestFileManager
String contents = FileUtils.fileRead( file, encoding );
- Assert.assertEquals( contentsTest, contents );
+ assertEquals( contentsTest, contents );
}
public File createFile( File dir, String filename, String contents, String encoding )
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java
index 78b9504..5c1ae2d 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java
@@ -15,7 +15,6 @@ package org.apache.maven.artifact.transform;
* the License.
*/
-import java.util.Collections;
import java.util.List;
import org.apache.maven.repository.legacy.resolver.transform.ArtifactTransformation;
@@ -23,14 +22,11 @@ import org.apache.maven.repository.legacy.resolver.transform.ArtifactTransformat
import org.apache.maven.repository.legacy.resolver.transform.LatestArtifactTransformation;
import org.apache.maven.repository.legacy.resolver.transform.ReleaseArtifactTransformation;
import org.apache.maven.repository.legacy.resolver.transform.SnapshotTransformation;
-import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.DefaultPlexusContainer;
-import org.codehaus.plexus.PlexusConstants;
import org.apache.maven.test.PlexusTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import javax.inject.Inject;
@@ -48,11 +44,11 @@ public class TransformationManagerTest
assertEquals( 3, tms.size() );
- assertTrue( "We expected the release transformation and got " + tms.get(0), tms.get(0) instanceof ReleaseArtifactTransformation );
+ assertTrue( tms.get(0) instanceof ReleaseArtifactTransformation, "We expected the release transformation and got " + tms.get(0) );
- assertTrue( "We expected the latest transformation and got " + tms.get(1), tms.get(1) instanceof LatestArtifactTransformation );
+ assertTrue( tms.get(1) instanceof LatestArtifactTransformation, "We expected the latest transformation and got " + tms.get(1) );
- assertTrue( "We expected the snapshot transformation and got " + tms.get(2), tms.get(2) instanceof SnapshotTransformation );
+ assertTrue( tms.get(2) instanceof SnapshotTransformation, "We expected the snapshot transformation and got " + tms.get(2) );
}
}
diff --git a/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java b/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
index 4999289..442493a 100644
--- a/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
@@ -28,12 +28,10 @@ import org.apache.maven.model.ActivationProperty;
import org.apache.maven.model.Profile;
import org.apache.maven.profiles.DefaultProfileManager;
import org.apache.maven.profiles.ProfileManager;
-import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.PlexusConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class DefaultProfileManagerTest
extends PlexusTestCase
diff --git a/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
index 3885380..338cffa 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
@@ -21,7 +21,6 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Arrays;
-import java.util.Collections;
import javax.inject.Inject;
@@ -32,14 +31,11 @@ import org.apache.maven.model.building.ModelBuildingException;
import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
-import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.DefaultPlexusContainer;
-import org.codehaus.plexus.PlexusConstants;
import org.eclipse.aether.DefaultRepositorySystemSession;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* @author Jason van Zyl
@@ -53,7 +49,7 @@ public abstract class AbstractMavenProjectTestCase
protected RepositorySystem repositorySystem;
@Override
- @Before
+ @BeforeEach
public void setUp()
throws Exception
{
@@ -70,7 +66,7 @@ public abstract class AbstractMavenProjectTestCase
}
}
- @After
+ @AfterEach
public void tearDown()
throws Exception
{
diff --git a/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java b/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
index d67259c..74178d9 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
@@ -34,12 +34,12 @@ import org.apache.maven.model.PluginExecution;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
public class ModelUtilsTest
{
@@ -549,7 +549,7 @@ public class ModelUtilsTest
ModelUtils.mergePluginDefinitions( pChild, pParent, true );
Map executionMap = pChild.getExecutionsAsMap();
- assertNull( "test execution should not be inherited from parent.", executionMap.get( testId ) );
+ assertNull( executionMap.get( testId ), "test execution should not be inherited from parent." );
}
@Test
@@ -590,7 +590,7 @@ public class ModelUtilsTest
ModelUtils.mergePluginDefinitions( pChild, pParent, true );
Map executionMap = pChild.getExecutionsAsMap();
- assertNull( "test execution should not be inherited from parent.", executionMap.get( testId ) );
+ assertNull( executionMap.get( testId ), "test execution should not be inherited from parent." );
}
@Test
@@ -631,7 +631,7 @@ public class ModelUtilsTest
ModelUtils.mergePluginDefinitions( pChild, pParent, true );
Map executionMap = pChild.getExecutionsAsMap();
- assertNotNull( "test execution should be inherited from parent.", executionMap.get( testId ) );
+ assertNotNull( executionMap.get( testId ), "test execution should be inherited from parent." );
}
}
diff --git a/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java b/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
index 0db4321..0cc449f 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
@@ -20,25 +20,17 @@ package org.apache.maven.project;
*/
import java.io.File;
-import java.util.Collections;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.execution.DefaultMavenExecutionRequest;
-import org.apache.maven.execution.DefaultMavenExecutionResult;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.repository.internal.DefaultArtifactDescriptorReader;
-import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.DefaultPlexusContainer;
-import org.codehaus.plexus.PlexusConstants;
-import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.impl.ArtifactDescriptorReader;
import org.eclipse.aether.impl.ArtifactResolver;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class ProjectClasspathTest
extends AbstractMavenProjectTestCase
@@ -46,6 +38,7 @@ public class ProjectClasspathTest
static final String dir = "projects/scope/";
@Override
+ @BeforeEach
public void setUp()
throws Exception
{
@@ -74,7 +67,7 @@ public class ProjectClasspathTest
Artifact artifact;
- assertNotNull( "Test project can't be null!", project );
+ assertNotNull( project, "Test project can't be null!" );
checkArtifactIdScope( project, "provided", "provided" );
checkArtifactIdScope( project, "test", "test" );
@@ -84,53 +77,53 @@ public class ProjectClasspathTest
// check all transitive deps of a test dependency are test, except test and provided which is skipped
artifact = getArtifact( project, "maven-test-test", "scope-provided" );
- assertNull( "Check no provided dependencies are transitive", artifact );
+ assertNull( artifact, "Check no provided dependencies are transitive" );
artifact = getArtifact( project, "maven-test-test", "scope-test" );
- assertNull( "Check no test dependencies are transitive", artifact );
+ assertNull( artifact, "Check no test dependencies are transitive" );
artifact = getArtifact( project, "maven-test-test", "scope-compile" );
assertNotNull( artifact );
System.out.println( "a = " + artifact );
System.out.println( "b = " + artifact.getScope() );
- assertEquals( "Check scope", "test", artifact.getScope() );
+ assertEquals( "test", artifact.getScope(), "Check scope" );
artifact = getArtifact( project, "maven-test-test", "scope-default" );
- assertEquals( "Check scope", "test", artifact.getScope() );
+ assertEquals( "test", artifact.getScope(), "Check scope" );
artifact = getArtifact( project, "maven-test-test", "scope-runtime" );
- assertEquals( "Check scope", "test", artifact.getScope() );
+ assertEquals( "test", artifact.getScope(), "Check scope" );
// check all transitive deps of a provided dependency are provided scope, except for test
checkGroupIdScope( project, "provided", "maven-test-provided" );
artifact = getArtifact( project, "maven-test-provided", "scope-runtime" );
- assertEquals( "Check scope", "provided", artifact.getScope() );
+ assertEquals( "provided", artifact.getScope(), "Check scope" );
// check all transitive deps of a runtime dependency are runtime scope, except for test
checkGroupIdScope( project, "runtime", "maven-test-runtime" );
artifact = getArtifact( project, "maven-test-runtime", "scope-runtime" );
- assertEquals( "Check scope", "runtime", artifact.getScope() );
+ assertEquals( "runtime", artifact.getScope(), "Check scope" );
// check all transitive deps of a compile dependency are compile scope, except for runtime and test
checkGroupIdScope( project, "compile", "maven-test-compile" );
artifact = getArtifact( project, "maven-test-compile", "scope-runtime" );
- assertEquals( "Check scope", "runtime", artifact.getScope() );
+ assertEquals( "runtime", artifact.getScope(), "Check scope" );
// check all transitive deps of a default dependency are compile scope, except for runtime and test
checkGroupIdScope( project, "compile", "maven-test-default" );
artifact = getArtifact( project, "maven-test-default", "scope-runtime" );
- assertEquals( "Check scope", "runtime", artifact.getScope() );
+ assertEquals( "runtime", artifact.getScope(), "Check scope" );
}
private void checkGroupIdScope( MavenProject project, String scopeValue, String groupId )
{
Artifact artifact;
artifact = getArtifact( project, groupId, "scope-compile" );
- assertEquals( "Check scope", scopeValue, artifact.getScope() );
+ assertEquals( scopeValue, artifact.getScope(), "Check scope" );
artifact = getArtifact( project, groupId, "scope-test" );
- assertNull( "Check test dependency is not transitive", artifact );
+ assertNull( artifact, "Check test dependency is not transitive" );
artifact = getArtifact( project, groupId, "scope-provided" );
- assertNull( "Check provided dependency is not transitive", artifact );
+ assertNull( artifact, "Check provided dependency is not transitive" );
artifact = getArtifact( project, groupId, "scope-default" );
- assertEquals( "Check scope", scopeValue, artifact.getScope() );
+ assertEquals( scopeValue, artifact.getScope(), "Check scope" );
}
private void checkArtifactIdScope( MavenProject project, String scope, String scopeValue )
@@ -138,7 +131,7 @@ public class ProjectClasspathTest
String artifactId = "scope-" + scope;
Artifact artifact = getArtifact( project, "maven-test", artifactId );
assertNotNull( artifact );
- assertEquals( "Check scope", scopeValue, artifact.getScope() );
+ assertEquals( scopeValue, artifact.getScope(), "Check scope" );
}
private Artifact getArtifact( MavenProject project, String groupId, String artifactId )
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
index 19c67a4..936424d 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
@@ -21,9 +21,9 @@ package org.apache.maven.project.inheritance.t00;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* A test which demonstrates maven's recursive inheritance where
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
index fe4f052..8f8199e 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
@@ -21,9 +21,9 @@ package org.apache.maven.project.inheritance.t01;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* A test which demonstrates maven's recursive inheritance where
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
index dbcc369..61a3932 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
@@ -29,11 +29,11 @@ import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* A test which demonstrates maven's recursive inheritance where
@@ -141,7 +141,7 @@ public class ProjectInheritanceTest
{
String pluginArtifactId = plugin.getArtifactId();
- assertTrue( "Illegal plugin found: " + pluginArtifactId, validPluginCounts.containsKey( pluginArtifactId ) );
+ assertTrue( validPluginCounts.containsKey( pluginArtifactId ), "Illegal plugin found: " + pluginArtifactId );
if ( pluginArtifactId.equals( testPluginArtifactId ) )
{
@@ -150,7 +150,7 @@ public class ProjectInheritanceTest
Integer count = validPluginCounts.get( pluginArtifactId );
- assertEquals( "Multiple copies of plugin: " + pluginArtifactId + " found in POM.", 0, (int) count );
+ assertEquals( 0, (int) count, "Multiple copies of plugin: " + pluginArtifactId + " found in POM." );
count = count + 1;
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java
index 82eaa28..3c658d8 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java
@@ -23,9 +23,9 @@ import java.io.File;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* A test which demonstrates maven's recursive inheritance where
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
index 8cedce7..34a31d5 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
@@ -25,11 +25,11 @@ import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Verifies the version of a dependency listed in a parent's
@@ -71,9 +71,9 @@ public class ProjectInheritanceTest
assertEquals( pom0Basedir, project1.getParent().getBasedir() );
Set set = project1.getArtifacts();
- assertNotNull( "No artifacts", set );
- assertTrue( "No Artifacts", set.size() > 0 );
- assertTrue( "Set size should be 3, is " + set.size(), set.size() == 3 );
+ assertNotNull( set, "No artifacts" );
+ assertTrue( set.size() > 0, "No Artifacts" );
+ assertTrue( set.size() == 3, "Set size should be 3, is " + set.size() );
for ( Object aSet : set )
{
@@ -83,8 +83,8 @@ public class ProjectInheritanceTest
artifact.isOptional()
? "true"
: "false" ) );
- assertTrue( "Incorrect version for " + artifact.getDependencyConflictId(),
- artifact.getVersion().equals( "1.0" ) );
+ assertTrue( artifact.getVersion().equals( "1.0" ),
+ "Incorrect version for " + artifact.getDependencyConflictId() );
}
}
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
index d8d8f22..8af4a2f 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
@@ -25,11 +25,11 @@ import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* A test which demonstrates maven's dependency management
@@ -67,8 +67,8 @@ public class ProjectInheritanceTest
assertEquals( pom0Basedir, project1.getParent().getBasedir() );
Set set = project1.getArtifacts();
- assertNotNull( "No artifacts", set );
- assertTrue( "No Artifacts", set.size() > 0 );
+ assertNotNull( set, "No artifacts" );
+ assertTrue( set.size() > 0, "No Artifacts" );
for ( Object aSet : set )
{
@@ -76,8 +76,8 @@ public class ProjectInheritanceTest
System.out.println(
"Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() + " Scope: "
+ artifact.getScope() );
- assertTrue( "Incorrect version for " + artifact.getDependencyConflictId(),
- artifact.getVersion().equals( "1.0" ) );
+ assertTrue( artifact.getVersion().equals( "1.0" ),
+ "Incorrect version for " + artifact.getDependencyConflictId() );
}
}
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
index f1c61b4..bc37066 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
@@ -26,11 +26,11 @@ import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* A test which demonstrates maven's dependency management
@@ -68,18 +68,18 @@ public class ProjectInheritanceTest
assertEquals( pom0Basedir, project1.getParent().getBasedir() );
Set set = project1.getArtifacts();
- assertNotNull( "No artifacts", set );
- assertTrue( "No Artifacts", set.size() > 0 );
+ assertNotNull( set, "No artifacts" );
+ assertTrue( set.size() > 0, "No Artifacts" );
Iterator iter = set.iterator();
- assertTrue( "Set size should be 4, is " + set.size(), set.size() == 4 );
+ assertTrue( set.size() == 4, "Set size should be 4, is " + set.size() );
while ( iter.hasNext() )
{
Artifact artifact = (Artifact) iter.next();
System.out.println( "Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion()
+ " Optional=" + ( artifact.isOptional() ? "true" : "false" ) );
- assertTrue( "Incorrect version for " + artifact.getDependencyConflictId(),
- artifact.getVersion().equals( "1.0" ) );
+ assertTrue( artifact.getVersion().equals( "1.0" ),
+ "Incorrect version for " + artifact.getDependencyConflictId() );
}
}
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
index 1821fa1..87b07d3 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
@@ -25,12 +25,12 @@ import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* A test which demonstrates maven's dependency management
@@ -68,21 +68,21 @@ public class ProjectInheritanceTest
assertEquals( pom0Basedir, project1.getParent().getBasedir() );
System.out.println("Project " + project1.getId() + " " + project1);
Set set = project1.getArtifacts();
- assertNotNull("No artifacts", set);
- assertTrue("No Artifacts", set.size() > 0);
- assertTrue("Set size should be 3, is " + set.size(), set.size() == 3 );
+ assertNotNull( set, "No artifacts" );
+ assertTrue( set.size() > 0, "No Artifacts" );
+ assertTrue( set.size() == 3, "Set size should be 3, is " + set.size() );
for ( Object aSet : set )
{
Artifact artifact = (Artifact) aSet;
- assertFalse( "", artifact.getArtifactId().equals( "t07-d" ) );
+ assertFalse( artifact.getArtifactId().equals( "t07-d" ) );
System.out.println(
"Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() + " Optional=" + (
artifact.isOptional()
? "true"
: "false" ) );
- assertTrue( "Incorrect version for " + artifact.getDependencyConflictId(),
- artifact.getVersion().equals( "1.0" ) );
+ assertTrue( artifact.getVersion().equals( "1.0" ),
+ "Incorrect version for " + artifact.getDependencyConflictId() );
}
}
}
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
index 9057752..c4562dc 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
@@ -26,11 +26,11 @@ import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* A test which demonstrates maven's dependency management
@@ -69,18 +69,17 @@ public class ProjectInheritanceTest
assertEquals( pom0Basedir, project1.getParent().getBasedir() );
System.out.println( "Project " + project1.getId() + " " + project1 );
Set set = project1.getArtifacts();
- assertNotNull( "No artifacts", set );
- assertTrue( "No Artifacts", set.size() > 0 );
+ assertNotNull( set, "No artifacts" );
+ assertTrue( set.size() > 0, "No Artifacts" );
Iterator iter = set.iterator();
- assertTrue( "Set size should be 4, is " + set.size(), set.size() == 4 );
+ assertTrue( set.size() == 4, "Set size should be 4, is " + set.size() );
while ( iter.hasNext() )
{
Artifact artifact = (Artifact) iter.next();
System.out.println( "Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion()
+ " Optional=" + ( artifact.isOptional() ? "true" : "false" ) );
- assertTrue( "Incorrect version for " + artifact.getDependencyConflictId(),
- artifact.getVersion().equals( "1.0" ) );
+ assertTrue( artifact.getVersion().equals( "1.0" ), "Incorrect version for " + artifact.getDependencyConflictId() );
}
}
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
index bd1a5d3..dcc4e8b 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
@@ -23,12 +23,12 @@ import java.util.Map;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Verifies exclusions listed in dependencyManagement are valid for
@@ -76,17 +76,17 @@ public class ProjectInheritanceTest
MavenProject project0 = getProjectWithDependencies( pom0 );
MavenProject project1 = getProjectWithDependencies( pom1 );
- assertNotNull("Parent is null", project1.getParent());
+ assertNotNull( project1.getParent(), "Parent is null" );
assertEquals( pom0Basedir, project1.getParent().getBasedir() );
Map map = project1.getArtifactMap();
- assertNotNull("No artifacts", map);
- assertTrue("No Artifacts", map.size() > 0);
- assertTrue("Set size should be 2, is " + map.size(), map.size() == 2);
+ assertNotNull( map, "No artifacts" );
+ assertTrue( map.size() > 0, "No Artifacts" );
+ assertTrue( map.size() == 2, "Set size should be 2, is " + map.size() );
- assertTrue("maven-test:t09-a is not in the project", map.containsKey( "maven-test:t09-a" ));
- assertTrue("maven-test:t09-b is not in the project", map.containsKey( "maven-test:t09-b" ));
- assertFalse("maven-test:t09-c is in the project", map.containsKey( "maven-test:t09-c" ));
+ assertTrue( map.containsKey( "maven-test:t09-a" ), "maven-test:t09-a is not in the project" );
+ assertTrue( map.containsKey( "maven-test:t09-b" ), "maven-test:t09-b is not in the project" );
+ assertFalse( map.containsKey( "maven-test:t09-c" ), "maven-test:t09-c is in the project" );
}
/**
@@ -115,13 +115,13 @@ public class ProjectInheritanceTest
assertEquals( pom0Basedir, project2.getParent().getBasedir() );
Map map = project2.getArtifactMap();
- assertNotNull( "No artifacts", map );
- assertTrue( "No Artifacts", map.size() > 0 );
- assertTrue( "Set size should be 4, is " + map.size(), map.size() == 4 );
+ assertNotNull( map, "No artifacts" );
+ assertTrue( map.size() > 0, "No Artifacts" );
+ assertTrue( map.size() == 4, "Set size should be 4, is " + map.size() );
- assertTrue( "maven-test:t09-a is not in the project", map.containsKey( "maven-test:t09-a" ) );
- assertTrue( "maven-test:t09-b is not in the project", map.containsKey( "maven-test:t09-b" ) );
- assertTrue( "maven-test:t09-c is not in the project", map.containsKey( "maven-test:t09-c" ) );
- assertTrue( "maven-test:t09-d is not in the project", map.containsKey( "maven-test:t09-d" ) );
+ assertTrue( map.containsKey( "maven-test:t09-a" ), "maven-test:t09-a is not in the project" );
+ assertTrue( map.containsKey( "maven-test:t09-b" ), "maven-test:t09-b is not in the project" );
+ assertTrue( map.containsKey( "maven-test:t09-c" ), "maven-test:t09-c is not in the project" );
+ assertTrue( map.containsKey( "maven-test:t09-d" ), "maven-test:t09-d is not in the project" );
}
}
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
index 02bf015..b1e7408 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
@@ -25,11 +25,11 @@ import java.util.Map;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Verifies scope inheritance of direct and transitive dependencies.
@@ -74,9 +74,9 @@ public class ProjectInheritanceTest
assertEquals( pom0Basedir, project1.getParent().getBasedir() );
System.out.println("Project " + project1.getId() + " " + project1);
Map map = project1.getArtifactMap();
- assertNotNull("No artifacts", map);
- assertTrue("No Artifacts", map.size() > 0);
- assertTrue("Set size should be 3, is " + map.size(), map.size() == 3);
+ assertNotNull( map, "No artifacts" );
+ assertTrue( map.size() > 0, "No Artifacts" );
+ assertTrue( map.size() == 3, "Set size should be 3, is " + map.size() );
Artifact a = (Artifact) map.get("maven-test:t10-a");
Artifact b = (Artifact) map.get("maven-test:t10-b");
@@ -88,13 +88,13 @@ public class ProjectInheritanceTest
// inherited from depMgmt
System.out.println(a.getScope());
- assertTrue("Incorrect scope for " + a.getDependencyConflictId(), a.getScope().equals("test"));
+ assertTrue( a.getScope().equals("test"), "Incorrect scope for " + a.getDependencyConflictId() );
// transitive dep, overridden b depMgmt
- assertTrue("Incorrect scope for " + b.getDependencyConflictId(), b.getScope().equals("runtime"));
+ assertTrue( b.getScope().equals("runtime"), "Incorrect scope for " + b.getDependencyConflictId() );
// direct dep, overrides depMgmt
- assertTrue("Incorrect scope for " + c.getDependencyConflictId(), c.getScope().equals("runtime"));
+ assertTrue( c.getScope().equals("runtime"), "Incorrect scope for " + c.getDependencyConflictId() );
}
}
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java
index 4d7fa51..3f21d5e 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java
@@ -23,10 +23,10 @@ import java.io.File;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
* Verifies scope of root project is preserved regardless of parent dependency management.
@@ -63,7 +63,7 @@ public class ProjectInheritanceTest
MavenProject project1 = getProjectWithDependencies( pom1 );
assertEquals( pom0Basedir, project1.getParent().getBasedir() );
- assertNull( "dependencyManagement has overwritten the scope of the currently building child project",
- project1.getArtifact().getScope() );
+ assertNull( project1.getArtifact().getScope(),
+ "dependencyManagement has overwritten the scope of the currently building child project" );
}
}
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java
index b872930..086d710 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java
@@ -25,10 +25,10 @@ import java.util.Map;
import org.apache.maven.model.Plugin;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
* Verifies that plugin execution sections in the parent POM that have
@@ -65,6 +65,6 @@ public class ProjectInheritanceTest extends AbstractProjectInheritanceTestCase
assertNotNull( compilerPlugin );
Map executionMap = compilerPlugin.getExecutionsAsMap();
- assertNull( "Plugin execution: \'test\' should NOT exist in the compiler plugin specification for the child project!", executionMap.get( "test" ) );
+ assertNull( executionMap.get( "test" ), "Plugin execution: \'test\' should NOT exist in the compiler plugin specification for the child project!" );
}
}
\ No newline at end of file
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
index 0097961..82aee6c 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
@@ -23,9 +23,9 @@ import java.io.File;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Verifies SCM inheritance uses modules statement from parent.
diff --git a/maven-compat/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java b/maven-compat/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java
index 4705568..022ccd5 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java
@@ -21,9 +21,9 @@ package org.apache.maven.project.path;
import java.io.File;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
@SuppressWarnings( "deprecation" )
public class DefaultPathTranslatorTest
{
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java b/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
index 5735db0..97687e3 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
@@ -21,9 +21,9 @@ package org.apache.maven.repository;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class DefaultMirrorSelectorTest
{
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
index f1ffbb0..eb56bc8 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
@@ -17,7 +17,6 @@ package org.apache.maven.repository;
import java.io.File;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import org.apache.maven.artifact.Artifact;
@@ -33,20 +32,17 @@ import org.apache.maven.model.Repository;
import org.apache.maven.model.RepositoryPolicy;
import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.repository.legacy.LegacyRepositorySystem;
-import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.DefaultPlexusContainer;
-import org.codehaus.plexus.PlexusConstants;
import org.apache.maven.test.PlexusTestCase;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
import org.eclipse.aether.repository.LocalRepository;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import javax.inject.Inject;
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java b/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
index b48bdd6..443bc44 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.repository;
*/
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import org.apache.maven.test.PlexusTestCase;
@@ -28,17 +27,14 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.repository.legacy.repository.ArtifactRepositoryFactory;
import org.apache.maven.settings.Mirror;
-import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.DefaultPlexusContainer;
-import org.codehaus.plexus.PlexusConstants;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import javax.inject.Inject;
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
index fe65393..e826505 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
@@ -31,14 +31,14 @@ import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class DefaultUpdateCheckManagerTest
extends AbstractArtifactComponentTestCase
@@ -55,7 +55,7 @@ public class DefaultUpdateCheckManagerTest
return "updateCheckManager";
}
- @Before
+ @BeforeEach
@Override
public void setUp()
throws Exception
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
index a0e9f90..e6177c7 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
@@ -22,7 +22,6 @@ package org.apache.maven.repository.legacy;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import org.apache.maven.artifact.Artifact;
@@ -43,22 +42,19 @@ import org.apache.maven.wagon.events.TransferEvent;
import org.apache.maven.wagon.events.TransferListener;
import org.apache.maven.wagon.observers.AbstractTransferListener;
import org.apache.maven.wagon.observers.Debug;
-import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.DefaultPlexusContainer;
-import org.codehaus.plexus.PlexusConstants;
import org.apache.maven.test.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import javax.inject.Inject;
@@ -248,25 +244,27 @@ public class DefaultWagonManagerTest
wagon.addExpectedContent( repo.getLayout().pathOf( artifact ) + ".md5", "cd26d9e10ce691cc69aa2b90dcebbdac" );
/* getArtifact */
- assertFalse( "Transfer listener is registered before test",
- wagon.getTransferEventSupport().hasTransferListener( transferListener ) );
+ assertFalse( wagon.getTransferEventSupport().hasTransferListener( transferListener ),
+ "Transfer listener is registered before test" );
wagonManager.getArtifact( artifact, repo, transferListener, false );
- assertFalse( "Transfer listener still registered after getArtifact",
- wagon.getTransferEventSupport().hasTransferListener( transferListener ) );
+ assertFalse( wagon.getTransferEventSupport().hasTransferListener( transferListener ),
+ "Transfer listener still registered after getArtifact" );
/* putArtifact */
File sampleFile = getTestFile( "target/test-file" );
FileUtils.fileWrite( sampleFile.getAbsolutePath(), "sample file" );
- assertFalse( "Transfer listener is registered before test", wagon.getTransferEventSupport().hasTransferListener( transferListener ) );
+ assertFalse( wagon.getTransferEventSupport().hasTransferListener( transferListener ),
+ "Transfer listener is registered before test" );
wagonManager.putArtifact( sampleFile, artifact, repo, transferListener );
- assertFalse( "Transfer listener still registered after putArtifact", wagon.getTransferEventSupport().hasTransferListener( transferListener ) );
+ assertFalse( wagon.getTransferEventSupport().hasTransferListener( transferListener ),
+ "Transfer listener still registered after putArtifact" );
}
/**
* Checks the verification of checksums.
*/
- @Ignore
+ @Disabled
@Test
public void testChecksumVerification()
throws Exception
@@ -295,8 +293,10 @@ public class DefaultWagonManagerTest
wagon.clearExpectedContent();
wagon.addExpectedContent( "path", "expected-failure" );
wagon.addExpectedContent( "path.sha1", "b7bb97d7d0b9244398d9b47296907f73313663e6" );
- assertThrows( "Checksum verification did not fail", ChecksumFailedException.class, () ->
- wagonManager.getArtifact( artifact, repo, null, false ) );
+ assertThrows(
+ ChecksumFailedException.class, () ->
+ wagonManager.getArtifact( artifact, repo, null, false ),
+ "Checksum verification did not fail" );
wagon.clearExpectedContent();
wagon.addExpectedContent( "path", "lower-case-checksum" );
@@ -311,9 +311,10 @@ public class DefaultWagonManagerTest
wagon.clearExpectedContent();
wagon.addExpectedContent( "path", "expected-failure" );
wagon.addExpectedContent( "path.md5", "b7bb97d7d0b9244398d9b47296907f73313663e6" );
- assertThrows( "Checksum verification did not fail",
+ assertThrows(
ChecksumFailedException.class,
- () -> wagonManager.getArtifact( artifact, repo, null, false ) );
+ () -> wagonManager.getArtifact( artifact, repo, null, false ),
+ "Checksum verification did not fail" );
}
@Test
@@ -333,7 +334,7 @@ public class DefaultWagonManagerTest
{
Wagon wagon = wagonManager.getWagon( protocol );
- assertNotNull( "Check wagon, protocol=" + protocol, wagon );
+ assertNotNull( wagon, "Check wagon, protocol=" + protocol );
}
private final class ArtifactRepositoryLayoutStub
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
index 1f4d69a..61f16cc 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
@@ -17,22 +17,18 @@ package org.apache.maven.repository.legacy;
import java.io.File;
import java.util.Arrays;
-import java.util.Collections;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.Authentication;
import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.settings.Server;
-import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.DefaultPlexusContainer;
-import org.codehaus.plexus.PlexusConstants;
import org.apache.maven.test.PlexusTestCase;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import javax.inject.Inject;
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
index 5927030..0ef67d9 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
@@ -49,18 +49,16 @@ import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.repository.legacy.metadata.MetadataResolutionRequest;
-import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.PlexusConstants;
import org.apache.maven.test.PlexusTestCase;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test the default artifact collector.
@@ -82,7 +80,7 @@ public class DefaultArtifactCollectorTest
private static final String GROUP_ID = "test";
- @Before
+ @BeforeEach
@Override
public void setUp()
throws Exception
@@ -95,29 +93,31 @@ public class DefaultArtifactCollectorTest
}
@Test
- @Ignore("works, but we don't fail on cycles presently")
+ @Disabled("works, but we don't fail on cycles presently")
public void testCircularDependencyNotIncludingCurrentProject()
throws ArtifactResolutionException, InvalidVersionSpecificationException
{
ArtifactSpec a = createArtifactSpec( "a", "1.0" );
ArtifactSpec b = a.addDependency( "b", "1.0" );
b.addDependency( "a", "1.0" );
- assertThrows( "Should have failed on cyclic dependency not involving project",
+ assertThrows(
CyclicDependencyException.class,
- () -> collect( a ) );
+ () -> collect( a ),
+ "Should have failed on cyclic dependency not involving project" );
}
@Test
- @Ignore("works, but we don't fail on cycles presently")
+ @Disabled("works, but we don't fail on cycles presently")
public void testCircularDependencyIncludingCurrentProject()
throws ArtifactResolutionException, InvalidVersionSpecificationException
{
ArtifactSpec a = createArtifactSpec( "a", "1.0" );
ArtifactSpec b = a.addDependency( "b", "1.0" );
b.addDependency( "project", "1.0" );
- assertThrows( "Should have failed on cyclic dependency not involving project",
+ assertThrows(
CyclicDependencyException.class,
- () -> collect( a ) );
+ () -> collect( a ),
+ "Should have failed on cyclic dependency not involving project" );
}
@Test
@@ -132,12 +132,12 @@ public class DefaultArtifactCollectorTest
ArtifactSpec d = b.addDependency( "d", "4.0" );
ArtifactResolutionResult res = collect( a );
- assertEquals( "Check artifact list",
- createSet( new Object[] { a.artifact, b.artifact, c.artifact, d.artifact } ), res.getArtifacts() );
+ assertEquals( createSet( new Object[] { a.artifact, b.artifact, c.artifact, d.artifact } ), res.getArtifacts(),
+ "Check artifact list" );
ArtifactFilter filter = new ExclusionSetFilter( new String[] { "b" } );
res = collect( a, filter );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, c.artifact } ), res.getArtifacts() );
+ assertEquals( createSet( new Object[] { a.artifact, c.artifact } ), res.getArtifacts(), "Check artifact list" );
}
@Test
@@ -154,13 +154,13 @@ public class DefaultArtifactCollectorTest
ArtifactSpec f = c1.addDependency( "f", "1.0" );
ArtifactResolutionResult res = collect( createSet( new Object[] { a.artifact, e.artifact } ) );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, b.artifact, e.artifact, c1.artifact,
- f.artifact } ), res.getArtifacts() );
- assertEquals( "Check version", "1.0", getArtifact( "c", res.getArtifacts() ).getVersion() );
+ assertEquals( createSet( new Object[] { a.artifact, b.artifact, e.artifact, c1.artifact, f.artifact } ),
+ res.getArtifacts(), "Check artifact list" );
+ assertEquals( "1.0", getArtifact( "c", res.getArtifacts() ).getVersion(), "Check version" );
}
@Test
- @Ignore
+ @Disabled
public void testResolveCorrectDependenciesWhenDifferentDependenciesOnNewest()
throws ArtifactResolutionException, InvalidVersionSpecificationException
{
@@ -175,13 +175,12 @@ public class DefaultArtifactCollectorTest
c1.addDependency( "f", "1.0" );
ArtifactResolutionResult res = collect( createSet( new Object[] { a.artifact, e.artifact } ) );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, b.artifact, e.artifact, c2.artifact,
- d.artifact } ), res.getArtifacts() );
- assertEquals( "Check version", "2.0", getArtifact( "c", res.getArtifacts() ).getVersion() );
+ assertEquals( createSet( new Object[] { a.artifact, b.artifact, e.artifact, c2.artifact, d.artifact } ), res.getArtifacts(), "Check artifact list" );
+ assertEquals( "2.0", getArtifact( "c", res.getArtifacts() ).getVersion(), "Check version" );
}
@Test
- @Ignore
+ @Disabled
public void testResolveCorrectDependenciesWhenDifferentDependenciesOnNewestVersionReplaced()
throws ArtifactResolutionException, InvalidVersionSpecificationException
{
@@ -198,9 +197,9 @@ public class DefaultArtifactCollectorTest
ArtifactResolutionResult res = collect( createSet( new Object[] { a.artifact } ) );
Object[] artifacts = new Object[] { a.artifact, c.artifact, d1.artifact, b2.artifact, e.artifact, g.artifact };
- assertEquals( "Check artifact list", createSet( artifacts ), res.getArtifacts() );
- assertEquals( "Check version", "1.0", getArtifact( "d", res.getArtifacts() ).getVersion() );
- assertEquals( "Check version", "2.0", getArtifact( "b", res.getArtifacts() ).getVersion() );
+ assertEquals( createSet( artifacts ), res.getArtifacts(), "Check artifact list" );
+ assertEquals( "1.0", getArtifact( "d", res.getArtifacts() ).getVersion(), "Check version" );
+ assertEquals( "2.0", getArtifact( "b", res.getArtifacts() ).getVersion(), "Check version" );
}
@Test
@@ -214,9 +213,8 @@ public class DefaultArtifactCollectorTest
b.addDependency( "c", "2.0" );
ArtifactResolutionResult res = collect( a );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, b.artifact, c.artifact } ),
- res.getArtifacts() );
- assertEquals( "Check version", "3.0", getArtifact( "c", res.getArtifacts() ).getVersion() );
+ assertEquals( createSet( new Object[] { a.artifact, b.artifact, c.artifact } ), res.getArtifacts(), "Check artifact list" );
+ assertEquals( "3.0", getArtifact( "c", res.getArtifacts() ).getVersion(), "Check version" );
}
@Test
@@ -230,9 +228,8 @@ public class DefaultArtifactCollectorTest
b.addDependency( "c", "3.0" );
ArtifactResolutionResult res = collect( a );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, b.artifact, c.artifact } ),
- res.getArtifacts() );
- assertEquals( "Check version", "2.0", getArtifact( "c", res.getArtifacts() ).getVersion() );
+ assertEquals( createSet( new Object[] { a.artifact, b.artifact, c.artifact } ), res.getArtifacts(), "Check artifact list" );
+ assertEquals( "2.0", getArtifact( "c", res.getArtifacts() ).getVersion(), "Check version" );
}
@Test
@@ -244,8 +241,8 @@ public class DefaultArtifactCollectorTest
ArtifactSpec b = createArtifactSpec( "b", "3.0" );
ArtifactResolutionResult res = collect( createSet( new Object[] { a.artifact, b.artifact } ) );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, b.artifact } ), res.getArtifacts() );
- assertEquals( "Check version", "3.0", getArtifact( "b", res.getArtifacts() ).getVersion() );
+ assertEquals( createSet( new Object[] { a.artifact, b.artifact } ), res.getArtifacts(), "Check artifact list" );
+ assertEquals( "3.0", getArtifact( "b", res.getArtifacts() ).getVersion(), "Check version" );
}
@Test
@@ -257,8 +254,8 @@ public class DefaultArtifactCollectorTest
ArtifactSpec b = createArtifactSpec( "b", "2.0" );
ArtifactResolutionResult res = collect( createSet( new Object[] { a.artifact, b.artifact } ) );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, b.artifact } ), res.getArtifacts() );
- assertEquals( "Check version", "2.0", getArtifact( "b", res.getArtifacts() ).getVersion() );
+ assertEquals( createSet( new Object[] { a.artifact, b.artifact } ), res.getArtifacts(), "Check artifact list" );
+ assertEquals( "2.0", getArtifact( "b", res.getArtifacts() ).getVersion(), "Check version" );
}
@Test
@@ -270,9 +267,9 @@ public class DefaultArtifactCollectorTest
ArtifactSpec b = createArtifactSpec( "junit", "3.8.1", Artifact.SCOPE_TEST );
ArtifactResolutionResult res = collect( createSet( new Object[] { a.artifact, b.artifact } ) );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, b.artifact } ), res.getArtifacts() );
- assertEquals( "Check version", "3.8.1", getArtifact( "junit", res.getArtifacts() ).getVersion() );
- assertEquals( "Check artifactScope", Artifact.SCOPE_TEST, getArtifact( "junit", res.getArtifacts() ).getScope() );
+ assertEquals( createSet( new Object[] { a.artifact, b.artifact } ), res.getArtifacts(), "Check artifact list" );
+ assertEquals( "3.8.1", getArtifact( "junit", res.getArtifacts() ).getVersion(), "Check version" );
+ assertEquals( Artifact.SCOPE_TEST, getArtifact( "junit", res.getArtifacts() ).getScope(), "Check artifactScope" );
}
@Test
@@ -284,9 +281,9 @@ public class DefaultArtifactCollectorTest
a.addDependency( "junit", "3.7" );
ArtifactResolutionResult res = collect( createSet( new Object[] { a.artifact, b.artifact } ) );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, b.artifact } ), res.getArtifacts() );
- assertEquals( "Check version", "3.8.1", getArtifact( "junit", res.getArtifacts() ).getVersion() );
- assertEquals( "Check artifactScope", Artifact.SCOPE_TEST, getArtifact( "junit", res.getArtifacts() ).getScope() );
+ assertEquals( createSet( new Object[] { a.artifact, b.artifact } ), res.getArtifacts(), "Check artifact list" );
+ assertEquals( "3.8.1", getArtifact( "junit", res.getArtifacts() ).getVersion(), "Check version" );
+ assertEquals( Artifact.SCOPE_TEST, getArtifact( "junit", res.getArtifacts() ).getScope(), "Check artifactScope" );
}
@Test
@@ -300,9 +297,8 @@ public class DefaultArtifactCollectorTest
b.addDependency( "c", "[1.0,3.0]" );
ArtifactResolutionResult res = collect( a );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, b.artifact, c.artifact } ),
- res.getArtifacts() );
- assertEquals( "Check version", "2.0", getArtifact( "c", res.getArtifacts() ).getVersion() );
+ assertEquals( createSet( new Object[] { a.artifact, b.artifact, c.artifact } ), res.getArtifacts(), "Check artifact list" );
+ assertEquals( "2.0", getArtifact( "c", res.getArtifacts() ).getVersion(), "Check version" );
}
@Test
@@ -315,9 +311,8 @@ public class DefaultArtifactCollectorTest
ArtifactSpec managedB = createArtifactSpec( "b", "5.0" );
ArtifactResolutionResult res = collect( a, managedB.artifact );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, managedB.artifact } ),
- res.getArtifacts() );
- assertEquals( "Check version", "5.0", getArtifact( "b", res.getArtifacts() ).getVersion() );
+ assertEquals( createSet( new Object[] { a.artifact, managedB.artifact } ), res.getArtifacts(), "Check artifact list" );
+ assertEquals( "5.0", getArtifact( "b", res.getArtifacts() ).getVersion(), "Check version" );
}
@Test
@@ -332,9 +327,8 @@ public class DefaultArtifactCollectorTest
ArtifactResolutionResult res = collect( a );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, b.artifact, c.artifact } ),
- res.getArtifacts() );
- assertEquals( "Check version", "2.5", getArtifact( "c", res.getArtifacts() ).getVersion() );
+ assertEquals( createSet( new Object[] { a.artifact, b.artifact, c.artifact } ), res.getArtifacts(), "Check artifact list" );
+ assertEquals( "2.5", getArtifact( "c", res.getArtifacts() ).getVersion(), "Check version" );
}
@Test
@@ -378,8 +372,8 @@ public class DefaultArtifactCollectorTest
ArtifactResolutionResult res = collect( a );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, c.artifact } ), res.getArtifacts() );
- assertEquals( "Check version", "2.0", getArtifact( "c", res.getArtifacts() ).getVersion() );
+ assertEquals( createSet( new Object[] { a.artifact, c.artifact } ), res.getArtifacts(), "Check artifact list" );
+ assertEquals( "2.0", getArtifact( "c", res.getArtifacts() ).getVersion(), "Check version" );
}
@Test
@@ -406,7 +400,7 @@ public class DefaultArtifactCollectorTest
Artifact modifiedB = createArtifactSpec( "b", "5.0", Artifact.SCOPE_RUNTIME ).artifact;
ArtifactResolutionResult res = collect( a, managedVersion );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, modifiedB } ), res.getArtifacts() );
+ assertEquals( createSet( new Object[] { a.artifact, modifiedB } ), res.getArtifacts(), "Check artifact list" );
}
@Test
@@ -420,11 +414,11 @@ public class DefaultArtifactCollectorTest
ArtifactResolutionResult result = collect( a, managedVersion );
- assertEquals( "collect has modified version in originating artifact", "1.0", artifact.getVersion() );
+ assertEquals( "1.0", artifact.getVersion(), "collect has modified version in originating artifact" );
Artifact resolvedArtifact = result.getArtifacts().iterator().next();
- assertEquals( "Resolved version don't match original artifact version", "1.0", resolvedArtifact.getVersion() );
+ assertEquals( "1.0", resolvedArtifact.getVersion(), "Resolved version don't match original artifact version" );
}
@Test
@@ -439,11 +433,11 @@ public class DefaultArtifactCollectorTest
Artifact modifiedC = createArtifactSpec( "c", "3.0", Artifact.SCOPE_COMPILE ).artifact;
ArtifactResolutionResult res = collect( createSet( new Object[] { a.artifact, c.artifact } ) );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, modifiedC } ), res.getArtifacts() );
+ assertEquals( createSet( new Object[] { a.artifact, modifiedC } ), res.getArtifacts(), "Check artifact list" );
Artifact artifact = getArtifact( "c", res.getArtifacts() );
// local wins now, and irrelevant if not local as test/provided aren't transitive
- // assertEquals( "Check artifactScope", Artifact.SCOPE_COMPILE, artifact.getArtifactScope() );
- assertEquals( "Check artifactScope", Artifact.SCOPE_TEST, artifact.getScope() );
+ // assertEquals( Artifact.SCOPE_COMPILE, artifact.getArtifactScope(), "Check artifactScope" );
+ assertEquals( Artifact.SCOPE_TEST, artifact.getScope(), "Check artifactScope" );
}
@Test
@@ -458,11 +452,11 @@ public class DefaultArtifactCollectorTest
Artifact modifiedC = createArtifactSpec( "c", "3.0", Artifact.SCOPE_RUNTIME ).artifact;
ArtifactResolutionResult res = collect( createSet( new Object[] { a.artifact, c.artifact } ) );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, modifiedC } ), res.getArtifacts() );
+ assertEquals( createSet( new Object[] { a.artifact, modifiedC } ), res.getArtifacts(), "Check artifact list" );
Artifact artifact = getArtifact( "c", res.getArtifacts() );
// local wins now, and irrelevant if not local as test/provided aren't transitive
- // assertEquals( "Check artifactScope", Artifact.SCOPE_RUNTIME, artifact.getArtifactScope() );
- assertEquals( "Check artifactScope", Artifact.SCOPE_TEST, artifact.getScope() );
+ // assertEquals( Artifact.SCOPE_RUNTIME, artifact.getArtifactScope(), "Check artifactScope" );
+ assertEquals( Artifact.SCOPE_TEST, artifact.getScope(), "Check artifactScope" );
}
@Test
@@ -478,10 +472,9 @@ public class DefaultArtifactCollectorTest
Artifact modifiedC = createArtifactSpec( "c", "3.0", Artifact.SCOPE_COMPILE ).artifact;
ArtifactResolutionResult res = collect( createSet( new Object[] { root.artifact } ) );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, root.artifact, modifiedC } ),
- res.getArtifacts() );
+ assertEquals( createSet( new Object[] { a.artifact, root.artifact, modifiedC } ), res.getArtifacts(), "Check artifact list" );
Artifact artifact = getArtifact( "c", res.getArtifacts() );
- assertEquals( "Check artifactScope", Artifact.SCOPE_COMPILE, artifact.getScope() );
+ assertEquals( Artifact.SCOPE_COMPILE, artifact.getScope(), "Check artifactScope" );
}
@Test
@@ -496,11 +489,11 @@ public class DefaultArtifactCollectorTest
Artifact modifiedC = createArtifactSpec( "c", "3.0", Artifact.SCOPE_COMPILE ).artifact;
ArtifactResolutionResult res = collect( createSet( new Object[] { a.artifact, c.artifact } ) );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, modifiedC } ), res.getArtifacts() );
+ assertEquals( createSet( new Object[] { a.artifact, modifiedC } ), res.getArtifacts(), "Check artifact list" );
Artifact artifact = getArtifact( "c", res.getArtifacts() );
// local wins now, and irrelevant if not local as test/provided aren't transitive
- // assertEquals( "Check artifactScope", Artifact.SCOPE_COMPILE, artifact.getArtifactScope() );
- assertEquals( "Check artifactScope", Artifact.SCOPE_PROVIDED, artifact.getScope() );
+ // assertEquals( Artifact.SCOPE_COMPILE, artifact.getArtifactScope(), "Check artifactScope" );
+ assertEquals( Artifact.SCOPE_PROVIDED, artifact.getScope(), "Check artifactScope" );
}
@Test
@@ -515,11 +508,11 @@ public class DefaultArtifactCollectorTest
Artifact modifiedC = createArtifactSpec( "c", "3.0", Artifact.SCOPE_RUNTIME ).artifact;
ArtifactResolutionResult res = collect( createSet( new Object[] { a.artifact, c.artifact } ) );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, modifiedC } ), res.getArtifacts() );
+ assertEquals( createSet( new Object[] { a.artifact, modifiedC } ), res.getArtifacts(), "Check artifact list" );
Artifact artifact = getArtifact( "c", res.getArtifacts() );
// local wins now, and irrelevant if not local as test/provided aren't transitive
- // assertEquals( "Check artifactScope", Artifact.SCOPE_RUNTIME, artifact.getArtifactScope() );
- assertEquals( "Check artifactScope", Artifact.SCOPE_PROVIDED, artifact.getScope() );
+ // assertEquals( Artifact.SCOPE_RUNTIME, artifact.getArtifactScope(), "Check artifactScope" );
+ assertEquals( Artifact.SCOPE_PROVIDED, artifact.getScope(), "Check artifactScope" );
}
@Test
@@ -531,7 +524,7 @@ public class DefaultArtifactCollectorTest
b.addDependency( "c", "3.0", Artifact.SCOPE_PROVIDED );
ArtifactResolutionResult res = collect( createSet( new Object[] { a.artifact, b.artifact } ) );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, b.artifact } ), res.getArtifacts() );
+ assertEquals( createSet( new Object[] { a.artifact, b.artifact } ), res.getArtifacts(), "Check artifact list" );
}
@Test
@@ -543,7 +536,7 @@ public class DefaultArtifactCollectorTest
b.addDependency( "c", "3.0", true );
ArtifactResolutionResult res = collect( createSet( new Object[] { a.artifact, b.artifact } ) );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, b.artifact } ), res.getArtifacts() );
+ assertEquals( createSet( new Object[] { a.artifact, b.artifact } ), res.getArtifacts(), "Check artifact list" );
}
@Test
@@ -555,7 +548,7 @@ public class DefaultArtifactCollectorTest
ArtifactSpec b = createArtifactSpec( "b", "1.0", true );
ArtifactResolutionResult res = collect( createSet( new Object[] { a.artifact, b.artifact } ) );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, b.artifact } ), res.getArtifacts() );
+ assertEquals( createSet( new Object[] { a.artifact, b.artifact } ), res.getArtifacts(), "Check artifact list" );
}
@Test
@@ -658,20 +651,20 @@ public class DefaultArtifactCollectorTest
ArtifactResolutionResult res = collect( createSet( new Object[] { a.artifact, b.artifact } ), filter );
Artifact artifact = getArtifact( "d", res.getArtifacts() );
- assertNotNull( "MNG-1895 Dependency was not added to resolution", artifact );
- assertEquals( "Check artifactScope", expectedScope, artifact.getScope() );
- assertEquals( "Check version", expectedVersion, artifact.getVersion() );
+ assertNotNull( artifact, "MNG-1895 Dependency was not added to resolution" );
+ assertEquals( expectedScope, artifact.getScope(), "Check artifactScope" );
+ assertEquals( expectedVersion, artifact.getVersion(), "Check version" );
ArtifactSpec d = createArtifactSpec( "d", "1.0" );
res = collect( createSet( new Object[] { a.artifact, b.artifact, d.artifact } ), filter );
artifact = getArtifact( "d", res.getArtifacts() );
- assertNotNull( "MNG-1895 Dependency was not added to resolution", artifact );
- assertEquals( "Check artifactScope", d.artifact.getScope(), artifact.getScope() );
- assertEquals( "Check version", "1.0", artifact.getVersion() );
+ assertNotNull( artifact, "MNG-1895 Dependency was not added to resolution" );
+ assertEquals( d.artifact.getScope(), artifact.getScope(), "Check artifactScope" );
+ assertEquals( "1.0", artifact.getVersion(), "Check version" );
}
@Test
- @Ignore
+ @Disabled
public void testOptionalNotTransitiveButVersionIsInfluential()
throws ArtifactResolutionException, InvalidVersionSpecificationException
{
@@ -685,10 +678,9 @@ public class DefaultArtifactCollectorTest
ArtifactSpec c = createArtifactSpec( "c", "3.0" );
ArtifactResolutionResult res = collect( createSet( new Object[] { a.artifact, b.artifact } ) );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, b.artifact, c.artifact, d.artifact,
- e.artifact } ), res.getArtifacts() );
+ assertEquals( createSet( new Object[] { a.artifact, b.artifact, c.artifact, d.artifact, e.artifact } ), res.getArtifacts(), "Check artifact list" );
Artifact artifact = getArtifact( "c", res.getArtifacts() );
- assertEquals( "Check version", "3.0", artifact.getVersion() );
+ assertEquals( "3.0", artifact.getVersion(), "Check version" );
}
@Test
@@ -700,7 +692,7 @@ public class DefaultArtifactCollectorTest
b.addDependency( "c", "3.0", Artifact.SCOPE_TEST );
ArtifactResolutionResult res = collect( createSet( new Object[] { a.artifact, b.artifact } ) );
- assertEquals( "Check artifact list", createSet( new Object[] { a.artifact, b.artifact } ), res.getArtifacts() );
+ assertEquals( createSet( new Object[] { a.artifact, b.artifact } ), res.getArtifacts(), "Check artifact list" );
}
@Test
@@ -723,6 +715,7 @@ public class DefaultArtifactCollectorTest
}
@Test
+ @Disabled("that one does not work")
public void testOverConstrainedVersionException()
throws ArtifactResolutionException, InvalidVersionSpecificationException
{
@@ -735,15 +728,11 @@ public class DefaultArtifactCollectorTest
ArtifactSpec c = createArtifactSpec( "c", "3.2.1-v3235e" );
- try
- {
- ArtifactResolutionResult res = collect( createSet( new Object[] { a.artifact } ) );
- }
- catch ( OverConstrainedVersionException e )
- {
- assertTrue( "Versions unordered", e.getMessage().contains( "[3.2.1-v3235e, 3.3.0-v3346]" ) );
- assertTrue( "DependencyTrail unresolved", e.getMessage().contains( "Path to dependency:" ) );
- }
+ OverConstrainedVersionException e = assertThrows(
+ OverConstrainedVersionException.class,
+ () -> collect( createSet( new Object[] { a.artifact } ) ) );
+ assertTrue( e.getMessage().contains( "[3.2.1-v3235e, 3.3.0-v3346]" ), "Versions unordered" );
+ assertTrue( e.getMessage().contains( "Path to dependency:" ), "DependencyTrail unresolved" );
}
private Artifact getArtifact( String id, Set artifacts )
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java
index 87fde6a..fbb2531 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java
@@ -27,17 +27,14 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ResolutionNode;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
-import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.DefaultPlexusContainer;
-import org.codehaus.plexus.PlexusConstants;
import org.apache.maven.test.PlexusTestCase;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
import javax.inject.Inject;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Provides a basis for testing conflict resolvers.
@@ -79,7 +76,7 @@ public abstract class AbstractConflictResolverTest
/*
* @see junit.framework.TestCase#setUp()
*/
- @Before
+ @BeforeEach
@Override
public void setUp()
throws Exception
@@ -96,7 +93,7 @@ public abstract class AbstractConflictResolverTest
/*
* @see org.codehaus.plexus.PlexusTestCase#tearDown()
*/
- @After
+ @AfterEach
@Override
public void tearDown() throws Exception
{
@@ -120,8 +117,8 @@ public abstract class AbstractConflictResolverTest
{
ResolutionNode resolvedNode = getConflictResolver().resolveConflict( actualNode1, actualNode2 );
- assertNotNull( "Expected resolvable", resolvedNode );
- assertEquals( "Resolution node", expectedNode, resolvedNode );
+ assertNotNull( resolvedNode, "Expected resolvable" );
+ assertEquals( expectedNode, resolvedNode, "Resolution node" );
}
protected Artifact createArtifact( String id, String version ) throws InvalidVersionSpecificationException
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java
index 4428f13..7b46ee3 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java
@@ -20,7 +20,7 @@ package org.apache.maven.repository.legacy.resolver.conflict;
*/
import org.apache.maven.artifact.resolver.ResolutionNode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests <code>FarthestConflictResolver</code>.
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java
index 5c188dc..34026bc 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java
@@ -20,7 +20,7 @@ package org.apache.maven.repository.legacy.resolver.conflict;
*/
import org.apache.maven.artifact.resolver.ResolutionNode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests <code>NearestConflictResolver</code>.
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java
index a9c4ca2..874644a 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java
@@ -20,7 +20,7 @@ package org.apache.maven.repository.legacy.resolver.conflict;
*/
import org.apache.maven.artifact.resolver.ResolutionNode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests <code>NewestConflictResolver</code>.
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java
index 3bbfa5f..76335f2 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java
@@ -20,7 +20,7 @@ package org.apache.maven.repository.legacy.resolver.conflict;
*/
import org.apache.maven.artifact.resolver.ResolutionNode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests <code>OldestConflictResolver</code>.
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
index 10d39bc..ebe0fd5 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
@@ -16,15 +16,14 @@ package org.apache.maven.repository.metadata;
*/
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.maven.artifact.ArtifactScopeEnum;
import org.apache.maven.test.PlexusTestCase;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
*
@@ -45,7 +44,7 @@ extends PlexusTestCase
MetadataGraphVertex v3;
MetadataGraphVertex v4;
//------------------------------------------------------------------------------------------
- @Before
+ @BeforeEach
@Override
public void setUp() throws Exception
{
@@ -85,9 +84,9 @@ extends PlexusTestCase
res = transform.transform( graph, ArtifactScopeEnum.compile, false );
- assertNotNull("null classpath container after compile transform", res );
- assertNotNull("null classpath after compile transform", res.getClasspath() );
- assertEquals("compile classpath should have 3 entries", 3, res.getClasspath().size() );
+ assertNotNull( res, "null classpath container after compile transform" );
+ assertNotNull( res.getClasspath(), "null classpath after compile transform" );
+ assertEquals( 3, res.getClasspath().size(), "compile classpath should have 3 entries" );
}
//------------------------------------------------------------------------------------------
@Test
@@ -98,12 +97,12 @@ extends PlexusTestCase
res = transform.transform( graph, ArtifactScopeEnum.runtime, false );
- assertNotNull("null classpath container after runtime transform", res );
- assertNotNull("null classpath after runtime transform", res.getClasspath() );
- assertEquals("runtime classpath should have 4 entries", 4, res.getClasspath().size() );
+ assertNotNull( res, "null classpath container after runtime transform" );
+ assertNotNull( res.getClasspath(), "null classpath after runtime transform" );
+ assertEquals( 4, res.getClasspath().size(), "runtime classpath should have 4 entries" );
ArtifactMetadata md = res.getClasspath().get(3);
- assertEquals("runtime artifact version should be 1.1", "1.1", md.getVersion() );
+ assertEquals("1.1", md.getVersion(), "runtime artifact version should be 1.1" );
}
//------------------------------------------------------------------------------------------
@Test
@@ -114,12 +113,12 @@ extends PlexusTestCase
res = transform.transform( graph, ArtifactScopeEnum.test, false );
- assertNotNull("null classpath container after runtime transform", res );
- assertNotNull("null classpath after runtime transform", res.getClasspath() );
- assertEquals("runtime classpath should have 4 entries", 4, res.getClasspath().size() );
+ assertNotNull( res, "null classpath container after test transform" );
+ assertNotNull( res.getClasspath(), "null classpath after test transform" );
+ assertEquals( 4, res.getClasspath().size(), "test classpath should have 4 entries" );
ArtifactMetadata md = res.getClasspath().get(3);
- assertEquals("test artifact version should be 1.2", "1.2", md.getVersion() );
+ assertEquals("1.2", md.getVersion(), "test artifact version should be 1.2" );
}
//------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java
index 5f144fd..ea4352e 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java
@@ -15,10 +15,10 @@ package org.apache.maven.repository.metadata;
* the License.
*/
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
*
@@ -33,7 +33,7 @@ public class DefaultGraphConflictResolutionPolicyTest
MetadataGraphEdge e2;
MetadataGraphEdge e3;
//------------------------------------------------------------------------------------------
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
policy = new DefaultGraphConflictResolutionPolicy();
@@ -49,10 +49,10 @@ public class DefaultGraphConflictResolutionPolicyTest
MetadataGraphEdge res;
res = policy.apply( e1, e2 );
- assertEquals( "Wrong depth edge selected", "1.1", res.getVersion() );
+ assertEquals( "1.1", res.getVersion(), "Wrong depth edge selected" );
res = policy.apply( e1, e3 );
- assertEquals( "Wrong version edge selected", "1.2", res.getVersion() );
+ assertEquals( "1.2", res.getVersion(), "Wrong version edge selected" );
}
//------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
index 75663dc..a41464a 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
@@ -19,12 +19,11 @@ import javax.inject.Inject;
import org.apache.maven.artifact.ArtifactScopeEnum;
import org.apache.maven.test.PlexusTestCase;
-import org.codehaus.plexus.logging.Logger;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
*
@@ -45,7 +44,7 @@ extends PlexusTestCase
MetadataGraphVertex v3;
MetadataGraphVertex v4;
//------------------------------------------------------------------------------------------
- @Before
+ @BeforeEach
@Override
public void setUp() throws Exception
{
@@ -85,22 +84,22 @@ extends PlexusTestCase
res = resolver.resolveConflicts( graph, ArtifactScopeEnum.compile );
- assertNotNull("null graph after resolver", res );
- assertNotNull("no vertices in the resulting graph after resolver", res.getVertices() );
+ assertNotNull( res, "null graph after resolver" );
+ assertNotNull( res.getVertices(), "no vertices in the resulting graph after resolver" );
- assertNotNull("no edges in the resulting graph after resolver", res.getExcidentEdges(v1) );
+ assertNotNull( res.getExcidentEdges(v1), "no edges in the resulting graph after resolver" );
- assertEquals( "wrong # of vertices in the resulting graph after resolver", 4, res.getVertices().size() );
- assertEquals( "wrong # of excident edges in the resulting graph entry after resolver", 2, res.getExcidentEdges(v1).size() );
+ assertEquals( 4, res.getVertices().size(), "wrong # of vertices in the resulting graph after resolver" );
+ assertEquals( 2, res.getExcidentEdges(v1).size(), "wrong # of excident edges in the resulting graph entry after resolver" );
- assertEquals( "wrong # of v2 incident edges in the resulting graph after resolver", 1, res.getIncidentEdges(v2).size() );
- assertEquals( "wrong edge v1-v2 in the resulting graph after resolver", "1.2", res.getIncidentEdges(v2).get(0).getVersion() );
+ assertEquals( 1, res.getIncidentEdges(v2).size(), "wrong # of v2 incident edges in the resulting graph after resolver" );
+ assertEquals( "1.2", res.getIncidentEdges(v2).get(0).getVersion(), "wrong edge v1-v2 in the resulting graph after resolver" );
- assertEquals( "wrong # of edges v1-v3 in the resulting graph after resolver", 1, res.getIncidentEdges(v3).size() );
- assertEquals( "wrong edge v1-v3 in the resulting graph after resolver", "1.1", res.getIncidentEdges(v3).get(0).getVersion() );
+ assertEquals( 1, res.getIncidentEdges(v3).size(), "wrong # of edges v1-v3 in the resulting graph after resolver" );
+ assertEquals( "1.1", res.getIncidentEdges(v3).get(0).getVersion(), "wrong edge v1-v3 in the resulting graph after resolver" );
- assertEquals( "wrong # of edges v3-v4 in the resulting graph after resolver", 1, res.getIncidentEdges(v4).size() );
- assertEquals( "wrong edge v3-v4 in the resulting graph after resolver", "1.2", res.getIncidentEdges(v4).get(0).getVersion() );
+ assertEquals( 1, res.getIncidentEdges(v4).size(), "wrong # of edges v3-v4 in the resulting graph after resolver" );
+ assertEquals( "1.2", res.getIncidentEdges(v4).get(0).getVersion(), "wrong edge v3-v4 in the resulting graph after resolver" );
}
//------------------------------------------------------------------------------------------
@Test
@@ -111,21 +110,21 @@ extends PlexusTestCase
res = resolver.resolveConflicts( graph, ArtifactScopeEnum.runtime );
- assertNotNull("null graph after resolver", res );
- assertNotNull("no vertices in the resulting graph after resolver", res.getVertices() );
- assertNotNull("no edges in the resulting graph after resolver", res.getExcidentEdges(v1) );
+ assertNotNull( res, "null graph after resolver" );
+ assertNotNull( res.getVertices(), "no vertices in the resulting graph after resolver" );
+ assertNotNull( res.getExcidentEdges(v1), "no edges in the resulting graph after resolver" );
- assertEquals( "wrong # of vertices in the resulting graph after resolver", 4, res.getVertices().size() );
- assertEquals( "wrong # of excident edges in the resulting graph entry after resolver", 2, res.getExcidentEdges(v1).size() );
+ assertEquals( 4, res.getVertices().size(), "wrong # of vertices in the resulting graph after resolver" );
+ assertEquals( 2, res.getExcidentEdges(v1).size(), "wrong # of excident edges in the resulting graph entry after resolver" );
- assertEquals( "wrong # of v2 incident edges in the resulting graph after resolver", 1, res.getIncidentEdges(v2).size() );
- assertEquals( "wrong edge v1-v2 in the resulting graph after resolver", "1.2", res.getIncidentEdges(v2).get(0).getVersion() );
+ assertEquals( 1, res.getIncidentEdges(v2).size(), "wrong # of v2 incident edges in the resulting graph after resolver" );
+ assertEquals( "1.2", res.getIncidentEdges(v2).get(0).getVersion(), "wrong edge v1-v2 in the resulting graph after resolver" );
- assertEquals( "wrong # of edges v1-v3 in the resulting graph after resolver", 1, res.getIncidentEdges(v3).size() );
- assertEquals( "wrong edge v1-v3 in the resulting graph after resolver", "1.1", res.getIncidentEdges(v3).get(0).getVersion() );
+ assertEquals( 1, res.getIncidentEdges(v3).size(), "wrong # of edges v1-v3 in the resulting graph after resolver" );
+ assertEquals( "1.1", res.getIncidentEdges(v3).get(0).getVersion(), "wrong edge v1-v3 in the resulting graph after resolver" );
- assertEquals( "wrong # of edges v3-v4 in the resulting graph after resolver", 1, res.getIncidentEdges(v4).size() );
- assertEquals( "wrong edge v3-v4 in the resulting graph after resolver", "1.1", res.getIncidentEdges(v4).get(0).getVersion() );
+ assertEquals( 1, res.getIncidentEdges(v4).size(), "wrong # of edges v3-v4 in the resulting graph after resolver" );
+ assertEquals( "1.1", res.getIncidentEdges(v4).get(0).getVersion(), "wrong edge v3-v4 in the resulting graph after resolver" );
}
//------------------------------------------------------------------------------------------
@Test
@@ -136,21 +135,21 @@ extends PlexusTestCase
res = resolver.resolveConflicts( graph, ArtifactScopeEnum.test );
- assertNotNull("null graph after resolver", res );
- assertNotNull("no vertices in the resulting graph after resolver", res.getVertices() );
- assertNotNull("no edges in the resulting graph after resolver", res.getExcidentEdges(v1) );
+ assertNotNull( res, "null graph after resolver" );
+ assertNotNull( res.getVertices(), "no vertices in the resulting graph after resolver" );
+ assertNotNull( res.getExcidentEdges(v1), "no edges in the resulting graph after resolver" );
- assertEquals( "wrong # of vertices in the resulting graph after resolver", 4, res.getVertices().size() );
- assertEquals( "wrong # of excident edges in the resulting graph entry after resolver", 2, res.getExcidentEdges(v1).size() );
+ assertEquals( 4, res.getVertices().size(), "wrong # of vertices in the resulting graph after resolver" );
+ assertEquals( 2, res.getExcidentEdges(v1).size(), "wrong # of excident edges in the resulting graph entry after resolver" );
- assertEquals( "wrong # of v2 incident edges in the resulting graph after resolver", 1, res.getIncidentEdges(v2).size() );
- assertEquals( "wrong edge v1-v2 in the resulting graph after resolver", "1.2", res.getIncidentEdges(v2).get(0).getVersion() );
+ assertEquals( 1, res.getIncidentEdges(v2).size(), "wrong # of v2 incident edges in the resulting graph after resolver" );
+ assertEquals( "1.2", res.getIncidentEdges(v2).get(0).getVersion(), "wrong edge v1-v2 in the resulting graph after resolver" );
- assertEquals( "wrong # of edges v1-v3 in the resulting graph after resolver", 1, res.getIncidentEdges(v3).size() );
- assertEquals( "wrong edge v1-v3 in the resulting graph after resolver", "1.1", res.getIncidentEdges(v3).get(0).getVersion() );
+ assertEquals( 1, res.getIncidentEdges(v3).size(), "wrong # of edges v1-v3 in the resulting graph after resolver" );
+ assertEquals( "1.1", res.getIncidentEdges(v3).get(0).getVersion(), "wrong edge v1-v3 in the resulting graph after resolver" );
- assertEquals( "wrong # of edges v3-v4 in the resulting graph after resolver", 1, res.getIncidentEdges(v4).size() );
- assertEquals( "wrong edge v3-v4 in the resulting graph after resolver", "1.2", res.getIncidentEdges(v4).get(0).getVersion() );
+ assertEquals( 1, res.getIncidentEdges(v4).size(), "wrong # of edges v3-v4 in the resulting graph after resolver" );
+ assertEquals( "1.2", res.getIncidentEdges(v4).get(0).getVersion(), "wrong edge v3-v4 in the resulting graph after resolver" );
}
//------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java b/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
index 7ee91a3..3b5b7a6 100644
--- a/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
+++ b/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
@@ -22,7 +22,6 @@ package org.apache.maven;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import java.util.Properties;
@@ -47,13 +46,12 @@ import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.apache.maven.test.PlexusTestCase;
import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.util.FileUtils;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
import org.eclipse.aether.repository.LocalRepository;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
import javax.inject.Inject;
diff --git a/maven-core/src/test/java/org/apache/maven/DefaultMavenTest.java b/maven-core/src/test/java/org/apache/maven/DefaultMavenTest.java
index df8fa1b..3a85ea4 100644
--- a/maven-core/src/test/java/org/apache/maven/DefaultMavenTest.java
+++ b/maven-core/src/test/java/org/apache/maven/DefaultMavenTest.java
@@ -29,10 +29,10 @@ import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DefaultMavenTest
extends AbstractCoreMavenComponentTestCase
diff --git a/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java b/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java
index 6d9262f..13ff67a 100644
--- a/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java
+++ b/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java
@@ -29,10 +29,10 @@ import org.apache.maven.model.Dependency;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.ComponentDescriptor;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class MavenLifecycleParticipantTest
extends AbstractCoreMavenComponentTestCase
@@ -131,7 +131,7 @@ public class MavenLifecycleParticipantTest
request.setGoals( Arrays.asList( "validate" ) );
MavenExecutionResult result = maven.execute( request );
- assertFalse( result.getExceptions().toString(), result.hasExceptions() );
+ assertFalse( result.hasExceptions(), result.getExceptions().toString() );
MavenProject project = result.getProject();
@@ -167,7 +167,7 @@ public class MavenLifecycleParticipantTest
request.setGoals( Arrays.asList( "validate" ) );
MavenExecutionResult result = maven.execute( request );
- assertFalse( result.getExceptions().toString(), result.hasExceptions() );
+ assertFalse( result.hasExceptions(), result.getExceptions().toString() );
List<String> order = new ArrayList<>();
for ( MavenProject project : result.getTopologicallySortedProjects() )
diff --git a/maven-core/src/test/java/org/apache/maven/MavenTest.java b/maven-core/src/test/java/org/apache/maven/MavenTest.java
index 4023f12..991e61d 100644
--- a/maven-core/src/test/java/org/apache/maven/MavenTest.java
+++ b/maven-core/src/test/java/org/apache/maven/MavenTest.java
@@ -17,11 +17,9 @@ package org.apache.maven;
import org.apache.maven.exception.ExceptionHandler;
-import org.codehaus.plexus.DefaultPlexusContainer;
+import org.junit.jupiter.api.Test;
import javax.inject.Inject;
-import java.util.Collections;
-import org.junit.Test;
public class MavenTest
extends AbstractCoreMavenComponentTestCase
diff --git a/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java b/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java
index 13fc06f..777bae5 100644
--- a/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java
+++ b/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java
@@ -26,11 +26,11 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
import javax.inject.Inject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.Matchers.endsWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
public class ProjectDependenciesResolverTest
extends AbstractCoreMavenComponentTestCase
diff --git a/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java b/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
index 5290780..6dba994 100644
--- a/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
@@ -24,9 +24,9 @@ import java.util.List;
import org.apache.maven.test.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ArtifactHandlerTest
extends PlexusTestCase
@@ -51,7 +51,7 @@ public class ArtifactHandlerTest
int i = 0;
for ( String col : cols )
{
- assertEquals( "Wrong column header", expected[i++], col.trim() );
+ assertEquals( expected[i++], col.trim(), "Wrong column header" );
}
}
else if ( line.startsWith( "|" ) )
@@ -67,12 +67,12 @@ public class ArtifactHandlerTest
String includesDependencies = trimApt( cols[7] );
ArtifactHandler handler = lookup( ArtifactHandler.class, type );
- assertEquals( type + " extension", handler.getExtension(), extension );
- assertEquals( type + " packaging", handler.getPackaging(), packaging );
- assertEquals( type + " classifier", handler.getClassifier(), classifier );
- assertEquals( type + " language", handler.getLanguage(), language );
- assertEquals( type + " addedToClasspath", handler.isAddedToClasspath() ? "true" : null, addedToClasspath );
- assertEquals( type + " includesDependencies", handler.isIncludesDependencies() ? "true" : null, includesDependencies );
+ assertEquals( handler.getExtension(), extension, type + " extension" );
+ assertEquals( handler.getPackaging(), packaging, type + " packaging" );
+ assertEquals( handler.getClassifier(), classifier, type + " classifier" );
+ assertEquals( handler.getLanguage(), language, type + " language" );
+ assertEquals( handler.isAddedToClasspath() ? "true" : null, addedToClasspath, type + " addedToClasspath" );
+ assertEquals( handler.isIncludesDependencies() ? "true" : null, includesDependencies, type + " includesDependencies" );
}
}
}
diff --git a/maven-core/src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java b/maven-core/src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java
index c504c96..76b1654 100644
--- a/maven-core/src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java
+++ b/maven-core/src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java
@@ -21,14 +21,14 @@ package org.apache.maven.artifact.resolver.filter;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Exclusion;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
import java.util.Arrays;
import java.util.Collections;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -36,7 +36,7 @@ public class ExclusionArtifactFilterTest
{
private Artifact artifact;
- @Before
+ @BeforeEach
public void setup()
{
artifact = mock( Artifact.class );
diff --git a/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java b/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java
index 3c532bf..3dd3eff 100644
--- a/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java
@@ -27,11 +27,11 @@ import org.apache.maven.configuration.internal.DefaultBeanConfigurator;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @author Benjamin Bentmann
@@ -41,14 +41,14 @@ public class DefaultBeanConfiguratorTest
private BeanConfigurator configurator;
- @Before
+ @BeforeEach
public void setUp()
throws Exception
{
configurator = new DefaultBeanConfigurator();
}
- @After
+ @AfterEach
public void tearDown()
throws Exception
{
diff --git a/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java b/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java
index 9fe6d4f..48cdb2f 100644
--- a/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java
@@ -30,9 +30,9 @@ import org.apache.maven.plugin.PluginContainerException;
import org.apache.maven.plugin.PluginExecutionException;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @author <a href="mailto:baerrach@apache.org">Barrie Treloar</a>
diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java b/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java
index 6e03776..df4941c 100644
--- a/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java
@@ -22,8 +22,8 @@ package org.apache.maven.execution;
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.model.Dependency;
import org.apache.maven.project.MavenProject;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.util.Optional;
@@ -40,7 +40,7 @@ public class DefaultBuildResumptionAnalyzerTest
private MavenExecutionResult executionResult;
- @Before
+ @BeforeEach
public void before() {
executionResult = new DefaultMavenExecutionResult();
}
diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionDataRepositoryTest.java b/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionDataRepositoryTest.java
index 697c74f..e1e1fa4 100644
--- a/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionDataRepositoryTest.java
+++ b/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionDataRepositoryTest.java
@@ -21,9 +21,7 @@ package org.apache.maven.execution;
import org.apache.maven.model.Build;
import org.apache.maven.project.MavenProject;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.List;
@@ -34,7 +32,6 @@ import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.is;
-@RunWith( MockitoJUnitRunner.class )
public class DefaultBuildResumptionDataRepositoryTest
{
private final DefaultBuildResumptionDataRepository repository = new DefaultBuildResumptionDataRepository();
diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java
index a746463..e57e791 100644
--- a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java
@@ -8,8 +8,10 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.settings.Profile;
import org.apache.maven.settings.Repository;
import org.apache.maven.settings.Settings;
-import org.eclipse.sisu.launch.InjectedTestCase;
-import org.junit.Test;
+import org.apache.maven.test.PlexusTestCase;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -31,7 +33,7 @@ import org.junit.Test;
*/
public class DefaultMavenExecutionRequestPopulatorTest
- extends InjectedTestCase
+ extends PlexusTestCase
{
@Inject
MavenExecutionRequestPopulator testee;
diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java
index 237362e..9a363ee 100644
--- a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java
@@ -20,14 +20,14 @@ package org.apache.maven.execution;
*/
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.util.List;
import org.apache.maven.project.MavenProject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Benjamin Bentmann
diff --git a/maven-core/src/test/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeTest.java b/maven-core/src/test/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeTest.java
index 124703b..0dda050 100644
--- a/maven-core/src/test/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeTest.java
+++ b/maven-core/src/test/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeTest.java
@@ -20,11 +20,11 @@ import com.google.inject.Key;
import org.apache.maven.execution.MojoExecutionEvent;
import org.apache.maven.execution.scope.WeakMojoExecutionListener;
import org.apache.maven.plugin.MojoExecutionException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class MojoExecutionScopeTest
{
diff --git a/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java b/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
index 6a8320b..d2f29e2 100644
--- a/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
@@ -37,12 +37,12 @@ import org.apache.maven.project.collector.MultiModuleCollectionStrategy;
import org.apache.maven.project.collector.PomlessCollectionStrategy;
import org.apache.maven.project.collector.ProjectsSelector;
import org.apache.maven.project.collector.RequestPomCollectionStrategy;
+import org.apache.maven.test.Parameter;
+import org.apache.maven.test.Parameterized;
+import org.apache.maven.test.Parameters;
+import org.apache.maven.test.Test;
import org.codehaus.plexus.util.StringUtils;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.BeforeEach;
import java.io.File;
import java.util.ArrayList;
@@ -56,15 +56,15 @@ import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
import static java.util.function.Function.identity;
-import static junit.framework.TestCase.assertEquals;
import static org.apache.maven.execution.MavenExecutionRequest.REACTOR_MAKE_DOWNSTREAM;
import static org.apache.maven.execution.MavenExecutionRequest.REACTOR_MAKE_UPSTREAM;
import static org.apache.maven.graph.DefaultGraphBuilderTest.ScenarioBuilder.scenario;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-@RunWith( Parameterized.class )
+@Parameterized
public class DefaultGraphBuilderTest
{
/*
@@ -104,13 +104,20 @@ public class DefaultGraphBuilderTest
private Map<String, MavenProject> artifactIdProjectMap;
// Parameters for the test
- private final String parameterDescription;
- private final List<String> parameterSelectedProjects;
- private final List<String> parameterExcludedProjects;
- private final String parameterResumeFrom;
- private final String parameterMakeBehavior;
- private final List<String> parameterExpectedResult;
- private final File parameterRequestedPom;
+ @Parameter( 0 )
+ private String parameterDescription;
+ @Parameter( 1 )
+ private List<String> parameterSelectedProjects;
+ @Parameter( 2 )
+ private List<String> parameterExcludedProjects;
+ @Parameter( 3 )
+ private String parameterResumeFrom;
+ @Parameter( 4 )
+ private String parameterMakeBehavior;
+ @Parameter( 5 )
+ private List<String> parameterExpectedResult;
+ @Parameter( 6 )
+ private File parameterRequestedPom;
@Parameters(name = "{index}. {0}")
public static Collection<Object[]> parameters()
@@ -191,17 +198,6 @@ public class DefaultGraphBuilderTest
);
}
- public DefaultGraphBuilderTest( String description, List<String> selectedProjects, List<String> excludedProjects, String resumedFrom, String makeBehavior, List<String> expectedReactorProjects, File requestedPom )
- {
- this.parameterDescription = description;
- this.parameterSelectedProjects = selectedProjects;
- this.parameterExcludedProjects = excludedProjects;
- this.parameterResumeFrom = resumedFrom;
- this.parameterMakeBehavior = makeBehavior;
- this.parameterExpectedResult = expectedReactorProjects;
- this.parameterRequestedPom = requestedPom;
- }
-
@Test
public void testGetReactorProjects()
{
@@ -226,10 +222,10 @@ public class DefaultGraphBuilderTest
List<MavenProject> expectedReactorProjects = parameterExpectedResult.stream()
.map( artifactIdProjectMap::get )
.collect( Collectors.toList());
- assertEquals( parameterDescription, expectedReactorProjects, actualReactorProjects );
+ assertEquals( expectedReactorProjects, actualReactorProjects, parameterDescription );
}
- @Before
+ @BeforeEach
public void before() throws Exception
{
graphBuilder = new DefaultGraphBuilder(
diff --git a/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java b/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java
index 621042c..94737fb 100644
--- a/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java
+++ b/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java
@@ -22,9 +22,9 @@ import org.apache.maven.model.Dependency;
import org.apache.maven.project.DuplicateProjectException;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.dag.CycleDetectedException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @author Kristian Rosenvold
diff --git a/maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java b/maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java
index 0f1f634..5050623 100644
--- a/maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java
@@ -26,7 +26,7 @@ import java.nio.file.Paths;
import org.apache.maven.model.Model;
import org.apache.maven.model.building.TransformerContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xmlunit.assertj.XmlAssert;
public class ConsumerModelSourceTransformerTest
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java
index c9a2887..2378ddd 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java
@@ -24,11 +24,8 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import org.apache.maven.test.PlexusTestCase;
-import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.DefaultPlexusContainer;
-import org.codehaus.plexus.PlexusConstants;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.arrayWithSize;
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
index c531d17..84c16ff 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
@@ -25,11 +25,11 @@ import org.apache.maven.lifecycle.internal.LifecycleTaskSegmentCalculator;
import org.apache.maven.lifecycle.internal.MojoExecutor;
import javax.inject.Inject;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Just asserts that it's able to create those components. Handy when CDI container gets a nervous breakdown.
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
index 38231c4..448ffda 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
@@ -42,16 +42,16 @@ import org.apache.maven.plugin.MojoNotFoundException;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.hasSize;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import javax.inject.Inject;
@@ -320,14 +320,16 @@ public class LifecycleExecutorTest
{
File pom = getProject( "project-basic" );
MavenSession session = createMavenSession( pom );
- MojoNotFoundException e = assertThrows( "expected a MojoNotFoundException",
+ MojoNotFoundException e = assertThrows(
MojoNotFoundException.class,
- () -> getExecutions( calculateExecutionPlan( session, "resources:" ) ) );
+ () -> getExecutions( calculateExecutionPlan( session, "resources:" ) ),
+ "expected a MojoNotFoundException" );
assertEquals( "", e.getGoal() );
- e = assertThrows( "expected a MojoNotFoundException",
+ e = assertThrows(
MojoNotFoundException.class,
- () -> getExecutions( calculateExecutionPlan( session, "org.apache.maven.plugins:maven-resources-plugin:0.1:resources:toomany" ) ) );
+ () -> getExecutions( calculateExecutionPlan( session, "org.apache.maven.plugins:maven-resources-plugin:0.1:resources:toomany" ) ),
+ "expected a MojoNotFoundException" );
assertEquals( "resources:toomany", e.getGoal() );
}
@@ -369,7 +371,7 @@ public class LifecycleExecutorTest
Arrays.asList( (Object) task ), false );
MojoExecution execution = executionPlan.getMojoExecutions().get(0);
- assertEquals(execution.toString(), "maven-it-plugin", execution.getArtifactId());
+ assertEquals( "maven-it-plugin", execution.getArtifactId(), execution.toString() );
assertNull(execution.getConfiguration());
lifeCycleExecutionPlanCalculator.setupMojoExecution( session, session.getCurrentProject(), execution,
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java
index 0e455e6..e077dc9 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java
@@ -20,11 +20,11 @@ import java.util.Set;
import org.apache.maven.lifecycle.internal.ExecutionPlanItem;
import org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub;
import org.apache.maven.model.Plugin;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
* @author Kristian Rosenvold
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java
index 4a5bd24..6a73160 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java
@@ -20,10 +20,10 @@ import java.util.List;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.internal.stub.LifecycleTaskSegmentCalculatorStub;
import org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class BuildListCalculatorTest
{
@@ -38,8 +38,8 @@ public class BuildListCalculatorTest
List<TaskSegment> taskSegments = lifecycleTaskSegmentCalculator.calculateTaskSegments( session );
final ProjectBuildList buildList = buildListCalculator.calculateProjectBuilds( session, taskSegments );
final ProjectBuildList segments = buildList.getByTaskSegment( taskSegments.get( 0 ) );
- assertEquals( "Stub data contains 3 segments", 3, taskSegments.size() );
- assertEquals( "Stub data contains 6 items", 6, segments.size() );
+ assertEquals( 3, taskSegments.size(), "Stub data contains 3 segments" );
+ assertEquals( 6, segments.size(), "Stub data contains 6 items" );
final ProjectSegment build = segments.get( 0 );
assertNotNull( build );
}
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java
index baea294..fe0776e 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java
@@ -23,9 +23,9 @@ import org.apache.maven.lifecycle.internal.builder.BuilderCommon;
import org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub;
import org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub;
import org.codehaus.plexus.logging.Logger;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java
index a29e64d..c2971f1 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java
@@ -31,7 +31,7 @@ import org.apache.maven.plugin.PluginResolutionException;
import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException;
import org.apache.maven.plugin.version.PluginVersionResolutionException;
import org.apache.maven.project.MavenProject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.A;
import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.B;
@@ -40,12 +40,12 @@ import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStu
import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.Y;
import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.Z;
import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.getProjectBuildList;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @author Kristian Rosenvold
*/
public class ConcurrencyDependencyGraphTest
- extends junit.framework.TestCase
{
@Test
public void testConcurrencyGraphPrimaryVersion()
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolverTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolverTest.java
index 7689515..000dd88 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolverTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolverTest.java
@@ -32,10 +32,10 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
import javax.inject.Inject;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class LifecycleDependencyResolverTest extends AbstractCoreMavenComponentTestCase
{
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
index 373b98b..28d552a 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
@@ -23,9 +23,9 @@ import org.apache.maven.lifecycle.internal.stub.DefaultLifecyclesStub;
import org.apache.maven.lifecycle.internal.stub.PluginPrefixResolverStub;
import org.apache.maven.lifecycle.internal.stub.PluginVersionResolverStub;
import org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @author Kristian Rosenvold
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImplTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImplTest.java
index 0f431b7..e5a44d6 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImplTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImplTest.java
@@ -24,10 +24,10 @@ import java.util.List;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.internal.stub.LifecycleTaskSegmentCalculatorStub;
import org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* @author Kristian Rosenvold
@@ -45,8 +45,8 @@ public class LifecycleTaskSegmentCalculatorImplTest
final ProjectBuildList buildList = buildListCalculator.calculateProjectBuilds( session, taskSegments );
final ProjectBuildList segments = buildList.getByTaskSegment( taskSegments.get( 0 ) );
- assertEquals( "Stub data contains 3 segments", 3, taskSegments.size() );
- assertEquals( "Stub data contains 6 items", 6, segments.size() );
+ assertEquals( 3, taskSegments.size(), "Stub data contains 3 segments" );
+ assertEquals( 6, segments.size(), "Stub data contains 6 items" );
final ProjectSegment build = segments.get( 0 );
assertNotNull( build );
}
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java
index 5c1251c..1d0211f 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java
@@ -21,10 +21,10 @@ import org.apache.maven.lifecycle.MavenExecutionPlan;
import org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub;
import org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub;
import org.apache.maven.plugin.MojoExecution;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author Kristian Rosenvold
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java
index 3e3f892..106c311 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java
@@ -17,12 +17,12 @@ package org.apache.maven.lifecycle.internal;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Kristian Rosenvold
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraphTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraphTest.java
index 5f69410..acad888 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraphTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraphTest.java
@@ -21,9 +21,9 @@ import org.apache.maven.execution.ProjectDependencyGraph;
import org.apache.maven.lifecycle.internal.ProjectBuildList;
import org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub;
import org.apache.maven.project.MavenProject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ConcurrencyDependencyGraphTest {
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxerTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxerTest.java
index 197ff6b..549e90b 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxerTest.java
@@ -41,9 +41,9 @@ import org.apache.maven.plugin.PluginNotFoundException;
import org.apache.maven.plugin.PluginResolutionException;
import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException;
import org.apache.maven.plugin.version.PluginVersionResolutionException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @author Kristian Rosenvold
@@ -125,7 +125,7 @@ public class ThreadOutputMuxerTest
threadOutputMuxer.close();
final byte[] bytes = byteArrayOutputStream.toByteArray();
String result = new String( bytes );
- assertEquals( result, expectedLength, bytes.length );
+ assertEquals( expectedLength, bytes.length, result );
}
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStubTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStubTest.java
index ddc20ec..cd2d327 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStubTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStubTest.java
@@ -18,10 +18,10 @@ package org.apache.maven.lifecycle.internal.stub;
import java.util.List;
import org.apache.maven.project.MavenProject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests the stub. Yeah, I know.
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java
index f60eace..677915f 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java
@@ -15,13 +15,13 @@ package org.apache.maven.lifecycle.mapping;
* the License.
*/
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author atanasenko
diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
index 524979d..954e221 100644
--- a/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
@@ -32,13 +32,13 @@ import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.repository.ComponentDescriptor;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
import javax.inject.Inject;
diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java
index 14961d1..d270293 100644
--- a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java
@@ -24,9 +24,9 @@ import java.util.Collections;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* MNG-3131
diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
index 490d915..9c0da4f 100644
--- a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
@@ -46,14 +46,14 @@ import org.codehaus.plexus.MutablePlexusContainer;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
import org.codehaus.plexus.util.dag.CycleDetectedException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import javax.inject.Inject;
@@ -80,9 +80,9 @@ public class PluginParameterExpressionEvaluatorTest
System.out.println( "Result: " + result );
- assertSame( "${plugin} expression does not return plugin descriptor.",
- exec.getMojoDescriptor().getPluginDescriptor(),
- result );
+ assertSame( exec.getMojoDescriptor().getPluginDescriptor(),
+ result,
+ "${plugin} expression does not return plugin descriptor." );
}
@Test
@@ -108,7 +108,7 @@ public class PluginParameterExpressionEvaluatorTest
assertNotNull( depResults );
assertEquals( 1, depResults.size() );
- assertSame( "dependency artifact is wrong.", depArtifact, depResults.get( 0 ) );
+ assertSame( depArtifact, depResults.get( 0 ), "dependency artifact is wrong." );
}
@Test
@@ -134,9 +134,9 @@ public class PluginParameterExpressionEvaluatorTest
assertNotNull( depResults );
assertEquals( 1, depResults.size() );
- assertSame( "dependency artifact is wrong.",
- depArtifact,
- depResults.get( ArtifactUtils.versionlessKey( depArtifact ) ) );
+ assertSame( depArtifact,
+ depResults.get( ArtifactUtils.versionlessKey( depArtifact ) ),
+ "dependency artifact is wrong." );
}
@Test
@@ -151,9 +151,9 @@ public class PluginParameterExpressionEvaluatorTest
System.out.println( "Result: " + result );
- assertSame( "${plugin.artifactId} expression does not return plugin descriptor's artifactId.",
- exec.getMojoDescriptor().getPluginDescriptor().getArtifactId(),
- result );
+ assertSame( exec.getMojoDescriptor().getPluginDescriptor().getArtifactId(),
+ result,
+ "${plugin.artifactId} expression does not return plugin descriptor's artifactId." );
}
@Test
diff --git a/maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java b/maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java
index 70faa44..4cf01cf 100644
--- a/maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java
+++ b/maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java
@@ -23,9 +23,9 @@ import java.util.concurrent.CountDownLatch;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenSession;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
* @author Kristian Rosenvold
diff --git a/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
index b2c1bd0..8b0cec0 100644
--- a/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
+++ b/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
@@ -21,20 +21,16 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Arrays;
-import java.util.Collections;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.building.ModelBuildingException;
import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
-import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.DefaultPlexusContainer;
-import org.codehaus.plexus.PlexusConstants;
import org.apache.maven.test.PlexusTestCase;
import org.eclipse.aether.DefaultRepositorySystemSession;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
import javax.inject.Inject;
@@ -49,7 +45,7 @@ public abstract class AbstractMavenProjectTestCase
@Inject
protected RepositorySystem repositorySystem;
- @Before
+ @BeforeEach
public void setUp()
throws Exception
{
@@ -66,15 +62,6 @@ public abstract class AbstractMavenProjectTestCase
}
}
- @After
- public void tearDown()
- throws Exception
- {
- projectBuilder = null;
-
- super.tearDown();
- }
-
protected ProjectBuilder getProjectBuilder()
{
return projectBuilder;
diff --git a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
index dac8489..d73b488 100644
--- a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
@@ -26,16 +26,18 @@ import java.util.List;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.codehaus.plexus.util.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
public class DefaultMavenProjectBuilderTest
extends AbstractMavenProjectTestCase
@@ -46,6 +48,7 @@ public class DefaultMavenProjectBuilderTest
private File localRepoDir;
@Override
+ @BeforeEach
public void setUp()
throws Exception
{
@@ -60,6 +63,7 @@ public class DefaultMavenProjectBuilderTest
}
@Override
+ @AfterEach
public void tearDown()
throws Exception
{
@@ -129,9 +133,10 @@ public class DefaultMavenProjectBuilderTest
{
File f1 = getTestFile( "src/test/resources/projects/future-model-version-pom.xml" );
- ProjectBuildingException e = assertThrows( "Expected to fail for future versions",
+ ProjectBuildingException e = assertThrows(
ProjectBuildingException.class,
- () -> getProject( f1 ) );
+ () -> getProject( f1 ),
+ "Expected to fail for future versions" );
assertContains( "Building this project requires a newer version of Maven", e.getMessage() );
}
@@ -143,9 +148,10 @@ public class DefaultMavenProjectBuilderTest
// update the resource if we stop supporting modelVersion 4.0.0
File f1 = getTestFile( "src/test/resources/projects/past-model-version-pom.xml" );
- ProjectBuildingException e = assertThrows( "Expected to fail for past versions",
+ ProjectBuildingException e = assertThrows(
ProjectBuildingException.class,
- () -> getProject( f1 ) );
+ () -> getProject( f1 ),
+ "Expected to fail for past versions" );
assertContains( "Building this project requires an older version of Maven", e.getMessage() );
}
@@ -155,9 +161,10 @@ public class DefaultMavenProjectBuilderTest
{
File f1 = getTestFile( "src/test/resources/projects/future-schema-model-version-pom.xml" );
- ProjectBuildingException e = assertThrows( "Expected to fail for future versions",
+ ProjectBuildingException e = assertThrows(
ProjectBuildingException.class,
- () -> getProject( f1 ) );
+ () -> getProject( f1 ),
+ "Expected to fail for future versions" );
assertContains( "Building this project requires a newer version of Maven", e.getMessage() );
}
@@ -218,9 +225,10 @@ public class DefaultMavenProjectBuilderTest
ProjectBuildingRequest request = newBuildingRequest();
request.setProcessPlugins( false );
request.setResolveDependencies( true );
- ProjectBuildingException e = assertThrows( "Project building did not fail despite invalid POM",
+ ProjectBuildingException e = assertThrows(
ProjectBuildingException.class,
- () -> projectBuilder.build( pomFile, request ) );
+ () -> projectBuilder.build( pomFile, request ),
+ "Project building did not fail despite invalid POM" );
List<ProjectBuildingResult> results = e.getResults();
assertNotNull( results );
assertEquals( 1, results.size() );
@@ -263,9 +271,10 @@ public class DefaultMavenProjectBuilderTest
File f1 =
getTestFile( "src/test/resources/projects/parent-version-range-local-child-without-version/child/pom.xml" );
- ProjectBuildingException e = assertThrows( "Expected 'ProjectBuildingException' not thrown.",
+ ProjectBuildingException e = assertThrows(
ProjectBuildingException.class,
- () -> getProject( f1 ) );
+ () -> getProject( f1 ),
+ "Expected 'ProjectBuildingException' not thrown." );
assertNotNull( e.getMessage() );
assertThat( e.getMessage(), containsString( "Version must be a constant" ) );
}
@@ -282,9 +291,10 @@ public class DefaultMavenProjectBuilderTest
getTestFile(
"src/test/resources/projects/parent-version-range-local-child-version-expression/child/pom.xml" );
- ProjectBuildingException e = assertThrows( "Expected 'ProjectBuildingException' not thrown.",
+ ProjectBuildingException e = assertThrows(
ProjectBuildingException.class,
- () -> getProject( f1 ) );
+ () -> getProject( f1 ),
+ "Expected 'ProjectBuildingException' not thrown." );
assertNotNull( e.getMessage() );
assertThat( e.getMessage(), containsString( "Version must be a constant" ) );
}
@@ -321,9 +331,10 @@ public class DefaultMavenProjectBuilderTest
getTestFile(
"src/test/resources/projects/parent-version-range-external-child-without-version/pom.xml" );
- ProjectBuildingException e = assertThrows( "Expected 'ProjectBuildingException' not thrown.",
+ ProjectBuildingException e = assertThrows(
ProjectBuildingException.class,
- () -> getProjectFromRemoteRepository( f1 ) );
+ () -> getProjectFromRemoteRepository( f1 ),
+ "Expected 'ProjectBuildingException' not thrown." );
assertNotNull( e.getMessage() );
assertThat( e.getMessage(), containsString( "Version must be a constant" ) );
}
@@ -340,9 +351,10 @@ public class DefaultMavenProjectBuilderTest
getTestFile(
"src/test/resources/projects/parent-version-range-external-child-version-expression/pom.xml" );
- ProjectBuildingException e = assertThrows( "Expected 'ProjectBuildingException' not thrown.",
+ ProjectBuildingException e = assertThrows(
ProjectBuildingException.class,
- () -> getProjectFromRemoteRepository( f1 ) );
+ () -> getProjectFromRemoteRepository( f1 ),
+ "Expected 'ProjectBuildingException' not thrown." );
assertNotNull( e.getMessage() );
assertThat( e.getMessage(), containsString( "Version must be a constant" ) );
}
diff --git a/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java
index 1d52b41..150eb6a 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java
@@ -24,15 +24,15 @@ import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.hamcrest.MatcherAssert.assertThat;
/**
* Tests {@link ExtensionDescriptorBuilder}.
@@ -44,14 +44,14 @@ public class ExtensionDescriptorBuilderTest
private ExtensionDescriptorBuilder builder;
- @Before
+ @BeforeEach
public void setUp()
throws Exception
{
builder = new ExtensionDescriptorBuilder();
}
- @After
+ @AfterEach
public void tearDown()
throws Exception
{
diff --git a/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java b/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
index 7847093..d2cba20 100644
--- a/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
@@ -28,13 +28,13 @@ import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
import org.apache.maven.model.Profile;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class MavenProjectTest
extends AbstractMavenProjectTestCase
@@ -83,9 +83,9 @@ public class MavenProjectTest
MavenProject project = new MavenProject( model );
- assertEquals( "groupId proto-inheritance failed.", "test-group", project.getGroupId() );
- assertEquals( "artifactId is masked.", "real-artifact", project.getArtifactId() );
- assertEquals( "version proto-inheritance failed.", "1000", project.getVersion() );
+ assertEquals( "test-group", project.getGroupId(), "groupId proto-inheritance failed." );
+ assertEquals( "real-artifact", project.getArtifactId(), "artifactId is masked." );
+ assertEquals( "1000", project.getVersion(), "version proto-inheritance failed." );
// draw the NPE.
project.getId();
@@ -110,8 +110,8 @@ public class MavenProjectTest
MavenProject clonedProject = projectToClone.clone();
assertEquals( "maven-core", clonedProject.getArtifactId() );
Map<?, ?> clonedMap = clonedProject.getManagedVersionMap();
- assertNotNull( "ManagedVersionMap not copied", clonedMap );
- assertTrue( "ManagedVersionMap is not empty", clonedMap.isEmpty() );
+ assertNotNull( clonedMap, "ManagedVersionMap not copied" );
+ assertTrue( clonedMap.isEmpty(), "ManagedVersionMap is not empty" );
}
@Test
@@ -121,22 +121,21 @@ public class MavenProjectTest
File f = getFileForClasspathResource( "dependencyManagement-pom.xml" );
MavenProject projectToClone = getProjectWithDependencies( f );
DependencyManagement dep = projectToClone.getDependencyManagement();
- assertNotNull( "No dependencyManagement", dep );
+ assertNotNull( dep, "No dependencyManagement" );
List<?> list = dep.getDependencies();
- assertNotNull( "No dependencies", list );
- assertTrue( "Empty dependency list", !list.isEmpty() );
+ assertNotNull( list, "No dependencies" );
+ assertTrue( !list.isEmpty(), "Empty dependency list" );
Map<?, ?> map = projectToClone.getManagedVersionMap();
- assertNotNull( "No ManagedVersionMap", map );
- assertTrue( "ManagedVersionMap is empty", !map.isEmpty() );
+ assertNotNull( map, "No ManagedVersionMap" );
+ assertTrue( !map.isEmpty(), "ManagedVersionMap is empty" );
MavenProject clonedProject = projectToClone.clone();
assertEquals( "maven-core", clonedProject.getArtifactId() );
Map<?, ?> clonedMap = clonedProject.getManagedVersionMap();
- assertNotNull( "ManagedVersionMap not copied", clonedMap );
- assertTrue( "ManagedVersionMap is empty", !clonedMap.isEmpty() );
- assertTrue( "ManagedVersionMap does not contain test key",
- clonedMap.containsKey( "maven-test:maven-test-b:jar" ) );
+ assertNotNull( clonedMap, "ManagedVersionMap not copied" );
+ assertTrue( !clonedMap.isEmpty(), "ManagedVersionMap is empty" );
+ assertTrue( clonedMap.containsKey( "maven-test:maven-test-b:jar" ), "ManagedVersionMap does not contain test key" );
}
@Test
@@ -168,7 +167,7 @@ public class MavenProjectTest
MavenProject projectToClone = getProject( f );
MavenProject clonedProject = projectToClone.clone();
- assertNotNull( "clonedProject - distributionManagement", clonedProject.getDistributionManagementArtifactRepository() );
+ assertNotNull( clonedProject.getDistributionManagementArtifactRepository(), "clonedProject - distributionManagement" );
}
@Test
@@ -180,16 +179,16 @@ public class MavenProjectTest
MavenProject projectToClone = getProject( f );
List<Profile> activeProfilesOrig = projectToClone.getActiveProfiles();
- assertEquals( "Expecting 1 active profile", 1, activeProfilesOrig.size() );
+ assertEquals( 1, activeProfilesOrig.size(), "Expecting 1 active profile" );
MavenProject clonedProject = projectToClone.clone();
List<Profile> activeProfilesClone = clonedProject.getActiveProfiles();
- assertEquals( "Expecting 1 active profile", 1, activeProfilesClone.size() );
+ assertEquals( 1, activeProfilesClone.size(), "Expecting 1 active profile" );
- assertNotSame( "The list of active profiles should have been cloned too but is same", activeProfilesOrig,
- activeProfilesClone );
+ assertNotSame( activeProfilesOrig, activeProfilesClone,
+ "The list of active profiles should have been cloned too but is same" );
}
@Test
@@ -200,8 +199,8 @@ public class MavenProjectTest
MavenProject projectToClone = getProject( f );
projectToClone.setPomFile( new File( new File( f.getParentFile(), "target" ), "flattened.xml" ) );
MavenProject clonedProject = projectToClone.clone();
- assertEquals( "POM file is preserved across clone", projectToClone.getFile(), clonedProject.getFile() );
- assertEquals( "Base directory is preserved across clone", projectToClone.getBasedir(), clonedProject.getBasedir() );
+ assertEquals( projectToClone.getFile(), clonedProject.getFile(), "POM file is preserved across clone" );
+ assertEquals( projectToClone.getBasedir(), clonedProject.getBasedir(), "Base directory is preserved across clone" );
}
@Test
diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
index 09b5be5..6a53907 100644
--- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
@@ -22,7 +22,6 @@ package org.apache.maven.project;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -37,26 +36,23 @@ import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.project.harness.PomTestWrapper;
import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
-import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.DefaultPlexusContainer;
-import org.codehaus.plexus.PlexusConstants;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
import org.eclipse.aether.repository.LocalRepository;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.endsWith;
import static org.hamcrest.Matchers.lessThan;
import static org.hamcrest.Matchers.startsWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class PomConstructionTest
extends PlexusTestCase
@@ -75,7 +71,7 @@ public class PomConstructionTest
private File testDirectory;
- @Before
+ @BeforeEach
public void setUp()
throws Exception
{
@@ -84,7 +80,7 @@ public class PomConstructionTest
new File( getBasedir(), BASE_MIXIN_DIR );
}
- @After
+ @AfterEach
public void tearDown()
throws Exception
{
@@ -1672,9 +1668,10 @@ public class PomConstructionTest
public void testValidationErrorUponNonUniqueArtifactRepositoryId()
throws Exception
{
- assertThrows( "Non-unique repository ids did not cause validation error",
+ assertThrows(
ProjectBuildingException.class,
- () -> buildPom( "unique-repo-id/artifact-repo" ) );
+ () -> buildPom( "unique-repo-id/artifact-repo" ),
+ "Non-unique repository ids did not cause validation error" );
}
/* MNG-4193 */
@@ -1682,9 +1679,10 @@ public class PomConstructionTest
public void testValidationErrorUponNonUniquePluginRepositoryId()
throws Exception
{
- assertThrows( "Non-unique repository ids did not cause validation error",
+ assertThrows(
ProjectBuildingException.class,
- () -> buildPom( "unique-repo-id/plugin-repo" ) );
+ () -> buildPom( "unique-repo-id/plugin-repo" ),
+ "Non-unique repository ids did not cause validation error" );
}
/* MNG-4193 */
@@ -1692,9 +1690,10 @@ public class PomConstructionTest
public void testValidationErrorUponNonUniqueArtifactRepositoryIdInProfile()
throws Exception
{
- assertThrows( "Non-unique repository ids did not cause validation error",
+ assertThrows(
ProjectBuildingException.class,
- () -> buildPom( "unique-repo-id/artifact-repo-in-profile" ) );
+ () -> buildPom( "unique-repo-id/artifact-repo-in-profile" ),
+ "Non-unique repository ids did not cause validation error" );
}
/* MNG-4193 */
@@ -1702,9 +1701,10 @@ public class PomConstructionTest
public void testValidationErrorUponNonUniquePluginRepositoryIdInProfile()
throws Exception
{
- assertThrows( "Non-unique repository ids did not cause validation error",
+ assertThrows(
ProjectBuildingException.class,
- () -> buildPom( "unique-repo-id/plugin-repo-in-profile" ) );
+ () -> buildPom( "unique-repo-id/plugin-repo-in-profile" ),
+ "Non-unique repository ids did not cause validation error" );
}
/** MNG-3843 */
@@ -1783,9 +1783,10 @@ public class PomConstructionTest
public void testParentPomPackagingMustBePom()
throws Exception
{
- assertThrows( "Wrong packaging of parent POM was not rejected",
+ assertThrows(
ProjectBuildingException.class,
- () -> buildPom( "parent-pom-packaging/sub" ) );
+ () -> buildPom( "parent-pom-packaging/sub" ),
+ "Wrong packaging of parent POM was not rejected" );
}
/** MNG-522, MNG-3018 */
@@ -1839,7 +1840,7 @@ public class PomConstructionTest
customPlugin = i;
}
}
- assertEquals( plugins.toString(), customPlugin, resourcesPlugin - 1 );
+ assertEquals( customPlugin, resourcesPlugin - 1, plugins.toString() );
}
/** MNG-4415 */
@@ -1906,9 +1907,10 @@ public class PomConstructionTest
public void testProjectArtifactIdIsNotInheritedButMandatory()
throws Exception
{
- assertThrows( "Missing artifactId did not cause validation error",
+ assertThrows(
ProjectBuildingException.class,
- () -> buildPom( "artifact-id-inheritance/child" ) );
+ () -> buildPom( "artifact-id-inheritance/child" ),
+ "Missing artifactId did not cause validation error" );
}
private void assertPathSuffixEquals( String expected, Object actual )
diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
index 025f196..506a844 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
@@ -34,7 +34,7 @@ import org.apache.maven.model.building.FileModelSource;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.ModelSource;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
@@ -42,10 +42,10 @@ import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.hasKey;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ProjectBuilderTest
diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
index 85d8a47..4c1dcf4 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
@@ -33,13 +33,13 @@ import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.impl.RemoteRepositoryManager;
import org.eclipse.aether.repository.RemoteRepository;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.Matchers.startsWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Test cases for the project {@code ModelResolver} implementation.
@@ -66,9 +66,10 @@ public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
parent.setArtifactId( "apache" );
parent.setVersion( "0" );
- UnresolvableModelException e = assertThrows( "Expected 'UnresolvableModelException' not thrown.",
+ UnresolvableModelException e = assertThrows(
UnresolvableModelException.class,
- () -> newModelResolver().resolveModel( parent ) );
+ () -> newModelResolver().resolveModel( parent ),
+ "Expected 'UnresolvableModelException' not thrown." );
assertNotNull( e.getMessage() );
assertThat( e.getMessage(), startsWith( "Could not find artifact org.apache:apache:pom:0 in central" ) );
}
@@ -81,9 +82,10 @@ public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
parent.setArtifactId( "apache" );
parent.setVersion( "[2.0,2.1)" );
- UnresolvableModelException e = assertThrows( "Expected 'UnresolvableModelException' not thrown.",
+ UnresolvableModelException e = assertThrows(
UnresolvableModelException.class,
- () -> newModelResolver().resolveModel( parent ) );
+ () -> newModelResolver().resolveModel( parent ),
+ "Expected 'UnresolvableModelException' not thrown." );
assertEquals( "No versions matched the requested parent version range '[2.0,2.1)'",
e.getMessage() );
}
@@ -96,9 +98,10 @@ public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
parent.setArtifactId( "apache" );
parent.setVersion( "[1,)" );
- UnresolvableModelException e = assertThrows( "Expected 'UnresolvableModelException' not thrown.",
+ UnresolvableModelException e = assertThrows(
UnresolvableModelException.class,
- () -> newModelResolver().resolveModel( parent ) );
+ () -> newModelResolver().resolveModel( parent ),
+ "Expected 'UnresolvableModelException' not thrown." );
assertEquals( "The requested parent version range '[1,)' does not specify an upper bound",
e.getMessage() );
}
@@ -135,9 +138,10 @@ public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
dependency.setArtifactId( "apache" );
dependency.setVersion( "0" );
- UnresolvableModelException e = assertThrows( "Expected 'UnresolvableModelException' not thrown.",
+ UnresolvableModelException e = assertThrows(
UnresolvableModelException.class,
- () -> newModelResolver().resolveModel( dependency ) );
+ () -> newModelResolver().resolveModel( dependency ),
+ "Expected 'UnresolvableModelException' not thrown." );
assertNotNull( e.getMessage() );
assertThat( e.getMessage(), startsWith( "Could not find artifact org.apache:apache:pom:0 in central" ) );
}
@@ -150,9 +154,10 @@ public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
dependency.setArtifactId( "apache" );
dependency.setVersion( "[2.0,2.1)" );
- UnresolvableModelException e = assertThrows( "Expected 'UnresolvableModelException' not thrown.",
+ UnresolvableModelException e = assertThrows(
UnresolvableModelException.class,
- () -> newModelResolver().resolveModel( dependency ) );
+ () -> newModelResolver().resolveModel( dependency ),
+ "Expected 'UnresolvableModelException' not thrown." );
assertEquals( "No versions matched the requested dependency version range '[2.0,2.1)'",
e.getMessage() );
}
@@ -165,9 +170,10 @@ public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
dependency.setArtifactId( "apache" );
dependency.setVersion( "[1,)" );
- UnresolvableModelException e = assertThrows( "Expected 'UnresolvableModelException' not thrown.",
+ UnresolvableModelException e = assertThrows(
UnresolvableModelException.class,
- () -> newModelResolver().resolveModel( dependency ) );
+ () -> newModelResolver().resolveModel( dependency ),
+ "Expected 'UnresolvableModelException' not thrown." );
assertEquals( "The requested dependency version range '[1,)' does not specify an upper bound",
e.getMessage() );
}
diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java
index 1ca124f..ec15951 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java
@@ -20,8 +20,9 @@ package org.apache.maven.project;
*/
import static org.hamcrest.Matchers.hasItem;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.util.ArrayList;
import java.util.Collections;
@@ -34,9 +35,7 @@ import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginManagement;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
/**
* Test sorting projects by dependencies.
@@ -45,9 +44,6 @@ import org.junit.rules.ExpectedException;
*/
public class ProjectSorterTest
{
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
-
private Parent createParent( MavenProject project )
{
return createParent( project.getGroupId(), project.getArtifactId(), project.getVersion() );
@@ -210,10 +206,10 @@ public class ProjectSorterTest
MavenProject project2 = createProject( "groupId", "artifactId", "1.0" );
projects.add( project2 );
- expectedException.expect( DuplicateProjectException.class );
- expectedException.reportMissingExceptionWithMessage( "Duplicate projects should fail" );
-
- new ProjectSorter( projects ).getSortedProjects();
+ assertThrows(
+ DuplicateProjectException.class,
+ () -> new ProjectSorter( projects ).getSortedProjects(),
+ "Duplicate projects should fail" );
}
@Test
diff --git a/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java b/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java
index e6d8710..2d5c1ba 100644
--- a/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java
@@ -29,12 +29,12 @@ import org.apache.maven.project.artifact.DefaultMavenMetadataCache.CacheKey;
import org.apache.maven.repository.DelegatingLocalArtifactRepository;
import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.repository.TestRepositorySystem;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
/**
* @author Igor Fedorenko
@@ -43,14 +43,14 @@ public class DefaultMavenMetadataCacheTest
{
private RepositorySystem repositorySystem;
- @Before
+ @BeforeEach
public void setUp()
throws Exception
{
repositorySystem = new TestRepositorySystem( null, null );
}
- @After
+ @AfterEach
public void tearDown()
throws Exception
{
diff --git a/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCacheTest.java b/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCacheTest.java
index d02da76..16317ff 100644
--- a/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCacheTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCacheTest.java
@@ -24,16 +24,16 @@ import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
public class DefaultProjectArtifactsCacheTest
{
private ProjectArtifactsCache cache;
- @Before
+ @BeforeEach
public void setUp()
throws Exception
{
diff --git a/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java b/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
index 1b92442..a69af5e 100644
--- a/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
@@ -21,16 +21,14 @@ package org.apache.maven.project.artifact;
import org.apache.maven.test.PlexusTestCase;
import org.apache.maven.repository.RepositorySystem;
-import org.codehaus.plexus.DefaultPlexusContainer;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import javax.inject.Inject;
-import java.util.Collections;
-@Ignore
+@Disabled
public class MavenMetadataSourceTest
extends PlexusTestCase
{
@@ -112,12 +110,12 @@ public class MavenMetadataSourceTest
Map artifactMap = project.getArtifactMap();
- assertNotNull( "artifact-map should not be null.", artifactMap );
+ assertNotNull( artifactMap, "artifact-map should not be null." );
assertEquals( "artifact-map should contain 1 element.", 1, artifactMap.size() );
Artifact artifact = (Artifact) artifactMap.get( key );
- assertNotNull( "dependency artifact not found in map.", artifact );
+ assertNotNull( artifact, "dependency artifact not found in map." );
assertEquals( "dependency artifact has wrong scope.", Artifact.SCOPE_COMPILE, artifact.getScope() );
//check for back-propagation of default scope.
@@ -164,12 +162,12 @@ public class MavenMetadataSourceTest
Map artifactMap = project.getArtifactMap();
- assertNotNull( "artifact-map should not be null.", artifactMap );
+ assertNotNull( artifactMap, "artifact-map should not be null." );
assertEquals( "artifact-map should contain 1 element.", 1, artifactMap.size() );
Artifact artifact = (Artifact) artifactMap.get( key );
- assertNotNull( "dependency artifact not found in map.", artifact );
+ assertNotNull( artifact, "dependency artifact not found in map." );
assertEquals( "dependency artifact has wrong scope.", Artifact.SCOPE_TEST, artifact.getScope() );
//check for back-propagation of default scope.
diff --git a/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
index f0c07b3..f966237 100644
--- a/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
@@ -27,10 +27,10 @@ import org.apache.maven.model.PluginExecution;
import org.apache.maven.project.AbstractMavenProjectTestCase;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* @author Jason van Zyl
diff --git a/maven-core/src/test/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformationTest.java b/maven-core/src/test/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformationTest.java
index c86af5c..4648737 100644
--- a/maven-core/src/test/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformationTest.java
+++ b/maven-core/src/test/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformationTest.java
@@ -21,19 +21,17 @@ package org.apache.maven.rtinfo.internal;
import org.apache.maven.rtinfo.RuntimeInformation;
import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.PlexusConstants;
import org.apache.maven.test.PlexusTestCase;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import javax.inject.Inject;
-import java.util.Collections;
public class DefaultRuntimeInformationTest
extends PlexusTestCase
@@ -67,17 +65,20 @@ public class DefaultRuntimeInformationTest
assertTrue( rtInfo.isMavenVersion( "[2.0.11,2.1.0),[3.0,)" ) );
assertFalse( rtInfo.isMavenVersion( "[9.0,)" ) );
- assertThrows( "Bad version range wasn't rejected",
+ assertThrows(
IllegalArgumentException.class,
- () -> rtInfo.isMavenVersion( "[3.0," ) );
+ () -> rtInfo.isMavenVersion( "[3.0," ),
+ "Bad version range wasn't rejected" );
- assertThrows( "Bad version range wasn't rejected",
+ assertThrows(
IllegalArgumentException.class,
- () -> rtInfo.isMavenVersion( "" ) );
+ () -> rtInfo.isMavenVersion( "" ),
+ "Bad version range wasn't rejected" );
- assertThrows( "Bad version range wasn't rejected",
+ assertThrows(
NullPointerException.class,
- () -> rtInfo.isMavenVersion( null ) );
+ () -> rtInfo.isMavenVersion( null ),
+ "Bad version range wasn't rejected" );
}
}
diff --git a/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java b/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
index 82fbf93..b9c9734 100644
--- a/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
+++ b/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
@@ -32,23 +32,18 @@ import org.apache.maven.project.harness.PomTestWrapper;
import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
-import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.DefaultPlexusContainer;
-import org.codehaus.plexus.PlexusConstants;
import org.apache.maven.test.PlexusTestCase;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
import org.eclipse.aether.repository.LocalRepository;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import javax.inject.Inject;
-import java.util.Collections;
-
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class PomConstructionWithSettingsTest
extends PlexusTestCase
@@ -65,7 +60,7 @@ public class PomConstructionWithSettingsTest
private File testDirectory;
- @Before
+ @BeforeEach
public void setUp()
throws Exception
{
diff --git a/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java b/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java
index 4431a75..6943c34 100644
--- a/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java
+++ b/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java
@@ -24,10 +24,10 @@ import java.util.List;
import java.util.Properties;
import java.util.Random;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class SettingsUtilsTest
{
diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java
index 896b59c..523645f 100644
--- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java
+++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java
@@ -19,7 +19,7 @@ package org.apache.maven.toolchain;
* under the License.
*/
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -36,8 +36,8 @@ import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.toolchain.model.ToolchainModel;
import org.codehaus.plexus.logging.Logger;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -57,7 +57,7 @@ public class DefaultToolchainManagerPrivateTest
@Mock
private ToolchainFactory toolchainFactory_rareType;
- @Before
+ @BeforeEach
public void setUp()
{
toolchainManager = new DefaultToolchainManagerPrivate();
diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
index 84444c0..c5b808f 100644
--- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
@@ -19,7 +19,7 @@ package org.apache.maven.toolchain;
* under the License.
*/
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -36,8 +36,8 @@ import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.toolchain.model.ToolchainModel;
import org.codehaus.plexus.logging.Logger;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentMatchers;
import org.mockito.InjectMocks;
import org.mockito.Mock;
@@ -58,7 +58,7 @@ public class DefaultToolchainManagerTest
@Mock
private ToolchainFactory toolchainFactory_rareType;
- @Before
+ @BeforeEach
public void onSetup() throws Exception
{
toolchainManager = new DefaultToolchainManager();
diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java
index 3b75455..a5d14b2 100644
--- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java
+++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java
@@ -19,9 +19,9 @@ package org.apache.maven.toolchain;
* under the License.
*/
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.mockito.Mockito.verify;
import java.io.InputStream;
@@ -32,8 +32,8 @@ import org.apache.maven.toolchain.model.PersistedToolchains;
import org.apache.maven.toolchain.model.ToolchainModel;
import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader;
import org.codehaus.plexus.logging.Logger;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -44,7 +44,7 @@ public class DefaultToolchainTest
private MavenToolchainsXpp3Reader reader = new MavenToolchainsXpp3Reader();
- @Before
+ @BeforeEach
public void setUp()
throws Exception
{
diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java
index 8da23be..6c167b1 100644
--- a/maven-core/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java
+++ b/maven-core/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java
@@ -19,11 +19,11 @@
package org.apache.maven.toolchain;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
*
diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
index f04d248..94c15b8 100644
--- a/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
@@ -27,8 +27,8 @@ import org.apache.maven.toolchain.model.PersistedToolchains;
import org.apache.maven.toolchain.model.ToolchainModel;
import org.codehaus.plexus.interpolation.os.OperatingSystemUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
import org.mockito.ArgumentMatchers;
import org.mockito.InjectMocks;
import org.mockito.MockitoAnnotations;
@@ -39,8 +39,8 @@ import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
@@ -58,7 +58,7 @@ public class DefaultToolchainsBuilderTest
@InjectMocks
private DefaultToolchainsBuilder toolchainBuilder;
- @Before
+ @BeforeEach
public void onSetup()
{
MockitoAnnotations.initMocks( this );
diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/building/ToolchainsBuildingExceptionTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/building/ToolchainsBuildingExceptionTest.java
index 0efda4d..8189268 100644
--- a/maven-core/src/test/java/org/apache/maven/toolchain/building/ToolchainsBuildingExceptionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/toolchain/building/ToolchainsBuildingExceptionTest.java
@@ -19,14 +19,14 @@ package org.apache.maven.toolchain.building;
* under the License.
*/
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Collections;
import org.apache.maven.building.Problem;
import org.apache.maven.building.ProblemCollector;
import org.apache.maven.building.ProblemCollectorFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class ToolchainsBuildingExceptionTest
{
diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java
index 5ad762a..7bed9a9 100644
--- a/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java
@@ -24,11 +24,11 @@ import org.apache.maven.toolchain.model.ToolchainModel;
import org.apache.maven.toolchain.model.TrackableBase;
import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.InputStream;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class MavenToolchainMergerTest
{
diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java
index 14e6bac..bc945fd 100644
--- a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java
@@ -29,7 +29,7 @@ import java.util.List;
import org.apache.commons.cli.Option;
import org.codehaus.plexus.util.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Pseudo test to generate documentation fragment about supported CLI options. TODO such documentation generation code
diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java
index dbb3879..a3aad6b 100644
--- a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java
@@ -20,18 +20,18 @@ package org.apache.maven.cli;
*/
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.commons.cli.CommandLine;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class CLIManagerTest
{
private CLIManager cliManager;
- @Before
+ @BeforeEach
public void setup()
{
cliManager = new CLIManager();
diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/CLIReportingUtilsTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/CLIReportingUtilsTest.java
index 0d1262c..ac0cb30 100644
--- a/maven-embedder/src/test/java/org/apache/maven/cli/CLIReportingUtilsTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/cli/CLIReportingUtilsTest.java
@@ -19,9 +19,9 @@ package org.apache.maven.cli;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class CLIReportingUtilsTest
{
diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java
index 7e2b489..1624be1 100644
--- a/maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java
@@ -19,9 +19,9 @@ package org.apache.maven.cli;
* under the License.
*/
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Karl Heinz Marbaise
diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java
index 1edb84e..c7a41a5 100644
--- a/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java
@@ -26,11 +26,11 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
import static org.mockito.Mockito.inOrder;
@@ -55,30 +55,25 @@ import org.apache.maven.toolchain.building.ToolchainsBuildingRequest;
import org.apache.maven.toolchain.building.ToolchainsBuildingResult;
import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.PlexusContainer;
-import org.eclipse.sisu.plexus.PlexusBeanModule;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.InOrder;
-import com.google.inject.Binder;
-import com.google.inject.Module;
-
public class MavenCliTest
{
private MavenCli cli;
private String origBasedir;
- @Before
+ @BeforeEach
public void setUp()
{
cli = new MavenCli();
origBasedir = System.getProperty( MavenCli.MULTIMODULE_PROJECT_DIRECTORY );
}
- @After
+ @AfterEach
public void tearDown()
throws Exception
{
@@ -149,9 +144,10 @@ public class MavenCliTest
// -TC2.2
assertEquals( (int) ( cores * 2.2 ), cli.calculateDegreeOfConcurrencyWithCoreMultiplier( "2.2C" ) );
- assertThrows( "Should have failed with a NumberFormatException",
+ assertThrows(
NumberFormatException.class,
- () -> cli.calculateDegreeOfConcurrencyWithCoreMultiplier( "CXXX" ) );
+ () -> cli.calculateDegreeOfConcurrencyWithCoreMultiplier( "CXXX" ),
+ "Should have failed with a NumberFormatException" );
}
@Test
@@ -307,7 +303,7 @@ public class MavenCliTest
public void testStyleColors()
throws Exception
{
- assumeTrue( "ANSI not supported", MessageUtils.isColorEnabled() );
+ assumeTrue( MessageUtils.isColorEnabled(), "ANSI not supported" );
CliRequest request;
MessageUtils.setColorEnabled( true );
@@ -349,8 +345,10 @@ public class MavenCliTest
CliRequest maybeColorRequest = new CliRequest( new String[] { "-Dstyle.color=maybe", "-B", "-l", "target/temp/mvn.log" }, null );
cli.cli( maybeColorRequest );
cli.properties( maybeColorRequest );
- assertThrows( "maybe is not a valid option", IllegalArgumentException.class,
- () -> cli.logging( maybeColorRequest ) );
+ assertThrows(
+ IllegalArgumentException.class,
+ () -> cli.logging( maybeColorRequest ),
+ "maybe is not a valid option" );
}
/**
diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
index 3abb872..d374b24 100644
--- a/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
@@ -26,9 +26,9 @@ import static org.mockito.Mockito.when;
import org.apache.maven.execution.ExecutionEvent;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.utils.logging.MessageUtils;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.mockito.InOrder;
import org.slf4j.Logger;
@@ -36,13 +36,13 @@ public class ExecutionEventLoggerTest
{
private ExecutionEventLogger executionEventLogger;
- @BeforeClass
+ @BeforeAll
public static void setUp()
{
MessageUtils.setColorEnabled( false );
}
- @AfterClass
+ @AfterAll
public static void tearDown()
{
MessageUtils.setColorEnabled( true );
diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
index e595ace..5090fac 100644
--- a/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
@@ -23,19 +23,20 @@ import java.util.Locale;
import org.apache.maven.cli.transfer.AbstractMavenTransferListener.FileSizeFormat;
import org.apache.maven.cli.transfer.AbstractMavenTransferListener.FileSizeFormat.ScaleUnit;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class FileSizeFormatTest {
- @Test( expected = IllegalArgumentException.class )
+ @Test
public void testNegativeSize()
{
FileSizeFormat format = new FileSizeFormat( Locale.ENGLISH );
long negativeSize = -100L;
- format.format( negativeSize );
+ assertThrows( IllegalArgumentException.class, () -> format.format( negativeSize ) );
}
@Test
@@ -209,21 +210,21 @@ public class FileSizeFormatTest {
assertEquals( "1.0 GB", format.format( _1000_megabytes, ScaleUnit.GIGABYTE ) );
}
- @Test( expected = IllegalArgumentException.class )
+ @Test
public void testNegativeProgressedSize()
{
FileSizeFormat format = new FileSizeFormat( Locale.ENGLISH );
long negativeProgressedSize = -100L;
- format.formatProgress( negativeProgressedSize, 10L );
+ assertThrows( IllegalArgumentException.class, () -> format.formatProgress( negativeProgressedSize, 10L ) );
}
- @Test( expected = IllegalArgumentException.class )
+ @Test
public void testNegativeProgressedSizeBiggerThanSize()
{
FileSizeFormat format = new FileSizeFormat( Locale.ENGLISH );
- format.formatProgress( 100L, 10L );
+ assertThrows( IllegalArgumentException.class, () -> format.formatProgress( 100L, 10L ) );
}
@Test
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/ComplexActivationTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/building/ComplexActivationTest.java
index ed384d0..1401652 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/building/ComplexActivationTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/building/ComplexActivationTest.java
@@ -22,11 +22,11 @@ package org.apache.maven.model.building;
import java.io.File;
import java.util.Properties;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
* @author Konstantin Perikov
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderFactoryTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderFactoryTest.java
index 1f869d0..5f12d6b 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderFactoryTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderFactoryTest.java
@@ -22,10 +22,10 @@ package org.apache.maven.model.building;
import java.io.File;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* @author Benjamin Bentmann
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java
index 2b6d53a..d61e2aa 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java
@@ -25,10 +25,10 @@ import org.apache.maven.model.Repository;
import org.apache.maven.model.resolution.InvalidRepositoryException;
import org.apache.maven.model.resolution.ModelResolver;
import org.apache.maven.model.resolution.UnresolvableModelException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* @author Guillaume Nodet
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java
index 569cfc9..d4a489c 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java
@@ -23,11 +23,12 @@ import java.io.File;
import java.io.IOException;
import org.apache.commons.lang3.SystemUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
-import static junit.framework.TestCase.assertFalse;
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assume.assumeTrue;
/**
* Test that validate the solution of MNG-6261 issue
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java
index 1c8b29b..9d53014 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java
@@ -28,10 +28,10 @@ import java.util.stream.Stream;
import org.apache.maven.model.building.DefaultModelBuilder.FileToRawModelMerger;
import org.apache.maven.model.merge.ModelMerger;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.hasItems;
-import static org.junit.Assert.assertThat;
public class FileToRawModelMergerTest
{
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
index 4df8953..b36c184 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
@@ -38,13 +38,13 @@ import org.apache.maven.model.io.DefaultModelReader;
import org.apache.maven.model.io.DefaultModelWriter;
import org.apache.maven.model.io.ModelWriter;
import org.apache.maven.xml.sax.filter.AbstractSAXFilter;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.xmlunit.matchers.CompareMatcher;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author Hervé Boutemy
@@ -57,7 +57,7 @@ public class DefaultInheritanceAssemblerTest
private InheritanceAssembler assembler;
- @Before
+ @BeforeEach
public void setUp()
throws Exception
{
@@ -171,10 +171,10 @@ public class DefaultInheritanceAssemblerTest
catch ( AssertionError afe )
{
// expected failure: wrong relative path calculation
- assertTrue( afe.getMessage(),
- afe.getMessage().contains(
+ assertTrue( afe.getMessage().contains(
"Expected text value 'http://www.apache.org/path/to/parent/child-artifact-id/' but was " +
- "'http://www.apache.org/path/to/parent/../child-artifact-id/'" ) );
+ "'http://www.apache.org/path/to/parent/../child-artifact-id/'" ),
+ afe.getMessage() );
}
// but ok from repo: local disk is ignored
testInheritance( "tricky-flat-artifactId-urls", true );
@@ -183,13 +183,15 @@ public class DefaultInheritanceAssemblerTest
// then relative path calculation will success during build from disk but fail when calculated from repo
testInheritance( "tricky-flat-directory-urls", false );
- AssertionError afe = assertThrows( "should have failed since module reference == directory name != artifactId",
+ AssertionError afe = assertThrows(
AssertionError.class,
- () -> testInheritance( "tricky-flat-directory-urls", true ) );
+ () -> testInheritance( "tricky-flat-directory-urls", true ),
+ "should have failed since module reference == directory name != artifactId" );
// expected failure
- assertTrue( afe.getMessage(), afe.getMessage().contains(
- "Expected text value 'http://www.apache.org/path/to/parent/../child-artifact-id/' but was " +
- "'http://www.apache.org/path/to/parent/child-artifact-id/'" ) );
+ assertTrue( afe.getMessage().contains(
+ "Expected text value 'http://www.apache.org/path/to/parent/../child-artifact-id/' but was " +
+ "'http://www.apache.org/path/to/parent/child-artifact-id/'" ),
+ afe.getMessage() );
}
@Test
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java
index d32aa68..032ef28 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java
@@ -38,22 +38,21 @@ import org.apache.maven.model.Scm;
import org.apache.maven.model.building.DefaultModelBuildingRequest;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.SimpleProblemCollector;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author jdcasey
*/
public abstract class AbstractModelInterpolatorTest
{
- protected ModelInterpolator interpolator;
private Properties context;
- @Before
+ @BeforeEach
public void setUp()
{
context = new Properties();
@@ -64,16 +63,16 @@ public abstract class AbstractModelInterpolatorTest
protected void assertProblemFree( SimpleProblemCollector collector )
{
- assertEquals( "Expected no errors", 0, collector.getErrors().size() );
- assertEquals( "Expected no warnings", 0, collector.getWarnings().size() );
- assertEquals( "Expected no fatals", 0, collector.getFatals().size() );
+ assertEquals( 0, collector.getErrors().size(), "Expected no errors" );
+ assertEquals( 0, collector.getWarnings().size(), "Expected no warnings" );
+ assertEquals( 0, collector.getFatals().size(), "Expected no fatals" );
}
protected void assertCollectorState( int numFatals, int numErrors, int numWarnings, SimpleProblemCollector collector )
{
- assertEquals( "Errors", numErrors, collector.getErrors().size() );
- assertEquals( "Warnings", numWarnings, collector.getWarnings().size() );
- assertEquals( "Fatals", numFatals, collector.getFatals().size() );
+ assertEquals( numErrors, collector.getErrors().size(), "Errors" );
+ assertEquals( numWarnings, collector.getWarnings().size(), "Warnings" );
+ assertEquals( numFatals, collector.getFatals().size(), "Fatals" );
}
private ModelBuildingRequest createModelBuildingRequest( Properties p )
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/MavenBuildTimestampTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/MavenBuildTimestampTest.java
index 56dc49c..73ea399 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/MavenBuildTimestampTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/MavenBuildTimestampTest.java
@@ -22,9 +22,9 @@ package org.apache.maven.model.interpolation;
import java.util.Date;
import java.util.Properties;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class MavenBuildTimestampTest
{
@@ -35,6 +35,6 @@ public class MavenBuildTimestampTest
interpolationProperties.setProperty( "maven.build.timestamp.format", "yyyyMMdd'T'HHmm'Z'" );
MavenBuildTimestamp timestamp = new MavenBuildTimestamp( new Date(), interpolationProperties );
String formattedTimestamp = timestamp.formattedTimestamp();
- assertTrue( "We expect the UTC marker at the end of the timestamp.", formattedTimestamp.endsWith( "Z" ) );
+ assertTrue( formattedTimestamp.endsWith( "Z" ), "We expect the UTC marker at the end of the timestamp." );
}
}
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
index 0d27cae..d0d71fd 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
@@ -38,13 +38,14 @@ import org.apache.maven.model.Model;
import org.apache.maven.model.building.DefaultModelBuildingRequest;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.SimpleProblemCollector;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.anyOf;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* StringSearchModelInterpolatorTest - not in use
@@ -56,16 +57,9 @@ import static org.junit.Assert.assertNotNull;
public class StringSearchModelInterpolatorTest
extends AbstractModelInterpolatorTest
{
- @Override
- public void setUp()
- {
- super.setUp();
- interpolator = new StringSearchModelInterpolator();
- }
-
protected ModelInterpolator createInterpolator()
{
- return this.interpolator;
+ return new StringSearchModelInterpolator();
}
@Test
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java
index bd201ed..7c90b07 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java
@@ -21,15 +21,8 @@ package org.apache.maven.model.interpolation;
public class StringVisitorModelInterpolatorTest extends AbstractModelInterpolatorTest
{
- @Override
- public void setUp()
- {
- super.setUp();
- interpolator = new StringVisitorModelInterpolator();
- }
-
protected ModelInterpolator createInterpolator()
{
- return this.interpolator;
+ return new StringVisitorModelInterpolator();
}
}
\ No newline at end of file
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/merge/MavenModelMergerTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/merge/MavenModelMergerTest.java
index 906a8b2..636f3fb 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/merge/MavenModelMergerTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/merge/MavenModelMergerTest.java
@@ -25,10 +25,10 @@ import java.util.Collections;
import org.apache.maven.model.Model;
import org.apache.maven.model.Prerequisites;
import org.apache.maven.model.Profile;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class MavenModelMergerTest
{
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/path/DefaultUrlNormalizerTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/path/DefaultUrlNormalizerTest.java
index 76135e2..010abe0 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/path/DefaultUrlNormalizerTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/path/DefaultUrlNormalizerTest.java
@@ -19,10 +19,10 @@ package org.apache.maven.model.path;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
* @author Benjamin Bentmann
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/AbstractProfileActivatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/AbstractProfileActivatorTest.java
index 8544d2a..c665125 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/AbstractProfileActivatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/AbstractProfileActivatorTest.java
@@ -26,10 +26,10 @@ import org.apache.maven.model.Profile;
import org.apache.maven.model.building.SimpleProblemCollector;
import org.apache.maven.model.profile.DefaultProfileActivationContext;
import org.apache.maven.model.profile.ProfileActivationContext;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Provides common services to test {@link ProfileActivator} implementations.
@@ -48,14 +48,14 @@ public abstract class AbstractProfileActivatorTest<T extends ProfileActivator>
this.activatorClass = Objects.requireNonNull( activatorClass, "activatorClass cannot be null" );;
}
- @Before
+ @BeforeEach
public void setUp()
throws Exception
{
activator = activatorClass.getConstructor().newInstance();
}
- @After
+ @AfterEach
public void tearDown()
throws Exception
{
@@ -74,8 +74,8 @@ public abstract class AbstractProfileActivatorTest<T extends ProfileActivator>
assertEquals( active, activator.isActive( profile, context, problems ) );
- assertEquals( problems.getErrors().toString(), 0, problems.getErrors().size() );
- assertEquals( problems.getWarnings().toString(), 0, problems.getWarnings().size() );
+ assertEquals( 0, problems.getErrors().size(), problems.getErrors().toString() );
+ assertEquals( 0, problems.getWarnings().size(), problems.getWarnings().toString() );
}
}
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java
index 92ad135..51bd93f 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java
@@ -23,7 +23,7 @@ import java.util.Properties;
import org.apache.maven.model.Activation;
import org.apache.maven.model.Profile;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests {@link JdkVersionProfileActivator}.
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java
index 3bffea2..251ea7d 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java
@@ -24,7 +24,7 @@ import java.util.Properties;
import org.apache.maven.model.Activation;
import org.apache.maven.model.ActivationProperty;
import org.apache.maven.model.Profile;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests {@link PropertyProfileActivator}.
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
index 3e4457c..5f17a8a 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
@@ -27,13 +27,13 @@ import org.apache.maven.model.building.DefaultModelBuildingRequest;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.SimpleProblemCollector;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
@@ -48,7 +48,7 @@ public class DefaultModelValidatorTest
{
String resource = "/poms/validation/" + pom;
InputStream is = getClass().getResourceAsStream( resource );
- assertNotNull( "missing resource: " + resource, is );
+ assertNotNull( is, "missing resource: " + resource );
return new MavenXpp3Reader().read( is );
}
@@ -96,17 +96,17 @@ public class DefaultModelValidatorTest
private void assertContains( String msg, String substring )
{
- assertTrue( "\"" + substring + "\" was not found in: " + msg, msg.contains( substring ) );
+ assertTrue( msg.contains( substring ), "\"" + substring + "\" was not found in: " + msg );
}
- @Before
+ @BeforeEach
public void setUp()
throws Exception
{
validator = new DefaultModelValidator();
}
- @After
+ @AfterEach
public void tearDown()
throws Exception
{
@@ -115,9 +115,9 @@ public class DefaultModelValidatorTest
private void assertViolations( SimpleProblemCollector result, int fatals, int errors, int warnings )
{
- assertEquals( String.valueOf( result.getFatals() ), fatals, result.getFatals().size() );
- assertEquals( String.valueOf( result.getErrors() ), errors, result.getErrors().size() );
- assertEquals( String.valueOf( result.getWarnings() ), warnings, result.getWarnings().size() );
+ assertEquals( fatals, result.getFatals().size(), String.valueOf( result.getFatals() ) );
+ assertEquals( errors, result.getErrors().size(), String.valueOf( result.getErrors() ) );
+ assertEquals( warnings, result.getWarnings().size(), String.valueOf( result.getWarnings() ) );
}
@Test
diff --git a/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java b/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java
index c95eb0f..cbfdc2a 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code ActivationFile}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java b/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java
index d6d8509..3be5cd9 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code ActivationOS}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java b/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java
index 3fae4e0..564adc0 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code ActivationProperty}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java b/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java
index a9d4acd..520c0a9 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code Activation}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/BuildTest.java b/maven-model/src/test/java/org/apache/maven/model/BuildTest.java
index f16de69..3a14bd3 100644
--- a/maven-model/src/test/java/org/apache/maven/model/BuildTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/BuildTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code Build}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java b/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java
index 8ed000e..ee6d41d 100644
--- a/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code CiManagement}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java b/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java
index 9171503..e2f3dbb 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code Contributor}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java b/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java
index 70ebd51..e63d224 100644
--- a/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code DependencyManagement}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java b/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java
index 4210e09..6b7bc3f 100644
--- a/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code Dependency}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java b/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java
index 95037f5..c648ffd 100644
--- a/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code DeploymentRepository}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java b/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java
index 54c6b73..61d86f0 100644
--- a/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code Developer}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java b/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java
index 91b9395..db8ba21 100644
--- a/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code DistributionManagement}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java b/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java
index 7aba6c7..90e4b74 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code Exclusion}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java b/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java
index da40b0d..218ff50 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code Extension}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java b/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java
index 2ca800d..27e1eb0 100644
--- a/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code IssueManagement}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java b/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java
index 739c139..dd56616 100644
--- a/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code License}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java b/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java
index 0171ab8..5de9edc 100644
--- a/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code MailingList}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/ModelTest.java b/maven-model/src/test/java/org/apache/maven/model/ModelTest.java
index 4910549..37adc82 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ModelTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ModelTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code Model}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java b/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java
index f0da085..026632a 100644
--- a/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code Notifier}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java b/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java
index 71f1f3b..ef19d2a 100644
--- a/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code Organization}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/ParentTest.java b/maven-model/src/test/java/org/apache/maven/model/ParentTest.java
index 3007e15..d8690fc 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ParentTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ParentTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code Parent}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java b/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java
index 34ea7ad..3e52df7 100644
--- a/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code PluginConfiguration}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java b/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java
index e9e4f52..ed4e9e3 100644
--- a/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code PluginContainer}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java b/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java
index 4613727..35b78bd 100644
--- a/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code PluginExecution}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java b/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java
index 49af4af..b4d8266 100644
--- a/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code PluginManagement}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/PluginTest.java b/maven-model/src/test/java/org/apache/maven/model/PluginTest.java
index f67abba..d8e345b 100644
--- a/maven-model/src/test/java/org/apache/maven/model/PluginTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/PluginTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code Plugin}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java b/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java
index c4f7ef5..2c91e47 100644
--- a/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code Prerequisites}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java b/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java
index 40f2cb5..ac719e4 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code Profile}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java b/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java
index 5ef704e..ea825a6 100644
--- a/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code Relocation}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java b/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java
index 6e149d7..094d2d5 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code ReportPlugin}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java b/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java
index 72395f2..c0bb257 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code ReportSet}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java b/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java
index 5e22e6f..3b04d02 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code Reporting}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java b/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java
index 933e17d..770bce2 100644
--- a/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code RepositoryPolicy}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java b/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java
index ca5cf71..62f32d7 100644
--- a/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code Repository}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java b/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java
index 476f736..3e5b1b3 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code Resource}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/ScmTest.java b/maven-model/src/test/java/org/apache/maven/model/ScmTest.java
index a4d2b1f..a6ccc24 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ScmTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ScmTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code Scm}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/SiteTest.java b/maven-model/src/test/java/org/apache/maven/model/SiteTest.java
index 140548f..5fe4975 100644
--- a/maven-model/src/test/java/org/apache/maven/model/SiteTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/SiteTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.model;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@code Site}.
diff --git a/maven-model/src/test/java/org/apache/maven/model/merge/ModelMergerTest.java b/maven-model/src/test/java/org/apache/maven/model/merge/ModelMergerTest.java
index 732c277..104b977 100644
--- a/maven-model/src/test/java/org/apache/maven/model/merge/ModelMergerTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/merge/ModelMergerTest.java
@@ -1,5 +1,6 @@
package org.apache.maven.model.merge;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.is;
@@ -22,8 +23,6 @@ import static org.hamcrest.Matchers.is;
* under the License.
*/
-import static org.junit.Assert.assertThat;
-
import java.util.Arrays;
import org.apache.maven.model.Build;
@@ -37,7 +36,7 @@ import org.apache.maven.model.PluginExecution;
import org.apache.maven.model.Profile;
import org.apache.maven.model.ReportSet;
import org.apache.maven.model.Repository;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* ModelMerger is based on same instances, subclasses should override KeyComputer per type
diff --git a/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java b/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java
index 4aa9f46..5b245af 100644
--- a/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java
+++ b/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java
@@ -27,10 +27,10 @@ import org.codehaus.plexus.component.repository.ComponentRequirement;
import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.configuration.PlexusConfigurationException;
import org.codehaus.plexus.util.ReaderFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Tests {@link PluginDescriptorBuilder}.
diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
index 699a172..0301a60 100644
--- a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
+++ b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
@@ -26,15 +26,13 @@ import javax.inject.Inject;
import org.apache.maven.test.PlexusTestCase;
import org.apache.maven.repository.internal.util.ConsoleRepositoryListener;
import org.apache.maven.repository.internal.util.ConsoleTransferListener;
-import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.PlexusConstants;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.repository.LocalRepository;
import org.eclipse.aether.repository.RemoteRepository;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
public abstract class AbstractRepositoryTestCase
extends PlexusTestCase
@@ -44,7 +42,7 @@ public abstract class AbstractRepositoryTestCase
protected RepositorySystemSession session;
- @Before
+ @BeforeEach
@Override
public void setUp()
throws Exception
diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReaderTest.java b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReaderTest.java
index 154ebc7..cd45fe3 100644
--- a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReaderTest.java
+++ b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReaderTest.java
@@ -25,11 +25,11 @@ import org.eclipse.aether.artifact.DefaultArtifact;
import org.eclipse.aether.impl.ArtifactDescriptorReader;
import org.eclipse.aether.impl.RepositoryEventDispatcher;
import org.eclipse.aether.resolution.ArtifactDescriptorRequest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -73,7 +73,6 @@ public class DefaultArtifactDescriptorReaderTest
}
}
- assertTrue( "Expected missing artifact descriptor for org.apache.maven.its:dep-mng5459:pom:0.4.0-20130404.090532-2",
- missingArtifactDescriptor );
+ assertTrue( missingArtifactDescriptor, "Expected missing artifact descriptor for org.apache.maven.its:dep-mng5459:pom:0.4.0-20130404.090532-2" );
}
}
diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java
index 3b13e2c..ce09b4b 100644
--- a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java
+++ b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java
@@ -30,12 +30,12 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
import org.eclipse.aether.impl.ArtifactResolver;
import org.eclipse.aether.impl.RemoteRepositoryManager;
import org.eclipse.aether.impl.VersionRangeResolver;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test cases for the default {@code ModelResolver} implementation.
@@ -62,9 +62,10 @@ public final class DefaultModelResolverTest extends AbstractRepositoryTestCase
parent.setArtifactId( "artifact" );
parent.setVersion( "0" );
- UnresolvableModelException e = assertThrows( "Expected 'UnresolvableModelException' not thrown.",
+ UnresolvableModelException e = assertThrows(
UnresolvableModelException.class,
- () -> newModelResolver().resolveModel( parent ) );
+ () -> newModelResolver().resolveModel( parent ),
+ "Expected 'UnresolvableModelException' not thrown." );
assertNotNull( e.getMessage() );
assertTrue( e.getMessage().startsWith( "Could not find artifact ut.simple:artifact:pom:0 in repo" ) );
}
@@ -77,9 +78,10 @@ public final class DefaultModelResolverTest extends AbstractRepositoryTestCase
parent.setArtifactId( "artifact" );
parent.setVersion( "[2.0,2.1)" );
- UnresolvableModelException e = assertThrows( "Expected 'UnresolvableModelException' not thrown.",
+ UnresolvableModelException e = assertThrows(
UnresolvableModelException.class,
- () -> newModelResolver().resolveModel( parent ) );
+ () -> newModelResolver().resolveModel( parent ),
+ "Expected 'UnresolvableModelException' not thrown." );
assertNotNull( e.getMessage() );
assertEquals( "No versions matched the requested parent version range '[2.0,2.1)'",
e.getMessage() );
@@ -93,9 +95,10 @@ public final class DefaultModelResolverTest extends AbstractRepositoryTestCase
parent.setArtifactId( "artifact" );
parent.setVersion( "[1.0,)" );
- UnresolvableModelException e = assertThrows( "Expected 'UnresolvableModelException' not thrown.",
+ UnresolvableModelException e = assertThrows(
UnresolvableModelException.class,
- () -> newModelResolver().resolveModel( parent ) );
+ () -> newModelResolver().resolveModel( parent ),
+ "Expected 'UnresolvableModelException' not thrown." );
assertEquals( "The requested parent version range '[1.0,)' does not specify an upper bound",
e.getMessage() );
}
@@ -132,9 +135,10 @@ public final class DefaultModelResolverTest extends AbstractRepositoryTestCase
dependency.setArtifactId( "artifact" );
dependency.setVersion( "0" );
- UnresolvableModelException e = assertThrows( "Expected 'UnresolvableModelException' not thrown.",
+ UnresolvableModelException e = assertThrows(
UnresolvableModelException.class,
- () -> newModelResolver().resolveModel( dependency ) );
+ () -> newModelResolver().resolveModel( dependency ),
+ "Expected 'UnresolvableModelException' not thrown." );
assertNotNull( e.getMessage() );
assertTrue( e.getMessage().startsWith( "Could not find artifact ut.simple:artifact:pom:0 in repo" ) );
}
@@ -147,9 +151,10 @@ public final class DefaultModelResolverTest extends AbstractRepositoryTestCase
dependency.setArtifactId( "artifact" );
dependency.setVersion( "[2.0,2.1)" );
- UnresolvableModelException e = assertThrows( "Expected 'UnresolvableModelException' not thrown.",
+ UnresolvableModelException e = assertThrows(
UnresolvableModelException.class,
- () -> newModelResolver().resolveModel( dependency ) );
+ () -> newModelResolver().resolveModel( dependency ),
+ "Expected 'UnresolvableModelException' not thrown." );
assertEquals( "No versions matched the requested dependency version range '[2.0,2.1)'",
e.getMessage() );
}
@@ -162,9 +167,10 @@ public final class DefaultModelResolverTest extends AbstractRepositoryTestCase
dependency.setArtifactId( "artifact" );
dependency.setVersion( "[1.0,)" );
- UnresolvableModelException e = assertThrows( "Expected 'UnresolvableModelException' not thrown.",
+ UnresolvableModelException e = assertThrows(
UnresolvableModelException.class,
- () -> newModelResolver().resolveModel( dependency ) );
+ () -> newModelResolver().resolveModel( dependency ),
+ "Expected 'UnresolvableModelException' not thrown." );
assertEquals( "The requested dependency version range '[1.0,)' does not specify an upper bound",
e.getMessage() );
}
diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultVersionResolverTest.java b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultVersionResolverTest.java
index 03d8eb5..8eebaf5 100644
--- a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultVersionResolverTest.java
+++ b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultVersionResolverTest.java
@@ -23,14 +23,13 @@ import javax.inject.Inject;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.artifact.DefaultArtifact;
-import org.eclipse.aether.impl.VersionResolver;
import org.eclipse.aether.resolution.VersionRequest;
import org.eclipse.aether.resolution.VersionResult;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DefaultVersionResolverTest
extends AbstractRepositoryTestCase
diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/MavenRepositorySystemUtilsTest.java b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/MavenRepositorySystemUtilsTest.java
index 59b83e2..e54ceb1 100644
--- a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/MavenRepositorySystemUtilsTest.java
+++ b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/MavenRepositorySystemUtilsTest.java
@@ -22,10 +22,10 @@ package org.apache.maven.repository.internal;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.impl.MetadataGeneratorFactory;
import org.eclipse.aether.spi.locator.ServiceLocator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class MavenRepositorySystemUtilsTest
{
diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataTest.java b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataTest.java
index a1526d6..86c7269 100644
--- a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataTest.java
+++ b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataTest.java
@@ -29,24 +29,24 @@ import java.util.Set;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.eclipse.aether.artifact.DefaultArtifact;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class RemoteSnapshotMetadataTest
{
private Locale defaultLocale;
- @Before
+ @BeforeEach
public void setLocaleToUseBuddhistCalendar()
{
defaultLocale = Locale.getDefault();
Locale.setDefault( new Locale( "th", "TH" ) );
}
- @After
+ @AfterEach
public void restoreLocale()
{
Locale.setDefault( defaultLocale );
@@ -76,7 +76,6 @@ public class RemoteSnapshotMetadataTest
/* Allow for this test running across midnight */
Set<String> expected = new HashSet<>( Arrays.asList( dateBefore, dateAfter ) );
- assertTrue( "Expected " + datePart + " to be in " + expected,
- expected.contains( datePart ) );
+ assertTrue( expected.contains( datePart ), "Expected " + datePart + " to be in " + expected );
}
}
diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java
index bddbd8c..77b2781 100644
--- a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java
+++ b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java
@@ -32,13 +32,13 @@ import org.eclipse.aether.resolution.ArtifactDescriptorRequest;
import org.eclipse.aether.resolution.ArtifactDescriptorResult;
import org.eclipse.aether.resolution.ArtifactRequest;
import org.eclipse.aether.resolution.ArtifactResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class RepositorySystemTest
extends AbstractRepositoryTestCase
diff --git a/maven-settings-builder/src/test/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactoryTest.java b/maven-settings-builder/src/test/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactoryTest.java
index 648549b..63d62be 100644
--- a/maven-settings-builder/src/test/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactoryTest.java
+++ b/maven-settings-builder/src/test/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactoryTest.java
@@ -21,9 +21,9 @@ package org.apache.maven.settings.building;
import java.io.File;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* @author Benjamin Bentmann
diff --git a/maven-settings-builder/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java b/maven-settings-builder/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java
index ffeb0d7..c23ebd2 100644
--- a/maven-settings-builder/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java
+++ b/maven-settings-builder/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java
@@ -30,12 +30,12 @@ import org.apache.maven.settings.Server;
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.building.SettingsProblem.Severity;
import org.apache.maven.settings.building.SettingsProblemCollector;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author mkleint
@@ -45,14 +45,14 @@ public class DefaultSettingsValidatorTest
private DefaultSettingsValidator validator;
- @Before
+ @BeforeEach
public void setUp()
throws Exception
{
validator = new DefaultSettingsValidator();
}
- @After
+ @AfterEach
public void tearDown()
throws Exception
{
@@ -61,7 +61,7 @@ public class DefaultSettingsValidatorTest
private void assertContains( String msg, String substring )
{
- assertTrue( "\"" + substring + "\" was not found in: " + msg, msg.contains( substring ) );
+ assertTrue( msg.contains( substring ), "\"" + substring + "\" was not found in: " + msg );
}
@Test
diff --git a/maven-slf4j-provider/src/test/java/org/slf4j/impl/MavenLoggerFactoryTest.java b/maven-slf4j-provider/src/test/java/org/slf4j/impl/MavenLoggerFactoryTest.java
index 352d627..44ac3d2 100644
--- a/maven-slf4j-provider/src/test/java/org/slf4j/impl/MavenLoggerFactoryTest.java
+++ b/maven-slf4j-provider/src/test/java/org/slf4j/impl/MavenLoggerFactoryTest.java
@@ -20,16 +20,17 @@ package org.slf4j.impl;
*/
import org.apache.maven.logwrapper.LogLevelRecorder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class MavenLoggerFactoryTest
{
@@ -80,11 +81,12 @@ public class MavenLoggerFactoryTest
assertTrue( logLevelRecorder.metThreshold() );
}
- @Test( expected = IllegalStateException.class )
+ @Test
public void failOnSeverityThresholdCanOnlyBeSetOnce()
{
MavenLoggerFactory mavenLoggerFactory = new MavenLoggerFactory();
mavenLoggerFactory.setLogLevelRecorder( new LogLevelRecorder( "WARN" ) );
- mavenLoggerFactory.setLogLevelRecorder( new LogLevelRecorder( "ERROR" ) );
+ assertThrows( IllegalStateException.class,
+ () -> mavenLoggerFactory.setLogLevelRecorder( new LogLevelRecorder( "ERROR" ) ) );
}
}
diff --git a/maven-slf4j-wrapper/pom.xml b/maven-slf4j-wrapper/pom.xml
index bdb7687..2631135 100644
--- a/maven-slf4j-wrapper/pom.xml
+++ b/maven-slf4j-wrapper/pom.xml
@@ -40,5 +40,10 @@ under the License.
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/maven-slf4j-wrapper/src/test/java/org/apache/maven/logwrapper/LogLevelRecorderTest.java b/maven-slf4j-wrapper/src/test/java/org/apache/maven/logwrapper/LogLevelRecorderTest.java
index 2bdb867..1e521a9 100644
--- a/maven-slf4j-wrapper/src/test/java/org/apache/maven/logwrapper/LogLevelRecorderTest.java
+++ b/maven-slf4j-wrapper/src/test/java/org/apache/maven/logwrapper/LogLevelRecorderTest.java
@@ -19,13 +19,13 @@ package org.apache.maven.logwrapper;
* under the License.
*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.event.Level;
import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class LogLevelRecorderTest
{
@@ -38,10 +38,10 @@ public class LogLevelRecorderTest
assertTrue( logLevelRecorder.metThreshold() );
}
- @Test( expected = IllegalArgumentException.class )
+ @Test
public void failsOnLowerThanWarn ()
{
- new LogLevelRecorder( "INFO" );
+ assertThrows( IllegalArgumentException.class, () -> new LogLevelRecorder( "INFO" ) );
}
@Test
diff --git a/maven-test-support/pom.xml b/maven-test-support/pom.xml
index 8a5821c..c051cc4 100644
--- a/maven-test-support/pom.xml
+++ b/maven-test-support/pom.xml
@@ -35,11 +35,17 @@ under the License.
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<version>${junitVersion}</version>
</dependency>
<dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <version>${junitVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<classifier>no_aop</classifier>
@@ -68,6 +74,12 @@ under the License.
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <version>5.7.0</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java b/maven-test-support/src/main/java/org/apache/maven/test/Parameter.java
similarity index 68%
copy from maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java
copy to maven-test-support/src/main/java/org/apache/maven/test/Parameter.java
index bd201ed..f5164c5 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java
+++ b/maven-test-support/src/main/java/org/apache/maven/test/Parameter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.model.interpolation;
+package org.apache.maven.test;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,17 +19,14 @@ package org.apache.maven.model.interpolation;
* under the License.
*/
-public class StringVisitorModelInterpolatorTest extends AbstractModelInterpolatorTest
-{
- @Override
- public void setUp()
- {
- super.setUp();
- interpolator = new StringVisitorModelInterpolator();
- }
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
- protected ModelInterpolator createInterpolator()
- {
- return this.interpolator;
- }
-}
\ No newline at end of file
+/**
+ * Parameter
+ */
+@Retention( RetentionPolicy.RUNTIME )
+public @interface Parameter
+{
+ int value() default 0;
+}
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java b/maven-test-support/src/main/java/org/apache/maven/test/Parameterized.java
similarity index 64%
copy from maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java
copy to maven-test-support/src/main/java/org/apache/maven/test/Parameterized.java
index bd201ed..a15fbaf 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java
+++ b/maven-test-support/src/main/java/org/apache/maven/test/Parameterized.java
@@ -1,4 +1,4 @@
-package org.apache.maven.model.interpolation;
+package org.apache.maven.test;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,17 +19,19 @@ package org.apache.maven.model.interpolation;
* under the License.
*/
-public class StringVisitorModelInterpolatorTest extends AbstractModelInterpolatorTest
-{
- @Override
- public void setUp()
- {
- super.setUp();
- interpolator = new StringVisitorModelInterpolator();
- }
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.extension.ExtendWith;
- protected ModelInterpolator createInterpolator()
- {
- return this.interpolator;
- }
-}
\ No newline at end of file
+/**
+ * Parameterized
+ */
+@Target( { ElementType.ANNOTATION_TYPE, ElementType.TYPE } )
+@Retention( RetentionPolicy.RUNTIME )
+@ExtendWith( ParameterizedExtension.class )
+public @interface Parameterized
+{
+}
diff --git a/maven-test-support/src/main/java/org/apache/maven/test/ParameterizedExtension.java b/maven-test-support/src/main/java/org/apache/maven/test/ParameterizedExtension.java
new file mode 100644
index 0000000..5741db4
--- /dev/null
+++ b/maven-test-support/src/main/java/org/apache/maven/test/ParameterizedExtension.java
@@ -0,0 +1,182 @@
+package org.apache.maven.test;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.extension.Extension;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.TestInstancePostProcessor;
+import org.junit.jupiter.api.extension.TestInstantiationException;
+import org.junit.jupiter.api.extension.TestTemplateInvocationContext;
+import org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider;
+import org.junit.jupiter.params.converter.DefaultArgumentConverter;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.platform.commons.util.CollectionUtils;
+import org.junit.platform.commons.util.ReflectionUtils;
+
+import static org.junit.jupiter.params.provider.Arguments.arguments;
+import static org.junit.platform.commons.util.AnnotationUtils.isAnnotated;
+
+/**
+ * ParameterizedExtension
+ */
+public class ParameterizedExtension implements TestTemplateInvocationContextProvider
+{
+
+ @Override
+ public boolean supportsTestTemplate( ExtensionContext context )
+ {
+ return context.getTestMethod()
+ .map( m -> isAnnotated( m, Test.class ) )
+ .orElse( false );
+ }
+
+ @Override
+ public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContexts(
+ ExtensionContext extensionContext )
+ {
+ Class<?> testClass = extensionContext.getRequiredTestClass();
+ try
+ {
+ List<Method> parameters = getParametersMethods( testClass );
+ if ( parameters.size() != 1 )
+ {
+ throw new IllegalStateException(
+ "Class " + testClass.getName() + " should provide a single method annotated with @"
+ + Parameters.class.getSimpleName() );
+ }
+ Object params = parameters.iterator().next().invoke( null );
+ return CollectionUtils.toStream( params )
+ .map( ParameterizedExtension::toArguments )
+ .map( Arguments::get )
+ .map( ParameterizedTemplate::new );
+ }
+ catch ( Exception e )
+ {
+ throw new IllegalStateException( "Unable to generate test templates for class " + testClass.getName(), e );
+ }
+ }
+
+ private List<Method> getParametersMethods( Class<?> testClass )
+ {
+ List<Method> parameters = Stream.of( testClass.getDeclaredMethods() )
+ .filter( m -> Modifier.isStatic( m.getModifiers() ) )
+ .filter( m -> m.getAnnotation( Parameters.class ) != null )
+ .collect( Collectors.toList() );
+ if ( parameters.isEmpty() && testClass != null )
+ {
+ return getParametersMethods( testClass.getSuperclass() );
+ }
+ else
+ {
+ return parameters;
+ }
+ }
+
+ private static Arguments toArguments( Object item )
+ {
+ // Nothing to do except cast.
+ if ( item instanceof Arguments )
+ {
+ return ( Arguments ) item;
+ }
+ // Pass all multidimensional arrays "as is", in contrast to Object[].
+ // See https://github.com/junit-team/junit5/issues/1665
+ if ( ReflectionUtils.isMultidimensionalArray( item ) )
+ {
+ return arguments( item );
+ }
+ // Special treatment for one-dimensional reference arrays.
+ // See https://github.com/junit-team/junit5/issues/1665
+ if ( item instanceof Object[] )
+ {
+ return arguments( ( Object[] ) item );
+ }
+ // Pass everything else "as is".
+ return arguments( item );
+ }
+
+ /**
+ * ParameterizedTemplate
+ */
+ public static class ParameterizedTemplate implements TestTemplateInvocationContext
+ {
+
+ private final Object[] params;
+
+ public ParameterizedTemplate( Object[] params )
+ {
+ this.params = params;
+ }
+
+ @Override
+ public String getDisplayName( int invocationIndex )
+ {
+ return "[" + invocationIndex + "] "
+ + Stream.of( params ).map( Object::toString ).collect( Collectors.joining( ", " ) );
+ }
+
+ @Override
+ public List<Extension> getAdditionalExtensions()
+ {
+ return Arrays.asList(
+ ( TestInstancePostProcessor ) this::postProcessTestInstance );
+ }
+
+ protected void postProcessTestInstance( Object testInstance, ExtensionContext context ) throws Exception
+ {
+ Class<?> clazz = testInstance.getClass();
+ List<Field> fields = hierarchy( clazz )
+ .map( Class::getDeclaredFields )
+ .flatMap( Stream::of )
+ .filter( f -> isAnnotated( f, Parameter.class ) )
+ .sorted( Comparator.comparing( f -> ( Integer ) f.getAnnotation( Parameter.class ).value() ) )
+ .collect( Collectors.toList() );
+ if ( params.length != fields.size() )
+ {
+ throw new TestInstantiationException(
+ "Expected " + fields.size() + " parameters bug got " + params.length + " when instantiating "
+ + clazz.getName() );
+ }
+ for ( int i = 0; i < fields.size(); i++ )
+ {
+ Field f = fields.get( i );
+ f.setAccessible( true );
+ f.set( testInstance, DefaultArgumentConverter.INSTANCE.convert( params[i], f.getType() ) );
+ }
+ }
+
+ protected Stream<Class<?>> hierarchy( Class<?> clazz )
+ {
+ Class<?> superclass = clazz.getSuperclass();
+ return Stream.concat( Stream.of( clazz ), superclass != null ? hierarchy( superclass ) : Stream.empty() );
+ }
+
+ }
+
+}
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java b/maven-test-support/src/main/java/org/apache/maven/test/Parameters.java
similarity index 68%
copy from maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java
copy to maven-test-support/src/main/java/org/apache/maven/test/Parameters.java
index bd201ed..b643a3a 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java
+++ b/maven-test-support/src/main/java/org/apache/maven/test/Parameters.java
@@ -1,4 +1,4 @@
-package org.apache.maven.model.interpolation;
+package org.apache.maven.test;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,17 +19,17 @@ package org.apache.maven.model.interpolation;
* under the License.
*/
-public class StringVisitorModelInterpolatorTest extends AbstractModelInterpolatorTest
-{
- @Override
- public void setUp()
- {
- super.setUp();
- interpolator = new StringVisitorModelInterpolator();
- }
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
- protected ModelInterpolator createInterpolator()
- {
- return this.interpolator;
- }
-}
\ No newline at end of file
+/**
+ * Parameters
+ */
+@Retention( RetentionPolicy.RUNTIME )
+@Target( ElementType.METHOD )
+public @interface Parameters
+{
+ String name() default "{index}";
+}
diff --git a/maven-test-support/src/main/java/org/apache/maven/test/PlexusTestCase.java b/maven-test-support/src/main/java/org/apache/maven/test/PlexusTestCase.java
index 7f53fd1..91dc25e 100644
--- a/maven-test-support/src/main/java/org/apache/maven/test/PlexusTestCase.java
+++ b/maven-test-support/src/main/java/org/apache/maven/test/PlexusTestCase.java
@@ -50,8 +50,8 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.DefaultContext;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
/**
* This is a slightly modified version of the original plexus class
@@ -70,7 +70,7 @@ public abstract class PlexusTestCase
private static String basedir;
- @Before
+ @BeforeEach
public void setUp()
throws Exception
{
@@ -161,7 +161,7 @@ public abstract class PlexusTestCase
return null;
}
- @After
+ @AfterEach
public void tearDown()
throws Exception
{
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java b/maven-test-support/src/main/java/org/apache/maven/test/Test.java
similarity index 68%
copy from maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java
copy to maven-test-support/src/main/java/org/apache/maven/test/Test.java
index bd201ed..5b542b6 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java
+++ b/maven-test-support/src/main/java/org/apache/maven/test/Test.java
@@ -1,4 +1,4 @@
-package org.apache.maven.model.interpolation;
+package org.apache.maven.test;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,17 +19,16 @@ package org.apache.maven.model.interpolation;
* under the License.
*/
-public class StringVisitorModelInterpolatorTest extends AbstractModelInterpolatorTest
-{
- @Override
- public void setUp()
- {
- super.setUp();
- interpolator = new StringVisitorModelInterpolator();
- }
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import org.junit.jupiter.api.TestTemplate;
- protected ModelInterpolator createInterpolator()
- {
- return this.interpolator;
- }
-}
\ No newline at end of file
+/**
+ * Test
+ */
+@Retention( RetentionPolicy.RUNTIME )
+@TestTemplate
+public @interface Test
+{
+}
diff --git a/maven-wrapper/src/test/java/org/apache/maven/wrapper/DownloaderTest.java b/maven-wrapper/src/test/java/org/apache/maven/wrapper/DownloaderTest.java
index 68bc5c6..c0e84c7 100644
--- a/maven-wrapper/src/test/java/org/apache/maven/wrapper/DownloaderTest.java
+++ b/maven-wrapper/src/test/java/org/apache/maven/wrapper/DownloaderTest.java
@@ -19,7 +19,7 @@ package org.apache.maven.wrapper;
* under the License.
*/
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.net.URI;
import java.nio.file.Files;
@@ -27,15 +27,14 @@ import java.nio.file.Path;
import java.util.Arrays;
import java.util.stream.Collectors;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
public class DownloaderTest
{
- @Rule
- public TemporaryFolder testDir = new TemporaryFolder();
+ @TempDir
+ public Path testDir;
private DefaultDownloader download;
@@ -47,14 +46,14 @@ public class DownloaderTest
private Path remoteFile;
- @Before
+ @BeforeEach
public void setUp()
throws Exception
{
download = new DefaultDownloader( "mvnw", "aVersion" );
- rootDir = testDir.newFolder( "root" ).toPath();
+ rootDir = testDir.resolve( "root" );
downloadFile = rootDir.resolve( "file" );
- remoteFile = testDir.newFile( "remoteFile" ).toPath();
+ remoteFile = testDir.resolve( "remoteFile" );
Files.write( remoteFile, Arrays.asList( "sometext" ) );
sourceRoot = remoteFile.toUri();
}
diff --git a/maven-wrapper/src/test/java/org/apache/maven/wrapper/InstallerTest.java b/maven-wrapper/src/test/java/org/apache/maven/wrapper/InstallerTest.java
index 3ff712a..bef2057 100644
--- a/maven-wrapper/src/test/java/org/apache/maven/wrapper/InstallerTest.java
+++ b/maven-wrapper/src/test/java/org/apache/maven/wrapper/InstallerTest.java
@@ -31,18 +31,18 @@ import java.util.Arrays;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Zip;
import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
/**
* @author Hans Dockter
*/
public class InstallerTest
{
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @TempDir
+ public Path temporaryFolder;
private Installer install;
@@ -62,7 +62,7 @@ public class InstallerTest
private PathAssembler.LocalDistribution localDistribution;
- @Before
+ @BeforeEach
public void setup()
throws Exception
{
@@ -73,9 +73,11 @@ public class InstallerTest
configuration.setDistribution( new URI( "http://server/maven-0.9.zip" ) );
configuration.setAlwaysDownload( false );
configuration.setAlwaysUnpack( false );
- distributionDir = temporaryFolder.newFolder( "someDistPath" ).toPath();
+ distributionDir = temporaryFolder.resolve( "someDistPath" );
+ Files.createDirectories( distributionDir );
mavenHomeDir = distributionDir.resolve( "maven-0.9" );
- zipStore = temporaryFolder.newFolder( "zips" ).toPath();
+ zipStore = temporaryFolder.resolve( "zips" );
+ Files.createDirectories( zipStore );
zipDestination = zipStore.resolve( "maven-0.9.zip" );
download = mock( Downloader.class );
@@ -94,7 +96,7 @@ public class InstallerTest
{
Files.createDirectories( zipDestination.getParent() );
- Path explodedZipDir = temporaryFolder.newFolder( "explodedZip" ).toPath();
+ Path explodedZipDir = temporaryFolder.resolve( "explodedZip" );
Path mavenScript = explodedZipDir.resolve( "maven-0.9/bin/mvn" );
Files.createDirectories( mavenScript.getParent() );
@@ -103,6 +105,8 @@ public class InstallerTest
zipTo( explodedZipDir, zipDestination );
}
+ @Test
+ @Disabled("not working")
public void testCreateDist()
throws Exception
{
diff --git a/maven-wrapper/src/test/java/org/apache/maven/wrapper/PathAssemblerTest.java b/maven-wrapper/src/test/java/org/apache/maven/wrapper/PathAssemblerTest.java
index 9e22be0..a2334c1 100644
--- a/maven-wrapper/src/test/java/org/apache/maven/wrapper/PathAssemblerTest.java
+++ b/maven-wrapper/src/test/java/org/apache/maven/wrapper/PathAssemblerTest.java
@@ -22,20 +22,15 @@ package org.apache.maven.wrapper;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
-import java.io.File;
import java.net.URI;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.util.regex.Pattern;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* @author Hans Dockter
@@ -48,7 +43,7 @@ public class PathAssemblerTest
final WrapperConfiguration configuration = new WrapperConfiguration();
- @Before
+ @BeforeEach
public void setup()
{
configuration.setDistributionBase( PathAssembler.MAVEN_USER_HOME_STRING );
diff --git a/maven-wrapper/src/test/java/org/apache/maven/wrapper/WrapperExecutorTest.java b/maven-wrapper/src/test/java/org/apache/maven/wrapper/WrapperExecutorTest.java
index 970245e..23bcf21 100644
--- a/maven-wrapper/src/test/java/org/apache/maven/wrapper/WrapperExecutorTest.java
+++ b/maven-wrapper/src/test/java/org/apache/maven/wrapper/WrapperExecutorTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.wrapper;
* under the License.
*/
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -35,17 +35,15 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Properties;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.mockito.Mockito;
public class WrapperExecutorTest
{
- @Rule
- public TemporaryFolder testDir = new TemporaryFolder();
+ @TempDir
+ public Path testDir;
private Installer install;
@@ -57,17 +55,17 @@ public class WrapperExecutorTest
private Path mockInstallDir;
- @Before
+ @BeforeEach
public void setUp()
throws Exception
{
- mockInstallDir = testDir.newFolder( "mock-dir" ).toPath();
+ mockInstallDir = testDir.resolve( "mock-dir" );
install = mock( Installer.class );
when( install.createDist( Mockito.any( WrapperConfiguration.class ) ) ).thenReturn( mockInstallDir );
start = mock( BootstrapMainStarter.class );
- propertiesFile = testDir.newFolder( "maven", "wrapper" ).toPath().resolve( "maven-wrapper.properties" );
+ propertiesFile = testDir.resolve( "maven" ).resolve( "wrapper" ).resolve( "maven-wrapper.properties" );
properties.put( "distributionUrl", "http://server/test/maven.zip" );
properties.put( "distributionBase", "testDistBase" );
@@ -96,7 +94,7 @@ public class WrapperExecutorTest
public void loadWrapperMetadataFromDirectory()
throws Exception
{
- WrapperExecutor wrapper = WrapperExecutor.forProjectDirectory( testDir.getRoot().toPath() );
+ WrapperExecutor wrapper = WrapperExecutor.forProjectDirectory( testDir );
assertEquals( new URI( "http://server/test/maven.zip" ), wrapper.getDistribution() );
assertEquals( new URI( "http://server/test/maven.zip" ), wrapper.getConfiguration().getDistribution() );
@@ -110,7 +108,7 @@ public class WrapperExecutorTest
public void useDefaultMetadataNoProeprtiesFile()
throws Exception
{
- WrapperExecutor wrapper = WrapperExecutor.forProjectDirectory( testDir.getRoot().toPath().resolve( "unknown" ) );
+ WrapperExecutor wrapper = WrapperExecutor.forProjectDirectory( testDir.resolve( "unknown" ) );
assertNull( wrapper.getDistribution() );
assertNull( wrapper.getConfiguration().getDistribution() );
@@ -157,9 +155,10 @@ public class WrapperExecutorTest
properties = new Properties();
writePropertiesFile( properties, propertiesFile, "header" );
- RuntimeException e = assertThrows( "Expected RuntimeException",
+ RuntimeException e = assertThrows(
RuntimeException.class,
- () -> WrapperExecutor.forWrapperPropertiesFile( propertiesFile ) );
+ () -> WrapperExecutor.forWrapperPropertiesFile( propertiesFile ),
+ "Expected RuntimeException" );
assertEquals( "No value with key 'distributionUrl' specified in wrapper properties file '"
+ propertiesFile + "'.", e.getMessage() );
}
@@ -167,11 +166,12 @@ public class WrapperExecutorTest
@Test
public void failWhenPropertiesFileDoesNotExist()
{
- propertiesFile = testDir.getRoot().toPath().resolve( "unknown.properties" );
+ propertiesFile = testDir.resolve( "unknown.properties" );
- RuntimeException e = assertThrows( "Expected RuntimeException",
+ RuntimeException e = assertThrows(
RuntimeException.class,
- () -> WrapperExecutor.forWrapperPropertiesFile( propertiesFile ) );
+ () -> WrapperExecutor.forWrapperPropertiesFile( propertiesFile ),
+ "Expected RuntimeException" );
assertEquals( "Wrapper properties file '" + propertiesFile + "' does not exist.", e.getMessage() );
}
diff --git a/maven-xml/pom.xml b/maven-xml/pom.xml
index 7995e98..600c2b9 100644
--- a/maven-xml/pom.xml
+++ b/maven-xml/pom.xml
@@ -33,6 +33,11 @@ under the License.
<dependencies>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-test-support</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-assertj</artifactId>
<scope>test</scope>
diff --git a/maven-xml/src/test/java/org/apache/maven/xml/sax/ChainedFilterTest.java b/maven-xml/src/test/java/org/apache/maven/xml/sax/ChainedFilterTest.java
index 47ac456..e9b10c9 100644
--- a/maven-xml/src/test/java/org/apache/maven/xml/sax/ChainedFilterTest.java
+++ b/maven-xml/src/test/java/org/apache/maven/xml/sax/ChainedFilterTest.java
@@ -34,7 +34,7 @@ import javax.xml.transform.stream.StreamResult;
import org.apache.maven.xml.Factories;
import org.apache.maven.xml.sax.filter.AbstractSAXFilter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
diff --git a/maven-xml/src/test/java/org/apache/maven/xml/sax/SAXEventUtilsTest.java b/maven-xml/src/test/java/org/apache/maven/xml/sax/SAXEventUtilsTest.java
index 02e55dc..048ee84 100644
--- a/maven-xml/src/test/java/org/apache/maven/xml/sax/SAXEventUtilsTest.java
+++ b/maven-xml/src/test/java/org/apache/maven/xml/sax/SAXEventUtilsTest.java
@@ -19,13 +19,10 @@ package org.apache.maven.xml.sax;
* under the License.
*/
-import static org.junit.Assert.assertThat;
-
-import org.apache.maven.xml.sax.SAXEventUtils;
-
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.CoreMatchers.is;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class SAXEventUtilsTest
{
diff --git a/maven-xml/src/test/java/org/apache/maven/xml/sax/ext/CommentRenormalizerTest.java b/maven-xml/src/test/java/org/apache/maven/xml/sax/ext/CommentRenormalizerTest.java
index c1885e2..dad847e 100644
--- a/maven-xml/src/test/java/org/apache/maven/xml/sax/ext/CommentRenormalizerTest.java
+++ b/maven-xml/src/test/java/org/apache/maven/xml/sax/ext/CommentRenormalizerTest.java
@@ -25,18 +25,19 @@ import static org.mockito.Mockito.verify;
import java.util.Arrays;
import java.util.Collection;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.apache.maven.test.Parameter;
+import org.apache.maven.test.Parameterized;
+import org.apache.maven.test.Parameters;
+import org.apache.maven.test.Test;
import org.xml.sax.ext.LexicalHandler;
-@RunWith( Parameterized.class )
+@Parameterized
public class CommentRenormalizerTest
{
- private LexicalHandler lexicalHandler;
+ private LexicalHandler lexicalHandler = mock( LexicalHandler.class );
- private final String lineSeparator;
+ @Parameter
+ private String lineSeparator;
@Parameters
public static Collection<Object[]> data() {
@@ -47,12 +48,6 @@ public class CommentRenormalizerTest
});
}
- public CommentRenormalizerTest( String lineSeparator )
- {
- this.lineSeparator = lineSeparator;
- this.lexicalHandler = mock( LexicalHandler.class );
- }
-
@Test
public void singleLine()
throws Exception
diff --git a/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/CiFriendlyXMLFilterTest.java b/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/CiFriendlyXMLFilterTest.java
index e51b76d..d83617e 100644
--- a/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/CiFriendlyXMLFilterTest.java
+++ b/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/CiFriendlyXMLFilterTest.java
@@ -19,20 +19,21 @@ package org.apache.maven.xml.sax.filter;
* under the License.
*/
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+
import org.xml.sax.SAXException;
public class CiFriendlyXMLFilterTest extends AbstractXMLFilterTests
{
private CiFriendlyXMLFilter filter;
- @Before
+ @BeforeEach
public void setUp()
{
filter = new CiFriendlyXMLFilter( true );
diff --git a/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilterTest.java b/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilterTest.java
index 300246a..df81175 100644
--- a/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilterTest.java
+++ b/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilterTest.java
@@ -31,7 +31,7 @@ import java.util.function.Function;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerConfigurationException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
diff --git a/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ModulesXMLFilterTest.java b/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ModulesXMLFilterTest.java
index fac2b79..301e316 100644
--- a/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ModulesXMLFilterTest.java
+++ b/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ModulesXMLFilterTest.java
@@ -23,7 +23,7 @@ import static org.xmlunit.assertj.XmlAssert.assertThat;
import java.util.function.Consumer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ext.LexicalHandler;
public class ModulesXMLFilterTest extends AbstractXMLFilterTests {
diff --git a/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ParentXMLFilterTest.java b/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ParentXMLFilterTest.java
index 809aef5..222e11f 100644
--- a/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ParentXMLFilterTest.java
+++ b/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ParentXMLFilterTest.java
@@ -19,7 +19,7 @@ package org.apache.maven.xml.sax.filter;
* under the License.
*/
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.nio.file.Paths;
import java.util.Optional;
@@ -28,7 +28,7 @@ import java.util.function.Consumer;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
diff --git a/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ReactorDependencyXMLFilterTest.java b/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ReactorDependencyXMLFilterTest.java
index 21a1742..d938503 100644
--- a/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ReactorDependencyXMLFilterTest.java
+++ b/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ReactorDependencyXMLFilterTest.java
@@ -25,7 +25,7 @@ import java.util.function.Consumer;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
diff --git a/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/RelativePathXMLFilterTest.java b/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/RelativePathXMLFilterTest.java
index 51ee41d..1628266 100644
--- a/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/RelativePathXMLFilterTest.java
+++ b/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/RelativePathXMLFilterTest.java
@@ -21,8 +21,7 @@ package org.apache.maven.xml.sax.filter;
import static org.xmlunit.assertj.XmlAssert.assertThat;
-import org.apache.maven.xml.sax.filter.RelativePathXMLFilter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class RelativePathXMLFilterTest extends AbstractXMLFilterTests
{
diff --git a/pom.xml b/pom.xml
index 6c90fb2..07aa46a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@ under the License.
<classWorldsVersion>2.6.0</classWorldsVersion>
<commonsCliVersion>1.4</commonsCliVersion>
<commonsLangVersion>3.8.1</commonsLangVersion>
- <junitVersion>4.13.1</junitVersion>
+ <junitVersion>5.7.0</junitVersion>
<mockitoVersion>3.2.0</mockitoVersion>
<plexusVersion>2.1.0</plexusVersion>
<plexusInterpolationVersion>1.26</plexusInterpolationVersion>
@@ -474,11 +474,16 @@ under the License.
<!--bootstrap-start-comment-->
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<version>${junitVersion}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!--bootstrap-end-comment-->