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/05 20:27:57 UTC
[maven-integration-testing] branch master updated (b1bd585 ->
04959fb)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git.
from b1bd585 Normalize line endings
new 5569806 [MNG-7230] Replace assert by simpler but equivalent calls
new 04959fb [MNG-7231] Fix Javadoc errors
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/maven/it/MavenITmng0469ReportConfigTest.java | 5 +++--
...MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java | 4 +++-
.../maven/it/MavenITmng3422ActiveComponentCollectionTest.java | 6 ++++--
.../it/MavenITmng3807PluginConfigExpressionEvaluationTest.java | 2 +-
.../maven/it/MavenITmng3810BadProfileActivationTest.java | 1 -
.../org/apache/maven/it/MavenITmng3843PomInheritanceTest.java | 4 +++-
.../maven/it/MavenITmng3933ProfilesXmlActivationTest.java | 6 +++---
.../it/MavenITmng4023ParentProfileOneTimeInjectionTest.java | 2 +-
.../maven/it/MavenITmng4053PluginConfigAttributesTest.java | 4 ++--
.../it/MavenITmng4361ForceDependencySnapshotUpdateTest.java | 2 +-
.../it/MavenITmng4368TimestampAwareArtifactInstallerTest.java | 10 +++++-----
.../it/MavenITmng4474PerLookupWagonInstantiationTest.java | 4 +++-
.../MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java | 4 +++-
.../maven/it/MavenITmng6071GetResourceWithCustomPom.java | 1 -
.../maven/it/MavenITmng6240PluginExtensionAetherProvider.java | 2 +-
.../it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java | 1 -
.../org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java | 1 +
.../main/java/org/apache/maven/plugin/coreit/ResolveMojo.java | 1 +
.../src/main/java/org/apache/maven/plugin/coreit/ItMojo.java | 1 +
.../java/org/apache/maven/plugin/coreit/BuildLocalPomMojo.java | 1 +
.../org/apache/maven/plugin/coreit/BuildRemotePomMojo.java | 1 +
21 files changed, 38 insertions(+), 25 deletions(-)
[maven-integration-testing] 02/02: [MNG-7231] Fix Javadoc errors
Posted by mi...@apache.org.
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-integration-testing.git
commit 04959fb0cffe3d6d2a9d79c9394a32ff45e62bb9
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Sun Sep 5 11:29:30 2021 +0200
[MNG-7231] Fix Javadoc errors
This closes #112
---
.../main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java | 1 +
.../src/main/java/org/apache/maven/plugin/coreit/ResolveMojo.java | 1 +
.../src/main/java/org/apache/maven/plugin/coreit/ItMojo.java | 1 +
.../src/main/java/org/apache/maven/plugin/coreit/BuildLocalPomMojo.java | 1 +
.../src/main/java/org/apache/maven/plugin/coreit/BuildRemotePomMojo.java | 1 +
5 files changed, 5 insertions(+)
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java
index 3ce6076..972456e 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java
@@ -21,6 +21,7 @@ package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
import java.io.File;
import java.io.FileOutputStream;
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ResolveMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ResolveMojo.java
index 09fa965..29091ef 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ResolveMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ResolveMojo.java
@@ -26,6 +26,7 @@ import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
import java.io.File;
import java.io.FileOutputStream;
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-log4j/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-log4j/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java
index adb8428..43600b3 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-log4j/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-log4j/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java
@@ -29,6 +29,7 @@ import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
/**
* Resolves an artifact and has an (unused) dependency on log4j.
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildLocalPomMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildLocalPomMojo.java
index b7c7770..cf078b9 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildLocalPomMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildLocalPomMojo.java
@@ -21,6 +21,7 @@ package org.apache.maven.plugin.coreit;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
import java.io.File;
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildRemotePomMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildRemotePomMojo.java
index 98cd5ef..78f2237 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildRemotePomMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildRemotePomMojo.java
@@ -24,6 +24,7 @@ import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
import java.io.File;
[maven-integration-testing] 01/02: [MNG-7230] Replace assert by
simpler but equivalent calls
Posted by mi...@apache.org.
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-integration-testing.git
commit 5569806bd06bb654ea59dda666b7b5afa5b1bf86
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Sun Sep 5 11:23:34 2021 +0200
[MNG-7230] Replace assert by simpler but equivalent calls
This closes #111
---
.../org/apache/maven/it/MavenITmng0469ReportConfigTest.java | 5 +++--
...MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java | 4 +++-
.../maven/it/MavenITmng3422ActiveComponentCollectionTest.java | 6 ++++--
.../it/MavenITmng3807PluginConfigExpressionEvaluationTest.java | 2 +-
.../maven/it/MavenITmng3810BadProfileActivationTest.java | 1 -
.../org/apache/maven/it/MavenITmng3843PomInheritanceTest.java | 4 +++-
.../maven/it/MavenITmng3933ProfilesXmlActivationTest.java | 6 +++---
.../it/MavenITmng4023ParentProfileOneTimeInjectionTest.java | 2 +-
.../maven/it/MavenITmng4053PluginConfigAttributesTest.java | 4 ++--
.../it/MavenITmng4361ForceDependencySnapshotUpdateTest.java | 2 +-
.../it/MavenITmng4368TimestampAwareArtifactInstallerTest.java | 10 +++++-----
.../it/MavenITmng4474PerLookupWagonInstantiationTest.java | 4 +++-
.../MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java | 4 +++-
.../maven/it/MavenITmng6071GetResourceWithCustomPom.java | 1 -
.../maven/it/MavenITmng6240PluginExtensionAetherProvider.java | 2 +-
.../it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java | 1 -
16 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
index 8334865..7037786 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
@@ -19,12 +19,13 @@ package org.apache.maven.it;
* under the License.
*/
-import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.Properties;
+import static org.junit.Assert.assertNotEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-469">MNG-469</a>.
*
@@ -100,7 +101,7 @@ public class MavenITmng0469ReportConfigTest
verifier.executeGoal( "validate" );
Properties props = verifier.loadProperties( "target/config.properties" );
assertEquals( "maven-it-plugin-site", props.getProperty( "project.reporting.plugins.0.artifactId" ) );
- assertFalse( "fail.properties".equals( props.getProperty( "project.reporting.plugins.0.configuration.children.infoFile.0.value" ) ) );
+ assertNotEquals( "fail.properties", props.getProperty( "project.reporting.plugins.0.configuration.children.infoFile.0.value" ) );
}
verifier.verifyErrorFreeLog();
verifier.resetStreams();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java
index a247a9d..f7c42dc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java
@@ -25,6 +25,8 @@ import java.util.Properties;
import org.apache.maven.it.util.ResourceExtractor;
import org.apache.maven.shared.utils.io.FileUtils;
+import static org.junit.Assert.assertNotEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1751">MNG-1751</a>.
*
@@ -77,7 +79,7 @@ public class MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest
Properties checksums = verifier.loadProperties( "target/checksum.properties" );
String sha1 = checksums.getProperty( "dep-0.1-SNAPSHOT.jar", "" ).toLowerCase( java.util.Locale.ENGLISH );
assertEquals( sha1, 40, sha1.length() );
- assertFalse( "fc081cd365b837dcb01eb9991f21c409b155ea5c".equals( sha1 ) );
+ assertNotEquals( "fc081cd365b837dcb01eb9991f21c409b155ea5c", sha1 );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java
index 1b6094c..4f1fb7e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java
@@ -25,6 +25,8 @@ import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.Properties;
+import static org.junit.Assert.assertNotEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3422">MNG-3422</a>.
*
@@ -56,8 +58,8 @@ public class MavenITmng3422ActiveComponentCollectionTest
verifier.resetStreams();
Properties props = verifier.loadProperties( "target/layout.properties" );
- assertFalse( "0".equals( props.getProperty( "layouts", "0" ) ) );
- assertFalse( "".equals( props.getProperty( "layouts.default", "" ) ) );
+ assertNotEquals( "0", props.getProperty( "layouts", "0" ) );
+ assertNotEquals( "", props.getProperty( "layouts.default", "" ) );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
index eec5a75..b271650 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
@@ -72,7 +72,7 @@ public class MavenITmng3807PluginConfigExpressionEvaluationTest
{
assertNotNull( value );
assertTrue( value.length() > 0 );
- assertTrue( value, !value.contains( "${" ) );
+ assertFalse( value, value.contains( "${" ) );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java
index 2450b01..6c8ed2f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
*/
import java.io.File;
-import java.util.Properties;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
index 0c592ec..a56eaff 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
@@ -26,6 +26,8 @@ import java.util.Collection;
import java.util.Properties;
import java.util.TreeSet;
+import static org.junit.Assert.assertNotEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3843">MNG-3843</a>.
*
@@ -137,7 +139,7 @@ public class MavenITmng3843PomInheritanceTest
assertEquals( "child-1", props.getProperty( "project.artifactId" ) );
assertEquals( "0.1", props.getProperty( "project.version" ) );
assertEquals( "jar", props.getProperty( "project.packaging" ) );
- assertFalse( "parent-name".equals( props.getProperty( "project.name" ) ) );
+ assertNotEquals( "parent-name", props.getProperty( "project.name" ) );
assertEquals( "parent-description", props.getProperty( "project.description", "" ) );
assertUrlCommon( "http://parent.url", props.getProperty( "project.url", "" ) );
assertEquals( "2008", props.getProperty( "project.inceptionYear", "" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933ProfilesXmlActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933ProfilesXmlActivationTest.java
index 7bc1c17..160813e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933ProfilesXmlActivationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933ProfilesXmlActivationTest.java
@@ -90,9 +90,9 @@ public class MavenITmng3933ProfilesXmlActivationTest
}
}
- assertEquals( null, props.getProperty( "project.properties.sysPropertyMissing" ) );
- assertEquals( null, props.getProperty( "project.properties.envPropertyMissing" ) );
- assertEquals( null, props.getProperty( "project.properties.filePropertyMissing" ) );
+ assertNull( props.getProperty( "project.properties.sysPropertyMissing" ) );
+ assertNull( props.getProperty( "project.properties.envPropertyMissing" ) );
+ assertNull( props.getProperty( "project.properties.filePropertyMissing" ) );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java
index 54a34f4..ece6ddc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java
@@ -60,7 +60,7 @@ public class MavenITmng4023ParentProfileOneTimeInjectionTest
Properties props = verifier.loadProperties( "sub/target/config.properties" );
assertEquals( "1", props.getProperty( "stringParams" ) );
assertEquals( "test", props.getProperty( "stringParams.0" ) );
- assertEquals( null, props.getProperty( "stringParams.1" ) );
+ assertNull( props.getProperty( "stringParams.1" ) );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java
index 41dd635..35ad20a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java
@@ -88,8 +88,8 @@ public class MavenITmng4053PluginConfigAttributesTest
assertEquals( "2", props.getProperty( "domParam.children.copy.0.attributes" ) );
assertEquals( "target", props.getProperty( "domParam.children.copy.0.children.fileset.0.attributes.dir" ) );
- assertEquals( null, props.getProperty( "domParam.children.copy.0.children.fileset.0.attributes.todir" ) );
- assertEquals( null, props.getProperty( "domParam.children.copy.0.children.fileset.0.attributes.overwrite" ) );
+ assertNull( props.getProperty( "domParam.children.copy.0.children.fileset.0.attributes.todir" ) );
+ assertNull( props.getProperty( "domParam.children.copy.0.children.fileset.0.attributes.overwrite" ) );
assertEquals( "1", props.getProperty( "domParam.children.copy.0.children.fileset.0.attributes" ) );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java
index e5e09af..09a82f6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java
@@ -62,7 +62,7 @@ public class MavenITmng4361ForceDependencySnapshotUpdateTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- assertEquals( null, verifier.loadProperties( "target/checksum.properties" ).getProperty( "b-0.1-SNAPSHOT.jar" ) );
+ assertNull( verifier.loadProperties( "target/checksum.properties" ).getProperty( "b-0.1-SNAPSHOT.jar" ) );
filterProps.setProperty( "@repo@", "repo-2" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java
index 7d67fec..6dcb5af 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java
@@ -68,7 +68,7 @@ public class MavenITmng4368TimestampAwareArtifactInstallerTest
String pom = FileUtils.fileRead( installedPom, "UTF-8" );
assertTrue( pom.indexOf( "Branch-A" ) > 0 );
- assertTrue( !pom.contains( "Branch-B" ) );
+ assertFalse( pom.contains( "Branch-B" ) );
assertEquals( aPom.length(), bPom.length() );
assertTrue( aPom.lastModified() > bPom.lastModified() );
@@ -82,7 +82,7 @@ public class MavenITmng4368TimestampAwareArtifactInstallerTest
verifier.resetStreams();
pom = FileUtils.fileRead( installedPom, "UTF-8" );
- assertTrue( !pom.contains( "Branch-A" ) );
+ assertFalse( pom.contains( "Branch-A" ) );
assertTrue( pom.indexOf( "Branch-B" ) > 0 );
}
@@ -120,7 +120,7 @@ public class MavenITmng4368TimestampAwareArtifactInstallerTest
String data = FileUtils.fileRead( installedArtifact, "UTF-8" );
assertTrue( data.indexOf( "Branch-A" ) > 0 );
- assertTrue( !data.contains( "Branch-B" ) );
+ assertFalse( data.contains( "Branch-B" ) );
assertEquals( aArtifact.length(), bArtifact.length() );
assertTrue( aArtifact.lastModified() > bArtifact.lastModified() );
@@ -134,7 +134,7 @@ public class MavenITmng4368TimestampAwareArtifactInstallerTest
verifier.resetStreams();
data = FileUtils.fileRead( installedArtifact, "UTF-8" );
- assertTrue( !data.contains( "Branch-A" ) );
+ assertFalse( data.contains( "Branch-A" ) );
assertTrue( data.indexOf( "Branch-B" ) > 0 );
long lastModified = installedArtifact.lastModified();
@@ -150,7 +150,7 @@ public class MavenITmng4368TimestampAwareArtifactInstallerTest
verifier.resetStreams();
data = FileUtils.fileRead( installedArtifact, "UTF-8" );
- assertTrue( !data.contains( "Branch-B" ) );
+ assertFalse( data.contains( "Branch-B" ) );
assertTrue( data.indexOf( "Branch-C" ) > 0 );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java
index 58de2a2..60e4da3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java
@@ -25,6 +25,8 @@ import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.Properties;
+import static org.junit.Assert.assertNotEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4474">MNG-4474</a>.
*
@@ -59,7 +61,7 @@ public class MavenITmng4474PerLookupWagonInstantiationTest
assertNotNull( hash1 );
String hash2 = props.getProperty( "coreit://two.hash" );
assertNotNull( hash2 );
- assertFalse( hash1.equals( hash2 ) );
+ assertNotEquals( hash1, hash2 );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java
index 2732863..62ebeb8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java
@@ -25,6 +25,8 @@ import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.Properties;
+import static org.junit.Assert.assertNotEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4528">MNG-4528</a>.
*
@@ -60,7 +62,7 @@ public class MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest
Properties props = verifier.loadProperties( "target/wagon.properties" );
String version = props.getProperty( "version", "" );
- assertFalse( "Bad wagon version used: " + version, version.equals( "1.0-alpha-6" ) );
+ assertNotEquals( "Bad wagon version used: " + version, "1.0-alpha-6", version );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java
index 87b1984..abf50ed 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java
@@ -4,7 +4,6 @@ import org.apache.maven.it.util.ResourceExtractor;
import org.junit.Test;
import java.io.File;
-import java.util.Properties;
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-6071">MNG-6071</a>:
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
index 6fb542d..0d24ad0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
@@ -74,7 +74,7 @@ public class MavenITmng6240PluginExtensionAetherProvider
count++;
}
}
- assertTrue( count == 2 ); // 1 from download, 1 from upload
+ assertEquals( 2, count ); // 1 from download, 1 from upload
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java
index d1e6661..a5d137e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java
@@ -2,7 +2,6 @@ package org.apache.maven.it;
import java.io.File;
import java.io.IOException;
-import java.util.Arrays;
import org.apache.maven.it.util.ResourceExtractor;
import org.junit.Test;