[MNG-7230] Replace assert by simpler but equivalent calls
This closes #111
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 @@
* 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 @@
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 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 @@
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 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 @@
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 @@
{
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 @@
*/
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.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 @@
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 @@
}
}
- 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 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 @@
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 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 @@
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.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 @@
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 @@
import java.io.File;
import java.io.IOException;
-import java.util.Arrays;
import org.apache.maven.it.util.ResourceExtractor;
import org.junit.Test;
