add tests

Author: lecousin

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

@@ -72,7 +72,7 @@ void testResizeSync() throws Exception {
 		s = io.getPosition();
 		if (s != 10) throw new Exception("Resize error: new position is " + s + ", expected is 10");
 
-		io.setSizeSync(0);
+		io.setSizeAsync(0).blockThrow(0);
 		s = io.getSizeSync();
 		if (s != 0) throw new Exception("Resize error: new size is " + s + ", expected is 0");
 		s = io.getPosition();

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

@@ -75,6 +75,12 @@ public void testReadableBufferedByteByByte() throws Exception {
 		}
 		if (io.read() != -1)
 			throw new Exception("Remaining byte(s) at the end of the file");
+		try {
+			io.readByte();
+			throw new AssertionError("EOFException expected");
+		} catch (EOFException e) {
+			// ok
+		}
 		io.close();
 	}
 

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/io/buffered/TestBufferedIOReadWriteResizableManyBuffers.java

@@ -7,6 +7,8 @@
 import net.lecousin.framework.core.test.io.TestReadWriteResizable;
 import net.lecousin.framework.io.FileIO;
 import net.lecousin.framework.io.buffering.BufferedIO;
+import net.lecousin.framework.memory.IMemoryManageable.FreeMemoryLevel;
+import net.lecousin.framework.memory.MemoryManager;
 
 public class TestBufferedIOReadWriteResizableManyBuffers extends TestReadWriteResizable {
 
@@ -21,6 +23,11 @@ protected BufferedIO.ReadWrite openReadWriteResizable() throws Exception {
 		byte[] b = new byte[500];
 		for (int i = 0; i < 9000000; i += 123456)
 			io.readSync(i, ByteBuffer.wrap(b));
+		MemoryManager.freeMemory(FreeMemoryLevel.EXPIRED_ONLY);
+		for (int i = 0; i < 9000000; i += 112233)
+			io.readSync(i, ByteBuffer.wrap(b));
+		for (int i = 0; i < 9000000; i += 221100)
+			io.writeSync(i, ByteBuffer.wrap(b));
 		io.setSizeSync(0);
 		return io;
 	}

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/io/buffered/TestByteArrayIOWritableBufferedToFile.java

@@ -5,6 +5,7 @@
 import java.io.IOException;
 import java.util.Collection;
 
+import org.junit.Assert;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
@@ -31,7 +32,10 @@ public TestByteArrayIOWritableBufferedToFile(byte[] testBuf, int nbBuf) {
 	@Override
 	protected IO.Writable.Buffered createWritableBufferedFromFile(File file) {
 		this.file = file;
-		return new ByteArrayIO("test");
+		ByteArrayIO io = new ByteArrayIO(16, "test");
+		io.toByteBuffer();
+		Assert.assertEquals(16, io.getCapacity());
+		return io;
 	}
 
 	@Override

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/io/buffered/TestTwoBuffersIOReadableSeekable.java

@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.util.Collection;
+import java.util.LinkedList;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -15,18 +16,38 @@
 @RunWith(Parameterized.class)
 public class TestTwoBuffersIOReadableSeekable extends TestReadableSeekable {
 
-	@Parameters(name = "nbBuf = {2}")
+	@Parameters(name = "nbBuf = {2}, test: {3}")
 	public static Collection<Object[]> parameters() {
-		return TestIO.UsingGeneratedTestFiles.generateTestCases(false);
+		Collection<Object[]> base = TestIO.UsingGeneratedTestFiles.generateTestCases(false);
+		LinkedList<Object[]> list = new LinkedList<>();
+		for (Object[] params : base) {
+			list.add(createParams(params, 0));
+			list.add(createParams(params, 1));
+			list.add(createParams(params, 2));
+		}
+		return list;
+	}
+	private static Object[] createParams(Object[] original, int test) {
+		return new Object[] { original[0], original[1], original[2], Integer.valueOf(test) };
 	}
 
-	public TestTwoBuffersIOReadableSeekable(File testFile, byte[] testBuf, int nbBuf) {
+	public TestTwoBuffersIOReadableSeekable(File testFile, byte[] testBuf, int nbBuf, int test) {
 		super(testFile, testBuf, nbBuf);
+		this.test = test;
 	}
 
+	protected int test;
+	
 	@Override
 	protected TwoBuffersIO createReadableSeekableFromFile(FileIO.ReadOnly file, long fileSize) {
-		return new TwoBuffersIO(file, 40000, (int)(fileSize - 40000));
+		if (fileSize == 0)
+			return new TwoBuffersIO(file, 1024, 0);
+		switch (test) {
+		default:
+		case 0: return new TwoBuffersIO(file, 40000, (int)(fileSize - 40000));
+		case 1: return new TwoBuffersIO(file, 12, (int)(fileSize - 12));
+		case 2: return new TwoBuffersIO(file, (int)(fileSize - 12), 12);
+		}
 	}
 
 }