You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2017/09/16 08:29:06 UTC
svn commit: r1808521 - in /poi/trunk/src: java/org/apache/poi/util/
testcases/org/apache/poi/ testcases/org/apache/poi/ss/util/
testcases/org/apache/poi/util/
Author: centic
Date: Sat Sep 16 08:29:06 2017
New Revision: 1808521
URL: http://svn.apache.org/viewvc?rev=1808521&view=rev
Log:
Fix some warnings in unit tests
Modified:
poi/trunk/src/java/org/apache/poi/util/StringUtil.java
poi/trunk/src/testcases/org/apache/poi/POIDataSamples.java
poi/trunk/src/testcases/org/apache/poi/POITestCase.java
poi/trunk/src/testcases/org/apache/poi/TestPOITestCase.java
poi/trunk/src/testcases/org/apache/poi/ss/util/TestNumberComparer.java
poi/trunk/src/testcases/org/apache/poi/util/TestHexDump.java
poi/trunk/src/testcases/org/apache/poi/util/TestIntList.java
poi/trunk/src/testcases/org/apache/poi/util/TestPOILogger.java
poi/trunk/src/testcases/org/apache/poi/util/TestStringUtil.java
poi/trunk/src/testcases/org/apache/poi/util/TestTempFile.java
Modified: poi/trunk/src/java/org/apache/poi/util/StringUtil.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/util/StringUtil.java?rev=1808521&r1=1808520&r2=1808521&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/util/StringUtil.java (original)
+++ poi/trunk/src/java/org/apache/poi/util/StringUtil.java Sat Sep 16 08:29:06 2017
@@ -27,9 +27,6 @@ import java.util.Map;
*/
@Internal
public class StringUtil {
-
- private static final POILogger logger = POILogFactory
- .getLogger(StringUtil.class);
protected static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
public static final Charset UTF16LE = Charset.forName("UTF-16LE");
public static final Charset UTF8 = Charset.forName("UTF-8");
Modified: poi/trunk/src/testcases/org/apache/poi/POIDataSamples.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/POIDataSamples.java?rev=1808521&r1=1808520&r2=1808521&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/POIDataSamples.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/POIDataSamples.java Sat Sep 16 08:29:06 2017
@@ -156,7 +156,7 @@ public final class POIDataSamples {
/**
*
* @param sampleFileName the name of the test file
- * @return
+ * @return Verifies that the file with the given name exists in the test-data directory
* @throws RuntimeException if the file was not found
*/
public File getFile(String sampleFileName) {
Modified: poi/trunk/src/testcases/org/apache/poi/POITestCase.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/POITestCase.java?rev=1808521&r1=1808520&r2=1808521&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/POITestCase.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/POITestCase.java Sat Sep 16 08:29:06 2017
@@ -19,7 +19,6 @@ package org.apache.poi;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertThat;
Modified: poi/trunk/src/testcases/org/apache/poi/TestPOITestCase.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/TestPOITestCase.java?rev=1808521&r1=1808520&r2=1808521&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/TestPOITestCase.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/TestPOITestCase.java Sat Sep 16 08:29:06 2017
@@ -17,10 +17,6 @@
package org.apache.poi;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import java.util.Collections;
import java.util.Locale;
import java.util.Map;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/util/TestNumberComparer.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/util/TestNumberComparer.java?rev=1808521&r1=1808520&r2=1808521&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/util/TestNumberComparer.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/util/TestNumberComparer.java Sat Sep 16 08:29:06 2017
@@ -73,6 +73,7 @@ public final class TestNumberComparer {
public void testSpecificExampleA() {
double a = 0.06-0.01;
double b = 0.05;
+ //noinspection ConstantConditions
assertFalse(a == b);
assertEquals(0, NumberComparer.compare(a, b));
}
@@ -84,6 +85,7 @@ public final class TestNumberComparer {
public void testSpecificExampleB() {
double a = 1+1.0028-0.9973;
double b = 1.0055;
+ //noinspection ConstantConditions
assertFalse(a == b);
assertEquals(0, NumberComparer.compare(a, b));
}
Modified: poi/trunk/src/testcases/org/apache/poi/util/TestHexDump.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestHexDump.java?rev=1808521&r1=1808520&r2=1808521&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/util/TestHexDump.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/util/TestHexDump.java Sat Sep 16 08:29:06 2017
@@ -251,11 +251,8 @@ public class TestHexDump {
public void testMain() throws Exception {
File file = TempFile.createTempFile("HexDump", ".dat");
try {
- FileOutputStream out = new FileOutputStream(file);
- try {
+ try (FileOutputStream out = new FileOutputStream(file)) {
IOUtils.copy(new ByteArrayInputStream("teststring".getBytes(LocaleUtil.CHARSET_1252)), out);
- } finally {
- out.close();
}
assertTrue(file.exists());
assertTrue(file.length() > 0);
Modified: poi/trunk/src/testcases/org/apache/poi/util/TestIntList.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestIntList.java?rev=1808521&r1=1808520&r2=1808521&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/util/TestIntList.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/util/TestIntList.java Sat Sep 16 08:29:06 2017
@@ -256,6 +256,7 @@ public final class TestIntList extends T
IntList list = new IntList();
assertEquals(list, list);
+ //noinspection ObjectEqualsNull
assertTrue(!list.equals(null));
IntList list2 = new IntList(200);
Modified: poi/trunk/src/testcases/org/apache/poi/util/TestPOILogger.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestPOILogger.java?rev=1808521&r1=1808520&r2=1808521&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/util/TestPOILogger.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/util/TestPOILogger.java Sat Sep 16 08:29:06 2017
@@ -42,17 +42,17 @@ public final class TestPOILogger extends
POILogger log = POILogFactory.getLogger( "foo" );
assertTrue(log instanceof TestPOILogger);
- TestPOILogger tlog = (TestPOILogger)log;
+ TestPOILogger tLog = (TestPOILogger)log;
log.log(POILogger.WARN, "Test = ", 1);
- assertEquals("Test = 1", tlog.lastLog);
+ assertEquals("Test = 1", tLog.lastLog);
log.log(POILogger.ERROR, "Test ", 1,2,new Exception("bla"));
- assertEquals("Test 12", tlog.lastLog);
- assertNotNull(tlog.lastEx);
+ assertEquals("Test 12", tLog.lastLog);
+ assertNotNull(tLog.lastEx);
log.log(POILogger.ERROR, "log\nforging", "\nevil","\nlog");
- assertEquals("log forging evil log", tlog.lastLog);
+ assertEquals("log forging evil log", tLog.lastLog);
} finally {
POILogFactory._loggerClassName = oldLCN;
}
Modified: poi/trunk/src/testcases/org/apache/poi/util/TestStringUtil.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestStringUtil.java?rev=1808521&r1=1808520&r2=1808521&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/util/TestStringUtil.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/util/TestStringUtil.java Sat Sep 16 08:29:06 2017
@@ -137,7 +137,9 @@ public class TestStringUtil {
try {
i.next();
fail();
- } catch(ArrayIndexOutOfBoundsException e) {}
+ } catch(ArrayIndexOutOfBoundsException e) {
+ // expected here
+ }
i = new StringsIterator(new String[] {"1"});
@@ -148,7 +150,9 @@ public class TestStringUtil {
try {
i.next();
fail();
- } catch(ArrayIndexOutOfBoundsException e) {}
+ } catch(ArrayIndexOutOfBoundsException e) {
+ // expected here
+ }
i = new StringsIterator(new String[] {"1","2","3"});
@@ -163,7 +167,9 @@ public class TestStringUtil {
try {
i.next();
fail();
- } catch(ArrayIndexOutOfBoundsException e) {}
+ } catch(ArrayIndexOutOfBoundsException e) {
+ // expected here
+ }
}
Modified: poi/trunk/src/testcases/org/apache/poi/util/TestTempFile.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestTempFile.java?rev=1808521&r1=1808520&r2=1808521&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/util/TestTempFile.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/util/TestTempFile.java Sat Sep 16 08:29:06 2017
@@ -54,10 +54,12 @@ public class TestTempFile {
@After
public void tearDown() throws IOException {
String[] files = tempDir.list();
+ assertNotNull(files);
// can have the "poifiles" subdir
if(files.length == 1) {
assertEquals("Had: " + Arrays.toString(files), DefaultTempFileCreationStrategy.POIFILES, files[0]);
files = new File(tempDir, files[0]).list();
+ assertNotNull(files);
assertEquals("Had: " + Arrays.toString(files), 0, files.length);
} else {
assertEquals("Had: " + Arrays.toString(files), 0, files.length);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org