Use NIO in tests to read test fixtures

Author: garydgregory

src/test/java/org/apache/commons/collections4/AbstractObjectTest.java

@@ -23,14 +23,15 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 
 import org.junit.jupiter.api.Test;
 
@@ -141,7 +142,7 @@ protected Object readExternalFormFromBytes(final byte[] b) throws IOException, C
      * @throws ClassNotFoundException
      */
     protected Object readExternalFormFromDisk(final String path) throws IOException, ClassNotFoundException {
-        try (FileInputStream stream = new FileInputStream(path)) {
+        try (InputStream stream = Files.newInputStream(Paths.get(path))) {
             return readExternalFormFromStream(stream);
         }
     }

src/test/java/org/apache/commons/collections4/properties/AbstractPropertiesFactoryTest.java

@@ -22,7 +22,7 @@
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 
 import java.io.BufferedReader;
-import java.io.FileInputStream;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Properties;
@@ -107,7 +107,7 @@ public void testLoadInputStream(final String fileExtension) throws Exception {
         // Can't tell what we are reading
         Assumptions.assumeFalse(isXmlTest(fileExtension));
         //
-        try (FileInputStream inputStream = new FileInputStream(getPathString(fileExtension))) {
+        try (InputStream inputStream = Files.newInputStream(Paths.get(getPathString(fileExtension)))) {
             assertContents(factory.load(inputStream));
         }
     }

src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java

@@ -21,10 +21,11 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.math.BigInteger;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.HashMap;
 
 import org.apache.commons.collections4.BulkTest;
@@ -53,7 +54,7 @@ public void testEmptyMap() throws IOException, ClassNotFoundException {
                                                     NOPTransformer.<String>nopTransformer(),
                                                     NOPTransformer.<String>nopTransformer());
 
-        final ObjectInputStream in = new ObjectInputStream(new FileInputStream(TEST_DATA_PATH + "/TransformedSplitMap.emptyCollection.version4.obj"));
+        final ObjectInputStream in = new ObjectInputStream(Files.newInputStream(Paths.get(TEST_DATA_PATH + "/TransformedSplitMap.emptyCollection.version4.obj")));
         final Object readObject = in.readObject();
         in.close();
 
@@ -71,7 +72,7 @@ public void testFullMap() throws IOException, ClassNotFoundException {
         map.put("e", "f");
         map.put("g", "h");
 
-        final ObjectInputStream in = new ObjectInputStream(new FileInputStream(TEST_DATA_PATH + "TransformedSplitMap.fullCollection.version4.obj"));
+        final ObjectInputStream in = new ObjectInputStream(Files.newInputStream(Paths.get(TEST_DATA_PATH + "TransformedSplitMap.fullCollection.version4.obj")));
         final Object readObject = in.readObject();
         in.close();