This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-collections.git
commit 2c4eae4897d2376e3ce810aeb357b6e9636cd9f5 Author: Gary D. Gregory <[email protected]> AuthorDate: Sat Mar 15 15:44:41 2025 -0400 Use NIO in tests to read test fixtures --- .../java/org/apache/commons/collections4/AbstractObjectTest.java | 5 +++-- .../collections4/properties/AbstractPropertiesFactoryTest.java | 4 ++-- .../commons/collections4/splitmap/TransformedSplitMapTest.java | 7 ++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java b/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java index 5cbb9ff67..8c7ec2f3a 100644 --- a/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java +++ b/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java @@ -23,7 +23,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; 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; @@ -31,6 +30,8 @@ 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 @@ public abstract class AbstractObjectTest extends BulkTest { * @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); } } diff --git a/src/test/java/org/apache/commons/collections4/properties/AbstractPropertiesFactoryTest.java b/src/test/java/org/apache/commons/collections4/properties/AbstractPropertiesFactoryTest.java index ac7d1f3cf..3861e1892 100644 --- a/src/test/java/org/apache/commons/collections4/properties/AbstractPropertiesFactoryTest.java +++ b/src/test/java/org/apache/commons/collections4/properties/AbstractPropertiesFactoryTest.java @@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; 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 abstract class AbstractPropertiesFactoryTest<T extends Properties> { // 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)); } } diff --git a/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java b/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java index 8ab4455fb..4a7be9ef3 100644 --- a/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java +++ b/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java @@ -21,10 +21,11 @@ import static org.junit.jupiter.api.Assertions.assertFalse; 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 class TransformedSplitMapTest extends BulkTest { 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 class TransformedSplitMapTest extends BulkTest { 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();
