You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2021/10/07 18:40:19 UTC
[maven] 01/01: [MNG-7287] - Simplify assertion with simpler and
equivalent calls.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MNG-7287
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 58c15a60ce3bd2969464add8d648acbd89ce23b8
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Thu Oct 7 20:25:46 2021 +0200
[MNG-7287] - Simplify assertion with simpler and equivalent calls.
---
.../apache/maven/artifact/ArtifactUtilsTest.java | 16 ++++++------
.../apache/maven/artifact/DefaultArtifactTest.java | 9 ++++---
.../artifact/versioning/ComparableVersionTest.java | 10 ++++----
.../versioning/DefaultArtifactVersionTest.java | 13 +++++-----
.../artifact/versioning/VersionRangeTest.java | 4 ++-
.../building/DefaultProblemCollectorTest.java | 3 ++-
.../apache/maven/building/DefaultProblemTest.java | 3 ++-
.../repository/MavenArtifactRepositoryTest.java | 14 ++++++-----
.../resolver/filter/AndArtifactFilterTest.java | 9 ++++---
.../resolver/filter/FilterHashEqualsTest.java | 11 ++++----
.../resolver/filter/OrArtifactFilterTest.java | 9 ++++---
.../inheritance/t04/ProjectInheritanceTest.java | 5 ++--
.../inheritance/t05/ProjectInheritanceTest.java | 3 +--
.../inheritance/t06/ProjectInheritanceTest.java | 5 ++--
.../inheritance/t07/ProjectInheritanceTest.java | 8 +++---
.../inheritance/t08/ProjectInheritanceTest.java | 4 +--
.../inheritance/t09/ProjectInheritanceTest.java | 4 +--
.../inheritance/t10/ProjectInheritanceTest.java | 8 +++---
.../internal/LifecycleDependencyResolverTest.java | 3 ++-
.../org/apache/maven/project/MavenProjectTest.java | 6 ++---
.../apache/maven/project/PomConstructionTest.java | 26 +++++++++----------
.../maven/model/building/FileModelSourceTest.java | 12 +++++----
.../org/apache/maven/model/ActivationFileTest.java | 6 +++--
.../org/apache/maven/model/ActivationOSTest.java | 6 +++--
.../apache/maven/model/ActivationPropertyTest.java | 6 +++--
.../org/apache/maven/model/ActivationTest.java | 6 +++--
.../java/org/apache/maven/model/BuildTest.java | 6 +++--
.../org/apache/maven/model/CiManagementTest.java | 6 +++--
.../org/apache/maven/model/ContributorTest.java | 6 +++--
.../maven/model/DependencyManagementTest.java | 6 +++--
.../org/apache/maven/model/DependencyTest.java | 6 +++--
.../maven/model/DeploymentRepositoryTest.java | 6 +++--
.../java/org/apache/maven/model/DeveloperTest.java | 6 +++--
.../maven/model/DistributionManagementTest.java | 6 +++--
.../java/org/apache/maven/model/ExclusionTest.java | 6 +++--
.../java/org/apache/maven/model/ExtensionTest.java | 6 +++--
.../apache/maven/model/IssueManagementTest.java | 6 +++--
.../java/org/apache/maven/model/LicenseTest.java | 6 +++--
.../org/apache/maven/model/MailingListTest.java | 6 +++--
.../java/org/apache/maven/model/ModelTest.java | 6 +++--
.../java/org/apache/maven/model/NotifierTest.java | 6 +++--
.../org/apache/maven/model/OrganizationTest.java | 6 +++--
.../java/org/apache/maven/model/ParentTest.java | 6 +++--
.../maven/model/PluginConfigurationTest.java | 6 +++--
.../apache/maven/model/PluginContainerTest.java | 6 +++--
.../apache/maven/model/PluginExecutionTest.java | 6 +++--
.../apache/maven/model/PluginManagementTest.java | 6 +++--
.../java/org/apache/maven/model/PluginTest.java | 6 +++--
.../org/apache/maven/model/PrerequisitesTest.java | 6 +++--
.../java/org/apache/maven/model/ProfileTest.java | 6 +++--
.../org/apache/maven/model/RelocationTest.java | 6 +++--
.../org/apache/maven/model/ReportPluginTest.java | 6 +++--
.../java/org/apache/maven/model/ReportSetTest.java | 6 +++--
.../java/org/apache/maven/model/ReportingTest.java | 6 +++--
.../apache/maven/model/RepositoryPolicyTest.java | 6 +++--
.../org/apache/maven/model/RepositoryTest.java | 6 +++--
.../java/org/apache/maven/model/ResourceTest.java | 6 +++--
.../test/java/org/apache/maven/model/ScmTest.java | 6 +++--
.../test/java/org/apache/maven/model/SiteTest.java | 6 +++--
.../descriptor/PluginDescriptorBuilderTest.java | 29 ++++++++++++----------
60 files changed, 262 insertions(+), 174 deletions(-)
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 2cbe18e..485b3f6 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
@@ -27,7 +27,9 @@ import org.apache.maven.artifact.versioning.VersionRange;
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.assertTrue;
/**
* Tests {@link ArtifactUtils}.
@@ -45,13 +47,13 @@ public class ArtifactUtilsTest
@Test
public void testIsSnapshot()
{
- assertEquals( false, ArtifactUtils.isSnapshot( null ) );
- assertEquals( false, ArtifactUtils.isSnapshot( "" ) );
- assertEquals( false, ArtifactUtils.isSnapshot( "1.2.3" ) );
- assertEquals( true, ArtifactUtils.isSnapshot( "1.2.3-SNAPSHOT" ) );
- assertEquals( true, ArtifactUtils.isSnapshot( "1.2.3-snapshot" ) );
- assertEquals( true, ArtifactUtils.isSnapshot( "1.2.3-20090413.094722-2" ) );
- assertEquals( false, ArtifactUtils.isSnapshot( "1.2.3-20090413X094722-2"));
+ assertFalse( ArtifactUtils.isSnapshot( null ) );
+ assertFalse( ArtifactUtils.isSnapshot( "" ) );
+ assertFalse( ArtifactUtils.isSnapshot( "1.2.3" ) );
+ assertTrue( ArtifactUtils.isSnapshot( "1.2.3-SNAPSHOT" ) );
+ assertTrue( ArtifactUtils.isSnapshot( "1.2.3-snapshot" ) );
+ assertTrue( ArtifactUtils.isSnapshot( "1.2.3-20090413.094722-2" ) );
+ assertFalse( ArtifactUtils.isSnapshot( "1.2.3-20090413X094722-2" ) );
}
@Test
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 3e9eb4d..6d9a06d 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
@@ -25,6 +25,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class DefaultArtifactTest
@@ -136,8 +137,8 @@ public class DefaultArtifactTest
Artifact artifact = new DefaultArtifact( groupId, artifactId, VersionRange.createFromVersion( "5.0" ), scope,
type, classifier, artifactHandler );
- assertTrue( artifact.compareTo( artifact1 ) == 0 );
- assertTrue( artifact1.compareTo( artifact ) == 0 );
+ assertEquals( 0, artifact.compareTo( artifact1 ) );
+ assertEquals( 0, artifact1.compareTo( artifact ) );
}
@Test
@@ -146,8 +147,8 @@ public class DefaultArtifactTest
{
VersionRange vr = VersionRange.createFromVersionSpec( "[1.0,2.0)" );
artifact = new DefaultArtifact( groupId, artifactId, vr, scope, type, null, artifactHandler );
- assertEquals( null, artifact.getVersion() );
- assertEquals( null, artifact.getBaseVersion() );
+ assertNull( artifact.getVersion() );
+ assertNull( artifact.getBaseVersion() );
}
}
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 a36f605..391a950 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
@@ -80,11 +80,11 @@ public class ComparableVersionTest
{
Comparable c1 = newComparable( v1 );
Comparable c2 = newComparable( v2 );
- 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 + " )" );
+ assertEquals( 0, c1.compareTo( c2 ), "expected " + v1 + " == " + v2 );
+ assertEquals( 0, c2.compareTo( c1 ), "expected " + v2 + " == " + v1 );
+ assertEquals( c1.hashCode(), c2.hashCode(), "expected same hashcode for " + v1 + " and " + v2 );
+ assertEquals( c1, c2, "expected " + v1 + ".equals( " + v2 + " )" );
+ assertEquals( c2, c1, "expected " + v2 + ".equals( " + v1 + " )" );
}
private void checkVersionsArrayEqual( String[] array )
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 fe22843..2f9ea67 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
@@ -24,6 +24,7 @@ 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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -189,20 +190,20 @@ public class DefaultArtifactVersionTest
{
ArtifactVersion v1 = newArtifactVersion( "1" );
ArtifactVersion v2 = newArtifactVersion( "1.0" );
- assertEquals( true, v1.equals( v2 ) );
+ assertTrue( v1.equals( v2 ) );
assertEquals( v1.hashCode(), v2.hashCode() );
}
@Test
public void testEqualsNullSafe()
{
- assertFalse( newArtifactVersion( "1" ).equals( null ) );
+ assertNotEquals( null, newArtifactVersion( "1" ) );
}
@Test
public void testEqualsTypeSafe()
{
- assertFalse( newArtifactVersion( "1" ).equals( "non-an-artifact-version-instance" ) );
+ assertNotEquals( "non-an-artifact-version-instance", newArtifactVersion( "1" ) );
}
private void assertVersionOlder( String left, String right )
@@ -217,11 +218,9 @@ public class DefaultArtifactVersionTest
private void assertVersionEqual( String left, String right )
{
- assertTrue(
- newArtifactVersion( left ).compareTo( newArtifactVersion( right ) ) == 0,
+ assertEquals( 0, newArtifactVersion( left ).compareTo( newArtifactVersion( right ) ),
left + " should be equal to " + right );
- assertTrue(
- newArtifactVersion( right ).compareTo( newArtifactVersion( left ) ) == 0,
+ assertEquals( 0, newArtifactVersion( right ).compareTo( newArtifactVersion( left ) ),
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 50270a0..4864e44 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
@@ -26,6 +26,7 @@ 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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -753,6 +754,7 @@ public class VersionRangeTest
restrictions = version.getRestrictions();
assertEquals( 0, restrictions.size(), CHECK_NUM_RESTRICTIONS );
- assertFalse( spec.equals( version ), "check !VersionRange.createFromVersionSpec(x).equals(VersionRange.createFromVersion(x))" );
+ assertNotEquals( spec, 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 dbde11e..a8b85d8 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
@@ -24,6 +24,7 @@ import org.junit.jupiter.api.Test;
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 DefaultProblemCollectorTest
{
@@ -47,7 +48,7 @@ public class DefaultProblemCollectorTest
assertEquals( "MESSAGE1",p1.getMessage() );
assertEquals( -1, p1.getLineNumber() );
assertEquals( -1, p1.getColumnNumber() );
- assertEquals( null, p1.getException() );
+ assertNull( p1.getException() );
Problem p2 = collector.getProblems().get(1);
assertEquals( Severity.WARNING, p2.getSeverity() );
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 4d9a3d8..6182f99 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
@@ -23,6 +23,7 @@ import org.apache.maven.building.Problem.Severity;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
public class DefaultProblemTest
@@ -82,7 +83,7 @@ public class DefaultProblemTest
public void testGetException()
{
DefaultProblem problem = new DefaultProblem( null, null, null, -1, -1, null );
- assertEquals( null, problem.getException() );
+ assertNull( problem.getException() );
Exception e = new Exception();
problem = new DefaultProblem( null, null, null, -1, -1, e );
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 4e7b5dc..7e02446 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
@@ -22,7 +22,9 @@ package org.apache.maven.artifact.repository;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class MavenArtifactRepositoryTest
@@ -50,13 +52,13 @@ public class MavenArtifactRepositoryTest
MavenArtifactRepositorySubclass r2 = new MavenArtifactRepositorySubclass( "foo" );
MavenArtifactRepositorySubclass r3 = new MavenArtifactRepositorySubclass( "bar" );
- assertTrue( r1.hashCode() == r2.hashCode() );
- assertFalse( r1.hashCode() == r3.hashCode() );
+ assertEquals( r1.hashCode(), r2.hashCode() );
+ assertNotEquals( r1.hashCode(), r3.hashCode() );
- assertTrue( r1.equals( r2 ) );
- assertTrue( r2.equals( r1 ) );
+ assertEquals( r1, r2 );
+ assertEquals( r2, r1 );
- assertFalse( r1.equals( r3 ) );
- assertFalse( r3.equals( r1 ) );
+ assertNotEquals( r1, r3 );
+ assertNotEquals( r3, r1 );
}
}
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 96a8882..4561308 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
@@ -25,6 +25,7 @@ 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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
@@ -47,12 +48,12 @@ public class AndArtifactFilterTest
AndArtifactFilter filter2 = new AndArtifactFilter( Arrays.asList( newSubFilter() ) );
- assertFalse( filter1.equals( null ) );
- assertTrue( filter1.equals( filter1 ) );
+ assertNotEquals( null, filter1 );
+ assertEquals( filter1, filter1 );
assertEquals( filter1.hashCode(), filter1.hashCode() );
- assertFalse( filter1.equals( filter2 ) );
- assertFalse( filter2.equals( filter1 ) );
+ assertNotEquals( filter1, filter2 );
+ assertNotEquals( filter2, filter1 );
}
}
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 6c3df9e..f7ff02d 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
@@ -24,6 +24,7 @@ import java.util.List;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
@@ -41,12 +42,12 @@ public class FilterHashEqualsTest
IncludesArtifactFilter f2 = new IncludesArtifactFilter( patterns );
- assertTrue( f1.equals(f2) );
- assertTrue( f2.equals(f1) );
- assertTrue( f1.hashCode() == f2.hashCode() );
+ assertEquals( f1, f2 );
+ assertEquals( f2, f1 );
+ assertEquals( f1.hashCode(), f2.hashCode() );
IncludesArtifactFilter f3 = new IncludesArtifactFilter( Arrays.asList( "d", "c", "e" ) );
- assertTrue( f1.equals( f3 ) );
- assertTrue( f1.hashCode() == f3.hashCode() );
+ assertEquals( f1, f3 );
+ assertEquals( f1.hashCode(), f3.hashCode() );
}
}
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 65d9caa..c2b2900 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
@@ -25,6 +25,7 @@ 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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
@@ -47,12 +48,12 @@ public class OrArtifactFilterTest
OrArtifactFilter filter2 = new OrArtifactFilter( Arrays.asList( newSubFilter() ) );
- assertFalse( filter1.equals( null ) );
- assertTrue( filter1.equals( filter1 ) );
+ assertNotEquals( null, filter1 );
+ assertEquals( filter1, filter1 );
assertEquals( filter1.hashCode(), filter1.hashCode() );
- assertFalse( filter1.equals( filter2 ) );
- assertFalse( filter2.equals( filter1 ) );
+ assertNotEquals( filter1, filter2 );
+ assertNotEquals( filter2, filter1 );
}
}
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 34a31d5..1103315 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
@@ -73,7 +73,7 @@ public class ProjectInheritanceTest
Set set = project1.getArtifacts();
assertNotNull( set, "No artifacts" );
assertTrue( set.size() > 0, "No Artifacts" );
- assertTrue( set.size() == 3, "Set size should be 3, is " + set.size() );
+ assertEquals( 3, set.size(), "Set size should be 3, is " + set.size() );
for ( Object aSet : set )
{
@@ -83,8 +83,7 @@ public class ProjectInheritanceTest
artifact.isOptional()
? "true"
: "false" ) );
- assertTrue( artifact.getVersion().equals( "1.0" ),
- "Incorrect version for " + artifact.getDependencyConflictId() );
+ assertEquals( "1.0", artifact.getVersion(), "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 8af4a2f..90cd8c1 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
@@ -76,8 +76,7 @@ public class ProjectInheritanceTest
System.out.println(
"Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() + " Scope: "
+ artifact.getScope() );
- assertTrue( artifact.getVersion().equals( "1.0" ),
- "Incorrect version for " + artifact.getDependencyConflictId() );
+ assertEquals( "1.0", artifact.getVersion(), "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 bc37066..a1378a2 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
@@ -71,15 +71,14 @@ public class ProjectInheritanceTest
assertNotNull( set, "No artifacts" );
assertTrue( set.size() > 0, "No Artifacts" );
Iterator iter = set.iterator();
- assertTrue( set.size() == 4, "Set size should be 4, is " + set.size() );
+ assertEquals( 4, set.size(), "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( artifact.getVersion().equals( "1.0" ),
- "Incorrect version for " + artifact.getDependencyConflictId() );
+ assertEquals( "1.0", artifact.getVersion(), "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 87b07d3..eab812c 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
@@ -29,6 +29,7 @@ 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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -70,19 +71,18 @@ public class ProjectInheritanceTest
Set set = project1.getArtifacts();
assertNotNull( set, "No artifacts" );
assertTrue( set.size() > 0, "No Artifacts" );
- assertTrue( set.size() == 3, "Set size should be 3, is " + set.size() );
+ assertEquals( 3, set.size(), "Set size should be 3, is " + set.size() );
for ( Object aSet : set )
{
Artifact artifact = (Artifact) aSet;
- assertFalse( artifact.getArtifactId().equals( "t07-d" ) );
+ assertNotEquals( "t07-d", artifact.getArtifactId() );
System.out.println(
"Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() + " Optional=" + (
artifact.isOptional()
? "true"
: "false" ) );
- assertTrue( artifact.getVersion().equals( "1.0" ),
- "Incorrect version for " + artifact.getDependencyConflictId() );
+ assertEquals( "1.0", artifact.getVersion(), "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 c4562dc..7794b32 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
@@ -72,14 +72,14 @@ public class ProjectInheritanceTest
assertNotNull( set, "No artifacts" );
assertTrue( set.size() > 0, "No Artifacts" );
Iterator iter = set.iterator();
- assertTrue( set.size() == 4, "Set size should be 4, is " + set.size() );
+ assertEquals( 4, set.size(), "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( artifact.getVersion().equals( "1.0" ), "Incorrect version for " + artifact.getDependencyConflictId() );
+ assertEquals( "1.0", artifact.getVersion(), "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 dcc4e8b..e1d9909 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
@@ -82,7 +82,7 @@ public class ProjectInheritanceTest
assertNotNull( map, "No artifacts" );
assertTrue( map.size() > 0, "No Artifacts" );
- assertTrue( map.size() == 2, "Set size should be 2, is " + map.size() );
+ assertEquals( 2, map.size(), "Set size should be 2, is " + map.size() );
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" );
@@ -117,7 +117,7 @@ public class ProjectInheritanceTest
Map map = project2.getArtifactMap();
assertNotNull( map, "No artifacts" );
assertTrue( map.size() > 0, "No Artifacts" );
- assertTrue( map.size() == 4, "Set size should be 4, is " + map.size() );
+ assertEquals( 4, map.size(), "Set size should be 4, is " + map.size() );
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" );
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 b1e7408..5bd466e 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
@@ -76,7 +76,7 @@ public class ProjectInheritanceTest
Map map = project1.getArtifactMap();
assertNotNull( map, "No artifacts" );
assertTrue( map.size() > 0, "No Artifacts" );
- assertTrue( map.size() == 3, "Set size should be 3, is " + map.size() );
+ assertEquals( 3, map.size(), "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( a.getScope().equals("test"), "Incorrect scope for " + a.getDependencyConflictId() );
+ assertEquals( "test", a.getScope(), "Incorrect scope for " + a.getDependencyConflictId() );
// transitive dep, overridden b depMgmt
- assertTrue( b.getScope().equals("runtime"), "Incorrect scope for " + b.getDependencyConflictId() );
+ assertEquals( "runtime", b.getScope(), "Incorrect scope for " + b.getDependencyConflictId() );
// direct dep, overrides depMgmt
- assertTrue( c.getScope().equals("runtime"), "Incorrect scope for " + c.getDependencyConflictId() );
+ assertEquals( "runtime", c.getScope(), "Incorrect scope for " + c.getDependencyConflictId() );
}
}
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 000dd88..b940fb0 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
@@ -36,6 +36,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class LifecycleDependencyResolverTest extends AbstractCoreMavenComponentTestCase
{
@@ -67,7 +68,7 @@ public class LifecycleDependencyResolverTest extends AbstractCoreMavenComponentT
MavenProject lib = session.getProjects().get( 1 );
MavenProject war = session.getProjects().get( 2 );
- assertEquals( null , war.getArtifactMap().get("org.apache.maven.its.mng6300:mng6300-lib").getFile() );
+ assertNull( war.getArtifactMap().get( "org.apache.maven.its.mng6300:mng6300-lib" ).getFile() );
lib.getArtifact().setFile( new File( "lib.jar" ) );
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 aff0dde..06182aa 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
@@ -129,17 +129,17 @@ public class MavenProjectTest
assertNotNull( dep, "No dependencyManagement" );
List<?> list = dep.getDependencies();
assertNotNull( list, "No dependencies" );
- assertTrue( !list.isEmpty(), "Empty dependency list" );
+ assertFalse( list.isEmpty(), "Empty dependency list" );
Map<?, ?> map = projectToClone.getManagedVersionMap();
assertNotNull( map, "No ManagedVersionMap" );
- assertTrue( !map.isEmpty(), "ManagedVersionMap is empty" );
+ assertFalse( map.isEmpty(), "ManagedVersionMap is empty" );
MavenProject clonedProject = projectToClone.clone();
assertEquals( "maven-core", clonedProject.getArtifactId() );
Map<?, ?> clonedMap = clonedProject.getManagedVersionMap();
assertNotNull( clonedMap, "ManagedVersionMap not copied" );
- assertTrue( !clonedMap.isEmpty(), "ManagedVersionMap is empty" );
+ assertFalse( clonedMap.isEmpty(), "ManagedVersionMap is empty" );
assertTrue( clonedMap.containsKey( "maven-test:maven-test-b:jar" ), "ManagedVersionMap does not contain test key" );
}
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 ff7cc05..e2f371e 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
@@ -695,22 +695,22 @@ public class PomConstructionTest
throws Exception
{
PomTestWrapper pom = buildPom( "limited-inheritance/child" );
- assertEquals( null, pom.getValue( "organization/url" ) );
- assertEquals( null, pom.getValue( "issueManagement/system" ) );
+ assertNull( pom.getValue( "organization/url" ) );
+ assertNull( pom.getValue( "issueManagement/system" ) );
assertEquals( 0, ( (List<?>) pom.getValue( "ciManagement/notifiers" ) ).size() );
assertEquals( "child-distros", pom.getValue( "distributionManagement/repository/id" ) );
assertEquals( "ssh://child.url/distros", pom.getValue( "distributionManagement/repository/url" ) );
- assertEquals( null, pom.getValue( "distributionManagement/repository/name" ) );
+ assertNull( pom.getValue( "distributionManagement/repository/name" ) );
assertEquals( true, pom.getValue( "distributionManagement/repository/uniqueVersion" ) );
assertEquals( "default", pom.getValue( "distributionManagement/repository/layout" ) );
assertEquals( "child-snaps", pom.getValue( "distributionManagement/snapshotRepository/id" ) );
assertEquals( "ssh://child.url/snaps", pom.getValue( "distributionManagement/snapshotRepository/url" ) );
- assertEquals( null, pom.getValue( "distributionManagement/snapshotRepository/name" ) );
+ assertNull( pom.getValue( "distributionManagement/snapshotRepository/name" ) );
assertEquals( true, pom.getValue( "distributionManagement/snapshotRepository/uniqueVersion" ) );
assertEquals( "default", pom.getValue( "distributionManagement/snapshotRepository/layout" ) );
assertEquals( "child-site", pom.getValue( "distributionManagement/site/id" ) );
assertEquals( "scp://child.url/site", pom.getValue( "distributionManagement/site/url" ) );
- assertEquals( null, pom.getValue( "distributionManagement/site/name" ) );
+ assertNull( pom.getValue( "distributionManagement/site/name" ) );
}
@Test
@@ -912,7 +912,7 @@ public class PomConstructionTest
assertEquals( "CHILD-3", pom.getValue( prefix + "stringParams/stringParam[6]" ) );
assertEquals( "CHILD-2", pom.getValue( prefix + "stringParams/stringParam[7]" ) );
assertEquals( "CHILD-4", pom.getValue( prefix + "stringParams/stringParam[8]" ) );
- assertEquals( null, pom.getValue( prefix + "stringParams/stringParam[9]" ) );
+ assertNull( pom.getValue( prefix + "stringParams/stringParam[9]" ) );
assertEquals( "PARENT-1", pom.getValue( prefix + "listParam/listParam[1]" ) );
assertEquals( "PARENT-3", pom.getValue( prefix + "listParam/listParam[2]" ) );
assertEquals( "PARENT-2", pom.getValue( prefix + "listParam/listParam[3]" ) );
@@ -921,7 +921,7 @@ public class PomConstructionTest
assertEquals( "CHILD-3", pom.getValue( prefix + "listParam/listParam[6]" ) );
assertEquals( "CHILD-2", pom.getValue( prefix + "listParam/listParam[7]" ) );
assertEquals( "CHILD-4", pom.getValue( prefix + "listParam/listParam[8]" ) );
- assertEquals( null, pom.getValue( prefix + "listParam/listParam[9]" ) );
+ assertNull( pom.getValue( prefix + "listParam/listParam[9]" ) );
}
/* MNG-4000 */
@@ -1105,8 +1105,8 @@ public class PomConstructionTest
assertEquals( "src", pom.getValue( "build/plugins[1]/configuration/domParam/copy/@todir" ) );
assertEquals( "true", pom.getValue( "build/plugins[1]/configuration/domParam/copy/@overwrite" ) );
assertEquals( "target", pom.getValue( "build/plugins[1]/configuration/domParam/copy/fileset/@dir" ) );
- assertEquals( null, pom.getValue( "build/plugins[1]/configuration/domParam/copy/fileset/@todir" ) );
- assertEquals( null, pom.getValue( "build/plugins[1]/configuration/domParam/copy/fileset/@overwrite" ) );
+ assertNull( pom.getValue( "build/plugins[1]/configuration/domParam/copy/fileset/@todir" ) );
+ assertNull( pom.getValue( "build/plugins[1]/configuration/domParam/copy/fileset/@overwrite" ) );
}
/** MNG-4053*/
@@ -1118,8 +1118,8 @@ public class PomConstructionTest
assertEquals( "src", pom.getValue( "build/plugins[1]/configuration/domParam/copy/@todir" ) );
assertEquals( "true", pom.getValue( "build/plugins[1]/configuration/domParam/copy/@overwrite" ) );
assertEquals( "target", pom.getValue( "build/plugins[1]/configuration/domParam/copy/fileset/@dir" ) );
- assertEquals( null, pom.getValue( "build/plugins[1]/configuration/domParam/copy/fileset/@todir" ) );
- assertEquals( null, pom.getValue( "build/plugins[1]/configuration/domParam/copy/fileset/@overwrite" ) );
+ assertNull( pom.getValue( "build/plugins[1]/configuration/domParam/copy/fileset/@todir" ) );
+ assertNull( pom.getValue( "build/plugins[1]/configuration/domParam/copy/fileset/@overwrite" ) );
}
@Test
@@ -1130,8 +1130,8 @@ public class PomConstructionTest
assertEquals( "src", pom.getValue( "build/plugins[1]/configuration/domParam/copy/@todir" ) );
assertEquals( "true", pom.getValue( "build/plugins[1]/configuration/domParam/copy/@overwrite" ) );
assertEquals( "target", pom.getValue( "build/plugins[1]/configuration/domParam/copy/fileset/@dir" ) );
- assertEquals( null, pom.getValue( "build/plugins[1]/configuration/domParam/copy/fileset/@todir" ) );
- assertEquals( null, pom.getValue( "build/plugins[1]/configuration/domParam/copy/fileset/@overwrite" ) );
+ assertNull( pom.getValue( "build/plugins[1]/configuration/domParam/copy/fileset/@todir" ) );
+ assertNull( pom.getValue( "build/plugins[1]/configuration/domParam/copy/fileset/@overwrite" ) );
}
@Test
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 1f61441..e17aa0b 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
@@ -25,7 +25,9 @@ import java.io.IOException;
import org.codehaus.plexus.util.Os;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
@@ -47,10 +49,10 @@ public class FileModelSourceTest
File tempFile = createTempFile( "pomTest" );
FileModelSource instance = new FileModelSource( tempFile );
- assertFalse( instance.equals( null ) );
- assertFalse( instance.equals( new Object() ) );
- assertTrue( instance.equals( instance ) );
- assertTrue( instance.equals( new FileModelSource( tempFile ) ) );
+ assertNotEquals( null, instance );
+ assertNotEquals( instance, new Object() );
+ assertEquals( instance, instance );
+ assertEquals( instance, new FileModelSource( tempFile ) );
}
@Test
@@ -66,7 +68,7 @@ public class FileModelSourceTest
FileModelSource upperCaseFileSouce = new FileModelSource( upperCaseFile );
FileModelSource lowerCaseFileSouce = new FileModelSource( lowerCaseFile );
- assertTrue( upperCaseFileSouce.equals( lowerCaseFileSouce ) );
+ assertEquals( upperCaseFileSouce, lowerCaseFileSouce );
}
private File createTempFile( String name ) throws IOException
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 cbfdc2a..2dec78d 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class ActivationFileTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new ActivationFile().equals( null ) );
+ assertNotEquals( null, new ActivationFile() );
new ActivationFile().equals( new ActivationFile() );
}
@@ -51,7 +53,7 @@ public class ActivationFileTest
public void testEqualsIdentity()
{
ActivationFile thing = new ActivationFile();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 3be5cd9..06fa4d4 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class ActivationOSTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new ActivationOS().equals( null ) );
+ assertNotEquals( null, new ActivationOS() );
new ActivationOS().equals( new ActivationOS() );
}
@@ -51,7 +53,7 @@ public class ActivationOSTest
public void testEqualsIdentity()
{
ActivationOS thing = new ActivationOS();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 564adc0..b641f85 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class ActivationPropertyTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new ActivationProperty().equals( null ) );
+ assertNotEquals( null, new ActivationProperty() );
new ActivationProperty().equals( new ActivationProperty() );
}
@@ -51,7 +53,7 @@ public class ActivationPropertyTest
public void testEqualsIdentity()
{
ActivationProperty thing = new ActivationProperty();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 520c0a9..4e7c7a5 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class ActivationTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new Activation().equals( null ) );
+ assertNotEquals( null, new Activation() );
new Activation().equals( new Activation() );
}
@@ -51,7 +53,7 @@ public class ActivationTest
public void testEqualsIdentity()
{
Activation thing = new Activation();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 3a14bd3..3948106 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class BuildTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new Build().equals( null ) );
+ assertNotEquals( null, new Build() );
new Build().equals( new Build() );
}
@@ -51,7 +53,7 @@ public class BuildTest
public void testEqualsIdentity()
{
Build thing = new Build();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 ee6d41d..94fe044 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class CiManagementTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new CiManagement().equals( null ) );
+ assertNotEquals( null, new CiManagement() );
new CiManagement().equals( new CiManagement() );
}
@@ -51,7 +53,7 @@ public class CiManagementTest
public void testEqualsIdentity()
{
CiManagement thing = new CiManagement();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 e2f3dbb..a2ca4e1 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class ContributorTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new Contributor().equals( null ) );
+ assertNotEquals( null, new Contributor() );
new Contributor().equals( new Contributor() );
}
@@ -51,7 +53,7 @@ public class ContributorTest
public void testEqualsIdentity()
{
Contributor thing = new Contributor();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 e63d224..7fa2e0d 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class DependencyManagementTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new DependencyManagement().equals( null ) );
+ assertNotEquals( null, new DependencyManagement() );
new DependencyManagement().equals( new DependencyManagement() );
}
@@ -51,7 +53,7 @@ public class DependencyManagementTest
public void testEqualsIdentity()
{
DependencyManagement thing = new DependencyManagement();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 6b7bc3f..10d2157 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class DependencyTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new Dependency().equals( null ) );
+ assertNotEquals( null, new Dependency() );
new Dependency().equals( new Dependency() );
}
@@ -51,7 +53,7 @@ public class DependencyTest
public void testEqualsIdentity()
{
Dependency thing = new Dependency();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 c648ffd..2e6f636 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class DeploymentRepositoryTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new DeploymentRepository().equals( null ) );
+ assertNotEquals( null, new DeploymentRepository() );
new DeploymentRepository().equals( new DeploymentRepository() );
}
@@ -51,7 +53,7 @@ public class DeploymentRepositoryTest
public void testEqualsIdentity()
{
DeploymentRepository thing = new DeploymentRepository();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 61d86f0..5d53e48 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class DeveloperTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new Developer().equals( null ) );
+ assertNotEquals( null, new Developer() );
new Developer().equals( new Developer() );
}
@@ -51,7 +53,7 @@ public class DeveloperTest
public void testEqualsIdentity()
{
Developer thing = new Developer();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 db8ba21..9e74ce7 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class DistributionManagementTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new DistributionManagement().equals( null ) );
+ assertNotEquals( null, new DistributionManagement() );
new DistributionManagement().equals( new DistributionManagement() );
}
@@ -51,7 +53,7 @@ public class DistributionManagementTest
public void testEqualsIdentity()
{
DistributionManagement thing = new DistributionManagement();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 90e4b74..a06c7cf 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class ExclusionTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new Exclusion().equals( null ) );
+ assertNotEquals( null, new Exclusion() );
new Exclusion().equals( new Exclusion() );
}
@@ -51,7 +53,7 @@ public class ExclusionTest
public void testEqualsIdentity()
{
Exclusion thing = new Exclusion();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 218ff50..1a24af4 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class ExtensionTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new Extension().equals( null ) );
+ assertNotEquals( null, new Extension() );
new Extension().equals( new Extension() );
}
@@ -51,7 +53,7 @@ public class ExtensionTest
public void testEqualsIdentity()
{
Extension thing = new Extension();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 27e1eb0..705f084 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class IssueManagementTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new IssueManagement().equals( null ) );
+ assertNotEquals( null, new IssueManagement() );
new IssueManagement().equals( new IssueManagement() );
}
@@ -51,7 +53,7 @@ public class IssueManagementTest
public void testEqualsIdentity()
{
IssueManagement thing = new IssueManagement();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 dd56616..68c3e4d 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class LicenseTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new License().equals( null ) );
+ assertNotEquals( null, new License() );
new License().equals( new License() );
}
@@ -51,7 +53,7 @@ public class LicenseTest
public void testEqualsIdentity()
{
License thing = new License();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 5de9edc..39de48f 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class MailingListTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new MailingList().equals( null ) );
+ assertNotEquals( null, new MailingList() );
new MailingList().equals( new MailingList() );
}
@@ -51,7 +53,7 @@ public class MailingListTest
public void testEqualsIdentity()
{
MailingList thing = new MailingList();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 37adc82..e622840 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class ModelTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new Model().equals( null ) );
+ assertNotEquals( null, new Model() );
new Model().equals( new Model() );
}
@@ -51,7 +53,7 @@ public class ModelTest
public void testEqualsIdentity()
{
Model thing = new Model();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 026632a..6a9fd29 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class NotifierTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new Notifier().equals( null ) );
+ assertNotEquals( null, new Notifier() );
new Notifier().equals( new Notifier() );
}
@@ -51,7 +53,7 @@ public class NotifierTest
public void testEqualsIdentity()
{
Notifier thing = new Notifier();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 ef19d2a..609a175 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class OrganizationTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new Organization().equals( null ) );
+ assertNotEquals( null, new Organization() );
new Organization().equals( new Organization() );
}
@@ -51,7 +53,7 @@ public class OrganizationTest
public void testEqualsIdentity()
{
Organization thing = new Organization();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 d8690fc..7bd4aa1 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class ParentTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new Parent().equals( null ) );
+ assertNotEquals( null, new Parent() );
new Parent().equals( new Parent() );
}
@@ -51,7 +53,7 @@ public class ParentTest
public void testEqualsIdentity()
{
Parent thing = new Parent();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 3e52df7..28e6b3d 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class PluginConfigurationTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new PluginConfiguration().equals( null ) );
+ assertNotEquals( null, new PluginConfiguration() );
new PluginConfiguration().equals( new PluginConfiguration() );
}
@@ -51,7 +53,7 @@ public class PluginConfigurationTest
public void testEqualsIdentity()
{
PluginConfiguration thing = new PluginConfiguration();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 ed4e9e3..5451ebe 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class PluginContainerTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new PluginContainer().equals( null ) );
+ assertNotEquals( null, new PluginContainer() );
new PluginContainer().equals( new PluginContainer() );
}
@@ -51,7 +53,7 @@ public class PluginContainerTest
public void testEqualsIdentity()
{
PluginContainer thing = new PluginContainer();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 35b78bd..d78d487 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class PluginExecutionTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new PluginExecution().equals( null ) );
+ assertNotEquals( null, new PluginExecution() );
new PluginExecution().equals( new PluginExecution() );
}
@@ -51,7 +53,7 @@ public class PluginExecutionTest
public void testEqualsIdentity()
{
PluginExecution thing = new PluginExecution();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 b4d8266..3620850 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class PluginManagementTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new PluginManagement().equals( null ) );
+ assertNotEquals( null, new PluginManagement() );
new PluginManagement().equals( new PluginManagement() );
}
@@ -51,7 +53,7 @@ public class PluginManagementTest
public void testEqualsIdentity()
{
PluginManagement thing = new PluginManagement();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 d8e345b..994b8e2 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class PluginTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new Plugin().equals( null ) );
+ assertNotEquals( null, new Plugin() );
new Plugin().equals( new Plugin() );
}
@@ -51,7 +53,7 @@ public class PluginTest
public void testEqualsIdentity()
{
Plugin thing = new Plugin();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 2c91e47..e3cfad2 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class PrerequisitesTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new Prerequisites().equals( null ) );
+ assertNotEquals( null, new Prerequisites() );
new Prerequisites().equals( new Prerequisites() );
}
@@ -51,7 +53,7 @@ public class PrerequisitesTest
public void testEqualsIdentity()
{
Prerequisites thing = new Prerequisites();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 ac719e4..6e6b818 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class ProfileTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new Profile().equals( null ) );
+ assertNotEquals( null, new Profile() );
new Profile().equals( new Profile() );
}
@@ -51,7 +53,7 @@ public class ProfileTest
public void testEqualsIdentity()
{
Profile thing = new Profile();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 ea825a6..fa47dd4 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class RelocationTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new Relocation().equals( null ) );
+ assertNotEquals( null, new Relocation() );
new Relocation().equals( new Relocation() );
}
@@ -51,7 +53,7 @@ public class RelocationTest
public void testEqualsIdentity()
{
Relocation thing = new Relocation();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 094d2d5..3668125 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class ReportPluginTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new ReportPlugin().equals( null ) );
+ assertNotEquals( null, new ReportPlugin() );
new ReportPlugin().equals( new ReportPlugin() );
}
@@ -51,7 +53,7 @@ public class ReportPluginTest
public void testEqualsIdentity()
{
ReportPlugin thing = new ReportPlugin();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 c0bb257..8c5d892 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class ReportSetTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new ReportSet().equals( null ) );
+ assertNotEquals( null, new ReportSet() );
new ReportSet().equals( new ReportSet() );
}
@@ -51,7 +53,7 @@ public class ReportSetTest
public void testEqualsIdentity()
{
ReportSet thing = new ReportSet();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 3b04d02..8d4b34d 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class ReportingTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new Reporting().equals( null ) );
+ assertNotEquals( null, new Reporting() );
new Reporting().equals( new Reporting() );
}
@@ -51,7 +53,7 @@ public class ReportingTest
public void testEqualsIdentity()
{
Reporting thing = new Reporting();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 770bce2..35dd548 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class RepositoryPolicyTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new RepositoryPolicy().equals( null ) );
+ assertNotEquals( null, new RepositoryPolicy() );
new RepositoryPolicy().equals( new RepositoryPolicy() );
}
@@ -51,7 +53,7 @@ public class RepositoryPolicyTest
public void testEqualsIdentity()
{
RepositoryPolicy thing = new RepositoryPolicy();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 62f32d7..e9ec797 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class RepositoryTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new Repository().equals( null ) );
+ assertNotEquals( null, new Repository() );
new Repository().equals( new Repository() );
}
@@ -51,7 +53,7 @@ public class RepositoryTest
public void testEqualsIdentity()
{
Repository thing = new Repository();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 3e5b1b3..e217045 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class ResourceTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new Resource().equals( null ) );
+ assertNotEquals( null, new Resource() );
new Resource().equals( new Resource() );
}
@@ -51,7 +53,7 @@ public class ResourceTest
public void testEqualsIdentity()
{
Resource thing = new Resource();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 a6ccc24..2624d53 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class ScmTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new Scm().equals( null ) );
+ assertNotEquals( null, new Scm() );
new Scm().equals( new Scm() );
}
@@ -51,7 +53,7 @@ public class ScmTest
public void testEqualsIdentity()
{
Scm thing = new Scm();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 5fe4975..9372831 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
@@ -21,7 +21,9 @@ package org.apache.maven.model;
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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,7 +44,7 @@ public class SiteTest
@Test
public void testEqualsNullSafe()
{
- assertFalse( new Site().equals( null ) );
+ assertNotEquals( null, new Site() );
new Site().equals( new Site() );
}
@@ -51,7 +53,7 @@ public class SiteTest
public void testEqualsIdentity()
{
Site thing = new Site();
- assertTrue( thing.equals( thing ) );
+ assertEquals( thing, thing );
}
@Test
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 5b245af..88d2490 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
@@ -30,7 +30,10 @@ import org.codehaus.plexus.util.ReaderFactory;
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.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@link PluginDescriptorBuilder}.
@@ -59,8 +62,8 @@ public class PluginDescriptorBuilderTest
assertEquals( "2.3-SNAPSHOT", pd.getVersion() );
assertEquals( "jar", pd.getGoalPrefix() );
assertEquals( "plugin-description", pd.getDescription() );
- assertEquals( false, pd.isIsolatedRealm() );
- assertEquals( true, pd.isInheritedByDefault() );
+ assertFalse( pd.isIsolatedRealm() );
+ assertTrue( pd.isInheritedByDefault() );
assertEquals( 2, pd.getMojos().size() );
assertEquals( 1, pd.getDependencies().size() );
@@ -70,12 +73,12 @@ public class PluginDescriptorBuilderTest
assertEquals( "mojo-description", md.getDescription() );
assertEquals( "runtime", md.getDependencyResolutionRequired() );
assertEquals( "test", md.getDependencyCollectionRequired() );
- assertEquals( false, md.isAggregator() );
- assertEquals( false, md.isDirectInvocationOnly() );
- assertEquals( true, md.isInheritedByDefault() );
- assertEquals( false, md.isOnlineRequired() );
- assertEquals( true, md.isProjectRequired() );
- assertEquals( false, md.isThreadSafe() );
+ assertFalse( md.isAggregator() );
+ assertFalse( md.isDirectInvocationOnly() );
+ assertTrue( md.isInheritedByDefault() );
+ assertFalse( md.isOnlineRequired() );
+ assertTrue( md.isProjectRequired() );
+ assertFalse( md.isThreadSafe() );
assertEquals( "package", md.getPhase() );
assertEquals( "org.apache.maven.plugin.jar.JarMojo", md.getImplementation() );
assertEquals( "antrun", md.getComponentConfigurator() );
@@ -104,8 +107,8 @@ public class PluginDescriptorBuilderTest
assertEquals( "jarName", mp.getAlias() );
assertEquals( "java.lang.String", mp.getType() );
assertEquals( "java.lang.String", mp.getImplementation() );
- assertEquals( true, mp.isEditable() );
- assertEquals( false, mp.isRequired() );
+ assertTrue( mp.isEditable() );
+ assertFalse( mp.isRequired() );
assertEquals( "parameter-description", mp.getDescription() );
assertEquals( "deprecated-parameter", mp.getDeprecated() );
assertEquals( "${jar.finalName}", mp.getExpression() );
@@ -128,9 +131,9 @@ public class PluginDescriptorBuilderTest
md = pd.getMojos().get( 1 );
assertEquals( "war", md.getGoal() );
- assertEquals( null, md.getDependencyResolutionRequired() );
- assertEquals( null, md.getDependencyCollectionRequired() );
- assertEquals( true, md.isThreadSafe() );
+ assertNull( md.getDependencyResolutionRequired() );
+ assertNull( md.getDependencyCollectionRequired() );
+ assertTrue( md.isThreadSafe() );
}
}