diff options
| author | Javen O'Neal <onealj@apache.org> | 2017-05-16 10:53:15 +0000 |
|---|---|---|
| committer | Javen O'Neal <onealj@apache.org> | 2017-05-16 10:53:15 +0000 |
| commit | 9b4e4769ddd9fb06278d88a713d0f1d2b1506c20 (patch) | |
| tree | d007c99fdff90f9bbcb30fb55d3ad33a16b1d95d /src/scratchpad/testcases/org/apache | |
| parent | b95c5bf5136e6578ac81f9c83ffdcf438635bc74 (diff) | |
| download | poi-9b4e4769ddd9fb06278d88a713d0f1d2b1506c20.tar.gz poi-9b4e4769ddd9fb06278d88a713d0f1d2b1506c20.zip | |
replace "String.indexOf(String) >= 1" with "String.contains(String)"
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1795296 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/scratchpad/testcases/org/apache')
| -rw-r--r-- | src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java | 16 | ||||
| -rw-r--r-- | src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java b/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java index 755bb63804..51b60399f8 100644 --- a/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java +++ b/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java @@ -64,9 +64,9 @@ public final class TestOutlookTextExtractor { assertContains(text, "From: Kevin Roast\n"); assertContains(text, "To: Kevin Roast <kevin.roast@alfresco.org>\n"); - assertEquals(-1, text.indexOf("CC:")); - assertEquals(-1, text.indexOf("BCC:")); - assertEquals(-1, text.indexOf("Attachment:")); + assertNotContained(text, "CC:"); + assertNotContained(text, "BCC:"); + assertNotContained(text, "Attachment:"); assertContains(text, "Subject: Test the content transformer\n"); Calendar cal = LocaleUtil.getLocaleCalendar(2007, 5, 14, 9, 42, 55); SimpleDateFormat f = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss Z", Locale.ROOT); @@ -89,8 +89,8 @@ public final class TestOutlookTextExtractor { assertContains(text, "From: Travis Ferguson\n"); assertContains(text, "To: travis@overwrittenstack.com\n"); - assertEquals(-1, text.indexOf("CC:")); - assertEquals(-1, text.indexOf("BCC:")); + assertNotContained(text, "CC:"); + assertNotContained(text, "BCC:"); assertContains(text, "Subject: test message\n"); assertContains(text, "Date: Fri, 6 Jul 2007 05:27:17 +0000\n"); assertContains(text, "This is a test message."); @@ -193,7 +193,7 @@ public final class TestOutlookTextExtractor { "'Paul Holmes-Higgin' <paul.hh@alfresco.com>; 'Mike Farman' <mikef@alfresco.com>\n"); assertContains(text, "CC: nickb@alfresco.com; " + "nick.burch@alfresco.com; 'Roy Wetherall' <roy.wetherall@alfresco.com>\n"); - assertEquals(-1, text.indexOf("BCC:")); + assertNotContained(text, "BCC:"); assertContains(text, "Subject: This is a test message please ignore\n"); assertContains(text, "Date: Mon, 11 Jan 2010 16:2"); // Exact times differ slightly assertContains(text, "The quick brown fox jumps over the lazy dog"); @@ -216,8 +216,8 @@ public final class TestOutlookTextExtractor { assertContains(text, "From: Nicolas1"); assertContains(text, "To: 'nicolas1.23456@free.fr'"); - assertEquals(-1, text.indexOf("CC:")); - assertEquals(-1, text.indexOf("BCC:")); + assertNotContained(text, "CC:"); + assertNotContained(text, "BCC:"); assertContains(text, "Subject: test"); assertContains(text, "Date: Wed, 22 Apr"); assertContains(text, "Attachment: test-unicode.doc\n"); diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java index 3979a442c5..ab3145e067 100644 --- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java +++ b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java @@ -162,7 +162,7 @@ public final class TestProblems extends HWPFTestCase { String text = para.text(); totalLength += text.length(); - if (text.indexOf("{delete me}") > -1) { + if (text.contains("{delete me}")) { para.delete(); deletedLength = text.length(); } |