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/05/26 21:05:25 UTC
[3/4] ant git commit: Use String#contains() (cherry-pick 92f18cf)
Use String#contains() (cherry-pick 92f18cf)
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/4e3e565e
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/4e3e565e
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/4e3e565e
Branch: refs/heads/1.9.x
Commit: 4e3e565ece3420005a63b663128dd11ae477cc1c
Parents: 520c0c6
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Sat May 26 22:51:23 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Sat May 26 23:03:49 2018 +0200
----------------------------------------------------------------------
.../apache/tools/ant/filters/LineContains.java | 2 +-
.../apache/tools/ant/filters/TokenFilter.java | 2 +-
.../org/apache/tools/ant/taskdefs/Copy.java | 2 +-
.../org/apache/tools/ant/taskdefs/Exec.java | 6 +-
.../org/apache/tools/ant/taskdefs/ExecTask.java | 2 +-
.../org/apache/tools/ant/taskdefs/JDBCTask.java | 4 +-
src/main/org/apache/tools/ant/taskdefs/Jar.java | 2 +-
.../org/apache/tools/ant/taskdefs/Javadoc.java | 4 +-
.../org/apache/tools/ant/taskdefs/Jikes.java | 2 +-
.../tools/ant/taskdefs/JikesOutputParser.java | 4 +-
.../org/apache/tools/ant/taskdefs/Rmic.java | 2 +-
.../org/apache/tools/ant/taskdefs/SQLExec.java | 5 +-
.../apache/tools/ant/taskdefs/VerifyJar.java | 8 +-
.../compilers/DefaultCompilerAdapter.java | 2 +-
.../tools/ant/taskdefs/condition/Contains.java | 4 +-
.../apache/tools/ant/taskdefs/condition/Os.java | 30 +++----
.../taskdefs/condition/ResourceContains.java | 2 +-
.../tools/ant/taskdefs/optional/ANTLR.java | 11 ++-
.../tools/ant/taskdefs/optional/NetRexxC.java | 14 +--
.../ant/taskdefs/optional/depend/Depend.java | 2 +-
.../optional/ejb/JonasDeploymentTool.java | 2 +-
.../tools/ant/taskdefs/optional/javah/Gcjh.java | 2 +-
.../ant/taskdefs/optional/javah/Kaffeh.java | 2 +-
.../ant/taskdefs/optional/jlink/jlink.java | 4 +-
.../optional/junit/JUnitTestRunner.java | 2 +-
.../tools/ant/taskdefs/optional/net/FTP.java | 9 +-
.../optional/net/FTPTaskMirrorImpl.java | 9 +-
.../ant/taskdefs/optional/ssh/SSHExec.java | 2 +-
.../ant/taskdefs/optional/ssh/SSHSession.java | 2 +-
.../org/apache/tools/ant/types/Commandline.java | 18 ++--
.../org/apache/tools/ant/types/FilterSet.java | 3 +-
src/main/org/apache/tools/ant/types/Path.java | 5 +-
.../ant/types/resources/selectors/Name.java | 2 +-
.../ant/types/selectors/ContainsSelector.java | 2 +-
.../tools/ant/util/RegexpPatternMapper.java | 2 +-
src/main/org/apache/tools/tar/TarEntry.java | 2 +-
.../org/apache/tools/ant/BuildFileTest.java | 15 ++--
.../org/apache/tools/ant/LocationTest.java | 10 +--
.../org/apache/tools/ant/TaskContainerTest.java | 14 +--
.../org/apache/tools/ant/taskdefs/AntTest.java | 6 +-
.../apache/tools/ant/taskdefs/ConcatTest.java | 10 +--
.../org/apache/tools/ant/taskdefs/CopyTest.java | 2 +-
.../org/apache/tools/ant/taskdefs/JarTest.java | 24 ++---
.../apache/tools/ant/taskdefs/LoadFileTest.java | 6 +-
.../apache/tools/ant/taskdefs/MacroDefTest.java | 2 +-
.../apache/tools/ant/taskdefs/MakeUrlTest.java | 2 +-
.../apache/tools/ant/taskdefs/ManifestTest.java | 4 +-
.../apache/tools/ant/taskdefs/PropertyTest.java | 2 +-
.../tools/ant/taskdefs/RmicAdvancedTest.java | 2 +-
.../apache/tools/ant/taskdefs/SQLExecTest.java | 2 +-
.../apache/tools/ant/taskdefs/StyleTest.java | 2 +-
.../org/apache/tools/ant/taskdefs/SyncTest.java | 16 ++--
.../apache/tools/ant/taskdefs/TaskdefTest.java | 6 +-
.../taskdefs/optional/EchoPropertiesTest.java | 2 +-
.../ant/taskdefs/optional/XmlValidateTest.java | 3 +-
.../tools/ant/taskdefs/optional/XsltTest.java | 2 +-
.../ant/taskdefs/optional/image/ImageTest.java | 2 +-
.../optional/junit/JUnitTestRunnerTest.java | 2 +-
.../taskdefs/optional/script/ScriptDefTest.java | 14 +--
.../tools/ant/types/CommandlineJavaTest.java | 2 +-
.../org/apache/tools/ant/types/PathTest.java | 2 +-
.../tools/ant/types/RedirectorElementTest.java | 2 +-
.../types/selectors/ModifiedSelectorTest.java | 2 +-
.../util/LayoutPreservingPropertiesTest.java | 94 +++++++++-----------
64 files changed, 202 insertions(+), 228 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/filters/LineContains.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/LineContains.java b/src/main/org/apache/tools/ant/filters/LineContains.java
index d74d4dd..a549251 100644
--- a/src/main/org/apache/tools/ant/filters/LineContains.java
+++ b/src/main/org/apache/tools/ant/filters/LineContains.java
@@ -118,7 +118,7 @@ public final class LineContains
boolean matches = true;
for (int i = 0; matches && i < containsSize; i++) {
String containsStr = (String) contains.elementAt(i);
- matches = line.indexOf(containsStr) >= 0;
+ matches = line.contains(containsStr);
}
if (matches ^ isNegated()) {
break;
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/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 ebad760..7da00cd 100644
--- a/src/main/org/apache/tools/ant/filters/TokenFilter.java
+++ b/src/main/org/apache/tools/ant/filters/TokenFilter.java
@@ -428,7 +428,7 @@ public class TokenFilter extends BaseFilterReader
if (contains == null) {
throw new BuildException("Missing contains in containsstring");
}
- if (string.indexOf(contains) > -1) {
+ if (string.contains(contains)) {
return string;
}
return null;
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/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 5845523..371c366 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Copy.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java
@@ -1091,7 +1091,7 @@ public class Copy extends Task {
}
message.append(ex.getMessage());
}
- if (ex.getClass().getName().indexOf("MalformedInput") != -1) {
+ if (ex.getClass().getName().contains("MalformedInput")) {
message.append(LINE_SEPARATOR);
message.append(
"This is normally due to the input file containing invalid");
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/taskdefs/Exec.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Exec.java b/src/main/org/apache/tools/ant/taskdefs/Exec.java
index cfc6b76..8247023 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Exec.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Exec.java
@@ -87,7 +87,7 @@ public class Exec extends Task {
// test if os match
String myos = System.getProperty("os.name");
log("Myos = " + myos, Project.MSG_VERBOSE);
- if ((os != null) && (os.indexOf(myos) < 0)) {
+ if (os != null && !os.contains(myos)) {
// this command will be executed only on the specified OS
log("Not found in " + os, Project.MSG_VERBOSE);
return 0;
@@ -98,9 +98,9 @@ public class Exec extends Task {
dir = getProject().getBaseDir();
}
- if (myos.toLowerCase(Locale.ENGLISH).indexOf("windows") >= 0) {
+ if (myos.toLowerCase(Locale.ENGLISH).contains("windows")) {
if (!dir.equals(getProject().resolveFile("."))) {
- if (myos.toLowerCase(Locale.ENGLISH).indexOf("nt") >= 0) {
+ if (myos.toLowerCase(Locale.ENGLISH).contains("nt")) {
command = "cmd /c cd " + dir + " && " + command;
} else {
String ant = getProject().getProperty(MagicNames.ANT_HOME);
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
index cc3c2bd..30f673a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
@@ -563,7 +563,7 @@ public class ExecTask extends Task {
//for the current os.name
String myos = System.getProperty("os.name");
log("Current OS is " + myos, Project.MSG_VERBOSE);
- if ((os != null) && (os.indexOf(myos) < 0)) {
+ if (os != null && !os.contains(myos)) {
// this command will be executed only on the specified OS
log("This OS, " + myos
+ " was not found in the specified list of valid OSes: " + os,
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java b/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
index 0954e70..3122115 100644
--- a/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
@@ -270,7 +270,7 @@ public abstract class JDBCTask extends Task {
String theVendor = dmd.getDatabaseProductName().toLowerCase();
log("RDBMS = " + theVendor, Project.MSG_VERBOSE);
- if (theVendor == null || theVendor.indexOf(rdbms) < 0) {
+ if (theVendor == null || !theVendor.contains(rdbms)) {
log("Not the required RDBMS: " + rdbms, Project.MSG_VERBOSE);
return false;
}
@@ -282,7 +282,7 @@ public abstract class JDBCTask extends Task {
log("Version = " + theVersion, Project.MSG_VERBOSE);
if (theVersion == null
|| !(theVersion.startsWith(version)
- || theVersion.indexOf(" " + version) >= 0)) {
+ || theVersion.contains(" " + version))) {
log("Not the required version: \"" + version + "\"", Project.MSG_VERBOSE);
return false;
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/taskdefs/Jar.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java
index 26ee087..adea841 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Jar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java
@@ -714,7 +714,7 @@ public class Jar extends Zip {
+ " be replaced by a newly generated one.",
Project.MSG_WARN);
} else {
- if (index && vPath.indexOf("/") == -1) {
+ if (index && !vPath.contains("/")) {
rootEntries.addElement(vPath);
}
super.zipFile(is, zOut, vPath, lastModified, fromArchive, mode);
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/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 a78c526..7a5c2ec 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -2230,7 +2230,7 @@ public class Javadoc extends Task {
if (useExternalFile) {
// TODO what is the following doing?
// should it run if !javadoc4 && executable != null?
- if (sourceFileName.indexOf(" ") > -1) {
+ if (sourceFileName.contains(" ")) {
String name = sourceFileName;
if (File.separatorChar == '\\') {
name = sourceFileName.replace(File.separatorChar, '/');
@@ -2516,7 +2516,7 @@ public class Javadoc extends Task {
// check if file may be vulnerable because it was not
// patched with "validURL(url)":
- if (fileContents.indexOf("function validURL(url) {") < 0) {
+ if (!fileContents.contains("function validURL(url) {")) {
// we need to patch the file!
final String patchedFileContents = patchContent(fileContents, fixData);
if (!patchedFileContents.equals(fileContents)) {
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/taskdefs/Jikes.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Jikes.java b/src/main/org/apache/tools/ant/taskdefs/Jikes.java
index 89ac3f1..3896001 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Jikes.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Jikes.java
@@ -83,7 +83,7 @@ public class Jikes {
// Windows has a 32k limit on total arg size, so
// create a temporary file to store all the arguments
- if (myos.toLowerCase(Locale.ENGLISH).indexOf("windows") >= 0
+ if (myos.toLowerCase(Locale.ENGLISH).contains("windows")
&& args.length > MAX_FILES_ON_COMMAND_LINE) {
BufferedWriter out = null;
try {
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java b/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
index b0fc19d..5ffb954 100644
--- a/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
+++ b/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
@@ -136,9 +136,9 @@ public class JikesOutputParser implements ExecuteStreamHandler {
if (line.trim().equals("")) {
continue;
}
- if (lower.indexOf("error") != -1) {
+ if (lower.contains("error")) {
setError(true);
- } else if (lower.indexOf("warning") != -1) {
+ } else if (lower.contains("warning")) {
setError(false);
} else {
// If we don't know the type of the line
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/taskdefs/Rmic.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
index e093e49..e20518a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
@@ -761,7 +761,7 @@ public class Rmic extends MatchingTask {
if (idl) {
log("will leave uptodate test to rmic implementation in idl mode.",
Project.MSG_VERBOSE);
- } else if (iiop && iiopOpts != null && iiopOpts.indexOf("-always") > -1) {
+ } else if (iiop && iiopOpts != null && iiopOpts.contains("-always")) {
log("no uptodate test as -always option has been specified",
Project.MSG_VERBOSE);
} else {
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
index 3f56c47..25bc68a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
@@ -778,7 +778,7 @@ public class SQLExec extends JDBCTask {
// SQL defines "--" as a comment to EOL
// and in Oracle it may contain a hint
// so we cannot just remove it, instead we must end it
- if (!keepformat && line.indexOf("--") >= 0) {
+ if (!keepformat && line.contains("--")) {
sql.append("\n");
}
int lastDelimPos = lastDelimiterPosition(sql, line);
@@ -934,7 +934,8 @@ public class SQLExec extends JDBCTask {
}
private String maybeQuote(String s) {
- if (csvQuoteChar == null || s == null || (!forceCsvQuoteChar && s.indexOf(csvColumnSep) == -1 && s.indexOf(csvQuoteChar) == -1)) {
+ if (csvQuoteChar == null || s == null
+ || (!forceCsvQuoteChar && !s.contains(csvColumnSep) && !s.contains(csvQuoteChar))) {
return s;
}
StringBuilder sb = new StringBuilder(csvQuoteChar);
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java b/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java
index 187a021..77408df 100644
--- a/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java
@@ -180,15 +180,15 @@ public class VerifyJar extends AbstractJarSignerTask {
String results = outputCache.toString();
//deal with jdk1.4.2 bug:
if (ex != null) {
- if (results.indexOf("zip file closed") >= 0) {
- log("You are running " + JARSIGNER_COMMAND + " against a JVM with"
- + " a known bug that manifests as an IllegalStateException.",
+ if (results.contains("zip file closed")) {
+ log("You are running " + JARSIGNER_COMMAND
+ + " against a JVM with a known bug that manifests as an IllegalStateException.",
Project.MSG_WARN);
} else {
throw ex;
}
}
- if (results.indexOf(VERIFIED_TEXT) < 0) {
+ if (!results.contains(VERIFIED_TEXT)) {
throw new BuildException(ERROR_NO_VERIFY + jar);
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/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 1cd5e62..9577632 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
@@ -559,7 +559,7 @@ public abstract class DefaultCompilerAdapter
"files", "", getJavac().getTempdir(), true, true);
out = new BufferedWriter(new FileWriter(tmpFile));
for (int i = firstFileName; i < args.length; i++) {
- if (quoteFiles && args[i].indexOf(" ") > -1) {
+ if (quoteFiles && args[i].contains(" ")) {
args[i] = args[i].replace(File.separatorChar, '/');
out.write("\"" + args[i] + "\"");
} else {
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/taskdefs/condition/Contains.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Contains.java b/src/main/org/apache/tools/ant/taskdefs/condition/Contains.java
index 8830a39..347c474 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/Contains.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/Contains.java
@@ -70,7 +70,7 @@ public class Contains implements Condition {
}
return caseSensitive
- ? string.indexOf(subString) > -1
- : string.toLowerCase().indexOf(subString.toLowerCase()) > -1;
+ ? string.contains(subString)
+ : string.toLowerCase().contains(subString.toLowerCase());
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
index 7bd5b01..ace0c66 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
@@ -257,17 +257,17 @@ public class Os implements Condition {
//windows probing logic relies on the word 'windows' in
//the OS
- boolean isWindows = OS_NAME.indexOf(FAMILY_WINDOWS) > -1;
+ boolean isWindows = OS_NAME.contains(FAMILY_WINDOWS);
boolean is9x = false;
boolean isNT = false;
if (isWindows) {
//there are only four 9x platforms that we look for
- is9x = (OS_NAME.indexOf("95") >= 0
- || OS_NAME.indexOf("98") >= 0
- || OS_NAME.indexOf("me") >= 0
+ is9x = (OS_NAME.contains("95")
+ || OS_NAME.contains("98")
+ || OS_NAME.contains("me")
//wince isn't really 9x, but crippled enough to
//be a muchness. Ant doesn't run on CE, anyway.
- || OS_NAME.indexOf("ce") >= 0);
+ || OS_NAME.contains("ce"));
isNT = !is9x;
}
if (family.equals(FAMILY_WINDOWS)) {
@@ -277,28 +277,28 @@ public class Os implements Condition {
} else if (family.equals(FAMILY_NT)) {
isFamily = isWindows && isNT;
} else if (family.equals(FAMILY_OS2)) {
- isFamily = OS_NAME.indexOf(FAMILY_OS2) > -1;
+ isFamily = OS_NAME.contains(FAMILY_OS2);
} else if (family.equals(FAMILY_NETWARE)) {
- isFamily = OS_NAME.indexOf(FAMILY_NETWARE) > -1;
+ isFamily = OS_NAME.contains(FAMILY_NETWARE);
} else if (family.equals(FAMILY_DOS)) {
isFamily = PATH_SEP.equals(";") && !isFamily(FAMILY_NETWARE);
} else if (family.equals(FAMILY_MAC)) {
- isFamily = OS_NAME.indexOf(FAMILY_MAC) > -1
- || OS_NAME.indexOf(DARWIN) > -1;
+ isFamily = OS_NAME.contains(FAMILY_MAC)
+ || OS_NAME.contains(DARWIN);
} else if (family.equals(FAMILY_TANDEM)) {
- isFamily = OS_NAME.indexOf("nonstop_kernel") > -1;
+ isFamily = OS_NAME.contains("nonstop_kernel");
} else if (family.equals(FAMILY_UNIX)) {
isFamily = PATH_SEP.equals(":")
&& !isFamily(FAMILY_VMS)
&& (!isFamily(FAMILY_MAC) || OS_NAME.endsWith("x")
- || OS_NAME.indexOf(DARWIN) > -1);
+ || OS_NAME.contains(DARWIN));
} else if (family.equals(FAMILY_ZOS)) {
- isFamily = OS_NAME.indexOf(FAMILY_ZOS) > -1
- || OS_NAME.indexOf("os/390") > -1;
+ isFamily = OS_NAME.contains(FAMILY_ZOS)
+ || OS_NAME.contains("os/390");
} else if (family.equals(FAMILY_OS400)) {
- isFamily = OS_NAME.indexOf(FAMILY_OS400) > -1;
+ isFamily = OS_NAME.contains(FAMILY_OS400);
} else if (family.equals(FAMILY_VMS)) {
- isFamily = OS_NAME.indexOf(FAMILY_VMS) > -1;
+ isFamily = OS_NAME.contains(FAMILY_VMS);
} else {
throw new BuildException(
"Don\'t know how to detect os family \""
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/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 76a9ad3..aed4c43 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java
@@ -155,7 +155,7 @@ public class ResourceContains implements Condition {
contents = contents.toLowerCase();
sub = sub.toLowerCase();
}
- return contents.indexOf(sub) >= 0;
+ return contents.contains(sub);
} catch (IOException e) {
throw new BuildException("There was a problem accessing resource : " + resource);
} finally {
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
index ba8afd2..2f73c3f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
@@ -302,12 +302,11 @@ public class ANTLR extends Task {
int err = run(commandline.getCommandline());
if (err != 0) {
throw new BuildException("ANTLR returned: " + err, getLocation());
- } else {
- String output = bos.toString();
- if (output.indexOf("error:") > -1) {
- throw new BuildException("ANTLR signaled an error: "
- + output, getLocation());
- }
+ }
+ String output = bos.toString();
+ if (output.contains("error:")) {
+ throw new BuildException("ANTLR signaled an error: "
+ + output, getLocation());
}
} else {
log("Skipped grammar file. Generated file " + generatedFile
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
index a8aec7b..5d7b8b2 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
@@ -887,24 +887,24 @@ public class NetRexxC extends MatchingTask {
}
// verbose level logging for suppressed messages
if (suppressMethodArgumentNotUsed
- && l.indexOf(MSG_METHOD_ARGUMENT_NOT_USED) != -1) {
+ && l.contains(MSG_METHOD_ARGUMENT_NOT_USED)) {
log(l, Project.MSG_VERBOSE);
} else if (suppressPrivatePropertyNotUsed
- && l.indexOf(MSG_PRIVATE_PROPERTY_NOT_USED) != -1) {
+ && l.contains(MSG_PRIVATE_PROPERTY_NOT_USED)) {
log(l, Project.MSG_VERBOSE);
} else if (suppressVariableNotUsed
- && l.indexOf(MSG_VARIABLE_NOT_USED) != -1) {
+ && l.contains(MSG_VARIABLE_NOT_USED)) {
log(l, Project.MSG_VERBOSE);
} else if (suppressExceptionNotSignalled
- && l.indexOf(MSG_EXCEPTION_NOT_SIGNALLED) != -1) {
+ && l.contains(MSG_EXCEPTION_NOT_SIGNALLED)) {
log(l, Project.MSG_VERBOSE);
} else if (suppressDeprecation
- && l.indexOf(MSG_DEPRECATION) != -1) {
+ && l.contains(MSG_DEPRECATION)) {
log(l, Project.MSG_VERBOSE);
- } else if (l.indexOf("Error:") != -1) {
+ } else if (l.contains("Error:")) {
// error level logging for compiler errors
log(l, Project.MSG_ERR);
- } else if (l.indexOf("Warning:") != -1) {
+ } else if (l.contains("Warning:")) {
// warning for all warning messages
log(l, Project.MSG_WARN);
} else {
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
index 7b51133..99a49c4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
@@ -522,7 +522,7 @@ public class Depend extends MatchingTask {
// without closure we may delete an inner class but not the
// top level class which would not trigger a recompile.
- if (affectedClass.indexOf("$") == -1) {
+ if (!affectedClass.contains("$")) {
continue;
}
// need to delete the main class
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
index d474f8b..07ca610 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
@@ -465,7 +465,7 @@ public class JonasDeploymentTool extends GenericDeploymentTool {
if (getConfig().namingScheme.getValue().equals(EjbJar.NamingScheme.DESCRIPTOR)) {
// try to find JOnAS specific convention name
- if (descriptorFileName.indexOf(getConfig().baseNameTerminator) == -1) {
+ if (!descriptorFileName.contains(getConfig().baseNameTerminator)) {
// baseNameTerminator not found: the descriptor use the
// JOnAS naming convention, ie [Foo.xml,jonas-Foo.xml] and
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/taskdefs/optional/javah/Gcjh.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javah/Gcjh.java b/src/main/org/apache/tools/ant/taskdefs/optional/javah/Gcjh.java
index 712bb76..c04eea3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/javah/Gcjh.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/javah/Gcjh.java
@@ -42,7 +42,7 @@ public class Gcjh implements JavahAdapter {
Execute.runCommand(javah, cmd.getCommandline());
return true;
} catch (BuildException e) {
- if (e.getMessage().indexOf("failed with return code") == -1) {
+ if (!e.getMessage().contains("failed with return code")) {
throw e;
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java b/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java
index d37f771..6bcba8c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java
@@ -47,7 +47,7 @@ public class Kaffeh implements JavahAdapter {
Execute.runCommand(javah, cmd.getCommandline());
return true;
} catch (BuildException e) {
- if (e.getMessage().indexOf("failed with return code") == -1) {
+ if (!e.getMessage().contains("failed with return code")) {
throw e;
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/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 ae4a892..744fa40 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
@@ -245,9 +245,7 @@ public class jlink {
//entry from another mergefile was called "com".
//In that case, just ignore the error and go on to the
//next entry.
- String mess = ex.getMessage();
-
- if (mess.indexOf("duplicate") >= 0) {
+ if (ex.getMessage().contains("duplicate")) {
//It was the duplicate entry.
continue;
} else {
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
index 8410444..7a0a2f6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
@@ -1154,7 +1154,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
private static boolean filterLine(final String line) {
for (String filter : DEFAULT_TRACE_FILTERS) {
- if (line.indexOf(filter) != -1) {
+ if (line.contains(filter)) {
return true;
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/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 b171df5..35c4065 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
@@ -2093,12 +2093,9 @@ public class FTP extends Task implements FTPTaskConfig {
if (!rc) {
log("Failed to issue Site Command: " + theCMD, Project.MSG_WARN);
} else {
-
- myReply = ftp.getReplyStrings();
-
- for (int x = 0; x < myReply.length; x++) {
- if (myReply[x] != null && myReply[x].indexOf("200") == -1) {
- log(myReply[x], Project.MSG_WARN);
+ for (String reply : ftp.getReplyStrings()) {
+ if (reply != null && !reply.contains("200")) {
+ log(reply, Project.MSG_WARN);
}
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/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 b7235e1..85d0289 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
@@ -1480,12 +1480,9 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
if (!rc) {
task.log("Failed to issue Site Command: " + theCMD, Project.MSG_WARN);
} else {
-
- myReply = ftp.getReplyStrings();
-
- for (int x = 0; x < myReply.length; x++) {
- if (myReply[x].indexOf("200") == -1) {
- task.log(myReply[x], Project.MSG_WARN);
+ for (String reply : ftp.getReplyStrings()) {
+ if (!reply.contains("200")) {
+ task.log(reply, Project.MSG_WARN);
}
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
index 80e0dda..13615a2 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
@@ -461,7 +461,7 @@ public class SSHExec extends SSHBase {
} catch (final BuildException e) {
throw e;
} catch (final JSchException e) {
- if (e.getMessage().indexOf("session is down") >= 0) {
+ if (e.getMessage().contains("session is down")) {
if (getFailonerror()) {
throw new BuildException(TIMEOUT_MESSAGE, e);
} else {
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java
index bbc186a..6394c86 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java
@@ -174,7 +174,7 @@ public class SSHSession extends SSHBase {
// completed successfully
} catch (final JSchException e) {
- if (e.getMessage().indexOf("session is down") >= 0) {
+ if (e.getMessage().contains("session is down")) {
if (getFailonerror()) {
throw new BuildException(TIMEOUT_MESSAGE, e);
} else {
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/types/Commandline.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/Commandline.java b/src/main/org/apache/tools/ant/types/Commandline.java
index 1b634ef..a1859ba 100644
--- a/src/main/org/apache/tools/ant/types/Commandline.java
+++ b/src/main/org/apache/tools/ant/types/Commandline.java
@@ -428,21 +428,19 @@ public class Commandline implements Cloneable {
* and double quotes.
*/
public static String quoteArgument(String argument) {
- if (argument.indexOf("\"") > -1) {
- if (argument.indexOf("\'") > -1) {
+ if (argument.contains("\"")) {
+ if (argument.contains("\'")) {
throw new BuildException("Can\'t handle single and double"
+ " quotes in same argument");
- } else {
- return '\'' + argument + '\'';
}
- } else if (argument.indexOf("\'") > -1
- || argument.indexOf(" ") > -1
- // WIN9x uses a bat file for executing commands
- || (IS_WIN_9X && argument.indexOf(';') != -1)) {
+ return '\'' + argument + '\'';
+ }
+ if (argument.contains("\'") || argument.contains(" ")
+ // WIN9x uses a bat file for executing commands
+ || (IS_WIN_9X && argument.contains(";"))) {
return '\"' + argument + '\"';
- } else {
- return argument;
}
+ return argument;
}
/**
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/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 fbfff11..15352f2 100644
--- a/src/main/org/apache/tools/ant/types/FilterSet.java
+++ b/src/main/org/apache/tools/ant/types/FilterSet.java
@@ -616,8 +616,7 @@ public class FilterSet extends DataType implements Cloneable {
}
passedTokens.addElement(parent);
String value = iReplaceTokens(line);
- if (value.indexOf(beginToken) == -1 && !duplicateToken
- && recurseDepth == 1) {
+ if (!value.contains(beginToken) && !duplicateToken && recurseDepth == 1) {
passedTokens = null;
} else if (duplicateToken) {
// should always be the case...
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/types/Path.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/Path.java b/src/main/org/apache/tools/ant/types/Path.java
index deaad3e..f2d4476 100644
--- a/src/main/org/apache/tools/ant/types/Path.java
+++ b/src/main/org/apache/tools/ant/types/Path.java
@@ -601,7 +601,7 @@ public class Path extends DataType implements Cloneable, ResourceCollection {
addExisting(systemBootClasspath);
}
- if (System.getProperty("java.vendor").toLowerCase(Locale.ENGLISH).indexOf("microsoft") >= 0) {
+ if (System.getProperty("java.vendor").toLowerCase(Locale.ENGLISH).contains("microsoft")) {
// TODO is this code still necessary? is there any 1.2+ port?
// Pull in *.zip from packages directory
FileSet msZipFiles = new FileSet();
@@ -765,8 +765,7 @@ public class Path extends DataType implements Cloneable, ResourceCollection {
* @since Ant 1.8.2
*/
private static boolean containsWildcards(String path) {
- return path != null
- && (path.indexOf("*") > -1 || path.indexOf("?") > -1);
+ return path != null && (path.contains("*") || path.contains("?"));
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/types/resources/selectors/Name.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resources/selectors/Name.java b/src/main/org/apache/tools/ant/types/resources/selectors/Name.java
index baf9a3c..5a4da15 100644
--- a/src/main/org/apache/tools/ant/types/resources/selectors/Name.java
+++ b/src/main/org/apache/tools/ant/types/resources/selectors/Name.java
@@ -143,7 +143,7 @@ public class Name implements ResourceSelector {
}
private String modify(String s) {
- if (s == null || !handleDirSep || s.indexOf("\\") == -1) {
+ if (s == null || !handleDirSep || !s.contains("\\")) {
return s;
}
return s.replace('\\', '/');
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java b/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java
index d0a7a8f..be149d0 100644
--- a/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java
@@ -204,7 +204,7 @@ public class ContainsSelector extends BaseExtendSelector implements ResourceSele
if (ignorewhitespace) {
teststr = SelectorUtils.removeWhitespace(teststr);
}
- if (teststr.indexOf(userstr) > -1) {
+ if (teststr.contains(userstr)) {
return true;
}
teststr = in.readLine();
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
index 6a2f4b5..599b7ef 100644
--- a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
+++ b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
@@ -118,7 +118,7 @@ public class RegexpPatternMapper implements FileNameMapper {
return null;
}
if (handleDirSep) {
- if (sourceFileName.indexOf("\\") != -1) {
+ if (sourceFileName.contains("\\")) {
sourceFileName = sourceFileName.replace('\\', '/');
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/main/org/apache/tools/tar/TarEntry.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/tar/TarEntry.java b/src/main/org/apache/tools/tar/TarEntry.java
index c44e47f..afdd951 100644
--- a/src/main/org/apache/tools/tar/TarEntry.java
+++ b/src/main/org/apache/tools/tar/TarEntry.java
@@ -1042,7 +1042,7 @@ public class TarEntry implements TarConstants {
fileName = fileName.substring(2);
}
}
- } else if (osname.indexOf("netware") > -1) {
+ } else if (osname.contains("netware")) {
int colon = fileName.indexOf(':');
if (colon != -1) {
fileName = fileName.substring(colon + 1);
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/tests/junit/org/apache/tools/ant/BuildFileTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/BuildFileTest.java b/src/tests/junit/org/apache/tools/ant/BuildFileTest.java
index e821bae..51e2dad 100644
--- a/src/tests/junit/org/apache/tools/ant/BuildFileTest.java
+++ b/src/tests/junit/org/apache/tools/ant/BuildFileTest.java
@@ -122,7 +122,7 @@ public abstract class BuildFileTest extends TestCase {
String realLog = getLog();
assertTrue("expecting log to contain \"" + substring + "\" log was \""
+ realLog + "\"",
- realLog.indexOf(substring) >= 0);
+ realLog.contains(substring));
}
/**
@@ -134,7 +134,7 @@ public abstract class BuildFileTest extends TestCase {
String realLog = getLog();
assertFalse("didn't expect log to contain \"" + substring + "\" log was \""
+ realLog + "\"",
- realLog.indexOf(substring) >= 0);
+ realLog.contains(substring));
}
/**
@@ -160,7 +160,7 @@ public abstract class BuildFileTest extends TestCase {
String realMessage = (message != null)
? message
: "expecting output to contain \"" + substring + "\" output was \"" + realOutput + "\"";
- assertTrue(realMessage, realOutput.indexOf(substring) >= 0);
+ assertTrue(realMessage, realOutput.contains(substring));
}
/**
@@ -176,7 +176,7 @@ public abstract class BuildFileTest extends TestCase {
String realMessage = (message != null)
? message
: "expecting output to not contain \"" + substring + "\" output was \"" + realOutput + "\"";
- assertFalse(realMessage, realOutput.indexOf(substring) >= 0);
+ assertFalse(realMessage, realOutput.contains(substring));
}
/**
@@ -237,7 +237,7 @@ public abstract class BuildFileTest extends TestCase {
assertTrue("expecting debug log to contain \"" + substring
+ "\" log was \""
+ realLog + "\"",
- realLog.indexOf(substring) >= 0);
+ realLog.contains(substring));
}
/**
@@ -425,8 +425,9 @@ public abstract class BuildFileTest extends TestCase {
executeTarget(target);
} catch (org.apache.tools.ant.BuildException ex) {
buildException = ex;
- if ((null != contains) && (ex.getMessage().indexOf(contains) == -1)) {
- fail("Should throw BuildException because '" + cause + "' with message containing '" + contains + "' (actual message '" + ex.getMessage() + "' instead)");
+ if (null != contains && !ex.getMessage().contains(contains)) {
+ fail("Should throw BuildException because '" + cause + "' with message containing '"
+ + contains + "' (actual message '" + ex.getMessage() + "' instead)");
}
return;
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/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 c8048a3..ca7f9b1 100644
--- a/src/tests/junit/org/apache/tools/ant/LocationTest.java
+++ b/src/tests/junit/org/apache/tools/ant/LocationTest.java
@@ -70,18 +70,16 @@ public class LocationTest {
public void testMacrodefWrappedTask() {
buildRule.executeTarget("testMacrodefWrappedTask");
Echo e = (Echo) buildRule.getProject().getReference("echo3");
- assertTrue(buildRule.getLog().indexOf("Line: "
- + (e.getLocation().getLineNumber() + 1))
- > -1);
+ assertTrue(buildRule.getLog().contains("Line: "
+ + (e.getLocation().getLineNumber() + 1)));
}
@Test
public void testPresetdefWrappedTask() {
buildRule.executeTarget("testPresetdefWrappedTask");
Echo e = (Echo) buildRule.getProject().getReference("echo4");
- assertTrue(buildRule.getLog().indexOf("Line: "
- + (e.getLocation().getLineNumber() + 1))
- > -1);
+ assertTrue(buildRule.getLog().contains("Line: "
+ + (e.getLocation().getLineNumber() + 1)));
}
public static class EchoLocation extends Task {
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/tests/junit/org/apache/tools/ant/TaskContainerTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/TaskContainerTest.java b/src/tests/junit/org/apache/tools/ant/TaskContainerTest.java
index 1fc745f..491d361 100644
--- a/src/tests/junit/org/apache/tools/ant/TaskContainerTest.java
+++ b/src/tests/junit/org/apache/tools/ant/TaskContainerTest.java
@@ -38,29 +38,29 @@ public class TaskContainerTest {
public void testPropertyExpansion() {
buildRule.executeTarget("testPropertyExpansion");
assertTrue("attribute worked",
- buildRule.getLog().indexOf("As attribute: it worked") > -1);
+ buildRule.getLog().contains("As attribute: it worked"));
assertTrue("nested text worked",
- buildRule.getLog().indexOf("As nested text: it worked") > -1);
+ buildRule.getLog().contains("As nested text: it worked"));
}
@Test
public void testTaskdef() {
buildRule.executeTarget("testTaskdef");
assertTrue("attribute worked",
- buildRule.getLog().indexOf("As attribute: it worked") > -1);
+ buildRule.getLog().contains("As attribute: it worked"));
assertTrue("nested text worked",
- buildRule.getLog().indexOf("As nested text: it worked") > -1);
+ buildRule.getLog().contains("As nested text: it worked"));
assertTrue("nested text worked",
- buildRule.getLog().indexOf("As nested task: it worked") > -1);
+ buildRule.getLog().contains("As nested task: it worked"));
}
@Test
public void testCaseInsensitive() {
buildRule.executeTarget("testCaseInsensitive");
assertTrue("works outside of container",
- buildRule.getLog().indexOf("hello ") > -1);
+ buildRule.getLog().contains("hello "));
assertTrue("works inside of container",
- buildRule.getLog().indexOf("world") > -1);
+ buildRule.getLog().contains("world"));
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
index 9371548..aee91fe 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
@@ -318,9 +318,9 @@ public class AntTest {
@Test
public void testPropertySet() {
buildRule.executeTarget("test-propertyset");
- assertTrue(buildRule.getLog().indexOf("test1 is ${test1}") > -1);
- assertTrue(buildRule.getLog().indexOf("test2 is ${test2}") > -1);
- assertTrue(buildRule.getLog().indexOf("test1.x is 1") > -1);
+ assertTrue(buildRule.getLog().contains("test1 is ${test1}"));
+ assertTrue(buildRule.getLog().contains("test2 is ${test2}"));
+ assertTrue(buildRule.getLog().contains("test1.x is 1"));
}
@Test
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/tests/junit/org/apache/tools/ant/taskdefs/ConcatTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ConcatTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ConcatTest.java
index b421650..daec44b 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ConcatTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ConcatTest.java
@@ -199,7 +199,7 @@ public class ConcatTest {
@Test
public void testFilter() {
buildRule.executeTarget("testfilter");
- assertTrue(buildRule.getLog().indexOf("REPLACED") > -1);
+ assertTrue(buildRule.getLog().contains("REPLACED"));
}
@Test
@@ -251,7 +251,7 @@ public class ConcatTest {
@Test
public void testfilterinline() {
buildRule.executeTarget("testfilterinline");
- assertTrue(buildRule.getLog().indexOf("REPLACED") > -1);
+ assertTrue(buildRule.getLog().contains("REPLACED"));
}
/**
@@ -260,8 +260,8 @@ public class ConcatTest {
@Test
public void testmultireader() {
buildRule.executeTarget("testmultireader");
- assertTrue(buildRule.getLog().indexOf("Bye") > -1);
- assertTrue(buildRule.getLog().indexOf("Hello") == -1);
+ assertTrue(buildRule.getLog().contains("Bye"));
+ assertTrue(!buildRule.getLog().contains("Hello"));
}
/**
* Check if fixlastline works
@@ -302,7 +302,7 @@ public class ConcatTest {
assertTrue(
"expecting file " + filename + " to contain " +
contains +
- " but got " + content, content.indexOf(contains) > -1);
+ " but got " + content, content.contains(contains));
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/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 f7780e3..db2daf8 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/CopyTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/CopyTest.java
@@ -110,7 +110,7 @@ public class CopyTest {
@Test
public void testFilterTest() {
buildRule.executeTarget("filtertest");
- assertTrue(buildRule.getLog().indexOf("loop in tokens") == -1);
+ assertTrue(!buildRule.getLog().contains("loop in tokens"));
}
@Test
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
index 3b916b6..402979c 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
@@ -344,33 +344,33 @@ public class JarTest {
@Test
public void testNoVersionInfoIgnore() {
buildRule.executeTarget("testNoVersionInfoIgnore");
- assertTrue(buildRule.getFullLog().indexOf("No Implementation-Title set.") > -1);
- assertTrue(buildRule.getFullLog().indexOf("No Implementation-Version set.") > -1);
- assertTrue(buildRule.getFullLog().indexOf("No Implementation-Vendor set.") > -1);
+ assertTrue(buildRule.getFullLog().contains("No Implementation-Title set."));
+ assertTrue(buildRule.getFullLog().contains("No Implementation-Version set."));
+ assertTrue(buildRule.getFullLog().contains("No Implementation-Vendor set."));
}
@Test
public void testNoVersionInfoWarn() {
buildRule.executeTarget("testNoVersionInfoWarn");
- assertTrue(buildRule.getLog().indexOf("No Implementation-Title set.") > -1);
- assertTrue(buildRule.getLog().indexOf("No Implementation-Version set.") > -1);
- assertTrue(buildRule.getLog().indexOf("No Implementation-Vendor set.") > -1);
+ assertTrue(buildRule.getLog().contains("No Implementation-Title set."));
+ assertTrue(buildRule.getLog().contains("No Implementation-Version set."));
+ assertTrue(buildRule.getLog().contains("No Implementation-Vendor set."));
}
@Test
public void testNoVersionInfoNoStrict() {
buildRule.executeTarget("testNoVersionInfoNoStrict");
- assertFalse(buildRule.getLog().indexOf("No Implementation-Title set.") > -1);
- assertFalse(buildRule.getLog().indexOf("No Implementation-Version set.") > -1);
- assertFalse(buildRule.getLog().indexOf("No Implementation-Vendor set.") > -1);
+ assertFalse(buildRule.getLog().contains("No Implementation-Title set."));
+ assertFalse(buildRule.getLog().contains("No Implementation-Version set."));
+ assertFalse(buildRule.getLog().contains("No Implementation-Vendor set."));
}
@Test
public void testHasVersionInfo() {
buildRule.executeTarget("testHasVersionInfo");
- assertFalse(buildRule.getLog().indexOf("No Implementation-Title set.") > -1);
- assertFalse(buildRule.getLog().indexOf("No Implementation-Version set.") > -1);
- assertFalse(buildRule.getLog().indexOf("No Implementation-Vendor set.") > -1);
+ assertFalse(buildRule.getLog().contains("No Implementation-Title set."));
+ assertFalse(buildRule.getLog().contains("No Implementation-Version set."));
+ assertFalse(buildRule.getLog().contains("No Implementation-Vendor set."));
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/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 48f47b8..ab665ad 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").indexOf("eh?")<0) {
+ 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").indexOf("rain")<0) {
+ 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").indexOf("World!")<0) {
+ if(!buildRule.getProject().getProperty("testFilterChain").contains("World!")) {
fail("Filter Chain broken");
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/tests/junit/org/apache/tools/ant/taskdefs/MacroDefTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/MacroDefTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/MacroDefTest.java
index 9ee7b20..59b6bd7 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/MacroDefTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/MacroDefTest.java
@@ -188,7 +188,7 @@ public class MacroDefTest {
try {
buildRule.executeTarget("backtraceoff");
} catch (BuildException ex) {
- if (ex.getMessage().indexOf("following error occurred") != -1) {
+ if (ex.getMessage().contains("following error occurred")) {
fail("error message contained backtrace - " + ex.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/tests/junit/org/apache/tools/ant/taskdefs/MakeUrlTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/MakeUrlTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/MakeUrlTest.java
index 592f1d7..b60604b 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/MakeUrlTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/MakeUrlTest.java
@@ -161,7 +161,7 @@ public class MakeUrlTest {
String result = getProperty(property);
assertTrue("expected " + contains + " in " + result,
- result != null && result.indexOf(contains) >= 0);
+ result != null && result.contains(contains));
}
/**
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java
index ca1a94d..e518782 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java
@@ -395,14 +395,14 @@ public class ManifestTest {
String mfAsString = mf.toString();
assertNotNull(mfAsString);
assertTrue(mfAsString.startsWith("Manifest-Version: 2.0"));
- assertTrue(mfAsString.indexOf("Foo: Bar") > -1);
+ assertTrue(mfAsString.contains("Foo: Bar"));
mf = getManifest(new File(outDir, "mftest2.mf"));
assertNotNull(mf);
mfAsString = mf.toString();
assertNotNull(mfAsString);
assertEquals(-1, mfAsString.indexOf("Foo: Bar"));
- assertTrue(mfAsString.indexOf("Foo: Baz") > -1);
+ assertTrue(mfAsString.contains("Foo: Baz"));
}
@Test
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/tests/junit/org/apache/tools/ant/taskdefs/PropertyTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/PropertyTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/PropertyTest.java
index adb7843..16c4d8a 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/PropertyTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/PropertyTest.java
@@ -69,7 +69,7 @@ public class PropertyTest {
fail("Did not throw exception on circular exception");
} catch (BuildException e) {
assertTrue("Circular definition not detected - ",
- e.getMessage().indexOf("was circularly defined") != -1);
+ e.getMessage().contains("was circularly defined"));
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java
index 4991143..676eda4 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java
@@ -465,7 +465,7 @@ public class RmicAdvancedTest {
buildRule.executeTarget(target);
fail("Target should have thrown a BuildException");
} catch (BuildException ex) {
- if (target.indexOf("IDL") > -1) {
+ if (target.contains("IDL")) {
assertEquals("this rmic implementation doesn't support the -idl switch", ex.getMessage());
} else {
assertEquals("this rmic implementation doesn't support the -iiop switch", ex.getMessage());
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/tests/junit/org/apache/tools/ant/taskdefs/SQLExecTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/SQLExecTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/SQLExecTest.java
index 24b042d..faa890e 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/SQLExecTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/SQLExecTest.java
@@ -90,7 +90,7 @@ public class SQLExecTest {
try {
sql.execute();
} catch (BuildException e){
- assertTrue(e.getCause().getMessage().indexOf("No suitable Driver") != -1);
+ assertTrue(e.getCause().getMessage().contains("No suitable Driver"));
}
assertTrue(JDBCTask.getLoaderMap().containsKey(NULL_DRIVER));
assertSame(sql.getLoader(), JDBCTask.getLoaderMap().get(NULL_DRIVER));
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java
index 9fd4667..e958524 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java
@@ -232,7 +232,7 @@ public class StyleTest {
"expecting file " + filename
+ " to contain " + contains
+ " but got " + content,
- content.indexOf(contains) > -1);
+ content.contains(contains));
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/tests/junit/org/apache/tools/ant/taskdefs/SyncTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/SyncTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/SyncTest.java
index 93431dc..b296b7b 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/SyncTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/SyncTest.java
@@ -41,7 +41,7 @@ public class SyncTest {
buildRule.executeTarget("simplecopy");
String d = buildRule.getProject().getProperty("dest") + "/a/b/c/d";
assertFileIsPresent(d);
- assertTrue(buildRule.getFullLog().indexOf("dangling") == -1);
+ assertTrue(!buildRule.getFullLog().contains("dangling"));
}
@Test
@@ -51,7 +51,7 @@ public class SyncTest {
assertFileIsNotPresent(d);
String c = buildRule.getProject().getProperty("dest") + "/a/b/c";
assertFileIsNotPresent(c);
- assertTrue(buildRule.getFullLog().indexOf("dangling") == -1);
+ assertTrue(!buildRule.getFullLog().contains("dangling"));
}
@Test
@@ -61,7 +61,7 @@ public class SyncTest {
assertFileIsNotPresent(d);
String c = buildRule.getProject().getProperty("dest") + "/a/b/c";
assertFileIsPresent(c);
- assertTrue(buildRule.getFullLog().indexOf("dangling") == -1);
+ assertTrue(!buildRule.getFullLog().contains("dangling"));
}
@Test
@@ -85,7 +85,7 @@ public class SyncTest {
assertFileIsPresent(d);
String f = buildRule.getProject().getProperty("dest") + "/e/f";
assertFileIsNotPresent(f);
- assertTrue(buildRule.getFullLog().indexOf("Removing orphan file:") > -1);
+ assertTrue(buildRule.getFullLog().contains("Removing orphan file:"));
assertContains("Removed 1 dangling file from", buildRule.getFullLog());
assertContains("Removed 1 dangling directory from", buildRule.getFullLog());
}
@@ -97,7 +97,7 @@ public class SyncTest {
assertFileIsPresent(d);
String f = buildRule.getProject().getProperty("dest") + "/e/f";
assertFileIsNotPresent(f);
- assertTrue(buildRule.getFullLog().indexOf("Removing orphan file:") > -1);
+ assertTrue(buildRule.getFullLog().contains("Removing orphan file:"));
assertContains("Removed 1 dangling file from", buildRule.getFullLog());
assertContains("Removed 1 dangling directory from", buildRule.getFullLog());
}
@@ -111,7 +111,7 @@ public class SyncTest {
assertFileIsPresent(c);
String f = buildRule.getProject().getProperty("dest") + "/e/f";
assertFileIsNotPresent(f);
- assertTrue(buildRule.getFullLog().indexOf("Removing orphan directory:") > -1);
+ assertTrue(buildRule.getFullLog().contains("Removing orphan directory:"));
assertContains("NO dangling file to remove from", buildRule.getFullLog());
assertContains("Removed 2 dangling directories from", buildRule.getFullLog());
}
@@ -123,7 +123,7 @@ public class SyncTest {
assertFileIsPresent(d);
String f = buildRule.getProject().getProperty("dest") + "/e/f";
assertFileIsPresent(f);
- assertTrue(buildRule.getFullLog().indexOf("Removing orphan file:") == -1);
+ assertTrue(!buildRule.getFullLog().contains("Removing orphan file:"));
}
@Test
@@ -133,7 +133,7 @@ public class SyncTest {
assertFileIsPresent(d);
String f = buildRule.getProject().getProperty("dest") + "/e/f";
assertFileIsPresent(f);
- assertTrue(buildRule.getFullLog().indexOf("Removing orphan file:") == -1);
+ assertTrue(!buildRule.getFullLog().contains("Removing orphan file:"));
}
public void assertFileIsPresent(String f) {
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/tests/junit/org/apache/tools/ant/taskdefs/TaskdefTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/TaskdefTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/TaskdefTest.java
index 7f28de0..24e5090 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/TaskdefTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/TaskdefTest.java
@@ -119,10 +119,10 @@ public class TaskdefTest {
buildRule.executeTarget("testOverride");
String log = buildRule.getLog();
assertTrue("override warning sent",
- log.indexOf("Trying to override old definition of task copy") > -1);
+ log.contains("Trying to override old definition of task copy"));
assertTrue("task inside target worked",
- log.indexOf("In target") > -1);
+ log.contains("In target"));
assertTrue("task inside target worked",
- log.indexOf("In TaskContainer") > -1);
+ log.contains("In TaskContainer"));
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/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 d1c3aea..9d34760 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
@@ -131,7 +131,7 @@ public class EchoPropertiesTest {
try {
String read = null;
while ((read = br.readLine()) != null) {
- if (read.indexOf("<property name=\"test.property\" value=\""+TEST_VALUE+"\" />") >= 0) {
+ if (read.contains("<property name=\"test.property\" value=\"" + TEST_VALUE + "\" />")) {
// found the property we set - it's good.
return;
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/tests/junit/org/apache/tools/ant/taskdefs/optional/XmlValidateTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/XmlValidateTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/XmlValidateTest.java
index 9cd6eb2..108e7d0 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/XmlValidateTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/XmlValidateTest.java
@@ -136,8 +136,7 @@ public class XmlValidateTest {
" doesn't support feature http://apache.org/xml/features/validation/schema")) {
throw new AssumptionViolatedException("parser doesn't support schema");
} else {
- assertTrue(
- e.getMessage().indexOf("not a valid XML document") > -1);
+ assertTrue(e.getMessage().contains("not a valid XML document"));
}
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/tests/junit/org/apache/tools/ant/taskdefs/optional/XsltTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/XsltTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/XsltTest.java
index d84fc69..e757fae 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/XsltTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/XsltTest.java
@@ -77,7 +77,7 @@ public class XsltTest {
@Test
public void testStyleSheetWithInclude() throws Exception {
buildRule.executeTarget("testStyleSheetWithInclude");
- if (buildRule.getLog().indexOf("java.io.FileNotFoundException") != -1) {
+ if (buildRule.getLog().contains("java.io.FileNotFoundException")) {
fail("xsl:include was not found");
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/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 b39832b..5320541 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
@@ -112,7 +112,7 @@ public class ImageTest {
} catch (RuntimeException re){
assertTrue("Run time exception should say 'Unable to process image stream'. :"
+ re.toString(),
- re.toString().indexOf("Unable to process image stream") > -1);
+ re.toString().contains("Unable to process image stream"));
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java
index f4f1541..dede70d 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java
@@ -80,7 +80,7 @@ public class JUnitTestRunnerTest {
runner.run();
String error = runner.getFormatter().getError();
assertEquals(error, JUnitTestRunner.ERRORS, runner.getRetCode());
- assertTrue(error, error.indexOf("thrown on purpose") != -1);
+ assertTrue(error, error.contains("thrown on purpose"));
}
// check that something which is not a testcase generates no errors
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/tests/junit/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java
index 66e6567..bfba298 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java
@@ -56,10 +56,10 @@ public class ScriptDefTest {
File baseDir = fileset.getDir(p);
String log = buildRule.getLog();
assertTrue("Expecting attribute value printed",
- log.indexOf("Attribute attr1 = test") != -1);
+ log.contains("Attribute attr1 = test"));
assertTrue("Expecting nested element value printed",
- log.indexOf("Fileset basedir = " + baseDir.getAbsolutePath()) != -1);
+ log.contains("Fileset basedir = " + baseDir.getAbsolutePath()));
}
@Test
@@ -91,10 +91,10 @@ public class ScriptDefTest {
File baseDir = fileset.getDir(p);
String log = buildRule.getLog();
assertTrue("Expecting attribute value to be printed",
- log.indexOf("Attribute attr1 = test") != -1);
+ log.contains("Attribute attr1 = test"));
assertTrue("Expecting nested element value to be printed",
- log.indexOf("Fileset basedir = " + baseDir.getAbsolutePath()) != -1);
+ log.contains("Fileset basedir = " + baseDir.getAbsolutePath()));
}
@Test
@@ -117,8 +117,8 @@ public class ScriptDefTest {
public void testDoubleDef() {
buildRule.executeTarget("doubledef");
String log = buildRule.getLog();
- assertTrue("Task1 did not execute", log.indexOf("Task1") != -1);
- assertTrue("Task2 did not execute", log.indexOf("Task2") != -1);
+ assertTrue("Task1 did not execute", log.contains("Task1"));
+ assertTrue("Task2 did not execute", log.contains("Task2"));
}
@Test
@@ -137,7 +137,7 @@ public class ScriptDefTest {
// get the fileset and its basedir
String log = buildRule.getLog();
assertTrue("Expecting property in attribute value replaced",
- log.indexOf("Attribute value = test") != -1);
+ log.contains("Attribute value = test"));
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/tests/junit/org/apache/tools/ant/types/CommandlineJavaTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/types/CommandlineJavaTest.java b/src/tests/junit/org/apache/tools/ant/types/CommandlineJavaTest.java
index db70ac4..5f6bb50 100644
--- a/src/tests/junit/org/apache/tools/ant/types/CommandlineJavaTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/CommandlineJavaTest.java
@@ -94,7 +94,7 @@ public class CommandlineJavaTest {
assertEquals("with classpath", "-Djava.compiler=NONE", s[1]);
assertEquals("with classpath", "-classpath", s[2]);
assertTrue("build.xml contained",
- s[3].indexOf("build.xml"+java.io.File.pathSeparator) >= 0);
+ s[3].contains("build.xml" + java.io.File.pathSeparator));
assertTrue("ant.jar contained", s[3].endsWith("ant.jar"));
assertEquals("with classpath", "junit.textui.TestRunner", s[4]);
assertEquals("with classpath",
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/tests/junit/org/apache/tools/ant/types/PathTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/types/PathTest.java b/src/tests/junit/org/apache/tools/ant/types/PathTest.java
index 20c0b3a..b75e9f5 100644
--- a/src/tests/junit/org/apache/tools/ant/types/PathTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/PathTest.java
@@ -572,7 +572,7 @@ public class PathTest {
assertEquals(0, p.list().length);
} catch (BuildException x) {
String m = x.toString();
- assertTrue(m, m.indexOf("circular") != -1);
+ assertTrue(m, m.contains("circular"));
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/src/tests/junit/org/apache/tools/ant/types/RedirectorElementTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/types/RedirectorElementTest.java b/src/tests/junit/org/apache/tools/ant/types/RedirectorElementTest.java
index b7bfa5d..9ed6ef6 100644
--- a/src/tests/junit/org/apache/tools/ant/types/RedirectorElementTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/RedirectorElementTest.java
@@ -73,7 +73,7 @@ public class RedirectorElementTest {
@Test
public void testLogInputString() {
buildRule.executeTarget("testLogInputString");
- if (buildRule.getLog().indexOf("testLogInputString can-cat") >= 0) {
+ if (buildRule.getLog().contains("testLogInputString can-cat")) {
AntAssert.assertContains("Using input string", buildRule.getFullLog());
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4e3e565e/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 e9591b5..0b940ad 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
@@ -185,7 +185,7 @@ public class ModifiedSelectorTest {
assertNotNull("'fs.full.value' must be set.", fsFullValue);
assertTrue("'fs.full.value' must not be null.", !"".equals(fsFullValue));
- assertTrue("'fs.full.value' must contain ant.bat.", fsFullValue.indexOf("ant.bat")>-1);
+ assertTrue("'fs.full.value' must contain ant.bat.", fsFullValue.contains("ant.bat"));
assertNotNull("'fs.mod.value' must be set.", fsModValue);
// must be empty according to the Mock* implementations