fix tests + ProgressiveBufferedReadableCharStream

Author: lecousin

net.lecousin.core/src/main/java/net/lecousin/framework/io/text/Decoder.java

@@ -93,10 +93,10 @@ public int decode(char[] chars, int pos, int len, MutableBoolean interrupt, int
 		int nb = 0;
 		do {
 			if (currentBuffer == null) {
-					// TODO if (nextBuffer.isUnblocked())
+				if (nextBuffer.isUnblocked())
 					currentBuffer = nextBuffer.blockResult(0);
-				// else
-				//	return nb > 0 ? nb : -2;
+				else
+					return nb > 0 ? nb : -2;
 				if (currentBuffer != null)
 					nextBuffer = io.readNextBufferAsync();
 			}

net.lecousin.core/src/main/java/net/lecousin/framework/io/text/ProgressiveBufferedReadableCharStream.java

@@ -507,7 +507,7 @@ public Void run() throws CancelException {
 				}
 				int min = lastNb < bufferSize / 10 ? bufferSize / 10 : 1;
 				int nb;
-				try { nb = decoder.decode(buffer.chars, buffer.pos, bufferSize - buffer.pos, interruptFillBuffer, min); }
+				try { nb = decoder.decode(buffer.chars, buffer.length, bufferSize - buffer.length, interruptFillBuffer, min); }
 				catch (IOException e) {
 					synchronized (buffers) {
 						error = e;

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

@@ -19,10 +19,6 @@ protected IO.Writable createWritable() throws IOException {
 		return createWritableBuffered();
 	}
 
-	@SuppressWarnings("unused")
-	protected void flush(IO.Writable.Buffered io) throws Exception {
-	}
-	
 	@Test(timeout=120000)
 	public void testWriteBufferByBufferInBuffered() throws Exception {
 		IO.Writable.Buffered io = createWritableBuffered();

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

@@ -39,7 +39,7 @@ protected IO.Writable.Buffered createWritableBuffered() throws IOException {
 	}
 
 	@Override
-	protected void flush(IO.Writable.Buffered io) throws IOException {
+	protected void flush(IO.Writable io) throws IOException {
 		ByteArrayIO bio = (ByteArrayIO)io;
 		FileOutputStream out = new FileOutputStream(file);
 		out.write(bio.getArray(), 0, (int)bio.getSizeSync());

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

@@ -36,7 +36,7 @@ protected IO.Writable.Buffered createWritableBuffered() throws IOException {
 	}
 
 	@Override
-	protected void flush(IO.Writable.Buffered io) throws Exception {
+	protected void flush(IO.Writable io) throws Exception {
 		MemoryIO mio = (MemoryIO)io;
 		FileIO.WriteOnly fio = new FileIO.WriteOnly(file, Task.PRIORITY_NORMAL);
 		mio.writeAsyncTo(fio).blockException(0);