sonar fixes

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

diff --git a/src/examples/src/org/apache/poi/xssf/eventusermodel/examples/FromHowTo.java b/src/examples/src/org/apache/poi/xssf/eventusermodel/examples/FromHowTo.java
index cd102144e093a53134714b1f5e983c40948f0b9a..2f31490dc44fdf284aca2e0d1ff3d767591c548f 100644 (file)
--- a/src/examples/src/org/apache/poi/xssf/eventusermodel/examples/FromHowTo.java
+++ b/src/examples/src/org/apache/poi/xssf/eventusermodel/examples/FromHowTo.java
@@ -129,8 +129,7 @@ public class FromHowTo {
                        }
                }
 
-               public void characters(char[] ch, int start, int length)
-                               throws SAXException {
+               public void characters(char[] ch, int start, int length) throws SAXException { // NOSONAR
                        lastContents += new String(ch, start, length);
                }
        }

diff --git a/src/java/org/apache/poi/util/StringUtil.java b/src/java/org/apache/poi/util/StringUtil.java
index e1735e624212e56f7513466bd3d9b29cdc0b2b03..14760dd23ea97694bf046ab99ca3550baeef0ee0 100644 (file)
--- a/src/java/org/apache/poi/util/StringUtil.java
+++ b/src/java/org/apache/poi/util/StringUtil.java
@@ -294,13 +294,11 @@ public class StringUtil {
     * An Iterator over an array of Strings.
     */
    public static class StringsIterator implements Iterator<String> {
-      private String[] strings;
+      private String[] strings = {};
       private int position = 0;
       public StringsIterator(String[] strings) {
-         if(strings != null) {
-            this.strings = strings;
-         } else {
-            this.strings = new String[0];
+          if (strings != null) {
+              this.strings = strings.clone();
          }
       }
 
@@ -309,8 +307,9 @@ public class StringUtil {
       }
       public String next() {
          int ourPos = position++;
-         if(ourPos >= strings.length)
+         if(ourPos >= strings.length) {
             throw new ArrayIndexOutOfBoundsException(ourPos);
+         }
          return strings[ourPos];
       }
       public void remove() {}

diff --git a/src/testcases/org/apache/poi/util/TestStringUtil.java b/src/testcases/org/apache/poi/util/TestStringUtil.java
index 17498396ece91a79693b767de8b9803af2b96380..bdfc20be09c2d7ad206182bf27d0958539d51dfc 100644 (file)
--- a/src/testcases/org/apache/poi/util/TestStringUtil.java
+++ b/src/testcases/org/apache/poi/util/TestStringUtil.java
@@ -17,24 +17,25 @@
 
 package org.apache.poi.util;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.nio.charset.Charset;
 
 import org.apache.poi.util.StringUtil.StringsIterator;
-
-import junit.framework.TestCase;
+import org.junit.Test;
 
 /**
  * Unit test for StringUtil
- *
- * @author  Marc Johnson (mjohnson at apache dot org
- * @author  Glen Stampoultzis (glens at apache.org)
- * @author  Sergei Kozello (sergeikozello at mail.ru)
  */
-public final class TestStringUtil extends TestCase {
+public class TestStringUtil {
 
     /**
      * test getFromUnicodeHigh for symbols with code below and more 127
      */
+    @Test
     public void testGetFromUnicodeHighSymbolsWithCodesMoreThan127() {
         byte[] test_data = new byte[]{0x22, 0x04,
                                       0x35, 0x04,
@@ -52,6 +53,7 @@ public final class TestStringUtil extends TestCase {
                 StringUtil.getFromUnicodeLE( test_data ) );
     }
 
+    @Test
     public void testPutCompressedUnicode() {
         byte[] output = new byte[100];
         byte[] expected_output =
@@ -87,6 +89,7 @@ public final class TestStringUtil extends TestCase {
         }
     }
 
+    @Test
     public void testPutUncompressedUnicode() {
         byte[] output = new byte[100];
         String input = "Hello World";
@@ -124,6 +127,7 @@ public final class TestStringUtil extends TestCase {
         }
     }
 
+    @Test
     public void testStringsIterator() {
        StringsIterator i;