Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Implemented CharSequenceReader.ready
  • Loading branch information
robtimus committed Jul 8, 2020
commit 4fa7b507ec3a7953dfdbc9e624920397e2a96ed7
10 changes: 10 additions & 0 deletions src/main/java/org/apache/commons/io/input/CharSequenceReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,16 @@ public void close() {
mark = start;
}

/**
* Tells whether this stream is ready to be read.
*
* @return {@code true} if more characters from the character sequence are available, or {@code false} otherwise.
*/
@Override
public boolean ready() {
return idx < end();
}

/**
* Mark the current position.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.apache.commons.io.input;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

Expand Down Expand Up @@ -51,6 +52,43 @@ public void testClose() throws IOException {
checkRead(subReader, "Foo");
}

@Test
public void testReady() throws IOException {
final Reader reader = new CharSequenceReader("FooBar");
assertTrue(reader.ready());
reader.skip(3);
assertTrue(reader.ready());
checkRead(reader, "Bar");
assertFalse(reader.ready());
reader.reset();
assertTrue(reader.ready());
reader.skip(2);
assertTrue(reader.ready());
reader.skip(10);
assertFalse(reader.ready());
reader.close();
assertTrue(reader.ready());
reader.skip(20);
assertFalse(reader.ready());

final Reader subReader = new CharSequenceReader("xFooBarx", 1, 7);
assertTrue(subReader.ready());
subReader.skip(3);
assertTrue(subReader.ready());
checkRead(subReader, "Bar");
assertFalse(subReader.ready());
subReader.reset();
assertTrue(subReader.ready());
subReader.skip(2);
assertTrue(subReader.ready());
subReader.skip(10);
assertFalse(subReader.ready());
subReader.close();
assertTrue(subReader.ready());
subReader.skip(20);
assertFalse(subReader.ready());
}

@Test
public void testMarkSupported() throws Exception {
try (final Reader reader = new CharSequenceReader("FooBar")) {
Expand Down