Enable some tests that are ignored, actually run green and did not have any comment...

Fix some compiler warnings

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1734687 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java b/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
index 060b1e4d3f2bf83fde3cc0c8306e4d165a72b603..7c9542ca9409aee4d691981d965bb06cba20857f 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
@@ -355,7 +355,7 @@ public class TestXWPFWordExtractor extends TestCase {
 
         for (String targ : targs) {
             boolean hit = false;
-            if (s.indexOf(targ) > -1) {
+            if (s.contains(targ)) {
                 hit = true;
                 hits++;
             }

diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
index b877451aa829d248136cde24e61afafd16978633..6cd3171f3c2dbaf726234bd8fcaca10d42e8d128 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
@@ -28,7 +28,6 @@ import java.math.BigInteger;
 import java.util.List;
 
 import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.openxmlformats.schemas.drawingml.x2006.picture.CTPicture;
 import org.openxmlformats.schemas.drawingml.x2006.picture.PicDocument;
@@ -61,7 +60,6 @@ public final class TestXWPFParagraph {
      * @throws IOException
      */
     @Test
-    @Ignore
     public void testHeaderParagraph() throws IOException {
         XWPFDocument xml = XWPFTestDataSamples.openSampleDocument("ThreeColHead.docx");
 
@@ -84,7 +82,6 @@ public final class TestXWPFParagraph {
      * @throws IOException
      */
     @Test
-    @Ignore
     public void testDocumentParagraph() throws IOException {
         XWPFDocument xml = XWPFTestDataSamples.openSampleDocument("ThreeColHead.docx");
         List<XWPFParagraph> ps = xml.getParagraphs();