[testng] 68/160: Replace indexOf() with contains()

[Eugene Zhukov]

This is an automated email from the git hooks/post-receive script.

eugene-guest pushed a commit to annotated tag testng-6.9.5
in repository testng.

commit d7aa93fe6e097ba15d10217bd929896d9e8a5b9c
Author: Ryan Schmitt <rschmitt at pobox.com>
Date:   Sat May 30 21:27:40 2015 -0700

    Replace indexOf() with contains()
---
 src/main/java/org/testng/TestNG.java                    | 2 +-
 src/main/java/org/testng/internal/BaseTestMethod.java   | 2 +-
 src/main/java/org/testng/internal/Utils.java            | 2 +-
 src/main/java/org/testng/reporters/XMLStringBuffer.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/testng/TestNG.java b/src/main/java/org/testng/TestNG.java
index 927d61b..676a1bf 100644
--- a/src/main/java/org/testng/TestNG.java
+++ b/src/main/java/org/testng/TestNG.java
@@ -1394,7 +1394,7 @@ public class TestNG {
     }
     if (cla.listener != null) {
       String sep = ";";
-      if (cla.listener.indexOf(",") >= 0) {
+      if (cla.listener.contains(",")) {
         sep = ",";
       }
       String[] strs = Utils.split(cla.listener, sep);
diff --git a/src/main/java/org/testng/internal/BaseTestMethod.java b/src/main/java/org/testng/internal/BaseTestMethod.java
index 778a5e5..68d838e 100755
--- a/src/main/java/org/testng/internal/BaseTestMethod.java
+++ b/src/main/java/org/testng/internal/BaseTestMethod.java
@@ -470,7 +470,7 @@ public abstract class BaseTestMethod implements ITestNGMethod {
       // Qualify these methods if they don't have a package
       for (int i = 0; i < methodsDependedUpon.length; i++) {
         String m = methodsDependedUpon[i];
-        if (m.indexOf(".") < 0) {
+        if (!m.contains(".")) {
           m = MethodHelper.calculateMethodCanonicalName(m_methodClass, methodsDependedUpon[i]);
           methodsDependedUpon[i] = m != null ? m : methodsDependedUpon[i];
         }
diff --git a/src/main/java/org/testng/internal/Utils.java b/src/main/java/org/testng/internal/Utils.java
index 19c517b..be4a190 100644
--- a/src/main/java/org/testng/internal/Utils.java
+++ b/src/main/java/org/testng/internal/Utils.java
@@ -610,7 +610,7 @@ public final class Utils {
       while((line = bufferedReader.readLine()) != null) {
         boolean isExcluded = false;
         for (String excluded : excludedStrings) {
-          if(line.indexOf(excluded) != -1) {
+          if(line.contains(excluded)) {
             isExcluded = true;
             excludedCount++;
             break;
diff --git a/src/main/java/org/testng/reporters/XMLStringBuffer.java b/src/main/java/org/testng/reporters/XMLStringBuffer.java
index 281daff..4e2b051 100755
--- a/src/main/java/org/testng/reporters/XMLStringBuffer.java
+++ b/src/main/java/org/testng/reporters/XMLStringBuffer.java
@@ -303,7 +303,7 @@ public class XMLStringBuffer {
     if (content == null) {
       content = "null";
     }
-    if (content.indexOf("]]>") > -1) {
+    if (content.contains("]]>")) {
       String[] subStrings = content.split("]]>");
       m_buffer.append(m_currentIndent).append("<![CDATA[").append(subStrings[0]).append("]]]]>");
       for (int i = 1; i < subStrings.length - 1; i++) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git