You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2021/09/04 19:35:08 UTC
[maven-resolver] 01/03: [MRESOLVER-198] Replace assert by simpler
but equivalent calls
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit 0bcf62366b38a8da617608369a13c20d7fba210b
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Thu Sep 2 17:40:41 2021 +0200
[MRESOLVER-198] Replace assert by simpler but equivalent calls
This closes #117
---
.../aether/DefaultRepositorySystemSessionTest.java | 7 +-
.../connector/basic/ChecksumValidatorTest.java | 4 +-
.../internal/impl/DefaultArtifactResolverTest.java | 4 +-
.../internal/impl/DefaultMetadataResolverTest.java | 2 +-
.../impl/DefaultRemoteRepositoryManagerTest.java | 2 +-
.../impl/DefaultTrackingFileManagerTest.java | 3 -
.../impl/DefaultUpdateCheckManagerTest.java | 96 +++++++++++-----------
.../impl/DefaultUpdatePolicyAnalyzerTest.java | 44 +++++-----
.../impl/EnhancedLocalRepositoryManagerTest.java | 4 +-
.../impl/Maven2RepositoryLayoutFactoryTest.java | 1 -
.../collect/DefaultDependencyCollectorTest.java | 4 +-
.../test/util/DependencyGraphParserTest.java | 2 +-
.../test/util/IniArtifactDataReaderTest.java | 8 +-
.../test/util/IniArtifactDescriptorReaderTest.java | 8 +-
.../internal/test/util/NodeDefinitionTest.java | 52 ++++++------
.../org/eclipse/aether/util/ChecksumUtilTest.java | 2 +-
.../org/eclipse/aether/util/ConfigUtilsTest.java | 18 ++--
.../aether/util/artifact/ArtifactIdUtilsTest.java | 94 ++++++++++-----------
.../util/filter/ExclusionDependencyFilterTest.java | 1 -
.../PatternExclusionsDependencyFilterTest.java | 82 ++++++++----------
.../PatternInclusionsDependencyFilterTest.java | 80 ++++++++----------
.../util/graph/transformer/ConflictMarkerTest.java | 2 +-
.../transformer/SimpleOptionalitySelectorTest.java | 14 ++--
.../graph/versions/ChainedVersionFilterTest.java | 6 +-
.../ContextualSnapshotVersionFilterTest.java | 6 +-
.../graph/versions/HighestVersionFilterTest.java | 6 +-
.../graph/versions/SnapshotVersionFilterTest.java | 6 +-
.../repository/ComponentAuthenticationTest.java | 10 +--
.../util/repository/SecretAuthenticationTest.java | 10 +--
.../util/repository/StringAuthenticationTest.java | 10 +--
.../aether/util/version/AbstractVersionTest.java | 14 ++--
.../util/version/GenericVersionSchemeTest.java | 2 +-
32 files changed, 286 insertions(+), 318 deletions(-)
diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositorySystemSessionTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositorySystemSessionTest.java
index b75c01b..ccca26a 100644
--- a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositorySystemSessionTest.java
+++ b/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositorySystemSessionTest.java
@@ -19,6 +19,7 @@ package org.eclipse.aether;
* under the License.
*/
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.fail;
@@ -86,9 +87,9 @@ public class DefaultRepositorySystemSessionTest
session2.setSystemProperty( "key", "test" );
session2.setConfigProperty( "key", "test" );
- assertEquals( null, session1.getUserProperties().get( "key" ) );
- assertEquals( null, session1.getSystemProperties().get( "key" ) );
- assertEquals( null, session1.getConfigProperties().get( "key" ) );
+ assertNull( session1.getUserProperties().get( "key" ) );
+ assertNull( session1.getSystemProperties().get( "key" ) );
+ assertNull( session1.getConfigProperties().get( "key" ) );
}
@Test
diff --git a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java b/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java
index 80d6173..c0d1467 100644
--- a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java
+++ b/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java
@@ -367,7 +367,7 @@ public class ChecksumValidatorTest
{
policy.tolerateFailure = true;
ChecksumValidator validator = newValidator( SHA1 );
- assertEquals( true, validator.handle( new ChecksumFailureException( "accept" ) ) );
+ assertTrue( validator.handle( new ChecksumFailureException( "accept" ) ) );
policy.assertCallbacks( "fail(accept)" );
}
@@ -376,7 +376,7 @@ public class ChecksumValidatorTest
{
policy.tolerateFailure = false;
ChecksumValidator validator = newValidator( SHA1 );
- assertEquals( false, validator.handle( new ChecksumFailureException( "reject" ) ) );
+ assertFalse( validator.handle( new ChecksumFailureException( "reject" ) ) );
policy.assertCallbacks( "fail(reject)" );
}
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java
index 3c27f98..5723e7f 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java
@@ -317,8 +317,8 @@ public class DefaultArtifactResolverTest
for ( ArtifactResult result : e.getResults() )
{
Throwable t = result.getExceptions().get( 0 );
- assertEquals( t.toString(), true, t instanceof ArtifactNotFoundException );
- assertEquals( t.toString(), true, t.getMessage().contains( "cached" ) );
+ assertTrue( t.toString(), t instanceof ArtifactNotFoundException );
+ assertTrue( t.toString(), t.getMessage().contains( "cached" ) );
}
}
}
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java
index d977a78..27fec64 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java
@@ -182,7 +182,7 @@ public class DefaultMetadataResolverTest
MetadataResult result = results.get( 0 );
assertNotNull( result.getException() );
- assertEquals( false, file.exists() );
+ assertFalse( file.exists() );
}
@Test
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java
index f799ed9..3700aa4 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java
@@ -102,7 +102,7 @@ public class DefaultRemoteRepositoryManagerTest
.setSnapshotPolicy( snapshotPolicy ).setReleasePolicy( releasePolicy ).build();
RepositoryPolicy effectivePolicy = manager.getPolicy( session, repo, true, true );
- assertEquals( true, effectivePolicy.isEnabled() );
+ assertTrue( effectivePolicy.isEnabled() );
assertEquals( RepositoryPolicy.CHECKSUM_POLICY_IGNORE, effectivePolicy.getChecksumPolicy() );
assertEquals( RepositoryPolicy.UPDATE_POLICY_ALWAYS, effectivePolicy.getUpdatePolicy() );
}
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultTrackingFileManagerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultTrackingFileManagerTest.java
index e3745aa..e6e2967 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultTrackingFileManagerTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultTrackingFileManagerTest.java
@@ -23,10 +23,7 @@ import static org.junit.Assert.*;
import java.io.File;
import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.Properties;
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
index 111aca7..a30770e 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
@@ -193,7 +193,7 @@ public class DefaultUpdateCheckManagerTest
// existing file, never checked before
manager.checkMetadata( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
// just checked
manager.touchMetadata( session, check );
@@ -203,12 +203,12 @@ public class DefaultUpdateCheckManagerTest
check.setPolicy( RepositoryPolicy.UPDATE_POLICY_INTERVAL + ":60" );
manager.checkMetadata( session, check );
- assertEquals( false, check.isRequired() );
+ assertFalse( check.isRequired() );
// no local file
check.getFile().delete();
manager.checkMetadata( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
// (! file.exists && ! repoKey) -> no timestamp
}
@@ -225,7 +225,7 @@ public class DefaultUpdateCheckManagerTest
// ! file.exists && updateRequired -> check in remote repo
check.setLocalLastUpdated( lastUpdate );
manager.checkMetadata( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
}
@Test
@@ -243,7 +243,7 @@ public class DefaultUpdateCheckManagerTest
// ! file.exists && ! updateRequired -> artifact not found in remote repo
check = newMetadataCheck().setPolicy( RepositoryPolicy.UPDATE_POLICY_DAILY );
manager.checkMetadata( session, check );
- assertEquals( false, check.isRequired() );
+ assertFalse( check.isRequired() );
assertTrue( check.getException() instanceof MetadataNotFoundException );
assertTrue( check.getException().isFromCache() );
}
@@ -263,7 +263,7 @@ public class DefaultUpdateCheckManagerTest
// ! file.exists && updateRequired -> check in remote repo
check = newMetadataCheck().setPolicy( RepositoryPolicy.UPDATE_POLICY_DAILY );
manager.checkMetadata( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
assertNull( check.getException() );
}
@@ -283,7 +283,7 @@ public class DefaultUpdateCheckManagerTest
check = newMetadataCheck();
session.setResolutionErrorPolicy( new SimpleResolutionErrorPolicy( false, true ) );
manager.checkMetadata( session, check );
- assertEquals( false, check.isRequired() );
+ assertFalse( check.isRequired() );
assertTrue( check.getException() instanceof MetadataTransferException );
assertTrue( String.valueOf( check.getException() ), check.getException().getMessage().contains( "some error" ) );
assertTrue( check.getException().isFromCache() );
@@ -305,7 +305,7 @@ public class DefaultUpdateCheckManagerTest
check = newMetadataCheck();
session.setResolutionErrorPolicy( new SimpleResolutionErrorPolicy( false, false ) );
manager.checkMetadata( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
assertNull( check.getException() );
}
@@ -317,13 +317,13 @@ public class DefaultUpdateCheckManagerTest
// first check
manager.checkMetadata( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
manager.touchMetadata( session, check );
// second check in same session
manager.checkMetadata( session, check );
- assertEquals( false, check.isRequired() );
+ assertFalse( check.isRequired() );
}
@Test
@@ -335,7 +335,7 @@ public class DefaultUpdateCheckManagerTest
session.setConfigProperty( DefaultUpdateCheckManager.CONFIG_PROP_SESSION_STATE, "bypass" );
manager.checkMetadata( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
resetSessionData( session );
manager.touchMetadata( session, check );
@@ -343,12 +343,12 @@ public class DefaultUpdateCheckManagerTest
// TODO This will be changed to 'enabled' in a future version
session.setConfigProperty( DefaultUpdateCheckManager.CONFIG_PROP_SESSION_STATE, "true" );
manager.checkMetadata( session, check );
- assertEquals( false, check.isRequired() );
+ assertFalse( check.isRequired() );
// TODO This will be changed to 'disabled' in a future version
session.setConfigProperty( DefaultUpdateCheckManager.CONFIG_PROP_SESSION_STATE, "false" );
manager.checkMetadata( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
}
@Test
@@ -360,14 +360,14 @@ public class DefaultUpdateCheckManagerTest
// first check
manager.checkMetadata( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
// first touch, without exception
manager.touchMetadata( session, check );
// another check in same session
manager.checkMetadata( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
// another touch, with exception
check.setException( new MetadataNotFoundException( check.getItem(), check.getRepository() ) );
@@ -375,7 +375,7 @@ public class DefaultUpdateCheckManagerTest
// another check in same session
manager.checkMetadata( session, check );
- assertEquals( false, check.isRequired() );
+ assertFalse( check.isRequired() );
}
@Test
@@ -387,14 +387,14 @@ public class DefaultUpdateCheckManagerTest
// first check
manager.checkMetadata( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
manager.touchMetadata( session, check );
// second check in same session but for repo with different id
check.setRepository( new RemoteRepository.Builder( check.getRepository() ).setId( "check" ).build() );
manager.checkMetadata( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
}
@Test
@@ -405,10 +405,10 @@ public class DefaultUpdateCheckManagerTest
session.setResolutionErrorPolicy( new SimpleResolutionErrorPolicy( true, false ) );
check.getFile().delete();
- assertEquals( check.getFile().getAbsolutePath(), false, check.getFile().exists() );
+ assertFalse( check.getFile().getAbsolutePath(), check.getFile().exists() );
manager.checkMetadata( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
}
@Test
@@ -424,7 +424,7 @@ public class DefaultUpdateCheckManagerTest
check.setFileValid( false );
manager.checkMetadata( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
}
@Test
@@ -437,10 +437,10 @@ public class DefaultUpdateCheckManagerTest
resetSessionData( session );
check.getFile().delete();
- assertEquals( check.getFile().getAbsolutePath(), false, check.getFile().exists() );
+ assertFalse( check.getFile().getAbsolutePath(), check.getFile().exists() );
manager.checkMetadata( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
}
@Test
@@ -451,7 +451,7 @@ public class DefaultUpdateCheckManagerTest
session.setResolutionErrorPolicy( new SimpleResolutionErrorPolicy( true, false ) );
manager.checkMetadata( session, check );
- assertEquals( false, check.isRequired() );
+ assertFalse( check.isRequired() );
}
@Test( expected = NullPointerException.class )
@@ -533,7 +533,7 @@ public class DefaultUpdateCheckManagerTest
// never checked before
manager.checkArtifact( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
// just checked
check.setLocalLastUpdated( 0L );
@@ -542,13 +542,13 @@ public class DefaultUpdateCheckManagerTest
lastUpdate = check.getFile().lastModified();
manager.checkArtifact( session, check );
- assertEquals( false, check.isRequired() );
+ assertFalse( check.isRequired() );
// no local file, no repo timestamp
check.setLocalLastUpdated( 0L );
check.getFile().delete();
manager.checkArtifact( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
}
@Test
@@ -562,7 +562,7 @@ public class DefaultUpdateCheckManagerTest
// ! file.exists && updateRequired -> check in remote repo
check.setLocalLastUpdated( lastUpdate );
manager.checkArtifact( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
}
@Test
@@ -579,7 +579,7 @@ public class DefaultUpdateCheckManagerTest
// ! file.exists && ! updateRequired -> artifact not found in remote repo
check = newArtifactCheck().setPolicy( RepositoryPolicy.UPDATE_POLICY_DAILY );
manager.checkArtifact( session, check );
- assertEquals( false, check.isRequired() );
+ assertFalse( check.isRequired() );
assertTrue( check.getException() instanceof ArtifactNotFoundException );
assertTrue( check.getException().isFromCache() );
}
@@ -598,7 +598,7 @@ public class DefaultUpdateCheckManagerTest
// ! file.exists && updateRequired -> check in remote repo
check = newArtifactCheck().setPolicy( RepositoryPolicy.UPDATE_POLICY_DAILY );
manager.checkArtifact( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
assertNull( check.getException() );
}
@@ -617,7 +617,7 @@ public class DefaultUpdateCheckManagerTest
check = newArtifactCheck();
session.setResolutionErrorPolicy( new SimpleResolutionErrorPolicy( false, true ) );
manager.checkArtifact( session, check );
- assertEquals( false, check.isRequired() );
+ assertFalse( check.isRequired() );
assertTrue( check.getException() instanceof ArtifactTransferException );
assertTrue( check.getException().isFromCache() );
}
@@ -637,7 +637,7 @@ public class DefaultUpdateCheckManagerTest
check = newArtifactCheck();
session.setResolutionErrorPolicy( new SimpleResolutionErrorPolicy( false, false ) );
manager.checkArtifact( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
assertNull( check.getException() );
}
@@ -649,13 +649,13 @@ public class DefaultUpdateCheckManagerTest
// first check
manager.checkArtifact( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
manager.touchArtifact( session, check );
// second check in same session
manager.checkArtifact( session, check );
- assertEquals( false, check.isRequired() );
+ assertFalse( check.isRequired() );
}
@Test
@@ -667,18 +667,18 @@ public class DefaultUpdateCheckManagerTest
session.setConfigProperty( DefaultUpdateCheckManager.CONFIG_PROP_SESSION_STATE, "bypass" );
manager.checkArtifact( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
resetSessionData( session );
manager.touchArtifact( session, check );
session.setConfigProperty( DefaultUpdateCheckManager.CONFIG_PROP_SESSION_STATE, "true" );
manager.checkArtifact( session, check );
- assertEquals( false, check.isRequired() );
+ assertFalse( check.isRequired() );
session.setConfigProperty( DefaultUpdateCheckManager.CONFIG_PROP_SESSION_STATE, "false" );
manager.checkArtifact( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
}
@Test
@@ -690,14 +690,14 @@ public class DefaultUpdateCheckManagerTest
// first check
manager.checkArtifact( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
// first touch, without exception
manager.touchArtifact( session, check );
// another check in same session
manager.checkArtifact( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
// another touch, with exception
check.setException( new ArtifactNotFoundException( check.getItem(), check.getRepository() ) );
@@ -705,7 +705,7 @@ public class DefaultUpdateCheckManagerTest
// another check in same session
manager.checkArtifact( session, check );
- assertEquals( false, check.isRequired() );
+ assertFalse( check.isRequired() );
}
@Test
@@ -716,14 +716,14 @@ public class DefaultUpdateCheckManagerTest
// first check
manager.checkArtifact( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
manager.touchArtifact( session, check );
// second check in same session but for repo with different id
check.setRepository( new RemoteRepository.Builder( check.getRepository() ).setId( "check" ).build() );
manager.checkArtifact( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
}
@Test
@@ -734,10 +734,10 @@ public class DefaultUpdateCheckManagerTest
session.setResolutionErrorPolicy( new SimpleResolutionErrorPolicy( true, false ) );
check.getFile().delete();
- assertEquals( check.getFile().getAbsolutePath(), false, check.getFile().exists() );
+ assertFalse( check.getFile().getAbsolutePath(), check.getFile().exists() );
manager.checkArtifact( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
}
@Test
@@ -753,7 +753,7 @@ public class DefaultUpdateCheckManagerTest
check.setFileValid( false );
manager.checkArtifact( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
}
@Test
@@ -766,10 +766,10 @@ public class DefaultUpdateCheckManagerTest
resetSessionData( session );
check.getFile().delete();
- assertEquals( check.getFile().getAbsolutePath(), false, check.getFile().exists() );
+ assertFalse( check.getFile().getAbsolutePath(), check.getFile().exists() );
manager.checkArtifact( session, check );
- assertEquals( true, check.isRequired() );
+ assertTrue( check.isRequired() );
}
@Test
@@ -780,7 +780,7 @@ public class DefaultUpdateCheckManagerTest
session.setResolutionErrorPolicy( new SimpleResolutionErrorPolicy( true, false ) );
manager.checkArtifact( session, check );
- assertEquals( false, check.isRequired() );
+ assertFalse( check.isRequired() );
}
}
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzerTest.java
index 58c3e8c..857d3cc 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzerTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzerTest.java
@@ -55,22 +55,22 @@ public class DefaultUpdatePolicyAnalyzerTest
public void testIsUpdateRequired_PolicyNever()
{
String policy = RepositoryPolicy.UPDATE_POLICY_NEVER;
- assertEquals( false, analyzer.isUpdatedRequired( session, Long.MIN_VALUE, policy ) );
- assertEquals( false, analyzer.isUpdatedRequired( session, Long.MAX_VALUE, policy ) );
- assertEquals( false, analyzer.isUpdatedRequired( session, 0, policy ) );
- assertEquals( false, analyzer.isUpdatedRequired( session, 1, policy ) );
- assertEquals( false, analyzer.isUpdatedRequired( session, now() - 604800000, policy ) );
+ assertFalse( analyzer.isUpdatedRequired( session, Long.MIN_VALUE, policy ) );
+ assertFalse( analyzer.isUpdatedRequired( session, Long.MAX_VALUE, policy ) );
+ assertFalse( analyzer.isUpdatedRequired( session, 0, policy ) );
+ assertFalse( analyzer.isUpdatedRequired( session, 1, policy ) );
+ assertFalse( analyzer.isUpdatedRequired( session, now() - 604800000, policy ) );
}
@Test
public void testIsUpdateRequired_PolicyAlways()
{
String policy = RepositoryPolicy.UPDATE_POLICY_ALWAYS;
- assertEquals( true, analyzer.isUpdatedRequired( session, Long.MIN_VALUE, policy ) );
- assertEquals( true, analyzer.isUpdatedRequired( session, Long.MAX_VALUE, policy ) );
- assertEquals( true, analyzer.isUpdatedRequired( session, 0, policy ) );
- assertEquals( true, analyzer.isUpdatedRequired( session, 1, policy ) );
- assertEquals( true, analyzer.isUpdatedRequired( session, now() - 1000, policy ) );
+ assertTrue( analyzer.isUpdatedRequired( session, Long.MIN_VALUE, policy ) );
+ assertTrue( analyzer.isUpdatedRequired( session, Long.MAX_VALUE, policy ) );
+ assertTrue( analyzer.isUpdatedRequired( session, 0, policy ) );
+ assertTrue( analyzer.isUpdatedRequired( session, 1, policy ) );
+ assertTrue( analyzer.isUpdatedRequired( session, now() - 1000, policy ) );
}
@Test
@@ -84,26 +84,26 @@ public class DefaultUpdatePolicyAnalyzerTest
long localMidnight = cal.getTimeInMillis();
String policy = RepositoryPolicy.UPDATE_POLICY_DAILY;
- assertEquals( true, analyzer.isUpdatedRequired( session, Long.MIN_VALUE, policy ) );
- assertEquals( false, analyzer.isUpdatedRequired( session, Long.MAX_VALUE, policy ) );
- assertEquals( false, analyzer.isUpdatedRequired( session, localMidnight, policy ) );
- assertEquals( false, analyzer.isUpdatedRequired( session, localMidnight + 1, policy ) );
- assertEquals( true, analyzer.isUpdatedRequired( session, localMidnight - 1, policy ) );
+ assertTrue( analyzer.isUpdatedRequired( session, Long.MIN_VALUE, policy ) );
+ assertFalse( analyzer.isUpdatedRequired( session, Long.MAX_VALUE, policy ) );
+ assertFalse( analyzer.isUpdatedRequired( session, localMidnight, policy ) );
+ assertFalse( analyzer.isUpdatedRequired( session, localMidnight + 1, policy ) );
+ assertTrue( analyzer.isUpdatedRequired( session, localMidnight - 1, policy ) );
}
@Test
public void testIsUpdateRequired_PolicyInterval()
{
String policy = RepositoryPolicy.UPDATE_POLICY_INTERVAL + ":5";
- assertEquals( true, analyzer.isUpdatedRequired( session, Long.MIN_VALUE, policy ) );
- assertEquals( false, analyzer.isUpdatedRequired( session, Long.MAX_VALUE, policy ) );
- assertEquals( false, analyzer.isUpdatedRequired( session, now(), policy ) );
- assertEquals( false, analyzer.isUpdatedRequired( session, now() - 5 - 1, policy ) );
- assertEquals( false, analyzer.isUpdatedRequired( session, now() - 1000 * 5 - 1, policy ) );
- assertEquals( true, analyzer.isUpdatedRequired( session, now() - 1000 * 60 * 5 - 1, policy ) );
+ assertTrue( analyzer.isUpdatedRequired( session, Long.MIN_VALUE, policy ) );
+ assertFalse( analyzer.isUpdatedRequired( session, Long.MAX_VALUE, policy ) );
+ assertFalse( analyzer.isUpdatedRequired( session, now(), policy ) );
+ assertFalse( analyzer.isUpdatedRequired( session, now() - 5 - 1, policy ) );
+ assertFalse( analyzer.isUpdatedRequired( session, now() - 1000 * 5 - 1, policy ) );
+ assertTrue( analyzer.isUpdatedRequired( session, now() - 1000 * 60 * 5 - 1, policy ) );
policy = RepositoryPolicy.UPDATE_POLICY_INTERVAL + ":invalid";
- assertEquals( false, analyzer.isUpdatedRequired( session, now(), policy ) );
+ assertFalse( analyzer.isUpdatedRequired( session, now(), policy ) );
}
@Test
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java
index 1dae789..729b012 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java
@@ -193,7 +193,7 @@ public class EnhancedLocalRepositoryManagerTest
LocalArtifactRequest request = new LocalArtifactRequest( artifact, null, null );
LocalArtifactResult result = manager.find( session, request );
assertTrue( result.isAvailable() );
- assertEquals( null, result.getRepository() );
+ assertNull( result.getRepository() );
snapshot = snapshot.setVersion( snapshot.getBaseVersion() );
addLocalArtifact( snapshot );
@@ -201,7 +201,7 @@ public class EnhancedLocalRepositoryManagerTest
request = new LocalArtifactRequest( snapshot, null, null );
result = manager.find( session, request );
assertTrue( result.isAvailable() );
- assertEquals( null, result.getRepository() );
+ assertNull( result.getRepository() );
}
@Test
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactoryTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactoryTest.java
index 82fd2ea..3720509 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactoryTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactoryTest.java
@@ -22,7 +22,6 @@ package org.eclipse.aether.internal.impl;
import static org.junit.Assert.*;
import java.net.URI;
-import java.util.Arrays;
import java.util.List;
import java.util.Locale;
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectorTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectorTest.java
index e8f2600..5d4c2aa 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectorTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectorTest.java
@@ -20,7 +20,7 @@ package org.eclipse.aether.internal.impl.collect;
*/
import static java.util.Objects.requireNonNull;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
@@ -296,7 +296,7 @@ public class DefaultDependencyCollectorTest
assertEquals( "1", a1.getArtifact().getVersion() );
for ( DependencyNode child : a1.getChildren() )
{
- assertFalse( "1".equals( child.getArtifact().getVersion() ) );
+ assertNotEquals( "1", child.getArtifact().getVersion() );
}
assertEquals( 1, result.getCycles().size() );
diff --git a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/DependencyGraphParserTest.java b/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/DependencyGraphParserTest.java
index ac0a368..10f257b 100644
--- a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/DependencyGraphParserTest.java
+++ b/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/DependencyGraphParserTest.java
@@ -293,7 +293,7 @@ public class DependencyGraphParserTest
Dependency dependency = node.getDependency();
assertNotNull( dependency );
assertEquals( "compile", dependency.getScope() );
- assertEquals( true, dependency.isOptional() );
+ assertTrue( dependency.isOptional() );
}
}
diff --git a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java b/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java
index 7afd8bc..4a50953 100644
--- a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java
+++ b/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java
@@ -178,7 +178,7 @@ public class IniArtifactDataReaderTest
Dependency dep = deps.get( 0 );
assertEquals( "scope", dep.getScope() );
- assertEquals( false, dep.isOptional() );
+ assertFalse( dep.isOptional() );
assertEquals( 2, dep.getExclusions().size() );
Iterator<Exclusion> it = dep.getExclusions().iterator();
Exclusion excl = it.next();
@@ -196,7 +196,7 @@ public class IniArtifactDataReaderTest
dep = deps.get( 1 );
assertEquals( "scope", dep.getScope() );
- assertEquals( true, dep.isOptional() );
+ assertTrue( dep.isOptional() );
assertEquals( 0, dep.getExclusions().size() );
art = dep.getArtifact();
@@ -207,7 +207,7 @@ public class IniArtifactDataReaderTest
dep = deps.get( 2 );
assertEquals( "scope", dep.getScope() );
- assertEquals( true, dep.isOptional() );
+ assertTrue( dep.isOptional() );
assertEquals( 0, dep.getExclusions().size() );
art = dep.getArtifact();
@@ -218,7 +218,7 @@ public class IniArtifactDataReaderTest
dep = deps.get( 3 );
assertEquals( "scope5", dep.getScope() );
- assertEquals( true, dep.isOptional() );
+ assertTrue( dep.isOptional() );
assertEquals( 0, dep.getExclusions().size() );
art = dep.getArtifact();
diff --git a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReaderTest.java b/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReaderTest.java
index 41ed12a..b98d8d8 100644
--- a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReaderTest.java
+++ b/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReaderTest.java
@@ -96,7 +96,7 @@ public class IniArtifactDescriptorReaderTest
Dependency dep = deps.get( 0 );
assertEquals( "scope", dep.getScope() );
- assertEquals( false, dep.isOptional() );
+ assertFalse( dep.isOptional() );
assertEquals( 2, dep.getExclusions().size() );
Iterator<Exclusion> it = dep.getExclusions().iterator();
Exclusion excl = it.next();
@@ -114,7 +114,7 @@ public class IniArtifactDescriptorReaderTest
dep = deps.get( 1 );
assertEquals( "scope", dep.getScope() );
- assertEquals( true, dep.isOptional() );
+ assertTrue( dep.isOptional() );
assertEquals( 0, dep.getExclusions().size() );
art = dep.getArtifact();
@@ -125,7 +125,7 @@ public class IniArtifactDescriptorReaderTest
dep = deps.get( 2 );
assertEquals( "scope", dep.getScope() );
- assertEquals( true, dep.isOptional() );
+ assertTrue( dep.isOptional() );
assertEquals( 0, dep.getExclusions().size() );
art = dep.getArtifact();
@@ -136,7 +136,7 @@ public class IniArtifactDescriptorReaderTest
dep = deps.get( 3 );
assertEquals( "scope5", dep.getScope() );
- assertEquals( true, dep.isOptional() );
+ assertTrue( dep.isOptional() );
assertEquals( 0, dep.getExclusions().size() );
art = dep.getArtifact();
diff --git a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/NodeDefinitionTest.java b/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/NodeDefinitionTest.java
index 8f41a5a..769691a 100644
--- a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/NodeDefinitionTest.java
+++ b/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/NodeDefinitionTest.java
@@ -35,7 +35,7 @@ public class NodeDefinitionTest
{
Pattern pattern = Pattern.compile( regex );
Matcher matcher = pattern.matcher( text );
- assertEquals( true, matcher.matches() );
+ assertTrue( matcher.matches() );
assertTrue( groups.length + " vs " + matcher.groupCount(), groups.length <= matcher.groupCount() );
for ( int i = 1; i <= groups.length; i++ )
{
@@ -47,7 +47,7 @@ public class NodeDefinitionTest
{
Pattern pattern = Pattern.compile( regex );
Matcher matcher = pattern.matcher( text );
- assertEquals( false, matcher.matches() );
+ assertFalse( matcher.matches() );
}
@Test
@@ -103,45 +103,45 @@ public class NodeDefinitionTest
public void testParsing_Node()
{
NodeDefinition desc = new NodeDefinition( "g:a:1" );
- assertEquals( null, desc.reference );
+ assertNull( desc.reference );
assertEquals( "g:a:1", desc.coords );
- assertEquals( null, desc.range );
- assertEquals( null, desc.premanagedVersion );
- assertEquals( null, desc.scope );
- assertEquals( null, desc.premanagedScope );
+ assertNull( desc.range );
+ assertNull( desc.premanagedVersion );
+ assertNull( desc.scope );
+ assertNull( desc.premanagedScope );
assertEquals( false, desc.optional );
- assertEquals( null, desc.properties );
- assertEquals( null, desc.relocations );
- assertEquals( null, desc.id );
+ assertNull( desc.properties );
+ assertNull( desc.relocations );
+ assertNull( desc.id );
desc = new NodeDefinition( "gid1:aid1:ext1:ver1 scope1 !optional" );
- assertEquals( null, desc.reference );
+ assertNull( desc.reference );
assertEquals( "gid1:aid1:ext1:ver1", desc.coords );
- assertEquals( null, desc.range );
- assertEquals( null, desc.premanagedVersion );
+ assertNull( desc.range );
+ assertNull( desc.premanagedVersion );
assertEquals( "scope1", desc.scope );
- assertEquals( null, desc.premanagedScope );
+ assertNull( desc.premanagedScope );
assertEquals( false, desc.optional );
- assertEquals( null, desc.properties );
- assertEquals( null, desc.relocations );
- assertEquals( null, desc.id );
+ assertNull( desc.properties );
+ assertNull( desc.relocations );
+ assertNull( desc.id );
desc = new NodeDefinition( "g:a:1 optional" );
- assertEquals( null, desc.reference );
+ assertNull( desc.reference );
assertEquals( "g:a:1", desc.coords );
- assertEquals( null, desc.range );
- assertEquals( null, desc.premanagedVersion );
- assertEquals( null, desc.scope );
- assertEquals( null, desc.premanagedScope );
+ assertNull( desc.range );
+ assertNull( desc.premanagedVersion );
+ assertNull( desc.scope );
+ assertNull( desc.premanagedScope );
assertEquals( true, desc.optional );
- assertEquals( null, desc.properties );
- assertEquals( null, desc.relocations );
- assertEquals( null, desc.id );
+ assertNull( desc.properties );
+ assertNull( desc.relocations );
+ assertNull( desc.id );
desc =
new NodeDefinition( "gid:aid:1(, 2)<[1, 3]" + " props = k:v" + " scope=c<r" + " optional"
+ " relocations = g:a:v , g:a:1" + " (id)" );
- assertEquals( null, desc.reference );
+ assertNull( desc.reference );
assertEquals( "gid:aid:1", desc.coords );
assertEquals( "(, 2)", desc.range );
assertEquals( "[1, 3]", desc.premanagedVersion );
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/ChecksumUtilTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/ChecksumUtilTest.java
index 733c290..59082de 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/ChecksumUtilTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/ChecksumUtilTest.java
@@ -204,7 +204,7 @@ public class ChecksumUtilTest
@Test
public void testToHexString()
{
- assertEquals( null, ChecksumUtils.toHexString( null ) );
+ assertNull( ChecksumUtils.toHexString( null ) );
assertEquals( "", ChecksumUtils.toHexString( new byte[] {} ) );
assertEquals( "00", ChecksumUtils.toHexString( new byte[] { 0 } ) );
assertEquals( "ff", ChecksumUtils.toHexString( new byte[] { -1 } ) );
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/ConfigUtilsTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/ConfigUtilsTest.java
index 440a7c1..0c49812 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/ConfigUtilsTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/ConfigUtilsTest.java
@@ -109,10 +109,10 @@ public class ConfigUtilsTest
public void testGetBoolean_Default()
{
config.put( "no-boolean", new Object() );
- assertEquals( true, ConfigUtils.getBoolean( config, true, "no-value" ) );
- assertEquals( false, ConfigUtils.getBoolean( config, false, "no-value" ) );
- assertEquals( true, ConfigUtils.getBoolean( config, true, "no-boolean" ) );
- assertEquals( false, ConfigUtils.getBoolean( config, false, "no-boolean" ) );
+ assertTrue( ConfigUtils.getBoolean( config, true, "no-value" ) );
+ assertFalse( ConfigUtils.getBoolean( config, false, "no-value" ) );
+ assertTrue( ConfigUtils.getBoolean( config, true, "no-boolean" ) );
+ assertFalse( ConfigUtils.getBoolean( config, false, "no-boolean" ) );
}
@Test
@@ -120,18 +120,18 @@ public class ConfigUtilsTest
{
config.put( "no-boolean", new Object() );
config.put( "some-boolean", true );
- assertEquals( true, ConfigUtils.getBoolean( config, false, "no-boolean", "some-boolean" ) );
+ assertTrue( ConfigUtils.getBoolean( config, false, "no-boolean", "some-boolean" ) );
config.put( "some-boolean", false );
- assertEquals( false, ConfigUtils.getBoolean( config, true, "no-boolean", "some-boolean" ) );
+ assertFalse( ConfigUtils.getBoolean( config, true, "no-boolean", "some-boolean" ) );
}
@Test
public void testGetBoolean_StringConversion()
{
config.put( "some-boolean", "true" );
- assertEquals( true, ConfigUtils.getBoolean( config, false, "some-boolean" ) );
+ assertTrue( ConfigUtils.getBoolean( config, false, "some-boolean" ) );
config.put( "some-boolean", "false" );
- assertEquals( false, ConfigUtils.getBoolean( config, true, "some-boolean" ) );
+ assertFalse( ConfigUtils.getBoolean( config, true, "some-boolean" ) );
}
@Test
@@ -216,7 +216,7 @@ public class ConfigUtilsTest
config.put( "some-float", "-12.3" );
assertEquals( -12.3f, ConfigUtils.getFloat( config, 0, "some-float" ), 0.01f );
config.put( "some-float", "NaN" );
- assertEquals( true, Float.isNaN( ConfigUtils.getFloat( config, 0, "some-float" ) ) );
+ assertTrue( Float.isNaN( ConfigUtils.getFloat( config, 0, "some-float" ) ) );
}
@Test
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/artifact/ArtifactIdUtilsTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/artifact/ArtifactIdUtilsTest.java
index 36193f3..6b382b7 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/artifact/ArtifactIdUtilsTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/artifact/ArtifactIdUtilsTest.java
@@ -94,34 +94,34 @@ public class ArtifactIdUtilsTest
{
Artifact artifact1 = null;
Artifact artifact2 = null;
- assertEquals( false, ArtifactIdUtils.equalsId( artifact1, artifact2 ) );
- assertEquals( false, ArtifactIdUtils.equalsId( artifact2, artifact1 ) );
+ assertFalse( ArtifactIdUtils.equalsId( artifact1, artifact2 ) );
+ assertFalse( ArtifactIdUtils.equalsId( artifact2, artifact1 ) );
artifact1 = new DefaultArtifact( "gid", "aid", "ext", "1.0-20110205.132618-23" );
- assertEquals( false, ArtifactIdUtils.equalsId( artifact1, artifact2 ) );
- assertEquals( false, ArtifactIdUtils.equalsId( artifact2, artifact1 ) );
+ assertFalse( ArtifactIdUtils.equalsId( artifact1, artifact2 ) );
+ assertFalse( ArtifactIdUtils.equalsId( artifact2, artifact1 ) );
artifact2 = new DefaultArtifact( "gidX", "aid", "ext", "1.0-20110205.132618-23" );
- assertEquals( false, ArtifactIdUtils.equalsId( artifact1, artifact2 ) );
- assertEquals( false, ArtifactIdUtils.equalsId( artifact2, artifact1 ) );
+ assertFalse( ArtifactIdUtils.equalsId( artifact1, artifact2 ) );
+ assertFalse( ArtifactIdUtils.equalsId( artifact2, artifact1 ) );
artifact2 = new DefaultArtifact( "gid", "aidX", "ext", "1.0-20110205.132618-23" );
- assertEquals( false, ArtifactIdUtils.equalsId( artifact1, artifact2 ) );
- assertEquals( false, ArtifactIdUtils.equalsId( artifact2, artifact1 ) );
+ assertFalse( ArtifactIdUtils.equalsId( artifact1, artifact2 ) );
+ assertFalse( ArtifactIdUtils.equalsId( artifact2, artifact1 ) );
artifact2 = new DefaultArtifact( "gid", "aid", "extX", "1.0-20110205.132618-23" );
- assertEquals( false, ArtifactIdUtils.equalsId( artifact1, artifact2 ) );
- assertEquals( false, ArtifactIdUtils.equalsId( artifact2, artifact1 ) );
+ assertFalse( ArtifactIdUtils.equalsId( artifact1, artifact2 ) );
+ assertFalse( ArtifactIdUtils.equalsId( artifact2, artifact1 ) );
artifact2 = new DefaultArtifact( "gid", "aid", "ext", "1.0-20110205.132618-24" );
- assertEquals( false, ArtifactIdUtils.equalsId( artifact1, artifact2 ) );
- assertEquals( false, ArtifactIdUtils.equalsId( artifact2, artifact1 ) );
+ assertFalse( ArtifactIdUtils.equalsId( artifact1, artifact2 ) );
+ assertFalse( ArtifactIdUtils.equalsId( artifact2, artifact1 ) );
artifact2 = new DefaultArtifact( "gid", "aid", "ext", "1.0-20110205.132618-23" );
- assertEquals( true, ArtifactIdUtils.equalsId( artifact1, artifact2 ) );
- assertEquals( true, ArtifactIdUtils.equalsId( artifact2, artifact1 ) );
+ assertTrue( ArtifactIdUtils.equalsId( artifact1, artifact2 ) );
+ assertTrue( ArtifactIdUtils.equalsId( artifact2, artifact1 ) );
- assertEquals( true, ArtifactIdUtils.equalsId( artifact1, artifact1 ) );
+ assertTrue( ArtifactIdUtils.equalsId( artifact1, artifact1 ) );
}
@Test
@@ -129,38 +129,38 @@ public class ArtifactIdUtilsTest
{
Artifact artifact1 = null;
Artifact artifact2 = null;
- assertEquals( false, ArtifactIdUtils.equalsBaseId( artifact1, artifact2 ) );
- assertEquals( false, ArtifactIdUtils.equalsBaseId( artifact2, artifact1 ) );
+ assertFalse( ArtifactIdUtils.equalsBaseId( artifact1, artifact2 ) );
+ assertFalse( ArtifactIdUtils.equalsBaseId( artifact2, artifact1 ) );
artifact1 = new DefaultArtifact( "gid", "aid", "ext", "1.0-20110205.132618-23" );
- assertEquals( false, ArtifactIdUtils.equalsBaseId( artifact1, artifact2 ) );
- assertEquals( false, ArtifactIdUtils.equalsBaseId( artifact2, artifact1 ) );
+ assertFalse( ArtifactIdUtils.equalsBaseId( artifact1, artifact2 ) );
+ assertFalse( ArtifactIdUtils.equalsBaseId( artifact2, artifact1 ) );
artifact2 = new DefaultArtifact( "gidX", "aid", "ext", "1.0-20110205.132618-23" );
- assertEquals( false, ArtifactIdUtils.equalsBaseId( artifact1, artifact2 ) );
- assertEquals( false, ArtifactIdUtils.equalsBaseId( artifact2, artifact1 ) );
+ assertFalse( ArtifactIdUtils.equalsBaseId( artifact1, artifact2 ) );
+ assertFalse( ArtifactIdUtils.equalsBaseId( artifact2, artifact1 ) );
artifact2 = new DefaultArtifact( "gid", "aidX", "ext", "1.0-20110205.132618-23" );
- assertEquals( false, ArtifactIdUtils.equalsBaseId( artifact1, artifact2 ) );
- assertEquals( false, ArtifactIdUtils.equalsBaseId( artifact2, artifact1 ) );
+ assertFalse( ArtifactIdUtils.equalsBaseId( artifact1, artifact2 ) );
+ assertFalse( ArtifactIdUtils.equalsBaseId( artifact2, artifact1 ) );
artifact2 = new DefaultArtifact( "gid", "aid", "extX", "1.0-20110205.132618-23" );
- assertEquals( false, ArtifactIdUtils.equalsBaseId( artifact1, artifact2 ) );
- assertEquals( false, ArtifactIdUtils.equalsBaseId( artifact2, artifact1 ) );
+ assertFalse( ArtifactIdUtils.equalsBaseId( artifact1, artifact2 ) );
+ assertFalse( ArtifactIdUtils.equalsBaseId( artifact2, artifact1 ) );
artifact2 = new DefaultArtifact( "gid", "aid", "ext", "X.0-20110205.132618-23" );
- assertEquals( false, ArtifactIdUtils.equalsBaseId( artifact1, artifact2 ) );
- assertEquals( false, ArtifactIdUtils.equalsBaseId( artifact2, artifact1 ) );
+ assertFalse( ArtifactIdUtils.equalsBaseId( artifact1, artifact2 ) );
+ assertFalse( ArtifactIdUtils.equalsBaseId( artifact2, artifact1 ) );
artifact2 = new DefaultArtifact( "gid", "aid", "ext", "1.0-20110205.132618-24" );
- assertEquals( true, ArtifactIdUtils.equalsBaseId( artifact1, artifact2 ) );
- assertEquals( true, ArtifactIdUtils.equalsBaseId( artifact2, artifact1 ) );
+ assertTrue( ArtifactIdUtils.equalsBaseId( artifact1, artifact2 ) );
+ assertTrue( ArtifactIdUtils.equalsBaseId( artifact2, artifact1 ) );
artifact2 = new DefaultArtifact( "gid", "aid", "ext", "1.0-20110205.132618-23" );
- assertEquals( true, ArtifactIdUtils.equalsBaseId( artifact1, artifact2 ) );
- assertEquals( true, ArtifactIdUtils.equalsBaseId( artifact2, artifact1 ) );
+ assertTrue( ArtifactIdUtils.equalsBaseId( artifact1, artifact2 ) );
+ assertTrue( ArtifactIdUtils.equalsBaseId( artifact2, artifact1 ) );
- assertEquals( true, ArtifactIdUtils.equalsBaseId( artifact1, artifact1 ) );
+ assertTrue( ArtifactIdUtils.equalsBaseId( artifact1, artifact1 ) );
}
@Test
@@ -168,34 +168,34 @@ public class ArtifactIdUtilsTest
{
Artifact artifact1 = null;
Artifact artifact2 = null;
- assertEquals( false, ArtifactIdUtils.equalsVersionlessId( artifact1, artifact2 ) );
- assertEquals( false, ArtifactIdUtils.equalsVersionlessId( artifact2, artifact1 ) );
+ assertFalse( ArtifactIdUtils.equalsVersionlessId( artifact1, artifact2 ) );
+ assertFalse( ArtifactIdUtils.equalsVersionlessId( artifact2, artifact1 ) );
artifact1 = new DefaultArtifact( "gid", "aid", "ext", "1.0-20110205.132618-23" );
- assertEquals( false, ArtifactIdUtils.equalsVersionlessId( artifact1, artifact2 ) );
- assertEquals( false, ArtifactIdUtils.equalsVersionlessId( artifact2, artifact1 ) );
+ assertFalse( ArtifactIdUtils.equalsVersionlessId( artifact1, artifact2 ) );
+ assertFalse( ArtifactIdUtils.equalsVersionlessId( artifact2, artifact1 ) );
artifact2 = new DefaultArtifact( "gidX", "aid", "ext", "1.0-20110205.132618-23" );
- assertEquals( false, ArtifactIdUtils.equalsVersionlessId( artifact1, artifact2 ) );
- assertEquals( false, ArtifactIdUtils.equalsVersionlessId( artifact2, artifact1 ) );
+ assertFalse( ArtifactIdUtils.equalsVersionlessId( artifact1, artifact2 ) );
+ assertFalse( ArtifactIdUtils.equalsVersionlessId( artifact2, artifact1 ) );
artifact2 = new DefaultArtifact( "gid", "aidX", "ext", "1.0-20110205.132618-23" );
- assertEquals( false, ArtifactIdUtils.equalsVersionlessId( artifact1, artifact2 ) );
- assertEquals( false, ArtifactIdUtils.equalsVersionlessId( artifact2, artifact1 ) );
+ assertFalse( ArtifactIdUtils.equalsVersionlessId( artifact1, artifact2 ) );
+ assertFalse( ArtifactIdUtils.equalsVersionlessId( artifact2, artifact1 ) );
artifact2 = new DefaultArtifact( "gid", "aid", "extX", "1.0-20110205.132618-23" );
- assertEquals( false, ArtifactIdUtils.equalsVersionlessId( artifact1, artifact2 ) );
- assertEquals( false, ArtifactIdUtils.equalsVersionlessId( artifact2, artifact1 ) );
+ assertFalse( ArtifactIdUtils.equalsVersionlessId( artifact1, artifact2 ) );
+ assertFalse( ArtifactIdUtils.equalsVersionlessId( artifact2, artifact1 ) );
artifact2 = new DefaultArtifact( "gid", "aid", "ext", "1.0-20110205.132618-24" );
- assertEquals( true, ArtifactIdUtils.equalsVersionlessId( artifact1, artifact2 ) );
- assertEquals( true, ArtifactIdUtils.equalsVersionlessId( artifact2, artifact1 ) );
+ assertTrue( ArtifactIdUtils.equalsVersionlessId( artifact1, artifact2 ) );
+ assertTrue( ArtifactIdUtils.equalsVersionlessId( artifact2, artifact1 ) );
artifact2 = new DefaultArtifact( "gid", "aid", "ext", "1.0-20110205.132618-23" );
- assertEquals( true, ArtifactIdUtils.equalsVersionlessId( artifact1, artifact2 ) );
- assertEquals( true, ArtifactIdUtils.equalsVersionlessId( artifact2, artifact1 ) );
+ assertTrue( ArtifactIdUtils.equalsVersionlessId( artifact1, artifact2 ) );
+ assertTrue( ArtifactIdUtils.equalsVersionlessId( artifact2, artifact1 ) );
- assertEquals( true, ArtifactIdUtils.equalsVersionlessId( artifact1, artifact1 ) );
+ assertTrue( ArtifactIdUtils.equalsVersionlessId( artifact1, artifact1 ) );
}
}
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ExclusionDependencyFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ExclusionDependencyFilterTest.java
index 1da95bb..37fca10 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ExclusionDependencyFilterTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ExclusionDependencyFilterTest.java
@@ -22,7 +22,6 @@ package org.eclipse.aether.util.filter;
import static org.junit.Assert.*;
import java.util.Arrays;
-import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilterTest.java
index 1513847..4296682 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilterTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilterTest.java
@@ -57,46 +57,36 @@ public class PatternExclusionsDependencyFilterTest
DependencyNode node = builder.build();
// full match
- assertEquals( "com.example.test:testArtifact:jar:1.0.3", true,
- dontAccept( node, "com.example.test:testArtifact:jar:1.0.3" ) );
+ assertTrue( "com.example.test:testArtifact:jar:1.0.3", dontAccept( node, "com.example.test:testArtifact:jar:1.0.3" ) );
// single wildcard
- assertEquals( "*:testArtifact:jar:1.0.3", true, dontAccept( node, "*:testArtifact:jar:1.0.3" ) );
- assertEquals( "com.example.test:*:jar:1.0.3", true, dontAccept( node, "com.example.test:*:jar:1.0.3" ) );
- assertEquals( "com.example.test:testArtifact:*:1.0.3", true,
- dontAccept( node, "com.example.test:testArtifact:*:1.0.3" ) );
- assertEquals( "com.example.test:testArtifact:*:1.0.3", true,
- dontAccept( node, "com.example.test:testArtifact:*:1.0.3" ) );
+ assertTrue( "*:testArtifact:jar:1.0.3", dontAccept( node, "*:testArtifact:jar:1.0.3" ) );
+ assertTrue( "com.example.test:*:jar:1.0.3", dontAccept( node, "com.example.test:*:jar:1.0.3" ) );
+ assertTrue( "com.example.test:testArtifact:*:1.0.3", dontAccept( node, "com.example.test:testArtifact:*:1.0.3" ) );
+ assertTrue( "com.example.test:testArtifact:*:1.0.3", dontAccept( node, "com.example.test:testArtifact:*:1.0.3" ) );
// implicit wildcard
- assertEquals( ":testArtifact:jar:1.0.3", true, dontAccept( node, ":testArtifact:jar:1.0.3" ) );
- assertEquals( "com.example.test::jar:1.0.3", true, dontAccept( node, "com.example.test::jar:1.0.3" ) );
- assertEquals( "com.example.test:testArtifact::1.0.3", true,
- dontAccept( node, "com.example.test:testArtifact::1.0.3" ) );
- assertEquals( "com.example.test:testArtifact:jar:", true,
- dontAccept( node, "com.example.test:testArtifact:jar:" ) );
+ assertTrue( ":testArtifact:jar:1.0.3", dontAccept( node, ":testArtifact:jar:1.0.3" ) );
+ assertTrue( "com.example.test::jar:1.0.3", dontAccept( node, "com.example.test::jar:1.0.3" ) );
+ assertTrue( "com.example.test:testArtifact::1.0.3", dontAccept( node, "com.example.test:testArtifact::1.0.3" ) );
+ assertTrue( "com.example.test:testArtifact:jar:", dontAccept( node, "com.example.test:testArtifact:jar:" ) );
// multi wildcards
- assertEquals( "*:*:jar:1.0.3", true, dontAccept( node, "*:*:jar:1.0.3" ) );
- assertEquals( "com.example.test:*:*:1.0.3", true, dontAccept( node, "com.example.test:*:*:1.0.3" ) );
- assertEquals( "com.example.test:testArtifact:*:*", true, dontAccept( node, "com.example.test:testArtifact:*:*" ) );
- assertEquals( "*:testArtifact:jar:*", true, dontAccept( node, "*:testArtifact:jar:*" ) );
- assertEquals( "*:*:jar:*", true, dontAccept( node, "*:*:jar:*" ) );
- assertEquals( ":*:jar:", true, dontAccept( node, ":*:jar:" ) );
+ assertTrue( "*:*:jar:1.0.3", dontAccept( node, "*:*:jar:1.0.3" ) );
+ assertTrue( "com.example.test:*:*:1.0.3", dontAccept( node, "com.example.test:*:*:1.0.3" ) );
+ assertTrue( "com.example.test:testArtifact:*:*", dontAccept( node, "com.example.test:testArtifact:*:*" ) );
+ assertTrue( "*:testArtifact:jar:*", dontAccept( node, "*:testArtifact:jar:*" ) );
+ assertTrue( "*:*:jar:*", dontAccept( node, "*:*:jar:*" ) );
+ assertTrue( ":*:jar:", dontAccept( node, ":*:jar:" ) );
// partial wildcards
- assertEquals( "*.example.test:testArtifact:jar:1.0.3", true,
- dontAccept( node, "*.example.test:testArtifact:jar:1.0.3" ) );
- assertEquals( "com.example.test:testArtifact:*ar:1.0.*", true,
- dontAccept( node, "com.example.test:testArtifact:*ar:1.0.*" ) );
- assertEquals( "com.example.test:testArtifact:jar:1.0.*", true,
- dontAccept( node, "com.example.test:testArtifact:jar:1.0.*" ) );
- assertEquals( "*.example.*:testArtifact:jar:1.0.3", true,
- dontAccept( node, "*.example.*:testArtifact:jar:1.0.3" ) );
+ assertTrue( "*.example.test:testArtifact:jar:1.0.3", dontAccept( node, "*.example.test:testArtifact:jar:1.0.3" ) );
+ assertTrue( "com.example.test:testArtifact:*ar:1.0.*", dontAccept( node, "com.example.test:testArtifact:*ar:1.0.*" ) );
+ assertTrue( "com.example.test:testArtifact:jar:1.0.*", dontAccept( node, "com.example.test:testArtifact:jar:1.0.*" ) );
+ assertTrue( "*.example.*:testArtifact:jar:1.0.3", dontAccept( node, "*.example.*:testArtifact:jar:1.0.3" ) );
// wildcard as empty string
- assertEquals( "com.example.test*:testArtifact:jar:1.0.3", true,
- dontAccept( node, "com.example.test*:testArtifact:jar:1.0.3" ) );
+ assertTrue( "com.example.test*:testArtifact:jar:1.0.3", dontAccept( node, "com.example.test*:testArtifact:jar:1.0.3" ) );
}
@Test
@@ -106,11 +96,11 @@ public class PatternExclusionsDependencyFilterTest
builder.groupId( "com.example.test" ).artifactId( "testArtifact" ).ext( "jar" ).version( "1.0.3" );
DependencyNode node = builder.build();
- assertEquals( "com.example.test:testArtifact:jar", true, dontAccept( node, "com.example.test:testArtifact:jar" ) );
- assertEquals( "com.example.test:testArtifact", true, dontAccept( node, "com.example.test:testArtifact" ) );
- assertEquals( "com.example.test", true, dontAccept( node, "com.example.test" ) );
+ assertTrue( "com.example.test:testArtifact:jar", dontAccept( node, "com.example.test:testArtifact:jar" ) );
+ assertTrue( "com.example.test:testArtifact", dontAccept( node, "com.example.test:testArtifact" ) );
+ assertTrue( "com.example.test", dontAccept( node, "com.example.test" ) );
- assertEquals( "com.example.foo", false, dontAccept( node, "com.example.foo" ) );
+ assertFalse( "com.example.foo", dontAccept( node, "com.example.foo" ) );
}
@Test
@@ -120,19 +110,14 @@ public class PatternExclusionsDependencyFilterTest
builder.groupId( "com.example.test" ).artifactId( "testArtifact" ).ext( "jar" ).version( "1.0.3" );
DependencyNode node = builder.build();
- assertEquals( "OTHER.GROUP.ID:testArtifact:jar:1.0.3", false,
- dontAccept( node, "OTHER.GROUP.ID:testArtifact:jar:1.0.3" ) );
- assertEquals( "com.example.test:OTHER_ARTIFACT:jar:1.0.3", false,
- dontAccept( node, "com.example.test:OTHER_ARTIFACT:jar:1.0.3" ) );
- assertEquals( "com.example.test:OTHER_ARTIFACT:jar:1.0.3", false,
- dontAccept( node, "com.example.test:OTHER_ARTIFACT:jar:1.0.3" ) );
- assertEquals( "com.example.test:testArtifact:WAR:1.0.3", false,
- dontAccept( node, "com.example.test:testArtifact:WAR:1.0.3" ) );
- assertEquals( "com.example.test:testArtifact:jar:SNAPSHOT", false,
- dontAccept( node, "com.example.test:testArtifact:jar:SNAPSHOT" ) );
-
- assertEquals( "*:*:war:*", false, dontAccept( node, "*:*:war:*" ) );
- assertEquals( "OTHER.GROUP.ID", false, dontAccept( node, "OTHER.GROUP.ID" ) );
+ assertFalse( "OTHER.GROUP.ID:testArtifact:jar:1.0.3", dontAccept( node, "OTHER.GROUP.ID:testArtifact:jar:1.0.3" ) );
+ assertFalse( "com.example.test:OTHER_ARTIFACT:jar:1.0.3", dontAccept( node, "com.example.test:OTHER_ARTIFACT:jar:1.0.3" ) );
+ assertFalse( "com.example.test:OTHER_ARTIFACT:jar:1.0.3", dontAccept( node, "com.example.test:OTHER_ARTIFACT:jar:1.0.3" ) );
+ assertFalse( "com.example.test:testArtifact:WAR:1.0.3", dontAccept( node, "com.example.test:testArtifact:WAR:1.0.3" ) );
+ assertFalse( "com.example.test:testArtifact:jar:SNAPSHOT", dontAccept( node, "com.example.test:testArtifact:jar:SNAPSHOT" ) );
+
+ assertFalse( "*:*:war:*", dontAccept( node, "*:*:war:*" ) );
+ assertFalse( "OTHER.GROUP.ID", dontAccept( node, "OTHER.GROUP.ID" ) );
}
@Test
@@ -142,8 +127,7 @@ public class PatternExclusionsDependencyFilterTest
builder.groupId( "com.example.test" ).artifactId( "testArtifact" ).ext( "jar" ).version( "1.0.3" );
DependencyNode node = builder.build();
- assertEquals( "com.example.test:testArtifact:jar:1.0.3:foo", false,
- dontAccept( node, "com.example.test:testArtifact:jar:1.0.3:foo" ) );
+ assertFalse( "com.example.test:testArtifact:jar:1.0.3:foo", dontAccept( node, "com.example.test:testArtifact:jar:1.0.3:foo" ) );
}
@Test
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java
index 0055cc2..50c8b8a 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java
@@ -58,44 +58,36 @@ public class PatternInclusionsDependencyFilterTest
DependencyNode node = builder.build();
// full match
- assertEquals( "com.example.test:testArtifact:jar:1.0.3", true,
- accept( node, "com.example.test:testArtifact:jar:1.0.3" ) );
+ assertTrue( "com.example.test:testArtifact:jar:1.0.3", accept( node, "com.example.test:testArtifact:jar:1.0.3" ) );
// single wildcard
- assertEquals( "*:testArtifact:jar:1.0.3", true, accept( node, "*:testArtifact:jar:1.0.3" ) );
- assertEquals( "com.example.test:*:jar:1.0.3", true, accept( node, "com.example.test:*:jar:1.0.3" ) );
- assertEquals( "com.example.test:testArtifact:*:1.0.3", true,
- accept( node, "com.example.test:testArtifact:*:1.0.3" ) );
- assertEquals( "com.example.test:testArtifact:*:1.0.3", true,
- accept( node, "com.example.test:testArtifact:*:1.0.3" ) );
+ assertTrue( "*:testArtifact:jar:1.0.3", accept( node, "*:testArtifact:jar:1.0.3" ) );
+ assertTrue( "com.example.test:*:jar:1.0.3", accept( node, "com.example.test:*:jar:1.0.3" ) );
+ assertTrue( "com.example.test:testArtifact:*:1.0.3", accept( node, "com.example.test:testArtifact:*:1.0.3" ) );
+ assertTrue( "com.example.test:testArtifact:*:1.0.3", accept( node, "com.example.test:testArtifact:*:1.0.3" ) );
// implicit wildcard
- assertEquals( ":testArtifact:jar:1.0.3", true, accept( node, ":testArtifact:jar:1.0.3" ) );
- assertEquals( "com.example.test::jar:1.0.3", true, accept( node, "com.example.test::jar:1.0.3" ) );
- assertEquals( "com.example.test:testArtifact::1.0.3", true,
- accept( node, "com.example.test:testArtifact::1.0.3" ) );
- assertEquals( "com.example.test:testArtifact:jar:", true, accept( node, "com.example.test:testArtifact:jar:" ) );
+ assertTrue( ":testArtifact:jar:1.0.3", accept( node, ":testArtifact:jar:1.0.3" ) );
+ assertTrue( "com.example.test::jar:1.0.3", accept( node, "com.example.test::jar:1.0.3" ) );
+ assertTrue( "com.example.test:testArtifact::1.0.3", accept( node, "com.example.test:testArtifact::1.0.3" ) );
+ assertTrue( "com.example.test:testArtifact:jar:", accept( node, "com.example.test:testArtifact:jar:" ) );
// multi wildcards
- assertEquals( "*:*:jar:1.0.3", true, accept( node, "*:*:jar:1.0.3" ) );
- assertEquals( "com.example.test:*:*:1.0.3", true, accept( node, "com.example.test:*:*:1.0.3" ) );
- assertEquals( "com.example.test:testArtifact:*:*", true, accept( node, "com.example.test:testArtifact:*:*" ) );
- assertEquals( "*:testArtifact:jar:*", true, accept( node, "*:testArtifact:jar:*" ) );
- assertEquals( "*:*:jar:*", true, accept( node, "*:*:jar:*" ) );
- assertEquals( ":*:jar:", true, accept( node, ":*:jar:" ) );
+ assertTrue( "*:*:jar:1.0.3", accept( node, "*:*:jar:1.0.3" ) );
+ assertTrue( "com.example.test:*:*:1.0.3", accept( node, "com.example.test:*:*:1.0.3" ) );
+ assertTrue( "com.example.test:testArtifact:*:*", accept( node, "com.example.test:testArtifact:*:*" ) );
+ assertTrue( "*:testArtifact:jar:*", accept( node, "*:testArtifact:jar:*" ) );
+ assertTrue( "*:*:jar:*", accept( node, "*:*:jar:*" ) );
+ assertTrue( ":*:jar:", accept( node, ":*:jar:" ) );
// partial wildcards
- assertEquals( "*.example.test:testArtifact:jar:1.0.3", true,
- accept( node, "*.example.test:testArtifact:jar:1.0.3" ) );
- assertEquals( "com.example.test:testArtifact:*ar:1.0.*", true,
- accept( node, "com.example.test:testArtifact:*ar:1.0.*" ) );
- assertEquals( "com.example.test:testArtifact:jar:1.0.*", true,
- accept( node, "com.example.test:testArtifact:jar:1.0.*" ) );
- assertEquals( "*.example.*:testArtifact:jar:1.0.3", true, accept( node, "*.example.*:testArtifact:jar:1.0.3" ) );
+ assertTrue( "*.example.test:testArtifact:jar:1.0.3", accept( node, "*.example.test:testArtifact:jar:1.0.3" ) );
+ assertTrue( "com.example.test:testArtifact:*ar:1.0.*", accept( node, "com.example.test:testArtifact:*ar:1.0.*" ) );
+ assertTrue( "com.example.test:testArtifact:jar:1.0.*", accept( node, "com.example.test:testArtifact:jar:1.0.*" ) );
+ assertTrue( "*.example.*:testArtifact:jar:1.0.3", accept( node, "*.example.*:testArtifact:jar:1.0.3" ) );
// wildcard as empty string
- assertEquals( "com.example.test*:testArtifact:jar:1.0.3", true,
- accept( node, "com.example.test*:testArtifact:jar:1.0.3" ) );
+ assertTrue( "com.example.test*:testArtifact:jar:1.0.3", accept( node, "com.example.test*:testArtifact:jar:1.0.3" ) );
}
@Test
@@ -105,11 +97,11 @@ public class PatternInclusionsDependencyFilterTest
builder.groupId( "com.example.test" ).artifactId( "testArtifact" ).ext( "jar" ).version( "1.0.3" );
DependencyNode node = builder.build();
- assertEquals( "com.example.test:testArtifact:jar", true, accept( node, "com.example.test:testArtifact:jar" ) );
- assertEquals( "com.example.test:testArtifact", true, accept( node, "com.example.test:testArtifact" ) );
- assertEquals( "com.example.test", true, accept( node, "com.example.test" ) );
+ assertTrue( "com.example.test:testArtifact:jar", accept( node, "com.example.test:testArtifact:jar" ) );
+ assertTrue( "com.example.test:testArtifact", accept( node, "com.example.test:testArtifact" ) );
+ assertTrue( "com.example.test", accept( node, "com.example.test" ) );
- assertEquals( "com.example.foo", false, accept( node, "com.example.foo" ) );
+ assertFalse( "com.example.foo", accept( node, "com.example.foo" ) );
}
@Test
@@ -119,19 +111,14 @@ public class PatternInclusionsDependencyFilterTest
builder.groupId( "com.example.test" ).artifactId( "testArtifact" ).ext( "jar" ).version( "1.0.3" );
DependencyNode node = builder.build();
- assertEquals( "OTHER.GROUP.ID:testArtifact:jar:1.0.3", false,
- accept( node, "OTHER.GROUP.ID:testArtifact:jar:1.0.3" ) );
- assertEquals( "com.example.test:OTHER_ARTIFACT:jar:1.0.3", false,
- accept( node, "com.example.test:OTHER_ARTIFACT:jar:1.0.3" ) );
- assertEquals( "com.example.test:OTHER_ARTIFACT:jar:1.0.3", false,
- accept( node, "com.example.test:OTHER_ARTIFACT:jar:1.0.3" ) );
- assertEquals( "com.example.test:testArtifact:WAR:1.0.3", false,
- accept( node, "com.example.test:testArtifact:WAR:1.0.3" ) );
- assertEquals( "com.example.test:testArtifact:jar:SNAPSHOT", false,
- accept( node, "com.example.test:testArtifact:jar:SNAPSHOT" ) );
-
- assertEquals( "*:*:war:*", false, accept( node, "*:*:war:*" ) );
- assertEquals( "OTHER.GROUP.ID", false, accept( node, "OTHER.GROUP.ID" ) );
+ assertFalse( "OTHER.GROUP.ID:testArtifact:jar:1.0.3", accept( node, "OTHER.GROUP.ID:testArtifact:jar:1.0.3" ) );
+ assertFalse( "com.example.test:OTHER_ARTIFACT:jar:1.0.3", accept( node, "com.example.test:OTHER_ARTIFACT:jar:1.0.3" ) );
+ assertFalse( "com.example.test:OTHER_ARTIFACT:jar:1.0.3", accept( node, "com.example.test:OTHER_ARTIFACT:jar:1.0.3" ) );
+ assertFalse( "com.example.test:testArtifact:WAR:1.0.3", accept( node, "com.example.test:testArtifact:WAR:1.0.3" ) );
+ assertFalse( "com.example.test:testArtifact:jar:SNAPSHOT", accept( node, "com.example.test:testArtifact:jar:SNAPSHOT" ) );
+
+ assertFalse( "*:*:war:*", accept( node, "*:*:war:*" ) );
+ assertFalse( "OTHER.GROUP.ID", accept( node, "OTHER.GROUP.ID" ) );
}
@Test
@@ -141,8 +128,7 @@ public class PatternInclusionsDependencyFilterTest
builder.groupId( "com.example.test" ).artifactId( "testArtifact" ).ext( "jar" ).version( "1.0.3" );
DependencyNode node = builder.build();
- assertEquals( "com.example.test:testArtifact:jar:1.0.3:foo", false,
- accept( node, "com.example.test:testArtifact:jar:1.0.3:foo" ) );
+ assertFalse( "com.example.test:testArtifact:jar:1.0.3:foo", accept( node, "com.example.test:testArtifact:jar:1.0.3:foo" ) );
}
@Test
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictMarkerTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictMarkerTest.java
index 550a0c6..6a81d51 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictMarkerTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictMarkerTest.java
@@ -63,7 +63,7 @@ public class ConflictMarkerTest
assertNotNull( ids.get( root.getChildren().get( 0 ) ) );
assertNotNull( ids.get( root.getChildren().get( 1 ) ) );
assertNotSame( ids.get( root.getChildren().get( 0 ) ), ids.get( root.getChildren().get( 1 ) ) );
- assertFalse( ids.get( root.getChildren().get( 0 ) ).equals( ids.get( root.getChildren().get( 1 ) ) ) );
+ assertNotEquals( ids.get( root.getChildren().get( 0 ) ), ids.get( root.getChildren().get( 1 ) ) );
}
@Test
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelectorTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelectorTest.java
index f6d268f..c2b8102 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelectorTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelectorTest.java
@@ -51,10 +51,10 @@ public class SimpleOptionalitySelectorTest
assertSame( root, transform( root ) );
assertEquals( 2, root.getChildren().size() );
- assertEquals( true, root.getChildren().get( 0 ).getDependency().isOptional() );
- assertEquals( true, root.getChildren().get( 0 ).getChildren().get( 0 ).getDependency().isOptional() );
- assertEquals( false, root.getChildren().get( 1 ).getDependency().isOptional() );
- assertEquals( false, root.getChildren().get( 1 ).getChildren().get( 0 ).getDependency().isOptional() );
+ assertTrue( root.getChildren().get( 0 ).getDependency().isOptional() );
+ assertTrue( root.getChildren().get( 0 ).getChildren().get( 0 ).getDependency().isOptional() );
+ assertFalse( root.getChildren().get( 1 ).getDependency().isOptional() );
+ assertFalse( root.getChildren().get( 1 ).getChildren().get( 0 ).getDependency().isOptional() );
}
@Test
@@ -65,8 +65,8 @@ public class SimpleOptionalitySelectorTest
assertSame( root, transform( root ) );
assertEquals( 2, root.getChildren().size() );
- assertEquals( true, root.getChildren().get( 0 ).getDependency().isOptional() );
- assertEquals( false, root.getChildren().get( 0 ).getChildren().get( 0 ).getDependency().isOptional() );
+ assertTrue( root.getChildren().get( 0 ).getDependency().isOptional() );
+ assertFalse( root.getChildren().get( 0 ).getChildren().get( 0 ).getDependency().isOptional() );
}
@Test
@@ -77,7 +77,7 @@ public class SimpleOptionalitySelectorTest
assertSame( root, transform( root ) );
assertEquals( 2, root.getChildren().size() );
- assertEquals( true, root.getChildren().get( 1 ).getDependency().isOptional() );
+ assertTrue( root.getChildren().get( 1 ).getDependency().isOptional() );
}
}
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java
index 9f8a2aa..6c0c750 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java
@@ -78,9 +78,9 @@ public class ChainedVersionFilterTest
public void testEquals()
{
VersionFilter filter = ChainedVersionFilter.newInstance( new HighestVersionFilter() );
- assertFalse( filter.equals( null ) );
- assertTrue( filter.equals( filter ) );
- assertTrue( filter.equals( ChainedVersionFilter.newInstance( new HighestVersionFilter() ) ) );
+ assertNotEquals( null, filter );
+ assertEquals( filter, filter );
+ assertEquals( filter, ChainedVersionFilter.newInstance( new HighestVersionFilter() ) );
}
}
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ContextualSnapshotVersionFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ContextualSnapshotVersionFilterTest.java
index 08b5a58..a9cb1a8 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ContextualSnapshotVersionFilterTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ContextualSnapshotVersionFilterTest.java
@@ -65,9 +65,9 @@ public class ContextualSnapshotVersionFilterTest
public void testEquals()
{
ContextualSnapshotVersionFilter filter = new ContextualSnapshotVersionFilter();
- assertFalse( filter.equals( null ) );
- assertTrue( filter.equals( filter ) );
- assertTrue( filter.equals( new ContextualSnapshotVersionFilter() ) );
+ assertNotEquals( null, filter );
+ assertEquals( filter, filter );
+ assertEquals( filter, new ContextualSnapshotVersionFilter() );
}
}
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/HighestVersionFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/HighestVersionFilterTest.java
index 49cbc9c..35a034a 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/HighestVersionFilterTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/HighestVersionFilterTest.java
@@ -50,9 +50,9 @@ public class HighestVersionFilterTest
public void testEquals()
{
HighestVersionFilter filter = new HighestVersionFilter();
- assertFalse( filter.equals( null ) );
- assertTrue( filter.equals( filter ) );
- assertTrue( filter.equals( new HighestVersionFilter() ) );
+ assertNotEquals( null, filter );
+ assertEquals( filter, filter );
+ assertEquals( filter, new HighestVersionFilter() );
}
}
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/SnapshotVersionFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/SnapshotVersionFilterTest.java
index add2037..d7d27fc 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/SnapshotVersionFilterTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/SnapshotVersionFilterTest.java
@@ -50,9 +50,9 @@ public class SnapshotVersionFilterTest
public void testEquals()
{
SnapshotVersionFilter filter = new SnapshotVersionFilter();
- assertFalse( filter.equals( null ) );
- assertTrue( filter.equals( filter ) );
- assertTrue( filter.equals( new SnapshotVersionFilter() ) );
+ assertNotEquals( null, filter );
+ assertEquals( filter, filter );
+ assertEquals( filter, new SnapshotVersionFilter() );
}
}
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/ComponentAuthenticationTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/ComponentAuthenticationTest.java
index 25d53f2..17386da 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/ComponentAuthenticationTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/ComponentAuthenticationTest.java
@@ -62,7 +62,7 @@ public class ComponentAuthenticationTest
Component comp = new Component();
Authentication auth = new ComponentAuthentication( "key", comp );
AuthenticationContext context = newContext( auth );
- assertEquals( null, context.get( "another-key" ) );
+ assertNull( context.get( "another-key" ) );
assertSame( comp, context.get( "key", Component.class ) );
}
@@ -77,11 +77,11 @@ public class ComponentAuthenticationTest
Authentication auth3 = new ComponentAuthentication( "key", new Object() );
String digest3 = newDigest( auth3 );
- assertFalse( digest3.equals( digest1 ) );
+ assertNotEquals( digest3, digest1 );
Authentication auth4 = new ComponentAuthentication( "Key", new Component() );
String digest4 = newDigest( auth4 );
- assertFalse( digest4.equals( digest1 ) );
+ assertNotEquals( digest4, digest1 );
}
@Test
@@ -91,8 +91,8 @@ public class ComponentAuthenticationTest
Authentication auth2 = new ComponentAuthentication( "key", new Component() );
Authentication auth3 = new ComponentAuthentication( "key", new Object() );
assertEquals( auth1, auth2 );
- assertFalse( auth1.equals( auth3 ) );
- assertFalse( auth1.equals( null ) );
+ assertNotEquals( auth1, auth3 );
+ assertNotEquals( null, auth1 );
}
@Test
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/SecretAuthenticationTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/SecretAuthenticationTest.java
index df4afaf..f7045ac 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/SecretAuthenticationTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/SecretAuthenticationTest.java
@@ -65,7 +65,7 @@ public class SecretAuthenticationTest
{
Authentication auth = new SecretAuthentication( "key", "value" );
AuthenticationContext context = newContext( auth );
- assertEquals( null, context.get( "another-key" ) );
+ assertNull( context.get( "another-key" ) );
assertEquals( "value", context.get( "key" ) );
}
@@ -80,11 +80,11 @@ public class SecretAuthenticationTest
Authentication auth3 = new SecretAuthentication( "key", "Value" );
String digest3 = newDigest( auth3 );
- assertFalse( digest3.equals( digest1 ) );
+ assertNotEquals( digest3, digest1 );
Authentication auth4 = new SecretAuthentication( "Key", "value" );
String digest4 = newDigest( auth4 );
- assertFalse( digest4.equals( digest1 ) );
+ assertNotEquals( digest4, digest1 );
}
@Test
@@ -94,8 +94,8 @@ public class SecretAuthenticationTest
Authentication auth2 = new SecretAuthentication( "key", "value" );
Authentication auth3 = new SecretAuthentication( "key", "Value" );
assertEquals( auth1, auth2 );
- assertFalse( auth1.equals( auth3 ) );
- assertFalse( auth1.equals( null ) );
+ assertNotEquals( auth1, auth3 );
+ assertNotEquals( null, auth1 );
}
@Test
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/StringAuthenticationTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/StringAuthenticationTest.java
index 8f89299..6f3c524 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/StringAuthenticationTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/StringAuthenticationTest.java
@@ -57,7 +57,7 @@ public class StringAuthenticationTest
{
Authentication auth = new StringAuthentication( "key", "value" );
AuthenticationContext context = newContext( auth );
- assertEquals( null, context.get( "another-key" ) );
+ assertNull( context.get( "another-key" ) );
assertEquals( "value", context.get( "key" ) );
}
@@ -72,11 +72,11 @@ public class StringAuthenticationTest
Authentication auth3 = new StringAuthentication( "key", "Value" );
String digest3 = newDigest( auth3 );
- assertFalse( digest3.equals( digest1 ) );
+ assertNotEquals( digest3, digest1 );
Authentication auth4 = new StringAuthentication( "Key", "value" );
String digest4 = newDigest( auth4 );
- assertFalse( digest4.equals( digest1 ) );
+ assertNotEquals( digest4, digest1 );
}
@Test
@@ -86,8 +86,8 @@ public class StringAuthenticationTest
Authentication auth2 = new StringAuthentication( "key", "value" );
Authentication auth3 = new StringAuthentication( "key", "Value" );
assertEquals( auth1, auth2 );
- assertFalse( auth1.equals( auth3 ) );
- assertFalse( auth1.equals( null ) );
+ assertNotEquals( auth1, auth3 );
+ assertNotEquals( null, auth1 );
}
@Test
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/AbstractVersionTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/AbstractVersionTest.java
index 52541db..32f19f2 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/AbstractVersionTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/AbstractVersionTest.java
@@ -20,6 +20,8 @@ package org.eclipse.aether.util.version;
*/
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import org.eclipse.aether.version.Version;
@@ -45,22 +47,22 @@ abstract class AbstractVersionTest
{
assertEquals( "expected " + v1 + " > " + v2, 1, Integer.signum( v1.compareTo( v2 ) ) );
assertEquals( "expected " + v2 + " < " + v1, -1, Integer.signum( v2.compareTo( v1 ) ) );
- assertEquals( "expected " + v1 + " != " + v2, false, v1.equals( v2 ) );
- assertEquals( "expected " + v2 + " != " + v1, false, v2.equals( v1 ) );
+ assertFalse( "expected " + v1 + " != " + v2, v1.equals( v2 ) );
+ assertFalse( "expected " + v2 + " != " + v1, v2.equals( v1 ) );
}
else if ( expected < 0 )
{
assertEquals( "expected " + v1 + " < " + v2, -1, Integer.signum( v1.compareTo( v2 ) ) );
assertEquals( "expected " + v2 + " > " + v1, 1, Integer.signum( v2.compareTo( v1 ) ) );
- assertEquals( "expected " + v1 + " != " + v2, false, v1.equals( v2 ) );
- assertEquals( "expected " + v2 + " != " + v1, false, v2.equals( v1 ) );
+ assertFalse( "expected " + v1 + " != " + v2, v1.equals( v2 ) );
+ assertFalse( "expected " + v2 + " != " + v1, v2.equals( v1 ) );
}
else
{
assertEquals( "expected " + v1 + " == " + v2, 0, v1.compareTo( v2 ) );
assertEquals( "expected " + v2 + " == " + v1, 0, v2.compareTo( v1 ) );
- assertEquals( "expected " + v1 + " == " + v2, true, v1.equals( v2 ) );
- assertEquals( "expected " + v2 + " == " + v1, true, v2.equals( v1 ) );
+ assertTrue( "expected " + v1 + " == " + v2, v1.equals( v2 ) );
+ assertTrue( "expected " + v2 + " == " + v1, v2.equals( v1 ) );
assertEquals( "expected #(" + v1 + ") == #(" + v1 + ")", v1.hashCode(), v2.hashCode() );
}
}
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionSchemeTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionSchemeTest.java
index e5465be..351a629 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionSchemeTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionSchemeTest.java
@@ -64,7 +64,7 @@ public class GenericVersionSchemeTest
assertTrue( c.containsVersion( new GenericVersion( "1.0" ) ) );
c = scheme.parseVersionConstraint( "[1.0]" );
- assertEquals( null, c.getVersion() );
+ assertNull( c.getVersion() );
assertTrue( c.containsVersion( new GenericVersion( "1.0" ) ) );
c = scheme.parseVersionConstraint( "[1.0],[2.0]" );