add tests + fix QuotedPrintable with ending spaces

Author: lecousin

net.lecousin.core/src/main/java/net/lecousin/framework/io/encoding/QuotedPrintable.java

@@ -9,17 +9,21 @@
 
 /** Utility method to encode and decode quoted-printable as defined in RFC 2045. */
 public final class QuotedPrintable {
+	
+	private QuotedPrintable() { /* no instance. */ }
 
 	/** Decode the given input. */
 	public static ByteBuffer decode(ByteBuffer input) throws IOException {
 		byte[] out = new byte[input.remaining()];
 		int pos = 0;
 		int endingSpaces = 0;
+		int endingSpacesSkipped = 0;
 		while (input.hasRemaining()) {
 			byte b = input.get();
 			if ((b >= 33 && b <= 60) || (b >= 62 && b <= 126)) {
 				out[pos++] = b;
 				endingSpaces = 0;
+				endingSpacesSkipped = 0;
 				continue;
 			}
 			if (b == '=') {
@@ -33,6 +37,7 @@ public static ByteBuffer decode(ByteBuffer input) throws IOException {
 				if (c1 == '\r' && c2 == '\n') {
 					// soft line break
 					endingSpaces = 0;
+					endingSpacesSkipped = 0;
 					continue;
 				}
 				int i = StringUtil.decodeHexa(c1);
@@ -41,6 +46,7 @@ public static ByteBuffer decode(ByteBuffer input) throws IOException {
 				if (j == -1) throw new IOException("Invalid hexadecimal value in quoted-printable");
 				out[pos++] = (byte)((i << 4) | j);
 				endingSpaces = 0;
+				endingSpacesSkipped = 0;
 				continue;
 			}
 			if (b == ' ' || b == '\t') {
@@ -50,17 +56,19 @@ public static ByteBuffer decode(ByteBuffer input) throws IOException {
 			}
 			if (b == '\r') {
 				endingSpaces++;
+				endingSpacesSkipped++;
 				continue;
 			}
 			if (b == '\n') {
 				// end of line
-				pos -= endingSpaces;
+				pos -= endingSpaces - endingSpacesSkipped;
 				endingSpaces = 0;
+				endingSpacesSkipped = 0;
 				continue;
 			}
 			throw new IOException("Unexpected byte " + b + " in quoted-printable data");
 		}
-		pos -= endingSpaces;
+		pos -= endingSpaces - endingSpacesSkipped;
 		input.position(input.position() - endingSpaces);
 		return ByteBuffer.wrap(out, 0, pos);
 	}

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

@@ -0,0 +1,50 @@
+package net.lecousin.framework.core.test.io;
+
+import java.io.File;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+import net.lecousin.framework.concurrent.Task;
+import net.lecousin.framework.core.test.LCCoreAbstractTest;
+import net.lecousin.framework.io.FileIO;
+import net.lecousin.framework.io.IO;
+import net.lecousin.framework.io.IOUtil;
+import net.lecousin.framework.io.TemporaryFiles;
+import net.lecousin.framework.io.text.ICharacterStream;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public abstract class TestCharacterStreamWritable extends LCCoreAbstractTest {
+
+	protected abstract ICharacterStream.Writable open(IO.Writable out, Charset charset) throws Exception;
+	
+	protected abstract void flush(ICharacterStream.Writable cs) throws Exception;
+	
+	@Test(timeout=120000)
+	public void test() throws Exception {
+		testWrite("Hello", StandardCharsets.US_ASCII);
+		testWrite("Bonjour vous-même", StandardCharsets.UTF_8);
+		testWrite("Hello World !", StandardCharsets.UTF_16);
+	}
+	
+	@SuppressWarnings("resource")
+	private void testWrite(String s, Charset charset) throws Exception {
+		File tmp = TemporaryFiles.get().createFileSync("test", "writablecs");
+		ICharacterStream.Writable cs = open(new FileIO.WriteOnly(tmp, Task.PRIORITY_NORMAL), charset);
+		cs.writeSync(s);
+		flush(cs);
+		cs.close();
+		Assert.assertEquals(s, IOUtil.readFullyAsStringSync(tmp, charset));
+		tmp.delete();
+
+		tmp = TemporaryFiles.get().createFileSync("test", "writablecs");
+		cs = open(new FileIO.WriteOnly(tmp, Task.PRIORITY_NORMAL), charset);
+		cs.writeAsync(s).blockThrow(0);
+		flush(cs);
+		cs.close();
+		Assert.assertEquals(s, IOUtil.readFullyAsStringSync(tmp, charset));
+		tmp.delete();
+	}
+	
+}

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

@@ -0,0 +1,48 @@
+package net.lecousin.framework.core.test.io;
+
+import java.io.File;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+import net.lecousin.framework.concurrent.Task;
+import net.lecousin.framework.core.test.LCCoreAbstractTest;
+import net.lecousin.framework.io.FileIO;
+import net.lecousin.framework.io.IO;
+import net.lecousin.framework.io.IOUtil;
+import net.lecousin.framework.io.TemporaryFiles;
+import net.lecousin.framework.io.text.ICharacterStream;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public abstract class TestCharacterStreamWritableBuffered extends LCCoreAbstractTest {
+
+	protected abstract ICharacterStream.Writable.Buffered open(IO.Writable out, Charset charset) throws Exception;
+	
+	protected abstract void flush(ICharacterStream.Writable cs) throws Exception;
+	
+	@Test(timeout=120000)
+	public void test() throws Exception {
+		testWrite("Hello", StandardCharsets.US_ASCII);
+		testWrite("Bonjour vous-même", StandardCharsets.UTF_8);
+		testWrite("Hello World !", StandardCharsets.UTF_16);
+	}
+	
+	private void testWrite(String s, Charset charset) throws Exception {
+		File tmp = TemporaryFiles.get().createFileSync("test", "writablecs");
+		@SuppressWarnings("resource")
+		ICharacterStream.Writable.Buffered cs = open(new FileIO.WriteOnly(tmp, Task.PRIORITY_NORMAL), charset);
+		char[] chars = s.toCharArray();
+		for (int i = 0; i < chars.length; ++i) {
+			if ((i % 2) == 0)
+				cs.writeSync(chars[i]);
+			else
+				cs.writeAsync(chars[i]).blockThrow(0);
+		}
+		flush(cs);
+		cs.close();
+		Assert.assertEquals(s, IOUtil.readFullyAsStringSync(tmp, charset));
+		tmp.delete();
+	}
+	
+}

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/io/TestIOUtil.java

@@ -81,6 +81,12 @@ public void test1() throws Exception {
 		for (int i = 70; i < 70 + 50; ++i)
 			Assert.assertEquals(data[10 + i - 70], buf[i]);
 		io.close();
+		
+		io = new ByteArrayIO(buf, "test");
+		Assert.assertEquals(0, IOUtil.skipSyncByReading(io, -1));
+		Assert.assertEquals(0, IOUtil.skipAsyncByReading(io, -1, null).blockResult(0).intValue());
+		Assert.assertEquals(0, IOUtil.skipAsyncByReading(io, -1, (p) -> {}).blockResult(0).intValue());
+		io.close();
 	}
 
 	@Test(timeout=120000)
@@ -136,5 +142,15 @@ public void testCopy() throws Exception {
 		IOUtil.copy(new FileIO.ReadOnly(tmp1, Task.PRIORITY_NORMAL), new FileIO.WriteOnly(tmp2, Task.PRIORITY_NORMAL), tmp1.length(), true, new FakeWorkProgress(), 100).blockThrow(0);
 		Assert.assertEquals(string, IOUtil.readFullyAsStringSync(tmp2, StandardCharsets.UTF_16));
 		tmp2.delete();
+		
+		// big file
+		tmp1 = TemporaryFiles.get().createFileSync("test", "ioutilcopy");
+		out = new FileOutputStream(tmp1);
+		for (int i = 0; i < 10; ++i)
+			out.write(new byte[64 * 1024]);
+		tmp2 = TemporaryFiles.get().createFileSync("test", "ioutilcopy");
+		IOUtil.copy(new FileIO.ReadOnly(tmp1, Task.PRIORITY_NORMAL), new FileIO.WriteOnly(tmp2, Task.PRIORITY_NORMAL), tmp1.length(), true, new FakeWorkProgress(), 100).blockThrow(0);
+		tmp1.delete();
+		tmp2.delete();
 	}
 }

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

@@ -32,6 +32,18 @@ public void testEncodeAndDecode() throws Exception {
 		for (int i = 0; i < 512; ++i)
 			data[i] = (byte)(i * 3 - (i % 31) + i / 35);
 		test(data);
+		
+		data = "This is a test =C3=A9 This is a test =C3=A9 This is a test =C3=A9 This is a=\r\n test =C3=A9 This is a test =C3=A9 This is a test \t \r".getBytes(StandardCharsets.US_ASCII);
+		ByteBuffer decoded = QuotedPrintable.decode(ByteBuffer.wrap(data));
+		byte[] expected = "This is a test é This is a test é This is a test é This is a test é This is a test é This is a test".getBytes(StandardCharsets.UTF_8);
+		for (int i = 0; i < expected.length; ++i)
+			if (decoded.hasRemaining())
+				Assert.assertEquals("At " + i, expected[i], decoded.get());
+			else
+				throw new AssertionError("Missing byte " + i);
+		decoded = QuotedPrintable.decode(data);
+		for (int i = 0; i < expected.length; ++i)
+			Assert.assertEquals("At " + i, expected[i], decoded.get());
 	}
 
 	private static void test(byte[] data) throws Exception {

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/io/text/TestBufferedWritableCharacterStream.java

@@ -0,0 +1,22 @@
+package net.lecousin.framework.core.tests.io.text;
+
+import java.nio.charset.Charset;
+
+import net.lecousin.framework.core.test.io.TestCharacterStreamWritable;
+import net.lecousin.framework.io.IO;
+import net.lecousin.framework.io.text.BufferedWritableCharacterStream;
+import net.lecousin.framework.io.text.ICharacterStream;
+
+public class TestBufferedWritableCharacterStream extends TestCharacterStreamWritable {
+
+	@Override
+	protected ICharacterStream.Writable open(IO.Writable out, Charset charset) {
+		return new BufferedWritableCharacterStream(out, charset, 5);
+	}
+	
+	@Override
+	protected void flush(ICharacterStream.Writable cs) throws Exception {
+		((BufferedWritableCharacterStream)cs).flush().blockThrow(0);
+	}
+	
+}

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/io/text/TestBufferedWritableCharacterStreamAsBuffered.java

@@ -0,0 +1,22 @@
+package net.lecousin.framework.core.tests.io.text;
+
+import java.nio.charset.Charset;
+
+import net.lecousin.framework.core.test.io.TestCharacterStreamWritableBuffered;
+import net.lecousin.framework.io.IO.Writable;
+import net.lecousin.framework.io.text.BufferedWritableCharacterStream;
+import net.lecousin.framework.io.text.ICharacterStream;
+
+public class TestBufferedWritableCharacterStreamAsBuffered extends TestCharacterStreamWritableBuffered {
+
+	@Override
+	protected ICharacterStream.Writable.Buffered open(Writable out, Charset charset) {
+		return new BufferedWritableCharacterStream(out, charset, 5);
+	}
+	
+	@Override
+	protected void flush(ICharacterStream.Writable cs) throws Exception {
+		((BufferedWritableCharacterStream)cs).flush().blockThrow(0);
+	}
+	
+}

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/io/text/TestWritableCharacterStream.java

@@ -0,0 +1,21 @@
+package net.lecousin.framework.core.tests.io.text;
+
+import java.nio.charset.Charset;
+
+import net.lecousin.framework.core.test.io.TestCharacterStreamWritable;
+import net.lecousin.framework.io.IO;
+import net.lecousin.framework.io.text.ICharacterStream;
+import net.lecousin.framework.io.text.WritableCharacterStream;
+
+public class TestWritableCharacterStream extends TestCharacterStreamWritable {
+
+	@Override
+	protected ICharacterStream.Writable open(IO.Writable out, Charset charset) {
+		return new WritableCharacterStream(out, charset);
+	}
+	
+	@Override
+	protected void flush(ICharacterStream.Writable cs) {
+	}
+
+}