Fix some IDE warnings and better output in unit test

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

2 files changed, 15 insertions, 15 deletions

diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java b/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java
index d12620de14..24eccf9419 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java
+++ b/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java
@@ -23,13 +23,13 @@ import static org.junit.Assert.assertNotNull;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileFilter;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 import org.apache.poi.POIDataSamples;
 import org.apache.poi.hpsf.CustomProperties;
@@ -59,19 +59,18 @@ public class TestReadAllFiles {
     
     @Parameters(name="{index}: {0} using {1}")
     public static Iterable<Object[]> files() {
-        final List<Object[]> files = new ArrayList<>();
-        
-        _samples.getFile("").listFiles(f -> {
-            if (f.getName().startsWith("Test")) {
-                files.add(new Object[]{ f });
-            }
-            return false;
-        });
-        
-        return files;
+        File hpsfTestDir = _samples.getFile("");
+
+        File[] files = hpsfTestDir.listFiles(f -> true);
+        Objects.requireNonNull(files, "Could not find directory " + hpsfTestDir.getAbsolutePath());
+
+        // convert to list of object-arrays for @Parameterized
+        return Arrays.stream(files).
+                map(file1 -> new Object[] {file1}).
+                collect(Collectors.toList());
     }
 
-    @Parameter(value=0)
+    @Parameter()
     public File file;
 
     /**
@@ -158,9 +157,11 @@ public class TestReadAllFiles {
              */
             if (dir.hasEntry(DocumentSummaryInformation.DEFAULT_STREAM_NAME)) {
                 final DocumentSummaryInformation dsi = TestWriteWellKnown.getDocumentSummaryInformation(poifs);
+                assertNotNull(dsi);
 
                 /* Execute the get... methods. */
                 dsi.getByteCount();
+                //noinspection ResultOfMethodCallIgnored
                 dsi.getByteOrder();
                 dsi.getCategory();
                 dsi.getCompany();
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
index 3959d80694..7b0ae4bee2 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
+++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
@@ -22,7 +22,6 @@ import static org.apache.poi.POITestCase.testPassesNow;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;