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/04/01 21:11:30 UTC
[1/4] ant git commit: Simplify append substring
Repository: ant
Updated Branches:
refs/heads/master 95495d57a -> b247c2e6d
Simplify append substring
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/86c7b1ff
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/86c7b1ff
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/86c7b1ff
Branch: refs/heads/master
Commit: 86c7b1ff732b6a40f1f9bb2b9d75c70f027031fa
Parents: 95495d5
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Sun Apr 1 21:39:10 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Sun Apr 1 21:39:10 2018 +0200
----------------------------------------------------------------------
src/main/org/apache/tools/ant/DefaultLogger.java | 2 +-
src/main/org/apache/tools/ant/filters/TokenFilter.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/KeySubst.java | 2 +-
src/main/org/apache/tools/ant/types/FilterSet.java | 2 +-
src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java | 2 +-
src/main/org/apache/tools/mail/SmtpResponseReader.java | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/86c7b1ff/src/main/org/apache/tools/ant/DefaultLogger.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/DefaultLogger.java b/src/main/org/apache/tools/ant/DefaultLogger.java
index 8390a64..db3cb68 100644
--- a/src/main/org/apache/tools/ant/DefaultLogger.java
+++ b/src/main/org/apache/tools/ant/DefaultLogger.java
@@ -140,7 +140,7 @@ public class DefaultLogger implements BuildLogger {
String msg1 = error.toString();
String msg2 = cause.toString();
if (msg1.endsWith(msg2)) {
- m.append(msg1.substring(0, msg1.length() - msg2.length()));
+ m.append(msg1, 0, msg1.length() - msg2.length());
error = cause;
} else {
break;
http://git-wip-us.apache.org/repos/asf/ant/blob/86c7b1ff/src/main/org/apache/tools/ant/filters/TokenFilter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/TokenFilter.java b/src/main/org/apache/tools/ant/filters/TokenFilter.java
index 7da00cd..e749836 100644
--- a/src/main/org/apache/tools/ant/filters/TokenFilter.java
+++ b/src/main/org/apache/tools/ant/filters/TokenFilter.java
@@ -380,7 +380,7 @@ public class TokenFilter extends BaseFilterReader
while (found >= 0) {
// write everything up to the from
if (found > start) {
- ret.append(line.substring(start, found));
+ ret.append(line, start, found);
}
// write the replacement to
http://git-wip-us.apache.org/repos/asf/ant/blob/86c7b1ff/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/KeySubst.java b/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
index ee476e7..44ea530 100644
--- a/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
+++ b/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
@@ -177,7 +177,7 @@ public class KeySubst extends Task {
while ((index = origString.indexOf("${", i)) > -1) {
key = origString.substring(index + 2, origString.indexOf("}",
index + 3));
- finalString.append(origString.substring(i, index));
+ finalString.append(origString, i, index);
if (keys.containsKey(key)) {
finalString.append(keys.get(key));
} else {
http://git-wip-us.apache.org/repos/asf/ant/blob/86c7b1ff/src/main/org/apache/tools/ant/types/FilterSet.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/FilterSet.java b/src/main/org/apache/tools/ant/types/FilterSet.java
index 38bc5cc..67dc16e 100644
--- a/src/main/org/apache/tools/ant/types/FilterSet.java
+++ b/src/main/org/apache/tools/ant/types/FilterSet.java
@@ -536,7 +536,7 @@ public class FilterSet extends DataType implements Cloneable {
}
String token =
line.substring(index + beginToken.length(), endIndex);
- b.append(line.substring(i, index));
+ b.append(line, i, index);
if (tokens.containsKey(token)) {
String value = tokens.get(token);
if (recurse && !value.equals(token)) {
http://git-wip-us.apache.org/repos/asf/ant/blob/86c7b1ff/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
index dafda3e..6dcb3aa 100644
--- a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
+++ b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
@@ -554,7 +554,7 @@ public class LayoutPreservingProperties extends Properties {
}
final int p = forEscaping.indexOf(c);
if (p != -1) {
- buffy.append("\\").append(escaped.substring(p, p + 1));
+ buffy.append("\\").append(escaped, p, p + 1);
} else if (c < 0x0020 || c > 0x007e) {
buffy.append(escapeUnicode(c));
} else {
http://git-wip-us.apache.org/repos/asf/ant/blob/86c7b1ff/src/main/org/apache/tools/mail/SmtpResponseReader.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/mail/SmtpResponseReader.java b/src/main/org/apache/tools/mail/SmtpResponseReader.java
index 69b11b4..2fdddc8 100644
--- a/src/main/org/apache/tools/mail/SmtpResponseReader.java
+++ b/src/main/org/apache/tools/mail/SmtpResponseReader.java
@@ -57,7 +57,7 @@ public class SmtpResponseReader {
String line = reader.readLine();
// CheckStyle:MagicNumber OFF
if (line != null && line.length() >= 3) {
- result.append(line.substring(0, 3));
+ result.append(line, 0, 3);
result.append(" ");
}
// CheckStyle:MagicNumber ON
[4/4] ant git commit: Remove more extraneous exceptions
Posted by gi...@apache.org.
Remove more extraneous exceptions
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/b247c2e6
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/b247c2e6
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/b247c2e6
Branch: refs/heads/master
Commit: b247c2e6dbca4dd1634bbfc54c26b09679268922
Parents: cac9c2f
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Sun Apr 1 23:11:04 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Sun Apr 1 23:11:04 2018 +0200
----------------------------------------------------------------------
.../apache/tools/ant/taskdefs/ChecksumTest.java | 8 +++-----
.../tools/ant/taskdefs/ExecuteJavaTest.java | 8 ++++----
.../org/apache/tools/ant/taskdefs/MoveTest.java | 4 ++--
.../ant/taskdefs/condition/IsReachableTest.java | 19 +++++++++----------
.../ant/taskdefs/cvslib/ChangeLogParserTest.java | 2 +-
.../taskdefs/optional/EchoPropertiesTest.java | 4 ++--
.../taskdefs/optional/junit/JUnitTaskTest.java | 4 ++--
.../apache/tools/ant/types/XMLCatalogTest.java | 2 +-
8 files changed, 24 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/b247c2e6/src/tests/junit/org/apache/tools/ant/taskdefs/ChecksumTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ChecksumTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ChecksumTest.java
index e103f98..695a5cd 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ChecksumTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ChecksumTest.java
@@ -18,8 +18,6 @@
package org.apache.tools.ant.taskdefs;
-import java.io.IOException;
-
import org.apache.tools.ant.BuildFileRule;
import org.junit.After;
import org.junit.Before;
@@ -47,17 +45,17 @@ public class ChecksumTest {
}
@Test
- public void testCreateMD5SUMformat() throws IOException {
+ public void testCreateMD5SUMformat() {
buildRule.executeTarget("createMD5SUMformat");
}
@Test
- public void testCreateSVFformat() throws IOException {
+ public void testCreateSVFformat() {
buildRule.executeTarget("createSVFformat");
}
@Test
- public void testCreatePattern() throws IOException {
+ public void testCreatePattern() {
buildRule.executeTarget("createPattern");
}
http://git-wip-us.apache.org/repos/asf/ant/blob/b247c2e6/src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteJavaTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteJavaTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteJavaTest.java
index b6d3e5a..c00d1b7 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteJavaTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteJavaTest.java
@@ -62,7 +62,7 @@ public class ExecuteJavaTest {
}
@Test
- public void testNoTimeOut() throws Exception {
+ public void testNoTimeOut() {
Commandline cmd = getCommandline(TIME_OUT / 2);
ej.setJavaCommand(cmd);
ej.execute(project);
@@ -71,7 +71,7 @@ public class ExecuteJavaTest {
// test that the watchdog ends the process
@Test
- public void testTimeOut() throws Exception {
+ public void testTimeOut() {
Commandline cmd = getCommandline(TIME_OUT * 2);
ej.setJavaCommand(cmd);
long now = System.currentTimeMillis();
@@ -88,7 +88,7 @@ public class ExecuteJavaTest {
}
@Test
- public void testNoTimeOutForked() throws Exception {
+ public void testNoTimeOutForked() {
Commandline cmd = getCommandline(TIME_OUT / 2);
ej.setJavaCommand(cmd);
ej.fork(cp);
@@ -97,7 +97,7 @@ public class ExecuteJavaTest {
// test that the watchdog ends the process
@Test
- public void testTimeOutForked() throws Exception {
+ public void testTimeOutForked() {
Commandline cmd = getCommandline(TIME_OUT * 2);
ej.setJavaCommand(cmd);
long now = System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/ant/blob/b247c2e6/src/tests/junit/org/apache/tools/ant/taskdefs/MoveTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/MoveTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/MoveTest.java
index 3799003..c09b6ba 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/MoveTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/MoveTest.java
@@ -91,12 +91,12 @@ public class MoveTest {
}
@Test
- public void testCompleteDirectoryMove() throws IOException {
+ public void testCompleteDirectoryMove() {
testCompleteDirectoryMove("testCompleteDirectoryMove");
}
@Test
- public void testCompleteDirectoryMove2() throws IOException {
+ public void testCompleteDirectoryMove2() {
testCompleteDirectoryMove("testCompleteDirectoryMove2");
}
http://git-wip-us.apache.org/repos/asf/ant/blob/b247c2e6/src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsReachableTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsReachableTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsReachableTest.java
index bef7ab1..6ddf26f 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsReachableTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsReachableTest.java
@@ -42,39 +42,38 @@ public class IsReachableTest {
"src/etc/testcases/taskdefs/conditions/isreachable.xml");
}
-
@Test
public void testLocalhost() {
buildRule.executeTarget("testLocalhost");
}
@Test
- public void testLocalhostURL() throws Exception {
+ public void testLocalhostURL() {
buildRule.executeTarget("testLocalhostURL");
}
@Test
- public void testIpv4localhost() throws Exception {
+ public void testIpv4localhost() {
buildRule.executeTarget("testIpv4localhost");
}
@Test
- public void testFTPURL() throws Exception {
+ public void testFTPURL() {
buildRule.executeTarget("testFTPURL");
}
@Test
- public void testBoth() throws Exception {
+ public void testBoth() {
try {
buildRule.executeTarget("testBoth");
- fail("Build exception expected: error on two targets");
+ fail("Build exception expected: error on two targets");
} catch (BuildException ex) {
assertEquals(IsReachable.ERROR_BOTH_TARGETS, ex.getMessage());
}
}
@Test
- public void testNoTargets() throws Exception {
+ public void testNoTargets() {
try {
buildRule.executeTarget("testNoTargets");
fail("Build exception expected: no params");
@@ -84,7 +83,7 @@ public class IsReachableTest {
}
@Test
- public void testBadTimeout() throws Exception {
+ public void testBadTimeout() {
try {
buildRule.executeTarget("testBadTimeout");
fail("Build exception expected: error on -ve timeout");
@@ -95,7 +94,7 @@ public class IsReachableTest {
@Test
@Ignore("Previously named in a way to prevent execution")
- public void NotestFile() throws Exception {
+ public void NotestFile() {
try {
buildRule.executeTarget("testFile");
fail("Build exception expected: error on file URL");
@@ -105,7 +104,7 @@ public class IsReachableTest {
}
@Test
- public void testBadURL() throws Exception {
+ public void testBadURL() {
try {
buildRule.executeTarget("testBadURL");
fail("Build exception expected: error in URL");
http://git-wip-us.apache.org/repos/asf/ant/blob/b247c2e6/src/tests/junit/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParserTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParserTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParserTest.java
index 4496bf0..e10a0dd 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParserTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParserTest.java
@@ -50,7 +50,7 @@ public class ChangeLogParserTest {
}
@Test
- public void testCvs112Format() throws Exception {
+ public void testCvs112Format() {
parser.stdout("Working file: build.xml");
parser.stdout("revision 1.475");
parser.stdout("date: 2004-06-05 16:10:32 +0000; author: somebody; state: Exp; lines: +2 -2");
http://git-wip-us.apache.org/repos/asf/ant/blob/b247c2e6/src/tests/junit/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java
index 0536c9a..1c2d445 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java
@@ -193,13 +193,13 @@ public class EchoPropertiesTest {
}
@Test
- public void testWithEmptyPrefixAndRegex() throws Exception {
+ public void testWithEmptyPrefixAndRegex() {
buildRule.executeTarget("testEchoWithEmptyPrefixToLog");
assertContains("test.property=" + TEST_VALUE, buildRule.getLog());
}
@Test
- public void testWithRegex() throws Exception {
+ public void testWithRegex() {
assumeTrue("Test skipped because no regexp matcher is present.",
RegexpMatcherFactory.regexpMatcherPresent(buildRule.getProject()));
buildRule.executeTarget("testWithRegex");
http://git-wip-us.apache.org/repos/asf/ant/blob/b247c2e6/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
index cac0f5b..8ef6c70 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
@@ -385,12 +385,12 @@ public class JUnitTaskTest {
}
@Test
- public void testTestMethods() throws Exception {
+ public void testTestMethods() {
buildRule.executeTarget("testTestMethods");
}
@Test
- public void testNonTestsSkipped() throws Exception {
+ public void testNonTestsSkipped() {
buildRule.executeTarget("testNonTests");
assertFalse("Test result should not exist as test was skipped - TEST-org.example.junit.NonTestMissed.xml",
http://git-wip-us.apache.org/repos/asf/ant/blob/b247c2e6/src/tests/junit/org/apache/tools/ant/types/XMLCatalogTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/types/XMLCatalogTest.java b/src/tests/junit/org/apache/tools/ant/types/XMLCatalogTest.java
index 30b62b4..7297264 100644
--- a/src/tests/junit/org/apache/tools/ant/types/XMLCatalogTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/XMLCatalogTest.java
@@ -312,7 +312,7 @@ public class XMLCatalogTest {
}
@Test
- public void testResolverBase() throws MalformedURLException, TransformerException {
+ public void testResolverBase() throws TransformerException {
String uri = "http://foo.com/bar/blah.xml";
String uriLoc = "etc/testcases/taskdefs/optional/xml/about.xml";
String base = toURLString(project.getBaseDir()) + "/src/";
[3/4] ant git commit: Simplify assertions
Posted by gi...@apache.org.
Simplify assertions
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/cac9c2fc
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/cac9c2fc
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/cac9c2fc
Branch: refs/heads/master
Commit: cac9c2fc4fa96c51bec547402dd4de055a6c84d0
Parents: 9a8a441
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Sun Apr 1 22:06:44 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Sun Apr 1 22:36:23 2018 +0200
----------------------------------------------------------------------
.../org/apache/tools/ant/LocationTest.java | 13 +++---
.../tools/ant/taskdefs/AntStructureTest.java | 37 +++++++++--------
.../tools/ant/taskdefs/AvailableTest.java | 7 ++--
.../org/apache/tools/ant/taskdefs/CopyTest.java | 43 +++++++++-----------
.../ant/taskdefs/ExecStreamRedirectorTest.java | 4 +-
.../apache/tools/ant/taskdefs/ImportTest.java | 4 +-
.../org/apache/tools/ant/taskdefs/JavaTest.java | 6 +--
.../apache/tools/ant/taskdefs/ReplaceTest.java | 2 +-
.../apache/tools/ant/taskdefs/SignJarTest.java | 3 +-
.../org/apache/tools/ant/taskdefs/ZipTest.java | 13 +++---
.../compilers/DefaultCompilerAdapterTest.java | 20 +++++----
.../tools/ant/taskdefs/optional/JspcTest.java | 5 +--
.../ant/taskdefs/optional/PropertyFileTest.java | 6 +--
.../ant/taskdefs/optional/image/ImageTest.java | 3 +-
.../junitlauncher/JUnitLauncherTaskTest.java | 5 ++-
.../ant/taskdefs/optional/unix/SymlinkTest.java | 20 ++++-----
.../apache/tools/ant/types/TarFileSetTest.java | 13 ++----
.../apache/tools/ant/types/ZipFileSetTest.java | 7 +---
.../types/selectors/ModifiedSelectorTest.java | 14 +++----
.../tools/ant/util/ClasspathUtilsTest.java | 4 +-
.../apache/tools/ant/util/DeweyDecimalTest.java | 20 ++++-----
.../org/apache/tools/zip/ZipEncodingTest.java | 8 ++--
.../org/apache/tools/zip/ZipEntryTest.java | 4 +-
.../junit/org/apache/tools/zip/ZipLongTest.java | 6 +--
.../org/apache/tools/zip/ZipShortTest.java | 6 +--
.../junitlauncher/vintage/JUnit4SampleTest.java | 11 +++--
26 files changed, 139 insertions(+), 145 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/ant/LocationTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/LocationTest.java b/src/tests/junit/org/apache/tools/ant/LocationTest.java
index 42aab1d..e6e3d53 100644
--- a/src/tests/junit/org/apache/tools/ant/LocationTest.java
+++ b/src/tests/junit/org/apache/tools/ant/LocationTest.java
@@ -26,7 +26,8 @@ import org.junit.Rule;
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.assertNotSame;
import static org.junit.Assert.assertTrue;
public class LocationTest {
@@ -43,8 +44,8 @@ public class LocationTest {
public void testPlainTask() {
buildRule.executeTarget("testPlainTask");
Echo e = buildRule.getProject().getReference("echo");
- assertFalse(e.getLocation() == Location.UNKNOWN_LOCATION);
- assertFalse(e.getLocation().getLineNumber() == 0);
+ assertNotSame(e.getLocation(), Location.UNKNOWN_LOCATION);
+ assertNotEquals(0, e.getLocation().getLineNumber());
}
@Test
@@ -52,7 +53,7 @@ public class LocationTest {
buildRule.executeTarget("testStandaloneType");
Echo e = buildRule.getProject().getReference("echo2");
FileSet f = buildRule.getProject().getReference("fs");
- assertFalse(f.getLocation() == Location.UNKNOWN_LOCATION);
+ assertNotSame(f.getLocation(), Location.UNKNOWN_LOCATION);
assertEquals(e.getLocation().getLineNumber() + 1,
f.getLocation().getLineNumber());
}
@@ -62,8 +63,8 @@ public class LocationTest {
buildRule.executeTarget("testConditionTask");
TaskAdapter ta = buildRule.getProject().getReference("cond");
ConditionTask c = (ConditionTask) ta.getProxy();
- assertFalse(c.getLocation() == Location.UNKNOWN_LOCATION);
- assertFalse(c.getLocation().getLineNumber() == 0);
+ assertNotSame(c.getLocation(), Location.UNKNOWN_LOCATION);
+ assertNotEquals(0, c.getLocation().getLineNumber());
}
@Test
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/ant/taskdefs/AntStructureTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/AntStructureTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/AntStructureTest.java
index da51b5d..406b441 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/AntStructureTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/AntStructureTest.java
@@ -18,12 +18,10 @@
package org.apache.tools.ant.taskdefs;
-import org.apache.tools.ant.AntAssert;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildFileRule;
import org.apache.tools.ant.Project;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -31,6 +29,9 @@ import org.junit.Test;
import java.io.PrintWriter;
import java.util.Hashtable;
+import static org.apache.tools.ant.AntAssert.assertContains;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
/**
@@ -68,7 +69,7 @@ public class AntStructureTest {
// the test has likely been loaded via a different classloader
// than this class. Therefore we make the printer assert its
// state and only check for the tail invocation.
- AntAssert.assertContains(MyPrinter.TAIL_CALLED, buildRule.getLog());
+ assertContains(MyPrinter.TAIL_CALLED, buildRule.getLog());
}
public static class MyPrinter implements AntStructure.StructurePrinter {
@@ -81,32 +82,32 @@ public class AntStructureTest {
public void printHead(PrintWriter out, Project p, Hashtable tasks,
Hashtable types) {
- Assert.assertTrue(!headCalled);
- Assert.assertTrue(!targetCalled);
- Assert.assertTrue(!tailCalled);
- Assert.assertEquals(0, elementCalled);
+ assertTrue(!headCalled);
+ assertTrue(!targetCalled);
+ assertTrue(!tailCalled);
+ assertEquals(0, elementCalled);
headCalled = true;
}
public void printTargetDecl(PrintWriter out) {
- Assert.assertTrue(headCalled);
- Assert.assertTrue(!targetCalled);
- Assert.assertTrue(!tailCalled);
- Assert.assertEquals(0, elementCalled);
+ assertTrue(headCalled);
+ assertTrue(!targetCalled);
+ assertTrue(!tailCalled);
+ assertEquals(0, elementCalled);
targetCalled = true;
}
public void printElementDecl(PrintWriter out, Project p, String name,
Class element) {
- Assert.assertTrue(headCalled);
- Assert.assertTrue(targetCalled);
- Assert.assertTrue(!tailCalled);
+ assertTrue(headCalled);
+ assertTrue(targetCalled);
+ assertTrue(!tailCalled);
elementCalled++;
this.p = p;
}
public void printTail(PrintWriter out) {
- Assert.assertTrue(headCalled);
- Assert.assertTrue(targetCalled);
- Assert.assertTrue(!tailCalled);
- Assert.assertTrue(elementCalled > 0);
+ assertTrue(headCalled);
+ assertTrue(targetCalled);
+ assertTrue(!tailCalled);
+ assertTrue(elementCalled > 0);
tailCalled = true;
p.log(TAIL_CALLED);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/ant/taskdefs/AvailableTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/AvailableTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/AvailableTest.java
index ae87a5a..be14160 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/AvailableTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/AvailableTest.java
@@ -26,7 +26,6 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
/**
@@ -81,7 +80,7 @@ public class AvailableTest {
@Test
public void test4() {
buildRule.executeTarget("test4");
- assertTrue(buildRule.getProject().getProperty("test") == null);
+ assertNull(buildRule.getProject().getProperty("test"));
}
// file does exist -> property 'test' == 'true'
@@ -94,7 +93,7 @@ public class AvailableTest {
@Test
public void test6() {
buildRule.executeTarget("test6");
- assertTrue(buildRule.getProject().getProperty("test") == null);
+ assertNull(buildRule.getProject().getProperty("test"));
}
// resource does exist -> property 'test' == 'true'
@@ -108,7 +107,7 @@ public class AvailableTest {
@Test
public void test8() {
buildRule.executeTarget("test8");
- assertTrue(buildRule.getProject().getProperty("test") == null);
+ assertNull(buildRule.getProject().getProperty("test"));
}
// class does exist -> property 'test' == 'true'
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/ant/taskdefs/CopyTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/CopyTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/CopyTest.java
index c027ae2..961a473 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/CopyTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/CopyTest.java
@@ -23,8 +23,6 @@ import org.apache.tools.ant.BuildFileRule;
import org.apache.tools.ant.FileUtilities;
import org.apache.tools.ant.taskdefs.condition.Os;
import org.apache.tools.ant.util.FileUtils;
-import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
@@ -37,8 +35,10 @@ import java.io.IOException;
import static org.apache.tools.ant.AntAssert.assertContains;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
/**
* Tests FileSet using the Copy task.
@@ -78,7 +78,7 @@ public class CopyTest {
public void test3() {
buildRule.executeTarget("test3");
File file3 = new File(buildRule.getProject().getProperty("output"), "copytest3.tmp");
- //rollback file timestamp instead of delaying test
+ // rollback file timestamp instead of delaying test
FileUtilities.rollbackTimestamps(file3, 3);
buildRule.executeTarget("test3Part2");
assertTrue(file3.exists());
@@ -90,19 +90,14 @@ public class CopyTest {
File file3c = new File(buildRule.getProject().getProperty("output"), "copytest3c.tmp");
assertTrue(file3c.exists());
- //file length checks rely on touch generating a zero byte file
- if (file3.length()==0) {
- fail("could not overwrite an existing, older file");
- }
- if (file3c.length()!=0) {
- fail("could not force overwrite an existing, newer file");
- }
- if (file3b.length()==0) {
- fail("unexpectedly overwrote an existing, newer file");
- }
+ // file length checks rely on touch generating a zero byte file
+
+ assertNotEquals("could not overwrite an existing, older file", 0, file3.length());
+ assertEquals("could not force overwrite an existing, newer file", 0, file3c.length());
+ assertNotEquals("unexpectedly overwrote an existing, newer file", 0, file3b.length());
- //file time checks for java1.2+
- assertTrue(file3a.lastModified() == file3.lastModified());
+ // file time checks for java1.2+
+ assertEquals(file3a.lastModified(), file3.lastModified());
assertTrue(file3c.lastModified() < file3a.lastModified());
}
@@ -293,14 +288,14 @@ public class CopyTest {
@Test
public void testCopyToSymlinkedSelf() throws Exception {
// we are only going to test against systems that support symlinks
- Assume.assumeTrue("Symlinks not supported on this operating system", Os.isFamily(Os.FAMILY_UNIX));
+ assumeTrue("Symlinks not supported on this operating system", Os.isFamily(Os.FAMILY_UNIX));
// setup the source files to run copying against
buildRule.executeTarget("setupSelfCopyTesting");
final File testDir = new File(buildRule.getProject().getProperty("self.copy.test.root.dir"));
- Assert.assertTrue(testDir + " was expected to be a directory", testDir.isDirectory());
+ assertTrue(testDir + " was expected to be a directory", testDir.isDirectory());
final File srcFile = new File(testDir, "file.txt");
- Assert.assertTrue("Source file " + srcFile + " was expected to be a file", srcFile.isFile());
+ assertTrue("Source file " + srcFile + " was expected to be a file", srcFile.isFile());
final long originalFileSize = srcFile.length();
final String originalContent;
final BufferedReader reader = new BufferedReader(new FileReader(srcFile));
@@ -309,26 +304,26 @@ public class CopyTest {
} finally {
reader.close();
}
- Assert.assertTrue("Content missing in file " + srcFile, originalContent != null && originalContent.length() > 0);
+ assertTrue("Content missing in file " + srcFile, originalContent != null && originalContent.length() > 0);
// run the copy tests
buildRule.executeTarget("testSelfCopy");
// make sure the source file hasn't been impacted by the copy
assertSizeAndContent(srcFile, originalFileSize, originalContent);
final File symlinkedFile = new File(testDir, "sylmink-file.txt");
- Assert.assertTrue(symlinkedFile + " was expected to be a file", symlinkedFile.isFile());
+ assertTrue(symlinkedFile + " was expected to be a file", symlinkedFile.isFile());
assertSizeAndContent(symlinkedFile, originalFileSize, originalContent);
final File symlinkedTestDir = new File(buildRule.getProject().getProperty("self.copy.test.symlinked.dir"));
- Assert.assertTrue(symlinkedTestDir + " was expected to be a directory", symlinkedTestDir.isDirectory());
+ assertTrue(symlinkedTestDir + " was expected to be a directory", symlinkedTestDir.isDirectory());
assertSizeAndContent(new File(symlinkedTestDir, "file.txt"), originalFileSize, originalContent);
assertSizeAndContent(new File(symlinkedTestDir, "sylmink-file.txt"), originalFileSize, originalContent);
}
private void assertSizeAndContent(final File file, final long expectedSize, final String expectedContent) throws IOException {
- Assert.assertTrue(file + " was expected to be a file", file.isFile());
- Assert.assertEquals("Unexpected size of file " + file, expectedSize, file.length());
+ assertTrue(file + " was expected to be a file", file.isFile());
+ assertEquals("Unexpected size of file " + file, expectedSize, file.length());
final BufferedReader reader = new BufferedReader(new FileReader(file));
final String content;
try {
@@ -336,6 +331,6 @@ public class CopyTest {
} finally {
reader.close();
}
- Assert.assertEquals("Unexpected content in file " + file, expectedContent, content);
+ assertEquals("Unexpected content in file " + file, expectedContent, content);
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java
index 4b359e3..7a51946 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java
@@ -11,7 +11,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.util.Arrays;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -57,7 +57,7 @@ public class ExecStreamRedirectorTest {
assertTrue(redirectedOutputFile + " is missing or not a regular file", redirectedOutputFile.isFile());
final byte[] redirectedOutput = readAllBytes(redirectedOutputFile);
assertNotNull("No content was redirected to " + redirectedOutputFile, redirectedOutput);
- assertFalse("Content in redirected file " + redirectedOutputFile + " was empty", redirectedOutput.length == 0);
+ assertNotEquals("Content in redirected file " + redirectedOutputFile + " was empty", 0, redirectedOutput.length);
if (dirListingOutput != null) {
// compare the directory listing that was redirected to these files. all files should have the same content
assertTrue("Redirected output in file " + redirectedOutputFile +
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/ant/taskdefs/ImportTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ImportTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ImportTest.java
index 40a52cd..79c3b3d 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ImportTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ImportTest.java
@@ -22,7 +22,6 @@ import static org.apache.tools.ant.AntAssert.assertContains;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.File;
@@ -53,8 +52,7 @@ public class ImportTest {
buildRule.configureProject("src/etc/testcases/taskdefs/import/unnamedImport.xml",
Project.MSG_WARN);
String log = buildRule.getLog();
- assertTrue("Warnings logged when not expected: " + log,
- log.length() == 0);
+ assertEquals("Warnings logged when not expected: " + log, 0, log.length());
}
@Test
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
index 5579f85..03804dc 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
@@ -41,8 +41,8 @@ import org.junit.Test;
import org.junit.internal.AssumptionViolatedException;
import static org.apache.tools.ant.AntAssert.assertContains;
-import org.junit.Assert;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -169,7 +169,7 @@ public class JavaTest {
java.setJvmargs("-Xmx128M");
java.setArgs(arg);
final String[] cmdLine = java.getCommandLine().getCommandline();
- Assert.assertNotNull("Has command line.", cmdLine);
+ assertNotNull("Has command line.", cmdLine);
assertEquals("Command line should have 5 elements", 5, cmdLine.length);
assertEquals("Last command line element should be java argument: " + arg,
arg,
@@ -195,7 +195,7 @@ public class JavaTest {
java.setJvmargs("-Xmx128M"); //NOI18N
java.setArgs(arg);
final String[] cmdLine = java.getCommandLine().getCommandline();
- Assert.assertNotNull("Has command line.", cmdLine);
+ assertNotNull("Has command line.", cmdLine);
assertEquals("Command line should have 5 elements", 5, cmdLine.length);
assertEquals("Last command line element should be java argument: " + arg,
arg,
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/ant/taskdefs/ReplaceTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ReplaceTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ReplaceTest.java
index 3d2ff4f..7dabd3d 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ReplaceTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ReplaceTest.java
@@ -148,7 +148,7 @@ public class ReplaceTest {
testFile.setLastModified(testFile.lastModified() - FileUtils.getFileUtils().getFileTimestampGranularity() * 5));
long ts1 = testFile.lastModified();
buildRule.executeTarget("testPreserve");
- assertTrue(ts1 == new File(buildRule.getOutputDir(), "test.txt").lastModified());
+ assertEquals(ts1, new File(buildRule.getOutputDir(), "test.txt").lastModified());
}
public void assertEqualContent(File expect, File result)
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java
index 91073bd..8a69125 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java
@@ -29,6 +29,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;
import static org.junit.Assert.fail;
@@ -124,7 +125,7 @@ public class SignJarTest {
File f = new File(testJarParent,
"../" + testJarParent.getName() + "/"
+ testJar.getName());
- assertFalse(testJar.equals(f));
+ assertNotEquals(testJar, f);
assertEquals(testJar.getCanonicalPath(), f.getCanonicalPath());
SignJar s = new SignJar();
s.setProject(buildRule.getProject());
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/ant/taskdefs/ZipTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ZipTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ZipTest.java
index b2e2858..9f93706 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ZipTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ZipTest.java
@@ -36,11 +36,10 @@ import org.junit.Test;
import static org.apache.tools.ant.AntAssert.assertContains;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeTrue;
-
public class ZipTest {
@Rule
@@ -138,12 +137,12 @@ public class ZipTest {
ZipFile zipFile = new ZipFile(new File(buildRule.getProject().getProperty("output"),
"zipgroupfileset.zip"));
- assertTrue(zipFile.getEntry("ant.xml") != null);
- assertTrue(zipFile.getEntry("optional/jspc.xml") != null);
- assertTrue(zipFile.getEntry("zip/zipgroupfileset3.zip") != null);
+ assertNotNull(zipFile.getEntry("ant.xml"));
+ assertNotNull(zipFile.getEntry("optional/jspc.xml"));
+ assertNotNull(zipFile.getEntry("zip/zipgroupfileset3.zip"));
- assertTrue(zipFile.getEntry("test6.mf") == null);
- assertTrue(zipFile.getEntry("test7.mf") == null);
+ assertNull(zipFile.getEntry("test6.mf"));
+ assertNull(zipFile.getEntry("test7.mf"));
zipFile.close();
}
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapterTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapterTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapterTest.java
index 2791e7d..dd95634 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapterTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapterTest.java
@@ -30,12 +30,14 @@ import org.apache.tools.ant.taskdefs.Javac;
import org.apache.tools.ant.types.Commandline;
import org.junit.Test;
-import static org.apache.tools.ant.AntAssert.assertContains;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.util.FileUtils;
-import org.junit.Assert;
+
+import static org.apache.tools.ant.AntAssert.assertContains;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
public class DefaultCompilerAdapterTest {
@@ -263,17 +265,17 @@ public class DefaultCompilerAdapterTest {
javac.setIncludeantruntime(false);
javac.add(impl);
javac.execute();
- Assert.assertNotNull(cmd[0]);
+ assertNotNull(cmd[0]);
final List<String> cmdLine = Arrays.asList(cmd[0].getCommandline());
//No modulesourcepath
assertEquals(-1, cmdLine.indexOf("--module-source-path"));
//The -sourcepath has to be followed by src
int index = cmdLine.indexOf("-sourcepath");
- Assert.assertTrue(index != -1 && index < cmdLine.size() - 1);
+ assertTrue(index != -1 && index < cmdLine.size() - 1);
assertEquals(src.getAbsolutePath(), cmdLine.get(index + 1));
//The --module-path has to be followed by modules
index = cmdLine.indexOf("--module-path");
- Assert.assertTrue(index != -1 && index < cmdLine.size() - 1);
+ assertTrue(index != -1 && index < cmdLine.size() - 1);
assertEquals(modules.getAbsolutePath(), cmdLine.get(index + 1));
//J1.java & J2.java has to be in files list
final Set<String> expected = new TreeSet<String>();
@@ -321,13 +323,13 @@ public class DefaultCompilerAdapterTest {
javac.setIncludeantruntime(false);
javac.add(impl);
javac.execute();
- Assert.assertNotNull(cmd[0]);
+ assertNotNull(cmd[0]);
final List<String> cmdLine = Arrays.asList(cmd[0].getCommandline());
//No sourcepath
assertEquals(-1, cmdLine.indexOf("-sourcepath"));
//The --module-source-path has to be followed by the pattern
int index = cmdLine.indexOf("--module-source-path");
- Assert.assertTrue(index != -1 && index < cmdLine.size() - 1);
+ assertTrue(index != -1 && index < cmdLine.size() - 1);
String expectedModSrcPath = String.format("%s/%s",
workDir.getAbsolutePath(),
moduleSrcPathStr)
@@ -336,7 +338,7 @@ public class DefaultCompilerAdapterTest {
assertEquals(expectedModSrcPath, cmdLine.get(index + 1));
//The --module-path has to be followed by modules
index = cmdLine.indexOf("--module-path");
- Assert.assertTrue(index != -1 && index < cmdLine.size() - 1);
+ assertTrue(index != -1 && index < cmdLine.size() - 1);
assertEquals(modules.getAbsolutePath(), cmdLine.get(index + 1));
//J1.java, J2.java & J3.java has to be in files list
final Set<String> expectedFiles = new TreeSet<String>();
@@ -386,7 +388,7 @@ public class DefaultCompilerAdapterTest {
javac.add(impl);
javac.execute();
final File[] compileList = impl.compileList;
- Assert.assertNotNull(compileList);
+ assertNotNull(compileList);
//J1.java, J2.java has to be in files list but not J3.java
final Set<String> expectedFiles = new TreeSet<String>();
Collections.addAll(expectedFiles,
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/ant/taskdefs/optional/JspcTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/JspcTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/JspcTest.java
index 3ec210e..555ab2f 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/JspcTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/JspcTest.java
@@ -181,9 +181,8 @@ public class JspcTest {
*/
protected void assertMapped(JspMangler mangler, String filename, String classname) {
String mappedname = mangler.mapJspToJavaName(new File(filename));
- assertTrue(filename + " should have mapped to " + classname
- + " but instead mapped to " + mappedname,
- classname.equals(mappedname));
+ assertEquals(filename + " should have mapped to " + classname
+ + " but instead mapped to " + mappedname, classname, mappedname);
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java
index 7ccf00a..3896c8f 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java
@@ -81,9 +81,9 @@ public class PropertyFileTest {
assertEquals(FNAME, beforeUpdate.getProperty(FNAME_KEY));
assertEquals(LNAME, beforeUpdate.getProperty(LNAME_KEY));
assertEquals(EMAIL, beforeUpdate.getProperty(EMAIL_KEY));
- assertEquals(null, beforeUpdate.getProperty(PHONE_KEY));
- assertEquals(null, beforeUpdate.getProperty(AGE_KEY));
- assertEquals(null, beforeUpdate.getProperty(DATE_KEY));
+ assertNull(beforeUpdate.getProperty(PHONE_KEY));
+ assertNull(beforeUpdate.getProperty(AGE_KEY));
+ assertNull(beforeUpdate.getProperty(DATE_KEY));
// ask ant to update the properties...
buildRule.executeTarget("update-existing-properties");
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageTest.java
index 2b8b582..0d91ede 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageTest.java
@@ -29,6 +29,7 @@ import org.junit.Test;
import java.io.File;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeTrue;
@@ -96,7 +97,7 @@ public class ImageTest {
AntAssert.assertContains("Processing File", buildRule.getLog());
f = new File(buildRule.getOutputDir(), LARGEIMAGE);
long overwrittenLastModified = f.lastModified();
- assertTrue("File was overwritten.", lastModified == overwrittenLastModified);
+ assertEquals("File was overwritten.", lastModified, overwrittenLastModified);
}
@Test
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTaskTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTaskTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTaskTest.java
index 84d4875..1649a84 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTaskTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTaskTest.java
@@ -5,12 +5,13 @@ import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildListener;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.ProjectHelper;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import java.io.File;
+import static org.junit.Assert.fail;
+
/**
* Tests the {@link JUnitLauncherTask}
*/
@@ -75,7 +76,7 @@ public class JUnitLauncherTaskTest {
public void testFailureStopsBuild() {
try {
project.executeTarget("test-failure-stops-build");
- Assert.fail("Test execution failure was expected to stop the build but didn't");
+ fail("Test execution failure was expected to stop the build but didn't");
} catch (BuildException be) {
// expected
}
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java
index 23f3725..717baec 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java
@@ -35,16 +35,16 @@ import org.apache.tools.ant.taskdefs.condition.Os;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.util.SymbolicLinkUtils;
import org.junit.After;
-import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
import java.io.File;
import java.nio.file.Files;
@@ -69,7 +69,7 @@ public class SymlinkTest {
@Before
public void setUp() {
- Assume.assumeTrue("Symlinks not supported on current operating system", supportsSymlinks);
+ assumeTrue("Symlinks not supported on current operating system", supportsSymlinks);
buildRule.configureProject("src/etc/testcases/taskdefs/optional/unix/symlink.xml");
buildRule.executeTarget("setUp");
}
@@ -274,8 +274,8 @@ public class SymlinkTest {
assertFalse(f.exists());
assertFalse(f.isDirectory());
assertFalse(f.isFile());
- assertTrue(su.isSymbolicLink(f.getAbsolutePath()) == false);
- assertTrue(su.isSymbolicLink(f.getParentFile(), f.getName()) == false);
+ assertFalse(su.isSymbolicLink(f.getAbsolutePath()));
+ assertFalse(su.isSymbolicLink(f.getParentFile(), f.getName()));
assertTrue(su.isDanglingSymbolicLink(f.getAbsolutePath()));
assertTrue(su.isDanglingSymbolicLink(f.getParentFile(),
f.getName()));
@@ -284,8 +284,8 @@ public class SymlinkTest {
assertFalse(f.exists());
assertFalse(f.isDirectory());
assertFalse(f.isFile());
- assertTrue(su.isSymbolicLink(f.getAbsolutePath()) == false);
- assertTrue(su.isSymbolicLink(f.getParentFile(), f.getName()) == false);
+ assertFalse(su.isSymbolicLink(f.getAbsolutePath()));
+ assertFalse(su.isSymbolicLink(f.getParentFile(), f.getName()));
assertTrue(su.isDanglingSymbolicLink(f.getAbsolutePath()));
assertTrue(su.isDanglingSymbolicLink(f.getParentFile(),
f.getName()));
@@ -305,10 +305,10 @@ public class SymlinkTest {
buildRule.executeTarget("test-overwrite-link");
final Project p = buildRule.getProject();
final String linkTargetResource = p.getProperty("test.overwrite.link.target.dir");
- Assert.assertNotNull("Property test.overwrite.link.target.dir is not set", linkTargetResource);
+ assertNotNull("Property test.overwrite.link.target.dir is not set", linkTargetResource);
final Path targetResourcePath = Paths.get(linkTargetResource);
- Assert.assertTrue(targetResourcePath + " is not a directory", Files.isDirectory(targetResourcePath));
- Assert.assertEquals(targetResourcePath + " directory was expected to be empty", 0, Files.list(targetResourcePath).count());
+ assertTrue(targetResourcePath + " is not a directory", Files.isDirectory(targetResourcePath));
+ assertEquals(targetResourcePath + " directory was expected to be empty", 0, Files.list(targetResourcePath).count());
}
@After
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/ant/types/TarFileSetTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/types/TarFileSetTest.java b/src/tests/junit/org/apache/tools/ant/types/TarFileSetTest.java
index 391e248..7d002e5 100644
--- a/src/tests/junit/org/apache/tools/ant/types/TarFileSetTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/TarFileSetTest.java
@@ -24,7 +24,6 @@ import org.apache.tools.ant.BuildException;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
/**
@@ -107,14 +106,10 @@ public class TarFileSetTest extends AbstractFileSetTest {
getProject().addReference("test", f);
TarFileSet zid = (TarFileSet) getInstance();
zid.setRefid(new Reference(getProject(), "test"));
- assertTrue("src attribute copied by copy constructor",
- zid.getSrc(getProject()).equals(f.getSrc(getProject())));
- assertTrue("prefix attribute copied by copy constructor",
- f.getPrefix(getProject()).equals(zid.getPrefix(getProject())));
- assertTrue("file mode attribute copied by copy constructor",
- f.getFileMode(getProject()) == zid.getFileMode(getProject()));
- assertTrue("dir mode attribute copied by copy constructor",
- f.getDirMode(getProject()) == zid.getDirMode(getProject()));
+ assertEquals("src attribute copied by copy constructor", zid.getSrc(getProject()), f.getSrc(getProject()));
+ assertEquals("prefix attribute copied by copy constructor", f.getPrefix(getProject()), zid.getPrefix(getProject()));
+ assertEquals("file mode attribute copied by copy constructor", f.getFileMode(getProject()), zid.getFileMode(getProject()));
+ assertEquals("dir mode attribute copied by copy constructor", f.getDirMode(getProject()), zid.getDirMode(getProject()));
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/ant/types/ZipFileSetTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/types/ZipFileSetTest.java b/src/tests/junit/org/apache/tools/ant/types/ZipFileSetTest.java
index c89b420..b4637da 100644
--- a/src/tests/junit/org/apache/tools/ant/types/ZipFileSetTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/ZipFileSetTest.java
@@ -24,7 +24,6 @@ import org.apache.tools.ant.BuildException;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
/**
@@ -106,10 +105,8 @@ public class ZipFileSetTest extends AbstractFileSetTest {
getProject().addReference("test", f);
ZipFileSet zid = (ZipFileSet) getInstance();
zid.setRefid(new Reference(getProject(), "test"));
- assertTrue("src attribute copied by copy constructor",
- zid.getSrc(getProject()).equals(f.getSrc(getProject())));
- assertTrue("prefix attribute copied by copy constructor",
- f.getPrefix(getProject()).equals(zid.getPrefix(getProject())));
+ assertEquals("src attribute copied by copy constructor", zid.getSrc(getProject()), f.getSrc(getProject()));
+ assertEquals("prefix attribute copied by copy constructor", f.getPrefix(getProject()), zid.getPrefix(getProject()));
assertEquals("file mode attribute copied by copy constructor",
f.getFileMode(getProject()), zid.getFileMode(getProject()));
assertEquals("dir mode attribute copied by copy constructor",
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java b/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
index 9be4d63..01c16e4 100644
--- a/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
@@ -18,7 +18,6 @@
package org.apache.tools.ant.types.selectors;
-
import java.io.File;
import java.io.FileWriter;
import java.text.RuleBasedCollator;
@@ -51,6 +50,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;
import static org.junit.Assert.fail;
@@ -189,7 +189,7 @@ public class ModifiedSelectorTest {
assertNotNull("'fs.mod.value' must be set.", fsModValue);
// must be empty according to the Mock* implementations
- assertTrue("'fs.mod.value' must be empty.", "".equals(fsModValue));
+ assertEquals("'fs.mod.value' must be empty.", "", fsModValue);
} finally {
bft.doTarget("modifiedselectortest-scenario-clean");
bft.deletePropertiesfile();
@@ -602,9 +602,9 @@ public class ModifiedSelectorTest {
Object o2 = "string2";
Object o3 = "string2"; // really "2"
- assertTrue("Comparator gave wrong value.", comp.compare(o1, o2) != 0);
- assertTrue("Comparator gave wrong value.", comp.compare(o1, o3) != 0);
- assertTrue("Comparator gave wrong value.", comp.compare(o2, o3) == 0);
+ assertNotEquals("Comparator gave wrong value.", 0, comp.compare(o1, o2));
+ assertNotEquals("Comparator gave wrong value.", 0, comp.compare(o1, o3));
+ assertEquals("Comparator gave wrong value.", 0, comp.compare(o2, o3));
}
// ===================== scenario tests =====================
@@ -837,8 +837,8 @@ public class ModifiedSelectorTest {
// do the checks
assertTrue("Cache file not created.", cachefile.exists());
assertTrue("Not enough files copied on first time.", to1.list().length > 5);
- assertTrue("Too much files copied on second time.", to2.list().length == 0);
- assertTrue("Too much files copied on third time.", to3.list().length == 2);
+ assertEquals("Too much files copied on second time.", 0, to2.list().length);
+ assertEquals("Too much files copied on third time.", 2, to3.list().length);
// don't catch the JUnit exceptions
} finally {
bft.doTarget("modifiedselectortest-scenario-clean");
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/ant/util/ClasspathUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/util/ClasspathUtilsTest.java b/src/tests/junit/org/apache/tools/ant/util/ClasspathUtilsTest.java
index ce6486b..9169156 100644
--- a/src/tests/junit/org/apache/tools/ant/util/ClasspathUtilsTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/ClasspathUtilsTest.java
@@ -26,7 +26,7 @@ import org.apache.tools.ant.Project;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
/**
@@ -61,6 +61,6 @@ public class ClasspathUtilsTest {
list.append(" ").append(enumeration.nextElement());
count++;
}
- assertTrue("Should be only one and not " + count + " " + list, count == 1);
+ assertEquals("Should be only one and not " + count + " " + list, 1, count);
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/ant/util/DeweyDecimalTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/util/DeweyDecimalTest.java b/src/tests/junit/org/apache/tools/ant/util/DeweyDecimalTest.java
index e8e8cbd..d16ba15 100644
--- a/src/tests/junit/org/apache/tools/ant/util/DeweyDecimalTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/DeweyDecimalTest.java
@@ -18,12 +18,12 @@
package org.apache.tools.ant.util;
+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;
-import org.junit.Test;
-
public class DeweyDecimalTest {
@Test
@@ -55,21 +55,21 @@ public class DeweyDecimalTest {
@Test
public void testEquals() {
- assertTrue(new DeweyDecimal("1.2.3").equals(new DeweyDecimal("1.2.3")));
- assertFalse(new DeweyDecimal("1.2.3").equals(new DeweyDecimal("1.2.4")));
- assertTrue(new DeweyDecimal("1.2.0").equals(new DeweyDecimal("1.2")));
- assertTrue(new DeweyDecimal("1.2").equals(new DeweyDecimal("1.2.0")));
+ assertEquals(new DeweyDecimal("1.2.3"), new DeweyDecimal("1.2.3"));
+ assertNotEquals(new DeweyDecimal("1.2.3"), new DeweyDecimal("1.2.4"));
+ assertEquals(new DeweyDecimal("1.2.0"), new DeweyDecimal("1.2"));
+ assertEquals(new DeweyDecimal("1.2"), new DeweyDecimal("1.2.0"));
}
@Test
public void compareTo() {
assertTrue(new DeweyDecimal("1.2.3").compareTo(new DeweyDecimal("1.2")) > 0);
assertTrue(new DeweyDecimal("1.2").compareTo(new DeweyDecimal("1.2.3")) < 0);
- assertTrue(new DeweyDecimal("1.2.3").compareTo(new DeweyDecimal("1.2.3")) == 0);
+ assertEquals(0, new DeweyDecimal("1.2.3").compareTo(new DeweyDecimal("1.2.3")));
assertTrue(new DeweyDecimal("1.2.3").compareTo(new DeweyDecimal("1.1.4")) > 0);
assertTrue(new DeweyDecimal("1.2.3").compareTo(new DeweyDecimal("1.2.2.9")) > 0);
- assertTrue(new DeweyDecimal("1.2.0").compareTo(new DeweyDecimal("1.2")) == 0);
- assertTrue(new DeweyDecimal("1.2").compareTo(new DeweyDecimal("1.2.0")) == 0);
+ assertEquals(0, new DeweyDecimal("1.2.0").compareTo(new DeweyDecimal("1.2")));
+ assertEquals(0, new DeweyDecimal("1.2").compareTo(new DeweyDecimal("1.2.0")));
}
// TODO isGreaterThan, ...
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/zip/ZipEncodingTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/zip/ZipEncodingTest.java b/src/tests/junit/org/apache/tools/zip/ZipEncodingTest.java
index f05d553..66418ce 100644
--- a/src/tests/junit/org/apache/tools/zip/ZipEncodingTest.java
+++ b/src/tests/junit/org/apache/tools/zip/ZipEncodingTest.java
@@ -25,6 +25,8 @@ import java.nio.ByteBuffer;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
/**
* Test zip encodings.
@@ -133,15 +135,15 @@ public class ZipEncodingTest {
String decoded = enc.decode(testBytes);
- assertEquals(true, enc.canEncode(decoded));
+ assertTrue(enc.canEncode(decoded));
ByteBuffer encoded = enc.encode(decoded);
assertByteEquals(testBytes, encoded);
- assertEquals(false, enc.canEncode(UNENC_STRING));
+ assertFalse(enc.canEncode(UNENC_STRING));
assertByteEquals("%U2016".getBytes("US-ASCII"), enc.encode(UNENC_STRING));
- assertEquals(false, enc.canEncode(BAD_STRING));
+ assertFalse(enc.canEncode(BAD_STRING));
assertByteEquals(BAD_STRING_ENC.getBytes("US-ASCII"),
enc.encode(BAD_STRING));
}
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java b/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java
index fc30eca..290694f 100644
--- a/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java
+++ b/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import java.util.NoSuchElementException;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.fail;
@@ -210,7 +210,7 @@ public class ZipEntryTest {
public void testNotEquals() {
ZipEntry entry1 = new ZipEntry("foo");
ZipEntry entry2 = new ZipEntry("bar");
- assertFalse(entry1.equals(entry2));
+ assertNotEquals(entry1, entry2);
}
@Test
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/zip/ZipLongTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/zip/ZipLongTest.java b/src/tests/junit/org/apache/tools/zip/ZipLongTest.java
index 6933840..04c47c7 100644
--- a/src/tests/junit/org/apache/tools/zip/ZipLongTest.java
+++ b/src/tests/junit/org/apache/tools/zip/ZipLongTest.java
@@ -63,12 +63,12 @@ public class ZipLongTest {
ZipLong zl2 = new ZipLong(0x12345678);
ZipLong zl3 = new ZipLong(0x87654321);
- assertTrue("reflexive", zl.equals(zl));
+ assertEquals("reflexive", zl, zl);
- assertTrue("works", zl.equals(zl2));
+ assertEquals("works", zl, zl2);
assertTrue("works, part two", !zl.equals(zl3));
- assertTrue("symmetric", zl2.equals(zl));
+ assertEquals("symmetric", zl2, zl);
assertTrue("null handling", !zl.equals(null));
assertTrue("non ZipLong handling", !zl.equals(0x1234));
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/apache/tools/zip/ZipShortTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/zip/ZipShortTest.java b/src/tests/junit/org/apache/tools/zip/ZipShortTest.java
index 5938db3..0f191e8 100644
--- a/src/tests/junit/org/apache/tools/zip/ZipShortTest.java
+++ b/src/tests/junit/org/apache/tools/zip/ZipShortTest.java
@@ -60,12 +60,12 @@ public class ZipShortTest {
ZipShort zs2 = new ZipShort(0x1234);
ZipShort zs3 = new ZipShort(0x5678);
- assertTrue("reflexive", zs.equals(zs));
+ assertEquals("reflexive", zs, zs);
- assertTrue("works", zs.equals(zs2));
+ assertEquals("works", zs, zs2);
assertTrue("works, part two", !zs.equals(zs3));
- assertTrue("symmetric", zs2.equals(zs));
+ assertEquals("symmetric", zs2, zs);
assertTrue("null handling", !zs.equals(null));
assertTrue("non ZipShort handling", !zs.equals(0x1234));
http://git-wip-us.apache.org/repos/asf/ant/blob/cac9c2fc/src/tests/junit/org/example/junitlauncher/vintage/JUnit4SampleTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/example/junitlauncher/vintage/JUnit4SampleTest.java b/src/tests/junit/org/example/junitlauncher/vintage/JUnit4SampleTest.java
index f5896e1..f9cef56 100644
--- a/src/tests/junit/org/example/junitlauncher/vintage/JUnit4SampleTest.java
+++ b/src/tests/junit/org/example/junitlauncher/vintage/JUnit4SampleTest.java
@@ -1,8 +1,11 @@
package org.example.junitlauncher.vintage;
-import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
/**
*
*/
@@ -10,16 +13,16 @@ public class JUnit4SampleTest {
@Test
public void testFoo() {
- Assert.assertEquals(1, 1);
+ assertEquals(1, 1);
}
@Test
public void testBar() {
- Assert.assertTrue(true);
+ assertTrue(true);
}
@Test
public void testFooBar() {
- Assert.assertFalse(false);
+ assertFalse(false);
}
}
[2/4] ant git commit: Simplify logic
Posted by gi...@apache.org.
Simplify logic
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/9a8a4416
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/9a8a4416
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/9a8a4416
Branch: refs/heads/master
Commit: 9a8a441655a09e6c074f4ec2cfb9c9a4a291809e
Parents: 86c7b1f
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Sun Apr 1 21:46:45 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Sun Apr 1 21:46:45 2018 +0200
----------------------------------------------------------------------
src/main/org/apache/tools/ant/Location.java | 12 ++----------
src/main/org/apache/tools/ant/Project.java | 4 ++--
.../tools/ant/filters/util/ChainReaderHelper.java | 2 +-
.../apache/tools/ant/input/GreedyInputHandler.java | 2 +-
.../apache/tools/ant/taskdefs/AbstractCvsTask.java | 4 ++--
src/main/org/apache/tools/ant/taskdefs/Antlib.java | 2 +-
.../org/apache/tools/ant/taskdefs/Available.java | 6 +++---
.../org/apache/tools/ant/taskdefs/Checksum.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/Copy.java | 2 +-
.../org/apache/tools/ant/taskdefs/Definer.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/Delete.java | 2 +-
.../org/apache/tools/ant/taskdefs/DependSet.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/Exit.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/Expand.java | 2 +-
.../org/apache/tools/ant/taskdefs/Javadoc.java | 3 +--
src/main/org/apache/tools/ant/taskdefs/Length.java | 2 +-
.../apache/tools/ant/taskdefs/LoadProperties.java | 2 +-
.../apache/tools/ant/taskdefs/LoadResource.java | 2 +-
.../org/apache/tools/ant/taskdefs/MacroDef.java | 4 ++--
.../apache/tools/ant/taskdefs/MacroInstance.java | 2 +-
.../apache/tools/ant/taskdefs/MatchingTask.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/Move.java | 6 +++---
.../org/apache/tools/ant/taskdefs/Parallel.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/SubAnt.java | 4 ++--
.../org/apache/tools/ant/taskdefs/UpToDate.java | 2 +-
.../org/apache/tools/ant/taskdefs/XSLTProcess.java | 8 +++-----
src/main/org/apache/tools/ant/taskdefs/Zip.java | 4 ++--
.../taskdefs/compilers/DefaultCompilerAdapter.java | 2 +-
.../apache/tools/ant/taskdefs/compilers/Jikes.java | 2 +-
.../ant/taskdefs/condition/ResourceContains.java | 3 +--
.../ant/taskdefs/optional/EchoProperties.java | 2 +-
.../tools/ant/taskdefs/optional/ccm/Continuus.java | 2 +-
.../ant/taskdefs/optional/clearcase/ClearCase.java | 2 +-
.../optional/ejb/BorlandDeploymentTool.java | 2 +-
.../optional/ejb/BorlandGenerateClient.java | 3 +--
.../optional/ejb/WeblogicDeploymentTool.java | 4 ++--
.../tools/ant/taskdefs/optional/image/Image.java | 2 +-
.../tools/ant/taskdefs/optional/jlink/jlink.java | 2 +-
.../ant/taskdefs/optional/junit/JUnitTask.java | 4 ++--
.../tools/ant/taskdefs/optional/net/FTP.java | 7 +++----
.../taskdefs/optional/net/FTPTaskMirrorImpl.java | 10 ++++------
.../tools/ant/taskdefs/optional/ssh/Directory.java | 9 ++++-----
src/main/org/apache/tools/ant/types/DataType.java | 17 +++++++----------
.../org/apache/tools/ant/types/Description.java | 13 ++++++-------
src/main/org/apache/tools/ant/types/FileList.java | 2 +-
.../apache/tools/ant/types/resources/Archives.java | 3 +--
.../tools/ant/types/resources/ResourceList.java | 2 +-
.../tools/ant/types/selectors/SelectSelector.java | 2 +-
.../apache/tools/ant/util/DOMElementWriter.java | 2 +-
src/main/org/apache/tools/ant/util/FileUtils.java | 4 ++--
.../org/apache/tools/ant/util/ResourceUtils.java | 6 +++---
.../org/apache/tools/zip/GeneralPurposeBit.java | 15 ++++++++-------
.../apache/tools/ant/taskdefs/LoadFileTest.java | 6 +++---
53 files changed, 98 insertions(+), 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/Location.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Location.java b/src/main/org/apache/tools/ant/Location.java
index 0e83760..a656704 100644
--- a/src/main/org/apache/tools/ant/Location.java
+++ b/src/main/org/apache/tools/ant/Location.java
@@ -159,16 +159,8 @@ public class Location implements Serializable {
*/
@Override
public boolean equals(Object other) {
- if (this == other) {
- return true;
- }
- if (other == null) {
- return false;
- }
- if (!(other.getClass() == getClass())) {
- return false;
- }
- return toString().equals(other.toString());
+ return this == other || other != null && other.getClass() == getClass()
+ && toString().equals(other.toString());
}
/**
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/Project.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
index 656764f..d5a714e 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -1398,12 +1398,12 @@ public class Project implements ResourceFactory {
curtarget.performTasks();
succeededTargets.add(curtarget.getName());
} catch (final RuntimeException ex) {
- if (!(keepGoingMode)) {
+ if (!keepGoingMode) {
throw ex; // throw further
}
thrownException = ex;
} catch (final Throwable ex) {
- if (!(keepGoingMode)) {
+ if (!keepGoingMode) {
throw new BuildException(ex);
}
thrownException = ex;
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java b/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java
index 5294f36..a804bb4 100644
--- a/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java
+++ b/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java
@@ -253,7 +253,7 @@ public final class ChainReaderHelper {
}
success = true;
} finally {
- if (!(success || classLoadersToCleanUp.isEmpty())) {
+ if (!success && !classLoadersToCleanUp.isEmpty()) {
cleanUpClassLoaders(classLoadersToCleanUp);
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/input/GreedyInputHandler.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/input/GreedyInputHandler.java b/src/main/org/apache/tools/ant/input/GreedyInputHandler.java
index cb52f4f..6a8901e 100644
--- a/src/main/org/apache/tools/ant/input/GreedyInputHandler.java
+++ b/src/main/org/apache/tools/ant/input/GreedyInputHandler.java
@@ -65,7 +65,7 @@ public class GreedyInputHandler extends DefaultInputHandler {
}
}
request.setInput(new String(baos.toByteArray()));
- if (!(request.isInputValid())) {
+ if (!request.isInputValid()) {
throw new BuildException(
"Received invalid console input");
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
index a83b8ba..f3cae46 100644
--- a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
@@ -603,7 +603,7 @@ public abstract class AbstractCvsTask extends Task {
*/
public void setTag(String p) {
// Check if not real tag => set it to null
- if (!(p == null || p.trim().isEmpty())) {
+ if (p != null && !p.trim().isEmpty()) {
tag = p;
addCommandArgument("-r" + p);
}
@@ -639,7 +639,7 @@ public abstract class AbstractCvsTask extends Task {
* can understand see man cvs
*/
public void setDate(String p) {
- if (!(p == null || p.trim().isEmpty())) {
+ if (p != null && !p.trim().isEmpty()) {
addCommandArgument("-D");
addCommandArgument(p);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/Antlib.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Antlib.java b/src/main/org/apache/tools/ant/taskdefs/Antlib.java
index 519436e..7698437 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Antlib.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Antlib.java
@@ -92,7 +92,7 @@ public class Antlib extends Task implements TaskContainer {
UnknownElement ue =
parser.parseAntlibDescriptor(project, antlibResource);
// Check name is "antlib"
- if (!(TAG.equals(ue.getTag()))) {
+ if (!TAG.equals(ue.getTag())) {
throw new BuildException(
"Unexpected tag " + ue.getTag() + " expecting "
+ TAG, ue.getLocation());
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/Available.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Available.java b/src/main/org/apache/tools/ant/taskdefs/Available.java
index 23496a0..b6d24bf 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Available.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Available.java
@@ -287,12 +287,12 @@ public class Available extends Task implements Condition {
} else {
setTaskName("available");
}
- if (!(classname == null || checkClass(classname))) {
+ if (classname != null && !checkClass(classname)) {
log("Unable to load class " + classname + appendix,
Project.MSG_VERBOSE);
return false;
}
- if ((file != null) && !checkFile()) {
+ if (file != null && !checkFile()) {
StringBuilder buf = new StringBuilder("Unable to find ");
if (type != null) {
buf.append(type).append(' ');
@@ -301,7 +301,7 @@ public class Available extends Task implements Condition {
log(buf.toString(), Project.MSG_VERBOSE);
return false;
}
- if ((resource != null) && !checkResource(resource)) {
+ if (resource != null && !checkResource(resource)) {
log("Unable to load resource " + resource + appendix,
Project.MSG_VERBOSE);
return false;
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/Checksum.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Checksum.java b/src/main/org/apache/tools/ant/taskdefs/Checksum.java
index f089ad7..3f30f02 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Checksum.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Checksum.java
@@ -328,7 +328,7 @@ public class Checksum extends MatchingTask implements Condition {
throw new BuildException(
"Specify at least one source - a file or a resource collection.");
}
- if (!(resources == null || resources.isFilesystemOnly())) {
+ if (resources != null && !resources.isFilesystemOnly()) {
throw new BuildException("Can only calculate checksums for file-based resources.");
}
if (file != null && file.exists() && file.isDirectory()) {
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/Copy.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java b/src/main/org/apache/tools/ant/taskdefs/Copy.java
index ca9feef..5a33705 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Copy.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java
@@ -909,7 +909,7 @@ public class Copy extends Task {
for (String dir : dirs) {
final File d = new File(dir);
if (!d.exists()) {
- if (!(d.mkdirs() || d.isDirectory())) {
+ if (!d.mkdirs() && !d.isDirectory()) {
log("Unable to create directory "
+ d.getAbsolutePath(), Project.MSG_ERR);
} else {
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/Definer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Definer.java b/src/main/org/apache/tools/ant/taskdefs/Definer.java
index 154974e..92af5d6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Definer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Definer.java
@@ -320,7 +320,7 @@ public abstract class Definer extends DefBase {
*/
private URL fileToURL() {
String message = null;
- if (!(file.exists())) {
+ if (!file.exists()) {
message = "File " + file + " does not exist";
}
if (message == null && !(file.isFile())) {
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/Delete.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Delete.java b/src/main/org/apache/tools/ant/taskdefs/Delete.java
index 2d1ab22..7b146d3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Delete.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Delete.java
@@ -748,7 +748,7 @@ public class Delete extends MatchingTask {
if (!f.exists()) {
continue;
}
- if (!(f.isDirectory()) || f.list().length == 0) {
+ if (!f.isDirectory() || f.list().length == 0) {
log("Deleting " + f, verbosity);
if (!delete(f) && failonerror) {
handle("Unable to delete "
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/DependSet.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/DependSet.java b/src/main/org/apache/tools/ant/taskdefs/DependSet.java
index 0fbdf56..b026510 100644
--- a/src/main/org/apache/tools/ant/taskdefs/DependSet.java
+++ b/src/main/org/apache/tools/ant/taskdefs/DependSet.java
@@ -205,7 +205,7 @@ public class DependSet extends MatchingTask {
"At least one set of target files must be specified");
}
//no sources = nothing to compare; no targets = nothing to delete:
- if (!(sources.isEmpty() || targets.isEmpty() || uptodate(sources, targets))) {
+ if (!sources.isEmpty() && !targets.isEmpty() && !uptodate(sources, targets)) {
log("Deleting all target files.", Project.MSG_VERBOSE);
if (verbose) {
for (String t : targets.list()) {
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/Exit.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Exit.java b/src/main/org/apache/tools/ant/taskdefs/Exit.java
index 35967a5..d803d0b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Exit.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Exit.java
@@ -138,7 +138,7 @@ public class Exit extends Task {
: (testIfCondition() && testUnlessCondition());
if (fail) {
String text = null;
- if (!(message == null || message.trim().isEmpty())) {
+ if (message != null && !message.trim().isEmpty()) {
text = message.trim();
} else {
if (ifCondition != null && !"".equals(ifCondition)
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/Expand.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java b/src/main/org/apache/tools/ant/taskdefs/Expand.java
index 963561b..56d5bf4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Expand.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Expand.java
@@ -268,7 +268,7 @@ public class Expand extends Task {
entryName = entryName.substring(1);
}
- if (!(patternsets == null || patternsets.isEmpty())) {
+ if (patternsets != null && !patternsets.isEmpty()) {
String name = entryName.replace('/', File.separatorChar)
.replace('\\', File.separatorChar);
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index 9b5e3c7..19f6885 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -2174,8 +2174,7 @@ public class Javadoc extends Task {
private void doDocFilesSubDirs(final Commandline toExecute) {
if (docFilesSubDirs) {
toExecute.createArgument().setValue("-docfilessubdirs");
- if (!(excludeDocFilesSubDir == null
- || excludeDocFilesSubDir.trim().isEmpty())) {
+ if (excludeDocFilesSubDir != null && !excludeDocFilesSubDir.trim().isEmpty()) {
toExecute.createArgument().setValue("-excludedocfilessubdir");
toExecute.createArgument().setValue(excludeDocFilesSubDir);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/Length.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Length.java b/src/main/org/apache/tools/ant/taskdefs/Length.java
index c39a795..04fab3d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Length.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Length.java
@@ -221,7 +221,7 @@ public class Length extends Task implements Condition {
"the mode attribute is for use with the file/resource length function");
}
} else if (resources != null) {
- if (!(EACH.equals(mode) || ALL.equals(mode))) {
+ if (!EACH.equals(mode) && !ALL.equals(mode)) {
throw new BuildException(
"invalid mode setting for file/resource length function: \""
+ mode + "\"");
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java b/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
index b186eef..b04ad7d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
+++ b/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
@@ -183,7 +183,7 @@ public class LoadProperties extends Task {
String text = instream.readFully();
- if (!(text == null || text.isEmpty())) {
+ if (text != null && !text.isEmpty()) {
if (!text.endsWith("\n")) {
text = text + "\n";
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/LoadResource.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/LoadResource.java b/src/main/org/apache/tools/ant/taskdefs/LoadResource.java
index 1f44d20..c236872 100644
--- a/src/main/org/apache/tools/ant/taskdefs/LoadResource.java
+++ b/src/main/org/apache/tools/ant/taskdefs/LoadResource.java
@@ -178,7 +178,7 @@ public class LoadResource extends Task {
text = null;
}
- if (!(text == null || text.isEmpty())) {
+ if (text != null && !text.isEmpty()) {
getProject().setNewProperty(property, text);
log("loaded " + text.length() + " characters",
Project.MSG_VERBOSE);
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/MacroDef.java b/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
index d69907d..1892f68 100644
--- a/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
+++ b/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
@@ -729,8 +729,8 @@ public class MacroDef extends AntlibDefinition {
}
if (getURI() == null || "".equals(getURI())
|| getURI().equals(ProjectHelper.ANT_CORE_URI)) {
- if (!(other.getURI() == null || "".equals(other.getURI())
- || other.getURI().equals(ProjectHelper.ANT_CORE_URI))) {
+ if (other.getURI() != null && !"".equals(other.getURI())
+ && !other.getURI().equals(ProjectHelper.ANT_CORE_URI)) {
return false;
}
} else if (!getURI().equals(other.getURI())) {
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java b/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
index 12249e6..23ff8ab 100644
--- a/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
+++ b/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
@@ -375,7 +375,7 @@ public class MacroInstance extends Task implements DynamicAttribute, TaskContain
text = text.trim();
}
localAttributes.put(macroDef.getText().getName(), text);
- } else if (!(text == null || text.trim().isEmpty())) {
+ } else if (text != null && !text.trim().isEmpty()) {
throw new BuildException(
"The \"%s\" macro does not support nested text data.",
getTaskName());
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
index a7654db..99371d4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
@@ -162,7 +162,7 @@ public abstract class MatchingTask extends Task implements SelectorContainer {
public void XsetIgnore(String ignoreString) {
log("The ignore attribute is deprecated."
+ "Please use the excludes attribute.", Project.MSG_WARN);
- if (!(ignoreString == null || ignoreString.isEmpty())) {
+ if (ignoreString != null && !ignoreString.isEmpty()) {
StringTokenizer tok = new StringTokenizer(ignoreString, ", ",
false);
while (tok.hasMoreTokens()) {
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/Move.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Move.java b/src/main/org/apache/tools/ant/taskdefs/Move.java
index 28a3086..a2f8414 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Move.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Move.java
@@ -179,7 +179,7 @@ public class Move extends Copy {
}
File d = new File(toDirName);
if (!d.exists()) {
- if (!(d.mkdirs() || d.exists())) {
+ if (!d.mkdirs() && !d.exists()) {
log("Unable to create directory "
+ d.getAbsolutePath(), Project.MSG_ERR);
} else {
@@ -372,8 +372,8 @@ public class Move extends Copy {
+ " is a no-op.", Project.MSG_VERBOSE);
return true;
}
- if (!(getFileUtils().areSame(sourceFile, destFile)
- || getFileUtils().tryHardToDelete(destFile, performGc))) {
+ if (!getFileUtils().areSame(sourceFile, destFile)
+ && !getFileUtils().tryHardToDelete(destFile, performGc)) {
throw new BuildException("Unable to remove existing file %s",
destFile);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/Parallel.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Parallel.java b/src/main/org/apache/tools/ant/taskdefs/Parallel.java
index c149a4a..0922b9f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Parallel.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Parallel.java
@@ -269,7 +269,7 @@ public class Parallel extends Task
ThreadGroup group = new ThreadGroup("parallel");
TaskRunnable[] daemons = null;
- if (!(daemonTasks == null || daemonTasks.tasks.isEmpty())) {
+ if (daemonTasks != null && !daemonTasks.tasks.isEmpty()) {
daemons = new TaskRunnable[daemonTasks.tasks.size()];
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
index cd97123..d930a8d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
@@ -227,7 +227,7 @@ public class SubAnt extends Task {
log("Leaving directory: " + subdirPath + "\n", Project.MSG_INFO);
}
} catch (RuntimeException ex) {
- if (!(getProject().isKeepGoingMode())) {
+ if (!getProject().isKeepGoingMode()) {
if (verbose && subdirPath != null) {
log("Leaving directory: " + subdirPath + "\n", Project.MSG_INFO);
}
@@ -235,7 +235,7 @@ public class SubAnt extends Task {
}
thrownException = ex;
} catch (Throwable ex) {
- if (!(getProject().isKeepGoingMode())) {
+ if (!getProject().isKeepGoingMode()) {
if (verbose && subdirPath != null) {
log("Leaving directory: " + subdirPath + "\n", Project.MSG_INFO);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
index 03babd9..19dcd23 100644
--- a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
+++ b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
@@ -159,7 +159,7 @@ public class UpToDate extends Task implements Condition {
"At least one srcfile or a nested <srcfiles> or <srcresources> element must be set.");
}
- if (!(sourceFileSets.isEmpty() && sourceResources.isEmpty())
+ if ((!sourceFileSets.isEmpty() || !sourceResources.isEmpty())
&& sourceFile != null) {
throw new BuildException(
"Cannot specify both the srcfile attribute and a nested <srcfiles> or <srcresources> element.");
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
index a7c6fa2..98bc458 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
@@ -889,11 +889,9 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
*/
private void ensureDirectoryFor(final File targetFile) throws BuildException {
final File directory = targetFile.getParentFile();
- if (!directory.exists()) {
- if (!(directory.mkdirs() || directory.isDirectory())) {
- handleError("Unable to create directory: "
- + directory.getAbsolutePath());
- }
+ if (!directory.exists() && !directory.mkdirs() && !directory.isDirectory()) {
+ handleError("Unable to create directory: "
+ + directory.getAbsolutePath());
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/Zip.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java
index 078c21a..a0dc95e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Zip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java
@@ -1600,13 +1600,13 @@ public class Zip extends MatchingTask {
final List<Resource> resources = new Vector<>();
if (!doFilesonly) {
for (String d : rs.getIncludedDirectories()) {
- if (!(d.isEmpty() && skipEmptyNames)) {
+ if (!d.isEmpty() || !skipEmptyNames) {
resources.add(rs.getResource(d));
}
}
}
for (String f : rs.getIncludedFiles()) {
- if (!(f.isEmpty() && skipEmptyNames)) {
+ if (!f.isEmpty() || !skipEmptyNames) {
resources.add(rs.getResource(f));
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
index a9ba55f..58f751f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
@@ -334,7 +334,7 @@ public abstract class DefaultCompilerAdapter
}
}
- if (!(extdirs == null || extdirs.isEmpty())) {
+ if (extdirs != null && !extdirs.isEmpty()) {
cmd.createArgument().setValue("-extdirs");
cmd.createArgument().setPath(extdirs);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
index cb9385c..f066248 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
@@ -83,7 +83,7 @@ public class Jikes extends DefaultCompilerAdapter {
classpath.append(new Path(project, jikesPath));
}
- if (!(extdirs == null || extdirs.isEmpty())) {
+ if (extdirs != null && !extdirs.isEmpty()) {
cmd.createArgument().setValue("-extdirs");
cmd.createArgument().setPath(extdirs);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java b/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java
index 033701b..8a82c78 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java
@@ -88,8 +88,7 @@ public class ResourceContains implements Condition {
o = rc.iterator().next();
}
} else {
- throw new BuildException("Illegal value at '%s': %s", refid,
- o);
+ throw new BuildException("Illegal value at '%s': %s", refid, o);
}
}
this.resource = (Resource) o;
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
index 2ce593e..6f4179c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
@@ -209,7 +209,7 @@ public class EchoProperties extends Task {
* @since Ant 1.7
*/
public void setRegex(String regex) {
- if (!(regex == null || regex.isEmpty())) {
+ if (regex != null && !regex.isEmpty()) {
this.regex = regex;
PropertySet ps = new PropertySet();
ps.setProject(getProject());
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
index 845c7bf..869ed7f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
@@ -103,7 +103,7 @@ public abstract class Continuus extends Task {
*/
protected final String getCcmCommand() {
String toReturn = ccmDir;
- if (!("".equals(toReturn) || toReturn.endsWith("/"))) {
+ if (!"".equals(toReturn) && !toReturn.endsWith("/")) {
toReturn += "/";
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
index eba0e9a..8db603d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
@@ -128,7 +128,7 @@ public abstract class ClearCase extends Task {
*/
protected final String getClearToolCommand() {
String toReturn = mClearToolDir;
- if (!("".equals(toReturn) || toReturn.endsWith("/"))) {
+ if (!"".equals(toReturn) && !toReturn.endsWith("/")) {
toReturn += "/";
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
index 6c1566c..8894045 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
@@ -240,7 +240,7 @@ public class BorlandDeploymentTool extends GenericDeploymentTool
protected void addVendorFiles(Hashtable<String, File> ejbFiles, String ddPrefix) {
//choose the right vendor DD
- if (!(version == BES || version == BAS)) {
+ if (version != BES && version != BAS) {
throw new BuildException("version " + version + " is not supported");
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
index 87925e4..5df3b36 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
@@ -160,8 +160,7 @@ public class BorlandGenerateClient extends Task {
setMode(JAVA_MODE);
}
- if (!(version == BorlandDeploymentTool.BES
- || version == BorlandDeploymentTool.BAS)) {
+ if (version != BorlandDeploymentTool.BES && version != BorlandDeploymentTool.BAS) {
throw new BuildException("version %d is not supported", version);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
index 8356471..d2ae38b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
@@ -566,8 +566,8 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool {
}
Path combinedClasspath = getCombinedClasspath();
- if (!(wlClasspath == null || combinedClasspath == null
- || combinedClasspath.toString().trim().isEmpty())) {
+ if (wlClasspath != null && combinedClasspath != null
+ && !combinedClasspath.toString().trim().isEmpty()) {
javaTask.createArg().setValue("-classpath");
javaTask.createArg().setPath(combinedClasspath);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java b/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java
index ef6c7db..1f36d3e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java
@@ -240,7 +240,7 @@ public class Image extends MatchingTask {
if (dstFile.exists()) {
// avoid overwriting unless necessary
- if(!overwrite
+ if (!overwrite
&& srcFile.lastModified() <= dstFile.lastModified()) {
log(srcFile + " omitted as " + dstFile
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java
index 2a3e519..7531e98 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java
@@ -355,7 +355,7 @@ public class jlink {
*/
String name = inputEntry.getName();
- if (!(inputEntry.isDirectory() || name.endsWith(".class"))) {
+ if (!inputEntry.isDirectory() && !name.endsWith(".class")) {
try (InputStream input = zip.getInputStream(zip.getEntry(name))) {
String className = ClassNameReader.getClassName(input);
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index 8c62d56..b57663a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -1703,8 +1703,8 @@ public class JUnitTask extends Task {
private void checkModules() {
if (hasPath(getCommandline().getModulepath()) ||
hasPath(getCommandline().getUpgrademodulepath())) {
- if (!(batchTests.stream().allMatch(BaseTest::getFork)
- && tests.stream().allMatch(BaseTest::getFork))) {
+ if (!batchTests.stream().allMatch(BaseTest::getFork)
+ || !tests.stream().allMatch(BaseTest::getFork)) {
throw new BuildException(
"The module path requires fork attribute to be set to true.");
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
index 95b0be3..e5bc658 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
@@ -2394,8 +2394,8 @@ public class FTP extends Task implements FTPTaskConfig {
// to indicate that an attempt to create a directory has
// failed because the directory already exists.
int rc = ftp.getReplyCode();
- if (!(ignoreNoncriticalErrors && (rc == CODE_550
- || rc == CODE_553 || rc == CODE_521))) {
+ if (!ignoreNoncriticalErrors
+ || rc != CODE_550 && rc != CODE_553 && rc != CODE_521) {
throw new BuildException(
"could not create directory: %s",
ftp.getReplyString());
@@ -2420,8 +2420,7 @@ public class FTP extends Task implements FTPTaskConfig {
private void handleMkDirFailure(FTPClient ftp)
throws BuildException {
int rc = ftp.getReplyCode();
- if (!(ignoreNoncriticalErrors
- && (rc == CODE_550 || rc == CODE_553 || rc == CODE_521))) {
+ if (!ignoreNoncriticalErrors || rc != CODE_550 && rc != CODE_553 && rc != CODE_521) {
throw new BuildException("could not create directory: %s",
ftp.getReplyString());
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
index 85b8680..61de400 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
@@ -1768,9 +1768,8 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
// to indicate that an attempt to create a directory has
// failed because the directory already exists.
int rc = ftp.getReplyCode();
- if (!(task.isIgnoreNoncriticalErrors() && (rc == CODE_550
- || rc == CODE_553
- || rc == CODE_521))) {
+ if (!task.isIgnoreNoncriticalErrors()
+ || rc != CODE_550 && rc != CODE_553 && rc != CODE_521) {
throw new BuildException("could not create directory: "
+ ftp.getReplyString());
}
@@ -1799,9 +1798,8 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
private void handleMkDirFailure(FTPClient ftp)
throws BuildException {
int rc = ftp.getReplyCode();
- if (!(task.isIgnoreNoncriticalErrors() && (rc == CODE_550
- || rc == CODE_553
- || rc == CODE_521))) {
+ if (!task.isIgnoreNoncriticalErrors()
+ || rc != CODE_550 && rc != CODE_553 && rc != CODE_521) {
throw new BuildException("could not create directory: "
+ ftp.getReplyString());
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java
index c57248b..47b618b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java
@@ -138,13 +138,12 @@ public class Directory {
return true;
}
- if (!(obj instanceof Directory)) {
- return false;
+ if (obj instanceof Directory) {
+ Directory d = (Directory) obj;
+ return this.directory.equals(d.directory);
}
- Directory d = (Directory) obj;
-
- return this.directory.equals(d.directory);
+ return false;
}
/**
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/types/DataType.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/DataType.java b/src/main/org/apache/tools/ant/types/DataType.java
index aa24589..037c2fb 100644
--- a/src/main/org/apache/tools/ant/types/DataType.java
+++ b/src/main/org/apache/tools/ant/types/DataType.java
@@ -251,17 +251,14 @@ public abstract class DataType extends ProjectComponent implements Cloneable {
}
dieOnCircularReference(project);
Object o = ref.getReferencedObject(project);
- if (!(requiredClass.isAssignableFrom(o.getClass()))) {
- log("Class " + displayName(o.getClass())
- + " is not a subclass of "
- + displayName(requiredClass),
- Project.MSG_VERBOSE);
- String msg = ref.getRefId() + " doesn\'t denote a " + dataTypeName;
- throw new BuildException(msg);
+ if (requiredClass.isAssignableFrom(o.getClass())) {
+ return (T) o;
}
- @SuppressWarnings("unchecked")
- final T result = (T) o;
- return result;
+ log("Class " + displayName(o.getClass())
+ + " is not a subclass of "
+ + displayName(requiredClass),
+ Project.MSG_VERBOSE);
+ throw new BuildException(ref.getRefId() + " doesn\'t denote a " + dataTypeName);
}
/**
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/types/Description.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/Description.java b/src/main/org/apache/tools/ant/types/Description.java
index 822697b..e7f2993 100644
--- a/src/main/org/apache/tools/ant/types/Description.java
+++ b/src/main/org/apache/tools/ant/types/Description.java
@@ -92,13 +92,12 @@ public class Description extends DataType {
return;
}
for (Task task : findElementInTarget(t, "description")) {
- if (!(task instanceof UnknownElement)) {
- continue;
- }
- UnknownElement ue = ((UnknownElement) task);
- String descComp = ue.getWrapper().getText().toString();
- if (descComp != null) {
- description.append(project.replaceProperties(descComp));
+ if (task instanceof UnknownElement) {
+ UnknownElement ue = (UnknownElement) task;
+ String descComp = ue.getWrapper().getText().toString();
+ if (descComp != null) {
+ description.append(project.replaceProperties(descComp));
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/types/FileList.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/FileList.java b/src/main/org/apache/tools/ant/types/FileList.java
index 32485e7..c286329 100644
--- a/src/main/org/apache/tools/ant/types/FileList.java
+++ b/src/main/org/apache/tools/ant/types/FileList.java
@@ -106,7 +106,7 @@ public class FileList extends DataType implements ResourceCollection {
*/
public void setFiles(String filenames) {
checkAttributesAllowed();
- if (!(filenames == null || filenames.isEmpty())) {
+ if (filenames != null && !filenames.isEmpty()) {
StringTokenizer tok = new StringTokenizer(
filenames, ", \t\n\r\f", false);
while (tok.hasMoreTokens()) {
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/types/resources/Archives.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resources/Archives.java b/src/main/org/apache/tools/ant/types/resources/Archives.java
index ea399be..618a11c 100644
--- a/src/main/org/apache/tools/ant/types/resources/Archives.java
+++ b/src/main/org/apache/tools/ant/types/resources/Archives.java
@@ -120,8 +120,7 @@ public class Archives extends DataType
*/
@Override
public void setRefid(final Reference r) {
- if (!(zips.getResourceCollections().isEmpty()
- && tars.getResourceCollections().isEmpty())) {
+ if (!zips.getResourceCollections().isEmpty() || !tars.getResourceCollections().isEmpty()) {
throw tooManyAttributes();
}
super.setRefid(r);
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/types/resources/ResourceList.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resources/ResourceList.java b/src/main/org/apache/tools/ant/types/resources/ResourceList.java
index aee4a78..4903898 100644
--- a/src/main/org/apache/tools/ant/types/resources/ResourceList.java
+++ b/src/main/org/apache/tools/ant/types/resources/ResourceList.java
@@ -110,7 +110,7 @@ public class ResourceList extends DataType implements ResourceCollection {
if (encoding != null) {
throw tooManyAttributes();
}
- if (!(filterChains.isEmpty() && textDocuments.isEmpty())) {
+ if (!filterChains.isEmpty() || !textDocuments.isEmpty()) {
throw noChildrenAllowed();
}
super.setRefid(r);
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java b/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java
index 2a00ce5..b5667f8 100644
--- a/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java
@@ -216,7 +216,7 @@ public class SelectSelector extends BaseSelectorContainer {
validate();
// Deal with if and unless properties first
- if (!(passesConditions())) {
+ if (!passesConditions()) {
return false;
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/util/DOMElementWriter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/DOMElementWriter.java b/src/main/org/apache/tools/ant/util/DOMElementWriter.java
index cada1ae..8113b3f 100644
--- a/src/main/org/apache/tools/ant/util/DOMElementWriter.java
+++ b/src/main/org/apache/tools/ant/util/DOMElementWriter.java
@@ -550,7 +550,7 @@ public class DOMElementWriter {
* @return true if it is an entity.
*/
public boolean isReference(String ent) {
- if (!(ent.charAt(0) == '&') || !ent.endsWith(";")) {
+ if (ent.charAt(0) != '&' || !ent.endsWith(";")) {
return false;
}
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/util/FileUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java
index 140c541..0ca5e73 100644
--- a/src/main/org/apache/tools/ant/util/FileUtils.java
+++ b/src/main/org/apache/tools/ant/util/FileUtils.java
@@ -665,12 +665,12 @@ public class FileUtils {
char sep = File.separatorChar;
filename = filename.replace('/', sep).replace('\\', sep);
char c = filename.charAt(0);
- if (!(ON_DOS || ON_NETWARE)) {
+ if (!ON_DOS && !ON_NETWARE) {
return (c == sep);
}
if (c == sep) {
// CheckStyle:MagicNumber OFF
- if (!(ON_DOS && len > 4 && filename.charAt(1) == sep)) {
+ if (!ON_DOS || len <= 4 || filename.charAt(1) != sep) {
return false;
}
// CheckStyle:MagicNumber ON
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/ant/util/ResourceUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/ResourceUtils.java b/src/main/org/apache/tools/ant/util/ResourceUtils.java
index fcc3668..1813061 100644
--- a/src/main/org/apache/tools/ant/util/ResourceUtils.java
+++ b/src/main/org/apache/tools/ant/util/ResourceUtils.java
@@ -368,8 +368,8 @@ public class ResourceUtils {
final String inputEncoding, final String outputEncoding,
final Project project, final boolean force)
throws IOException {
- if (!(overwrite || SelectorUtils.isOutOfDate(source, dest, FileUtils.getFileUtils()
- .getFileTimestampGranularity()))) {
+ if (!overwrite && !SelectorUtils.isOutOfDate(source, dest,
+ FileUtils.getFileUtils().getFileTimestampGranularity())) {
return;
}
final boolean filterSetsAvailable = (filters != null
@@ -515,7 +515,7 @@ public class ResourceUtils {
}
final boolean e1 = r1.isExists();
final boolean e2 = r2.isExists();
- if (!(e1 || e2)) {
+ if (!e1 && !e2) {
return 0;
}
if (e1 != e2) {
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/main/org/apache/tools/zip/GeneralPurposeBit.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/zip/GeneralPurposeBit.java b/src/main/org/apache/tools/zip/GeneralPurposeBit.java
index f5f353c..99a2cd4 100644
--- a/src/main/org/apache/tools/zip/GeneralPurposeBit.java
+++ b/src/main/org/apache/tools/zip/GeneralPurposeBit.java
@@ -189,14 +189,15 @@ public final class GeneralPurposeBit implements Cloneable {
@Override
public boolean equals(Object o) {
- if (!(o instanceof GeneralPurposeBit)) {
- return false;
+ if (o instanceof GeneralPurposeBit) {
+ GeneralPurposeBit g = (GeneralPurposeBit) o;
+ return g.encryptionFlag == encryptionFlag
+ && g.strongEncryptionFlag == strongEncryptionFlag
+ && g.languageEncodingFlag == languageEncodingFlag
+ && g.dataDescriptorFlag == dataDescriptorFlag;
}
- GeneralPurposeBit g = (GeneralPurposeBit) o;
- return g.encryptionFlag == encryptionFlag
- && g.strongEncryptionFlag == strongEncryptionFlag
- && g.languageEncodingFlag == languageEncodingFlag
- && g.dataDescriptorFlag == dataDescriptorFlag;
+
+ return false;
}
@Override
http://git-wip-us.apache.org/repos/asf/ant/blob/9a8a4416/src/tests/junit/org/apache/tools/ant/taskdefs/LoadFileTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/LoadFileTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/LoadFileTest.java
index ab665ad..136b45b 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/LoadFileTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/LoadFileTest.java
@@ -102,7 +102,7 @@ public class LoadFileTest {
@Test
public void testLoadAFile() throws BuildException {
buildRule.executeTarget("testLoadAFile");
- if(!buildRule.getProject().getProperty("testLoadAFile").contains("eh?")) {
+ if (!buildRule.getProject().getProperty("testLoadAFile").contains("eh?")) {
fail("property is not all in the file");
}
}
@@ -122,7 +122,7 @@ public class LoadFileTest {
@Test
public void testEvalProps() throws BuildException {
buildRule.executeTarget("testEvalProps");
- if(!buildRule.getProject().getProperty("testEvalProps").contains("rain")) {
+ if (!buildRule.getProject().getProperty("testEvalProps").contains("rain")) {
fail("property eval broken");
}
}
@@ -133,7 +133,7 @@ public class LoadFileTest {
@Test
public void testFilterChain() throws BuildException {
buildRule.executeTarget("testFilterChain");
- if(!buildRule.getProject().getProperty("testFilterChain").contains("World!")) {
+ if (!buildRule.getProject().getProperty("testFilterChain").contains("World!")) {
fail("Filter Chain broken");
}
}