'String.indexOf()' expression is replaceable with 'contains()'

Reports any String.indexOf() expressions which can be replaced with a call to the String.contains() method available in Java 5 and newer.

Signed-off-by: Lars Grefer <eclipse@larsgrefer.de>

2 files changed, 2 insertions, 2 deletions

diff --git a/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java b/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java
index 6be6cc61e..76b7a181a 100644
--- a/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java
+++ b/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java
@@ -477,7 +477,7 @@ public final class TestUtil {
 		String[] paths = FileUtil.listFiles(expectedBaseDir);
 		boolean result = true;
 		for (String path : paths) {
-			if (-1 != path.indexOf("CVS")) {
+			if (path.contains("CVS")) {
 				continue;
 			}
 			if (!sameFiles(handler, expectedBaseDir, actualBaseDir, path) && result) {
diff --git a/testing-util/src/test/java/org/aspectj/testingutil/TestUtilTest.java b/testing-util/src/test/java/org/aspectj/testingutil/TestUtilTest.java
index 0807bd2a3..1427ccc8a 100644
--- a/testing-util/src/test/java/org/aspectj/testingutil/TestUtilTest.java
+++ b/testing-util/src/test/java/org/aspectj/testingutil/TestUtilTest.java
@@ -116,7 +116,7 @@ public class TestUtilTest extends TestCase {
             } catch (IllegalArgumentException e) {
                 assertTrue("exception: " + errors[i], fail);
                 String m = e.getMessage();
-                if (-1 == m.indexOf(errors[i])) {
+                if (!m.contains(errors[i])) {
                     fail(errors[i] + " not in " + m);
                 }
             }