fix OutputToInput + add tests

Author: lecousin

net.lecousin.core/src/main/java/net/lecousin/framework/io/out2in/OutputToInput.java

@@ -156,6 +156,8 @@ public int readSync(long pos, ByteBuffer buffer) throws IOException {
 		}
 		int nb;
 		lockIO.lock();
+		if (writePos - pos < buffer.remaining())
+			buffer.limit(buffer.position() + (int)(writePos - pos));
 		nb = ((IO.Readable.Seekable)io).readSync(pos, buffer);
 		lockIO.unlock();
 		return nb;
@@ -208,6 +210,8 @@ public AsyncSupplier<Integer, IOException> readAsync(long pos, ByteBuffer buffer
 		AsyncSupplier<Integer, IOException> result = new AsyncSupplier<>();
 		Task.cpu("OutputToInput.readAsync", io.getPriority(), t -> {
 			lockIO.lock();
+			if (writePos - pos < buffer.remaining())
+				buffer.limit(buffer.position() + (int)(writePos - pos));
 			AsyncSupplier<Integer, IOException> read = ((IO.Readable.Seekable)io).readAsync(pos, buffer, ondone);
 			read.onDone(() -> {
 				lockIO.unlock();

net.lecousin.core/src/test/java/net/lecousin/framework/core/test/io/TestOutputToInput.java

@@ -91,7 +91,9 @@ public void testWriteSyncReadHalfSync() throws Exception {
 				readHalfSync(o2i, (nbRead % 2) == 0, b);
 				nbRead++;
 			}
-			if (o2i.readSync(ByteBuffer.wrap(new byte[1])) == 1)
+			if (o2i.readSync(ByteBuffer.wrap(new byte[1])) > 0)
+				throw new IOException("Data can be read after the end");
+			if (o2i.readAsync(ByteBuffer.wrap(new byte[1])).blockResult(0).intValue() > 0)
 				throw new IOException("Data can be read after the end");
 		}
 	}
@@ -195,6 +197,37 @@ public void run() {
 		}
 	}
 
+	@Test
+	public void testWriteReadMore() throws Exception {
+		Assume.assumeTrue(nbBuf > 0);
+		try (IO.OutputToInput o2i = createOutputToInput()) {
+			int nbWrite = 0;
+			while (nbWrite < nbBuf) {
+				ByteBuffer bu = ByteBuffer.wrap(testBuf);
+				o2i.writeSync(bu);
+				Assert.assertEquals(0, bu.remaining());
+				nbWrite++;
+			}
+			Assert.assertFalse(o2i.isFullDataAvailable());
+			o2i.endOfData();
+			Assert.assertTrue(o2i.isFullDataAvailable());
+			Assert.assertEquals(nbBuf * testBuf.length, o2i.readFullySync(ByteBuffer.allocate(nbBuf * testBuf.length + 1024)));
+		}
+		try (IO.OutputToInput o2i = createOutputToInput()) {
+			int nbWrite = 0;
+			while (nbWrite < nbBuf) {
+				ByteBuffer bu = ByteBuffer.wrap(testBuf);
+				o2i.writeSync(bu);
+				Assert.assertEquals(0, bu.remaining());
+				nbWrite++;
+			}
+			Assert.assertFalse(o2i.isFullDataAvailable());
+			o2i.endOfData();
+			Assert.assertTrue(o2i.isFullDataAvailable());
+			Assert.assertEquals(nbBuf * testBuf.length, o2i.readFullyAsync(ByteBuffer.allocate(nbBuf * testBuf.length + 1024)).blockResult(0).intValue());
+		}
+	}
+	
 	@Test
 	public void testSkipSync() throws Exception {
 		try (IO.OutputToInput o2i = createOutputToInput()) {

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/io/o2i/TestOutputToInput.java

@@ -0,0 +1,40 @@
+package net.lecousin.framework.core.tests.io.o2i;
+
+import java.util.Collection;
+
+import net.lecousin.framework.concurrent.threads.Task.Priority;
+import net.lecousin.framework.core.test.io.TestIO;
+import net.lecousin.framework.core.test.runners.LCConcurrentRunner;
+import net.lecousin.framework.io.IO;
+import net.lecousin.framework.io.buffering.ByteArrayIO;
+import net.lecousin.framework.io.buffering.IOInMemoryOrFile;
+import net.lecousin.framework.io.out2in.OutputToInput;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(LCConcurrentRunner.Parameterized.class) @org.junit.runners.Parameterized.UseParametersRunnerFactory(LCConcurrentRunner.ConcurrentParameterizedRunnedFactory.class)
+public class TestOutputToInput extends net.lecousin.framework.core.test.io.TestOutputToInput {
+
+	@Parameters(name = "nbBuf = {1}, testCase = {2}")
+	public static Collection<Object[]> parameters() {
+		return addTestParameter(TestIO.UsingTestData.generateTestCases(true), Integer.valueOf(1), Integer.valueOf(2));
+	}
+	
+	public TestOutputToInput(byte[] testBuf, int nbBuf, int testCase) {
+		super(testBuf, nbBuf);
+		this.testCase = testCase;
+	}
+	
+	private int testCase;
+
+	@Override
+	protected IO.OutputToInput createOutputToInput() {
+		switch (testCase) {
+		default:
+		case 1: return new OutputToInput(new IOInMemoryOrFile(4096, Priority.NORMAL, "test"), "test");
+		case 2: return new OutputToInput(new ByteArrayIO(new byte[nbBuf * testBuf.length + 1024], "test"), "test");
+		}
+	}
+	
+}

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/io/o2i/TestOutputToInputAsReadable.java

@@ -28,7 +28,6 @@ public TestOutputToInputAsReadable(File testFile, byte[] testBuf, int nbBuf) {
 		super(testFile, testBuf, nbBuf);
 	}
 
-	@SuppressWarnings("resource")
 	@Override
 	protected IO.Readable createReadableFromFile(FileIO.ReadOnly file, long fileSize) throws Exception {
 		file.close();