You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/03/28 19:58:21 UTC
ant-ivy git commit: Simplify assertions
Repository: ant-ivy
Updated Branches:
refs/heads/master 8c4cd482a -> e4131dc59
Simplify assertions
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/e4131dc5
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/e4131dc5
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/e4131dc5
Branch: refs/heads/master
Commit: e4131dc592baff1cf5e834a43eb783d3fe694808
Parents: 8c4cd48
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Wed Mar 28 21:58:04 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Wed Mar 28 21:58:04 2018 +0200
----------------------------------------------------------------------
test/java/org/apache/ivy/IvyTest.java | 17 ++++-----
.../org/apache/ivy/ant/FixDepsTaskTest.java | 37 ++++++++++----------
.../org/apache/ivy/ant/IvyBuildNumberTest.java | 23 ++++++------
.../org/apache/ivy/ant/IvyConfigureTest.java | 6 ++--
.../ivy/ant/IvyDependencyUpdateCheckerTest.java | 3 +-
test/java/org/apache/ivy/ant/IvyReportTest.java | 6 ++--
.../java/org/apache/ivy/ant/IvyResolveTest.java | 2 +-
.../apache/ivy/core/module/id/ModuleIdTest.java | 13 +++----
.../apache/ivy/core/resolve/ResolveTest.java | 6 ++--
.../core/settings/XmlSettingsParserTest.java | 12 +++----
.../org/apache/ivy/osgi/util/VersionTest.java | 2 +-
.../matcher/AbstractPatternMatcherTest.java | 4 +--
.../plugins/repository/vfs/VfsResourceTest.java | 3 +-
.../ivy/plugins/resolver/ChainResolverTest.java | 5 +--
.../org/apache/ivy/util/ConfiguratorTest.java | 13 +++----
.../org/apache/ivy/util/StringUtilsTest.java | 3 +-
16 files changed, 83 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e4131dc5/test/java/org/apache/ivy/IvyTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/IvyTest.java b/test/java/org/apache/ivy/IvyTest.java
index abe5c13..e8fddce 100644
--- a/test/java/org/apache/ivy/IvyTest.java
+++ b/test/java/org/apache/ivy/IvyTest.java
@@ -31,6 +31,7 @@ import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
public class IvyTest {
private File cache;
@@ -61,8 +62,8 @@ public class IvyTest {
Ivy ivy = Ivy.newInstance();
ivy.getLoggerEngine().setDefaultLogger(mockLogger);
ivy.configure(new File("test/repositories/ivysettings.xml"));
- assertFalse("IvyContext should be cleared and return a default Ivy instance", IvyContext
- .getContext().getIvy() == ivy);
+ assertNotSame("IvyContext should be cleared and return a default Ivy instance",
+ IvyContext.getContext().getIvy(), ivy);
ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml"),
@@ -70,8 +71,8 @@ public class IvyTest {
assertNotNull(report);
assertFalse(report.hasError());
mockLogger.assertLogContains("mod1.1");
- assertFalse("IvyContext should be cleared and return a default Ivy instance", IvyContext
- .getContext().getIvy() == ivy);
+ assertNotSame("IvyContext should be cleared and return a default Ivy instance",
+ IvyContext.getContext().getIvy(), ivy);
// then we load another instance, and use it for another resolution
MockMessageLogger mockLogger2 = new MockMessageLogger();
@@ -83,8 +84,8 @@ public class IvyTest {
assertNotNull(report);
assertFalse(report.hasError());
mockLogger2.assertLogContains("norev/ivysettings.xml");
- assertFalse("IvyContext should be cleared and return a default Ivy instance", IvyContext
- .getContext().getIvy() == ivy2);
+ assertNotSame("IvyContext should be cleared and return a default Ivy instance",
+ IvyContext.getContext().getIvy(), ivy2);
// finally we reuse the first instance to make another resolution
report = ivy.resolve(new File("test/repositories/1/org6/mod6.1/ivys/ivy-0.3.xml"),
@@ -92,8 +93,8 @@ public class IvyTest {
assertNotNull(report);
assertFalse(report.hasError());
mockLogger.assertLogContains("mod6.1");
- assertFalse("IvyContext should be cleared and return a default Ivy instance", IvyContext
- .getContext().getIvy() == ivy);
+ assertNotSame("IvyContext should be cleared and return a default Ivy instance",
+ IvyContext.getContext().getIvy(), ivy);
}
private ResolveOptions getResolveOptions(Ivy ivy, String[] confs) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e4131dc5/test/java/org/apache/ivy/ant/FixDepsTaskTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/FixDepsTaskTest.java b/test/java/org/apache/ivy/ant/FixDepsTaskTest.java
index 0223fed..049e21d 100644
--- a/test/java/org/apache/ivy/ant/FixDepsTaskTest.java
+++ b/test/java/org/apache/ivy/ant/FixDepsTaskTest.java
@@ -35,6 +35,7 @@ import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
public class FixDepsTaskTest {
@@ -82,9 +83,9 @@ public class FixDepsTaskTest {
assertEquals(1, md.getDependencies().length);
assertEquals("org1", md.getDependencies()[0].getDependencyId().getOrganisation());
assertEquals("mod1.2", md.getDependencies()[0].getDependencyId().getName());
- assertEquals(false, md.getDependencies()[0].isChanging());
- assertEquals(true, md.getDependencies()[0].isForce());
- assertEquals(false, md.getDependencies()[0].isTransitive());
+ assertFalse(md.getDependencies()[0].isChanging());
+ assertTrue(md.getDependencies()[0].isForce());
+ assertFalse(md.getDependencies()[0].isTransitive());
assertEquals("2.0", md.getDependencies()[0].getDependencyRevisionId().getRevision());
}
@@ -114,9 +115,9 @@ public class FixDepsTaskTest {
assertEquals("org1", md.getDependencies()[0].getDependencyId().getOrganisation());
assertEquals("mod1.2", md.getDependencies()[0].getDependencyId().getName());
- assertEquals(false, md.getDependencies()[0].isChanging());
- assertEquals(true, md.getDependencies()[0].isForce());
- assertEquals(false, md.getDependencies()[0].isTransitive());
+ assertFalse(md.getDependencies()[0].isChanging());
+ assertTrue(md.getDependencies()[0].isForce());
+ assertFalse(md.getDependencies()[0].isTransitive());
assertEquals("2.0", md.getDependencies()[0].getDependencyRevisionId().getRevision());
assertEquals(1, md.getDependencies()[0].getModuleConfigurations().length);
assertEquals("default", md.getDependencies()[0].getModuleConfigurations()[0]);
@@ -125,9 +126,9 @@ public class FixDepsTaskTest {
assertEquals("org1", md.getDependencies()[1].getDependencyId().getOrganisation());
assertEquals("mod1.1", md.getDependencies()[1].getDependencyId().getName());
- assertEquals(false, md.getDependencies()[1].isChanging());
- assertEquals(true, md.getDependencies()[1].isForce());
- assertEquals(false, md.getDependencies()[1].isTransitive());
+ assertFalse(md.getDependencies()[1].isChanging());
+ assertTrue(md.getDependencies()[1].isForce());
+ assertFalse(md.getDependencies()[1].isTransitive());
assertEquals("2.0", md.getDependencies()[1].getDependencyRevisionId().getRevision());
assertEquals(1, md.getDependencies()[1].getModuleConfigurations().length);
assertEquals("compile", md.getDependencies()[1].getModuleConfigurations()[0]);
@@ -161,9 +162,9 @@ public class FixDepsTaskTest {
assertEquals("org1", md.getDependencies()[0].getDependencyId().getOrganisation());
assertEquals("mod1.2", md.getDependencies()[0].getDependencyId().getName());
- assertEquals(false, md.getDependencies()[0].isChanging());
- assertEquals(true, md.getDependencies()[0].isForce());
- assertEquals(false, md.getDependencies()[0].isTransitive());
+ assertFalse(md.getDependencies()[0].isChanging());
+ assertTrue(md.getDependencies()[0].isForce());
+ assertFalse(md.getDependencies()[0].isTransitive());
assertEquals("2.0", md.getDependencies()[0].getDependencyRevisionId().getRevision());
assertEquals(1, md.getDependencies()[0].getModuleConfigurations().length);
assertEquals("default", md.getDependencies()[0].getModuleConfigurations()[0]);
@@ -172,9 +173,9 @@ public class FixDepsTaskTest {
assertEquals("org1", md.getDependencies()[1].getDependencyId().getOrganisation());
assertEquals("mod1.1", md.getDependencies()[1].getDependencyId().getName());
- assertEquals(false, md.getDependencies()[1].isChanging());
- assertEquals(true, md.getDependencies()[1].isForce());
- assertEquals(false, md.getDependencies()[1].isTransitive());
+ assertFalse(md.getDependencies()[1].isChanging());
+ assertTrue(md.getDependencies()[1].isForce());
+ assertFalse(md.getDependencies()[1].isTransitive());
assertEquals("2.0", md.getDependencies()[1].getDependencyRevisionId().getRevision());
assertEquals(1, md.getDependencies()[1].getModuleConfigurations().length);
assertEquals("compile", md.getDependencies()[1].getModuleConfigurations()[0]);
@@ -183,9 +184,9 @@ public class FixDepsTaskTest {
assertEquals("org1", md.getDependencies()[2].getDependencyId().getOrganisation());
assertEquals("mod1.2", md.getDependencies()[2].getDependencyId().getName());
- assertEquals(false, md.getDependencies()[2].isChanging());
- assertEquals(true, md.getDependencies()[2].isForce());
- assertEquals(false, md.getDependencies()[2].isTransitive());
+ assertFalse(md.getDependencies()[2].isChanging());
+ assertTrue(md.getDependencies()[2].isForce());
+ assertFalse(md.getDependencies()[2].isTransitive());
assertEquals("2.1", md.getDependencies()[2].getDependencyRevisionId().getRevision());
assertEquals(1, md.getDependencies()[2].getModuleConfigurations().length);
assertEquals("compile", md.getDependencies()[2].getModuleConfigurations()[0]);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e4131dc5/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java b/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java
index 043d997..df51916 100644
--- a/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java
+++ b/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java
@@ -26,6 +26,7 @@ import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
public class IvyBuildNumberTest {
@@ -51,9 +52,9 @@ public class IvyBuildNumberTest {
buildNumber.setOrganisation("org1");
buildNumber.setModule("newmod");
buildNumber.execute();
- assertEquals(null, buildNumber.getProject().getProperty("ivy.revision"));
+ assertNull(buildNumber.getProject().getProperty("ivy.revision"));
assertEquals("0", buildNumber.getProject().getProperty("ivy.new.revision"));
- assertEquals(null, buildNumber.getProject().getProperty("ivy.build.number"));
+ assertNull(buildNumber.getProject().getProperty("ivy.build.number"));
assertEquals("0", buildNumber.getProject().getProperty("ivy.new.build.number"));
}
@@ -63,9 +64,9 @@ public class IvyBuildNumberTest {
buildNumber.setModule("newmod");
buildNumber.setDefault("1.0-dev-1");
buildNumber.execute();
- assertEquals(null, buildNumber.getProject().getProperty("ivy.revision"));
+ assertNull(buildNumber.getProject().getProperty("ivy.revision"));
assertEquals("1.0-dev-1", buildNumber.getProject().getProperty("ivy.new.revision"));
- assertEquals(null, buildNumber.getProject().getProperty("ivy.build.number"));
+ assertNull(buildNumber.getProject().getProperty("ivy.build.number"));
assertEquals("1", buildNumber.getProject().getProperty("ivy.new.build.number"));
}
@@ -75,10 +76,10 @@ public class IvyBuildNumberTest {
buildNumber.setModule("newmod");
buildNumber.setDefault("mydefault");
buildNumber.execute();
- assertEquals(null, buildNumber.getProject().getProperty("ivy.revision"));
+ assertNull(buildNumber.getProject().getProperty("ivy.revision"));
assertEquals("mydefault", buildNumber.getProject().getProperty("ivy.new.revision"));
- assertEquals(null, buildNumber.getProject().getProperty("ivy.build.number"));
- assertEquals(null, buildNumber.getProject().getProperty("ivy.new.build.number"));
+ assertNull(buildNumber.getProject().getProperty("ivy.build.number"));
+ assertNull(buildNumber.getProject().getProperty("ivy.new.build.number"));
}
@Test
@@ -99,7 +100,7 @@ public class IvyBuildNumberTest {
buildNumber.execute();
assertEquals("test", buildNumber.getProject().getProperty("ivy.revision"));
assertEquals("test.1", buildNumber.getProject().getProperty("ivy.new.revision"));
- assertEquals(null, buildNumber.getProject().getProperty("ivy.build.number"));
+ assertNull(buildNumber.getProject().getProperty("ivy.build.number"));
assertEquals("1", buildNumber.getProject().getProperty("ivy.new.build.number"));
}
@@ -147,7 +148,7 @@ public class IvyBuildNumberTest {
buildNumber.execute();
assertEquals("1.1", buildNumber.getProject().getProperty("ivy.revision"));
assertEquals("1.1.1", buildNumber.getProject().getProperty("ivy.new.revision"));
- assertEquals(null, buildNumber.getProject().getProperty("ivy.build.number"));
+ assertNull(buildNumber.getProject().getProperty("ivy.build.number"));
assertEquals("1", buildNumber.getProject().getProperty("ivy.new.build.number"));
}
@@ -157,9 +158,9 @@ public class IvyBuildNumberTest {
buildNumber.setModule("mod1.1");
buildNumber.setRevision("3.");
buildNumber.execute();
- assertEquals(null, buildNumber.getProject().getProperty("ivy.revision"));
+ assertNull(buildNumber.getProject().getProperty("ivy.revision"));
assertEquals("3.0", buildNumber.getProject().getProperty("ivy.new.revision"));
- assertEquals(null, buildNumber.getProject().getProperty("ivy.build.number"));
+ assertNull(buildNumber.getProject().getProperty("ivy.build.number"));
assertEquals("0", buildNumber.getProject().getProperty("ivy.new.build.number"));
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e4131dc5/test/java/org/apache/ivy/ant/IvyConfigureTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyConfigureTest.java b/test/java/org/apache/ivy/ant/IvyConfigureTest.java
index a748e13..b6770ad 100644
--- a/test/java/org/apache/ivy/ant/IvyConfigureTest.java
+++ b/test/java/org/apache/ivy/ant/IvyConfigureTest.java
@@ -19,6 +19,8 @@ package org.apache.ivy.ant;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import java.io.File;
@@ -251,7 +253,7 @@ public class IvyConfigureTest {
configure.execute();
assertNotNull(getIvyInstance());
- assertTrue(ivy != getIvyInstance());
+ assertNotSame(ivy, getIvyInstance());
}
@Test
@@ -268,7 +270,7 @@ public class IvyConfigureTest {
newAntSettings.setFile(new File("test/repositories/ivysettings.xml"));
newAntSettings.execute();
- assertTrue(ivy == getIvyInstance());
+ assertSame(ivy, getIvyInstance());
}
/**
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e4131dc5/test/java/org/apache/ivy/ant/IvyDependencyUpdateCheckerTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyDependencyUpdateCheckerTest.java b/test/java/org/apache/ivy/ant/IvyDependencyUpdateCheckerTest.java
index c54c972..060357a 100644
--- a/test/java/org/apache/ivy/ant/IvyDependencyUpdateCheckerTest.java
+++ b/test/java/org/apache/ivy/ant/IvyDependencyUpdateCheckerTest.java
@@ -34,6 +34,7 @@ import org.junit.rules.ExpectedException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
public class IvyDependencyUpdateCheckerTest extends AntTaskTestCase {
@@ -246,7 +247,7 @@ public class IvyDependencyUpdateCheckerTest extends AntTaskTestCase {
dependencyUpdateChecker.getProject().getProperty("ivy.parent[0].module"));
assertEquals("1.0",
dependencyUpdateChecker.getProject().getProperty("ivy.parent[0].revision"));
- assertEquals(null, dependencyUpdateChecker.getProject().getProperty("ivy.parent[0].branch"));
+ assertNull(dependencyUpdateChecker.getProject().getProperty("ivy.parent[0].branch"));
assertLogContaining("Dependencies updates available :");
assertLogContaining("org1#mod1.1\t1.1 -> 2.0");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e4131dc5/test/java/org/apache/ivy/ant/IvyReportTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyReportTest.java b/test/java/org/apache/ivy/ant/IvyReportTest.java
index f8bb471..5c533f4 100644
--- a/test/java/org/apache/ivy/ant/IvyReportTest.java
+++ b/test/java/org/apache/ivy/ant/IvyReportTest.java
@@ -29,6 +29,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
public class IvyReportTest {
@@ -100,9 +102,9 @@ public class IvyReportTest {
// check that revision 2.2 of mod1.2 is only present once
String reportContent = FileUtil.readEntirely(xmlReport);
int index = reportContent.indexOf("<revision name=\"2.2\"");
- assertTrue(index != -1);
+ assertNotEquals(index, -1);
index = reportContent.indexOf("<revision name=\"2.2\"", index + 1);
- assertTrue(index == -1);
+ assertEquals(index, -1);
} finally {
Locale.setDefault(oldLocale);
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e4131dc5/test/java/org/apache/ivy/ant/IvyResolveTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyResolveTest.java b/test/java/org/apache/ivy/ant/IvyResolveTest.java
index 46e9f62..70dd022 100644
--- a/test/java/org/apache/ivy/ant/IvyResolveTest.java
+++ b/test/java/org/apache/ivy/ant/IvyResolveTest.java
@@ -653,7 +653,7 @@ public class IvyResolveTest {
assertEquals("apache", resolve.getProject().getProperty("ivy.parent[0].organisation"));
assertEquals("resolve-simple", resolve.getProject().getProperty("ivy.parent[0].module"));
assertEquals("1.0", resolve.getProject().getProperty("ivy.parent[0].revision"));
- assertEquals(null, resolve.getProject().getProperty("ivy.parent[0].branch"));
+ assertNull(resolve.getProject().getProperty("ivy.parent[0].branch"));
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e4131dc5/test/java/org/apache/ivy/core/module/id/ModuleIdTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/module/id/ModuleIdTest.java b/test/java/org/apache/ivy/core/module/id/ModuleIdTest.java
index 166f9a0..408acf6 100644
--- a/test/java/org/apache/ivy/core/module/id/ModuleIdTest.java
+++ b/test/java/org/apache/ivy/core/module/id/ModuleIdTest.java
@@ -21,6 +21,7 @@ import org.junit.Test;
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.assertTrue;
@@ -61,9 +62,9 @@ public class ModuleIdTest {
ModuleId moduleId = new ModuleId(org, name);
ModuleId moduleId2 = new ModuleId(org, name);
- assertTrue(moduleId.equals(moduleId));
- assertTrue(moduleId.equals(moduleId2));
- assertTrue(moduleId2.equals(moduleId));
+ assertEquals(moduleId, moduleId);
+ assertEquals(moduleId, moduleId2);
+ assertEquals(moduleId2, moduleId);
}
@Test
@@ -75,8 +76,8 @@ public class ModuleIdTest {
assertNotNull(moduleId);
assertFalse(moduleId.equals(null));
- assertFalse(moduleId.equals(moduleId2));
- assertFalse(moduleId2.equals(moduleId));
+ assertNotEquals(moduleId, moduleId2);
+ assertNotEquals(moduleId2, moduleId);
}
@Test
@@ -112,7 +113,7 @@ public class ModuleIdTest {
String name = "some-new-module";
ModuleId moduleId = new ModuleId(org, name);
- assertTrue(moduleId.compareTo(new ModuleId(org, name)) == 0);
+ assertEquals(0, moduleId.compareTo(new ModuleId(org, name)));
}
@Test
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e4131dc5/test/java/org/apache/ivy/core/resolve/ResolveTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/resolve/ResolveTest.java b/test/java/org/apache/ivy/core/resolve/ResolveTest.java
index 65870f7..6564a26 100644
--- a/test/java/org/apache/ivy/core/resolve/ResolveTest.java
+++ b/test/java/org/apache/ivy/core/resolve/ResolveTest.java
@@ -216,14 +216,14 @@ public class ResolveTest {
// verify the origin in the report
ArtifactOrigin reportOrigin = dReports[0].getArtifactOrigin();
assertNotNull(reportOrigin);
- assertEquals("isLocal for artifact not correct", true, reportOrigin.isLocal());
+ assertTrue("isLocal for artifact not correct", reportOrigin.isLocal());
assertEquals("location for artifact not correct", expectedLocation,
reportOrigin.getLocation());
// verify the saved origin on disk
ArtifactOrigin ivyOrigin = getSavedArtifactOrigin(artifact);
assertNotNull(ivyOrigin);
- assertEquals("isLocal for artifact not correct", true, ivyOrigin.isLocal());
+ assertTrue("isLocal for artifact not correct", ivyOrigin.isLocal());
assertEquals("location for artifact not correct", expectedLocation, ivyOrigin.getLocation());
// now resolve the same artifact again and verify the origin of the (not-downloaded)
@@ -240,7 +240,7 @@ public class ResolveTest {
dReports[0].getDownloadStatus());
reportOrigin = dReports[0].getArtifactOrigin();
assertNotNull(reportOrigin);
- assertEquals("isLocal for artifact not correct", true, reportOrigin.isLocal());
+ assertTrue("isLocal for artifact not correct", reportOrigin.isLocal());
assertEquals("location for artifact not correct", expectedLocation,
reportOrigin.getLocation());
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e4131dc5/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java b/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
index 1aae1f3..9264198 100644
--- a/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
+++ b/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
@@ -168,9 +168,9 @@ public class XmlSettingsParserTest {
assertEquals(0, settings.getStatusManager().getPriority("gold"));
assertEquals(1, settings.getStatusManager().getPriority("silver"));
assertEquals(2, settings.getStatusManager().getPriority("bronze"));
- assertEquals(false, settings.getStatusManager().isIntegration("gold"));
- assertEquals(false, settings.getStatusManager().isIntegration("silver"));
- assertEquals(true, settings.getStatusManager().isIntegration("bronze"));
+ assertFalse(settings.getStatusManager().isIntegration("gold"));
+ assertFalse(settings.getStatusManager().isIntegration("silver"));
+ assertTrue(settings.getStatusManager().isIntegration("bronze"));
}
@Test
@@ -221,7 +221,7 @@ public class XmlSettingsParserTest {
assertEquals("[module]/ivys/ivy-[revision].xml", settings.getDefaultCacheIvyPattern());
assertEquals("[module]/[type]s/[artifact]-[revision].[ext]",
settings.getDefaultCacheArtifactPattern());
- assertEquals(true, settings.isDefaultUseOrigin());
+ assertTrue(settings.isDefaultUseOrigin());
DefaultRepositoryCacheManager c = (DefaultRepositoryCacheManager) settings
.getRepositoryCacheManager("mycache");
@@ -237,7 +237,7 @@ public class XmlSettingsParserTest {
assertEquals(60 * 3600 * 1000, // 2d 12h = 60h
c.getTTL(ModuleRevisionId.newInstance("org3", "A", "A")));
assertEquals(new File("mycache").getCanonicalFile(), c.getBasedir().getCanonicalFile());
- assertEquals(false, c.isUseOrigin());
+ assertFalse(c.isUseOrigin());
assertEquals("no-lock", c.getLockStrategy().getName());
assertEquals("[module]/ivy-[revision].xml", c.getIvyPattern());
@@ -253,7 +253,7 @@ public class XmlSettingsParserTest {
assertEquals("[module]/ivys/ivy-[revision].xml", c2.getIvyPattern());
assertEquals("[module]/[type]s/[artifact]-[revision].[ext]", c2.getArtifactPattern());
- assertEquals(true, c2.isUseOrigin());
+ assertTrue(c2.isUseOrigin());
assertEquals(c2, settings.getResolver("A").getRepositoryCacheManager());
assertEquals(c, settings.getResolver("B").getRepositoryCacheManager());
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e4131dc5/test/java/org/apache/ivy/osgi/util/VersionTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/osgi/util/VersionTest.java b/test/java/org/apache/ivy/osgi/util/VersionTest.java
index ae4420a..9762d35 100644
--- a/test/java/org/apache/ivy/osgi/util/VersionTest.java
+++ b/test/java/org/apache/ivy/osgi/util/VersionTest.java
@@ -47,7 +47,7 @@ public class VersionTest {
@Test
public void testCompareTo() {
- assertTrue(new Version("1.2.3").compareTo(new Version("1.2.3")) == 0);
+ assertEquals(0, new Version("1.2.3").compareTo(new Version("1.2.3")));
assertTrue(new Version("1.2.3").compareTo(new Version("1.2.2")) > 0);
assertTrue(new Version("1.2.3").compareTo(new Version("1.1.3")) > 0);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e4131dc5/test/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcherTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcherTest.java b/test/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcherTest.java
index 62df8ec..6b8a183 100644
--- a/test/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcherTest.java
+++ b/test/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcherTest.java
@@ -46,9 +46,9 @@ public abstract class AbstractPatternMatcherTest {
public void testIsExact() {
// '*' is a special matcher
Matcher matcher = patternMatcher.getMatcher("*");
- assertEquals(false, matcher.isExact());
+ assertFalse(matcher.isExact());
matcher.matches("The words aren't what they were.");
- assertEquals(false, matcher.isExact());
+ assertFalse(matcher.isExact());
// test some exact patterns for this matcher
String[] expressions = getExactExpressions();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e4131dc5/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java b/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java
index be84e22..591541f 100644
--- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java
+++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java
@@ -161,8 +161,7 @@ public class VfsResourceTest {
Collections.sort(actual);
Collections.sort(expected);
- assertTrue("\nExpected: " + expected.toString() + "\nActual: " + actual.toString(),
- actual.equals(expected));
+ assertEquals("\nExpected: " + expected.toString() + "\nActual: " + actual.toString(), actual, expected);
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e4131dc5/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
index 7889183..b35a954 100644
--- a/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
@@ -18,6 +18,7 @@
package org.apache.ivy.plugins.resolver;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -442,7 +443,7 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
assertNotNull(rmr);
// the module returned should be the default one found in cache since check modified is
// false
- assertEquals(true, rmr.getDescriptor().isDefault());
+ assertTrue(rmr.getDescriptor().isDefault());
}
/**
@@ -467,7 +468,7 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
ResolvedModuleRevision rmr = chain.getDependency(dd, data);
assertNotNull(rmr);
- assertEquals(false, rmr.getDescriptor().isDefault());
+ assertFalse(rmr.getDescriptor().isDefault());
assertEquals("2", rmr.getResolver().getName());
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e4131dc5/test/java/org/apache/ivy/util/ConfiguratorTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/util/ConfiguratorTest.java b/test/java/org/apache/ivy/util/ConfiguratorTest.java
index 6cc532d..95be683 100644
--- a/test/java/org/apache/ivy/util/ConfiguratorTest.java
+++ b/test/java/org/apache/ivy/util/ConfiguratorTest.java
@@ -18,6 +18,7 @@
package org.apache.ivy.util;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.io.File;
@@ -227,17 +228,17 @@ public class ConfiguratorTest {
Housing housing = new House();
conf.setRoot(housing);
conf.setAttribute("empty", "true");
- assertEquals(true, housing.isEmpty());
+ assertTrue(housing.isEmpty());
conf.setAttribute("empty", "false");
- assertEquals(false, housing.isEmpty());
+ assertFalse(housing.isEmpty());
conf.setAttribute("empty", "yes");
- assertEquals(true, housing.isEmpty());
+ assertTrue(housing.isEmpty());
conf.setAttribute("empty", "no");
- assertEquals(false, housing.isEmpty());
+ assertFalse(housing.isEmpty());
conf.setAttribute("empty", "on");
- assertEquals(true, housing.isEmpty());
+ assertTrue(housing.isEmpty());
conf.setAttribute("empty", "off");
- assertEquals(false, housing.isEmpty());
+ assertFalse(housing.isEmpty());
}
@Test
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e4131dc5/test/java/org/apache/ivy/util/StringUtilsTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/util/StringUtilsTest.java b/test/java/org/apache/ivy/util/StringUtilsTest.java
index 0e9aeae..9112485 100644
--- a/test/java/org/apache/ivy/util/StringUtilsTest.java
+++ b/test/java/org/apache/ivy/util/StringUtilsTest.java
@@ -21,6 +21,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
public class StringUtilsTest {
@@ -39,6 +40,6 @@ public class StringUtilsTest {
StringUtils.decrypt(StringUtils
.encrypt("yet another string with 126 digits and others :;%_-$& characters")));
- assertFalse("apache".equals(StringUtils.encrypt("apache")));
+ assertNotEquals("apache", StringUtils.encrypt("apache"));
}
}