fix tests

Author: lecousin

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

@@ -471,16 +471,16 @@ public void testSkipSyncNegativeValue() throws Exception {
 			if (skipped != 0)
 				throw new Exception("Readable is not supposed to be able to skip with a negative value, skipping -10 bytes returned " + skipped + " while 0 was expected.");
 		}
+		io.readSync(buffer);
+		Assert.assertEquals("Invalid byte read after skipSync with negative value", testBuf[testBuf.length / 2 + (int)skipped], b[0]);
 		skipped = io.skipSync(-2 * testBuf.length);
 		if (io instanceof IO.Readable.Seekable) {
-			if (skipped != -((testBuf.length + testBuf.length / 2) - 10))
-				throw new Exception("Skip beyond beginning of IO on Readable.Seekable is supposed to go to the offset 0. Skipping " + (-2 * testBuf.length) + " returned " + skipped + " but expected was " + (-((testBuf.length + testBuf.length / 2) - 10)));
+			if (skipped != -((testBuf.length + testBuf.length / 2) - 10 + 1))
+				throw new Exception("Skip beyond beginning of IO on Readable.Seekable is supposed to go to the offset 0. Skipping " + (-2 * testBuf.length) + " returned " + skipped + " but expected was " + (-((testBuf.length + testBuf.length / 2) - 10 + 1)));
 		} else {
 			if (skipped != 0)
 				throw new Exception("Readable is not supposed to be able to skip with a negative value, skipping -10 bytes returned " + skipped + " while 0 was expected.");
 		}
-		io.readSync(buffer);
-		Assert.assertEquals("Invalid byte read after skipSync with negative value", testBuf[testBuf.length / 2 + (int)skipped], b[0]);
 		io.close();
 	}
 

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

@@ -27,7 +27,7 @@ public TestTwoBuffersIODeterminedSizeReadable(File testFile, byte[] testBuf, int
 	@Override
 	protected TwoBuffersIO createReadableFromFile(FileIO.ReadOnly file, long fileSize) {
 		if (fileSize <= 40000)
-			return new TwoBuffersIO.DeterminedSize(file, (int)fileSize, 10);
+			return new TwoBuffersIO.DeterminedSize(file, (int)fileSize, 0);
 		return new TwoBuffersIO.DeterminedSize(file, 40000, (int)(fileSize - 40000));
 	}
 

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

@@ -26,7 +26,9 @@ public TestTwoBuffersIOReadableBuffered(File testFile, byte[] testBuf, int nbBuf
 
 	@Override
 	protected TwoBuffersIO createReadableBufferedFromFile(FileIO.ReadOnly file, long fileSize) {
-		return new TwoBuffersIO(file, 40000, (int)(fileSize - 40000));
+		int second = (int)(fileSize - 39999);
+		if (second <= 0) second = 10;
+		return new TwoBuffersIO(file, 39999, second);
 	}
 
 }

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/io/encoding/TestBase64.java

@@ -36,12 +36,60 @@ public void testDecoding() throws IOException {
 		Assert.assertEquals("That is a test!", new String(Base64.decode("VGhhdCBpcyBhIHRlc3Qh=")));
 
 		byte[] buf = new byte[100];
-		Base64.decode4BytesBase64("VGhp".getBytes("US-ASCII"), buf, 10);
+		Assert.assertEquals(3, Base64.decode4BytesBase64("VGhp".getBytes("US-ASCII"), buf, 10));
 		Assert.assertEquals((byte)'T', buf[10]);
 		Assert.assertEquals((byte)'h', buf[11]);
 		Assert.assertEquals((byte)'i', buf[12]);
 
 		Assert.assertArrayEquals("This is a test".getBytes(StandardCharsets.UTF_8), Base64.decode("   VGhpcyBpcyBhIHRlc3Q=".getBytes(StandardCharsets.UTF_8), 3, 20));
+		
+		Assert.assertEquals(1, Base64.decode4BytesBase64("a0==".getBytes("US-ASCII"), buf, 0));
+		Assert.assertEquals((byte)'k', buf[0]);
+		Assert.assertEquals(1, Base64.decode4BytesBase64(ByteBuffer.wrap("a0==".getBytes("US-ASCII")), buf, 3));
+		Assert.assertEquals((byte)'k', buf[3]);
+		Assert.assertEquals(1, Base64.decode4BytesBase64(CharBuffer.wrap("a0==".toCharArray()), buf, 5));
+		Assert.assertEquals((byte)'k', buf[5]);
+		Assert.assertEquals(1, Base64.decode4BytesBase64(CharBuffer.wrap("a0=".toCharArray()), buf, 6));
+		Assert.assertEquals((byte)'k', buf[6]);
+		try {
+			Base64.decode4BytesBase64(CharBuffer.wrap("a0=x".toCharArray()), buf, 7);
+			throw new AssertionError("Error expected");
+		} catch (IOException e) {}
+		Assert.assertEquals(2, Base64.decode4BytesBase64(CharBuffer.wrap("a01=".toCharArray()), buf, 20));
+		Assert.assertEquals((byte)'k', buf[20]);
+		Assert.assertEquals((byte)'M', buf[21]);
+		try {
+			Base64.decode4BytesBase64(CharBuffer.wrap("a0}=".toCharArray()), buf, 50);
+			throw new AssertionError("Error expected");
+		} catch (IOException e) {}
+		
+		Assert.assertEquals(0, Base64.decode(new byte[0]).length);
+		byte[] b2 = Base64.decode("a0==".getBytes("US-ASCII"));
+		Assert.assertEquals(1, b2.length);
+		Assert.assertEquals((byte)'k', b2[0]);
+
+		Assert.assertEquals(0, Base64.decode(new byte[0], 0, 0).length);
+		b2 = Base64.decode("a0==".getBytes("US-ASCII"), 0, 4);
+		Assert.assertEquals(1, b2.length);
+		Assert.assertEquals((byte)'k', b2[0]);
+		b2 = Base64.decode("a0=".getBytes("US-ASCII"), 0, 3);
+		Assert.assertEquals(0, b2.length);
+		b2 = Base64.decode(ByteBuffer.wrap("a0==".getBytes("US-ASCII")));
+		Assert.assertEquals(1, b2.length);
+		Assert.assertEquals((byte)'k', b2[0]);
+		b2 = Base64.decode(CharBuffer.wrap("a0==".toCharArray()));
+		Assert.assertEquals(1, b2.length);
+		Assert.assertEquals((byte)'k', b2[0]);
+		b2 = Base64.decode(CharBuffer.wrap("a01=".toCharArray()));
+		Assert.assertEquals(2, b2.length);
+		Assert.assertEquals((byte)'k', b2[0]);
+		Assert.assertEquals((byte)'M', b2[1]);
+
+		b2 = Base64.decode("VGhp".getBytes("US-ASCII"), 0, 4);
+		Assert.assertEquals(3, b2.length);
+		Assert.assertEquals((byte)'T', b2[0]);
+		Assert.assertEquals((byte)'h', b2[1]);
+		Assert.assertEquals((byte)'i', b2[2]);
 	}
 
 	@SuppressWarnings("resource")