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-io.git
commit d75998eda53b36df1cce4ed6fe61de871286737f
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Oct 7 14:40:36 2024 -0400
Refactor tests to isolate deprecated constructor use
---
.../io/input/RandomAccessFileInputStreamTest.java | 84 ++++++++++++++++------
1 file changed, 64 insertions(+), 20 deletions(-)
diff --git
a/src/test/java/org/apache/commons/io/input/RandomAccessFileInputStreamTest.java
b/src/test/java/org/apache/commons/io/input/RandomAccessFileInputStreamTest.java
index 08540914b..6d28c078a 100644
---
a/src/test/java/org/apache/commons/io/input/RandomAccessFileInputStreamTest.java
+++
b/src/test/java/org/apache/commons/io/input/RandomAccessFileInputStreamTest.java
@@ -46,10 +46,13 @@ public class RandomAccessFileInputStreamTest {
return RandomAccessFileMode.READ_ONLY.create(DATA_FILE_NAME);
}
+ @SuppressWarnings("resource")
@Test
public void testAvailableAfterClose() throws IOException {
- try (RandomAccessFileInputStream inputStream = new
RandomAccessFileInputStream(createRandomAccessFile(),
- true)) {
+ try (RandomAccessFileInputStream inputStream =
RandomAccessFileInputStream.builder()
+ .setRandomAccessFile(createRandomAccessFile())
+ .setCloseOnClose(true)
+ .get()) {
inputStream.close();
assertEquals(0, inputStream.available());
}
@@ -57,16 +60,20 @@ public class RandomAccessFileInputStreamTest {
@Test
public void testAvailableAfterOpen() throws IOException {
- try (RandomAccessFileInputStream inputStream = new
RandomAccessFileInputStream(createRandomAccessFile(),
- true)) {
+ try (RandomAccessFileInputStream inputStream =
RandomAccessFileInputStream.builder()
+ .setRandomAccessFile(createRandomAccessFile())
+ .setCloseOnClose(true)
+ .get()) {
assertEquals(DATA_FILE_LEN, inputStream.available());
}
}
@Test
public void testAvailableLong() throws IOException {
- try (RandomAccessFileInputStream inputStream = new
RandomAccessFileInputStream(createRandomAccessFile(),
- true)) {
+ try (RandomAccessFileInputStream inputStream =
RandomAccessFileInputStream.builder()
+ .setRandomAccessFile(createRandomAccessFile())
+ .setCloseOnClose(true)
+ .get()) {
assertEquals(DATA_FILE_LEN, inputStream.availableLong());
}
}
@@ -130,7 +137,9 @@ public class RandomAccessFileInputStreamTest {
@Test
public void testConstructorCloseOnCloseFalse() throws IOException {
try (RandomAccessFile file = createRandomAccessFile()) {
- try (RandomAccessFileInputStream inputStream = new
RandomAccessFileInputStream(file, false)) {
+ try (RandomAccessFileInputStream inputStream =
RandomAccessFileInputStream.builder()
+ .setRandomAccessFile(createRandomAccessFile())
+ .get()) {
assertFalse(inputStream.isCloseOnClose());
assertNotEquals(-1, inputStream.getRandomAccessFile().read());
}
@@ -140,7 +149,7 @@ public class RandomAccessFileInputStreamTest {
@SuppressWarnings("resource") // instance variable access
@Test
- public void testConstructorCloseOnCloseTrue() throws IOException {
+ public void testDeprecatedConstructorCloseOnCloseTrue() throws IOException
{
try (RandomAccessFile file = createRandomAccessFile()) {
try (RandomAccessFileInputStream inputStream = new
RandomAccessFileInputStream(file, true)) {
assertTrue(inputStream.isCloseOnClose());
@@ -152,7 +161,7 @@ public class RandomAccessFileInputStreamTest {
@SuppressWarnings("resource") // instance variable access
@Test
- public void testConstructorRandomAccessFile() throws IOException {
+ public void testDeprecatedConstructorRandomAccessFile() throws IOException
{
try (RandomAccessFile file = createRandomAccessFile()) {
try (RandomAccessFileInputStream inputStream = new
RandomAccessFileInputStream(file)) {
assertFalse(inputStream.isCloseOnClose());
@@ -162,15 +171,40 @@ public class RandomAccessFileInputStreamTest {
}
}
+ @SuppressWarnings("deprecation")
+ @Test
+ public void testDeprecatedConstructors() throws IOException {
+ try (RandomAccessFile randomAccessFile = createRandomAccessFile()) {
+ try (RandomAccessFileInputStream inputStream = new
RandomAccessFileInputStream(randomAccessFile)) {
+ assertFalse(inputStream.isCloseOnClose());
+ assertEquals(randomAccessFile,
inputStream.getRandomAccessFile());
+ }
+ try (RandomAccessFileInputStream inputStream = new
RandomAccessFileInputStream(randomAccessFile, true)) {
+ assertTrue(inputStream.isCloseOnClose());
+ assertEquals(randomAccessFile,
inputStream.getRandomAccessFile());
+ }
+ try (RandomAccessFileInputStream inputStream = new
RandomAccessFileInputStream(randomAccessFile, false)) {
+ assertFalse(inputStream.isCloseOnClose());
+ assertEquals(randomAccessFile,
inputStream.getRandomAccessFile());
+ }
+ }
+ }
+
+ @SuppressWarnings("deprecation")
@Test
- public void testConstructorRandomAccessFileNull() {
+ public void testDeprecatedConstructorsNull() {
assertThrows(NullPointerException.class, () -> new
RandomAccessFileInputStream(null));
+ assertThrows(NullPointerException.class, () -> new
RandomAccessFileInputStream(null, true));
+ assertThrows(NullPointerException.class, () -> new
RandomAccessFileInputStream(null, false));
}
@Test
public void testGetters() throws IOException {
try (RandomAccessFile file = createRandomAccessFile()) {
- try (RandomAccessFileInputStream inputStream = new
RandomAccessFileInputStream(file, true)) {
+ try (RandomAccessFileInputStream inputStream =
RandomAccessFileInputStream.builder()
+ .setRandomAccessFile(file)
+ .setCloseOnClose(true)
+ .get()) {
assertEquals(file, inputStream.getRandomAccessFile());
assertTrue(inputStream.isCloseOnClose());
}
@@ -179,8 +213,10 @@ public class RandomAccessFileInputStreamTest {
@Test
public void testRead() throws IOException {
- try (RandomAccessFileInputStream inputStream = new
RandomAccessFileInputStream(createRandomAccessFile(),
- true)) {
+ try (RandomAccessFileInputStream inputStream =
RandomAccessFileInputStream.builder()
+ .setRandomAccessFile(createRandomAccessFile())
+ .setCloseOnClose(true)
+ .get()) {
// A Test Line.
assertEquals('A', inputStream.read());
assertEquals(' ', inputStream.read());
@@ -201,8 +237,10 @@ public class RandomAccessFileInputStreamTest {
@Test
public void testReadAfterClose() throws IOException {
- try (RandomAccessFileInputStream inputStream = new
RandomAccessFileInputStream(createRandomAccessFile(),
- true)) {
+ try (RandomAccessFileInputStream inputStream =
RandomAccessFileInputStream.builder()
+ .setRandomAccessFile(createRandomAccessFile())
+ .setCloseOnClose(true)
+ .get()) {
inputStream.close();
assertThrows(IOException.class, inputStream::read);
}
@@ -210,8 +248,10 @@ public class RandomAccessFileInputStreamTest {
@Test
public void testReadByteArray() throws IOException {
- try (RandomAccessFileInputStream inputStream = new
RandomAccessFileInputStream(createRandomAccessFile(),
- true)) {
+ try (RandomAccessFileInputStream inputStream =
RandomAccessFileInputStream.builder()
+ .setRandomAccessFile(createRandomAccessFile())
+ .setCloseOnClose(true)
+ .get()) {
// A Test Line.
final int dataLen = 12;
final byte[] buffer = new byte[dataLen];
@@ -225,8 +265,10 @@ public class RandomAccessFileInputStreamTest {
@Test
public void testReadByteArrayBounds() throws IOException {
- try (RandomAccessFileInputStream inputStream = new
RandomAccessFileInputStream(createRandomAccessFile(),
- true)) {
+ try (RandomAccessFileInputStream inputStream =
RandomAccessFileInputStream.builder()
+ .setRandomAccessFile(createRandomAccessFile())
+ .setCloseOnClose(true)
+ .get()) {
// A Test Line.
final int dataLen = 12;
final byte[] buffer = new byte[dataLen];
@@ -242,7 +284,9 @@ public class RandomAccessFileInputStreamTest {
public void testSkip() throws IOException {
try (RandomAccessFile file = createRandomAccessFile();
- final RandomAccessFileInputStream inputStream = new
RandomAccessFileInputStream(file, false)) {
+ final RandomAccessFileInputStream inputStream =
RandomAccessFileInputStream.builder()
+ .setRandomAccessFile(file)
+ .get()) {
assertEquals(0, inputStream.skip(-1));
assertEquals(0, inputStream.skip(Integer.MIN_VALUE));
assertEquals(0, inputStream.skip(0));
