ziver/zutil
1
0
Fork 0
Code Issues Pull requests Activity Actions

Added mark support to boundary stream and that fixed hasNext() in multipart

Browse source
This commit is contained in:
Ziver Koc 2016-07-15 16:48:47 +02:00
parent 99973b7c98
commit 52deb4b16d
5 changed files with 209 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

123
test/zutil/io/BufferedBoundaryInputStreamTest.java
View file

@ -27,22 +27,37 @@ package zutil.io;
import org.junit.Test;
import java.io.IOException;
import java.io.InputStream;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.*;
@SuppressWarnings("resource")
public class BufferedBoundaryInputStreamTest {
private static BufferedBoundaryInputStream getBufferedBoundaryInputStream(String data, String b) {
private void readAndAssertArray(byte[] expected, InputStream in, int readcount) throws IOException {
byte[] buff = new byte[readcount];
int n = in.read(buff, 0, readcount);
if (n < readcount)
n += in.read(buff, n, readcount-n);
assertEquals(readcount, n);
assertArrayEquals(expected, buff);
}
private static BufferedBoundaryInputStream getBufferedBoundaryInputStream(String data, String boundary) {
return getBufferedBoundaryInputStream(data, boundary, -1);
}
private static BufferedBoundaryInputStream getBufferedBoundaryInputStream(String data, String boundary, int buffLimit) {
StringInputStream inin = new StringInputStream(data);
BufferedBoundaryInputStream in = new BufferedBoundaryInputStream(inin);
in.setBoundary(b);
BufferedBoundaryInputStream in = buffLimit >= 0 ?
new BufferedBoundaryInputStream(inin, buffLimit) :
new BufferedBoundaryInputStream(inin);
in.setBoundary(boundary);
return in;
}
@Test
public void read_normal() throws IOException {
BufferedBoundaryInputStream in = getBufferedBoundaryInputStream("aaa#a##aaaaaaa#", "#");
@ -200,10 +215,8 @@ public class BufferedBoundaryInputStreamTest {
@Test
public void read_largeData() throws IOException {
String data = "#aaaaaaaaaaaa#aa#aaaaaaaaaaaaaaa#";
StringInputStream inin = new StringInputStream(data);
BufferedBoundaryInputStream in = new BufferedBoundaryInputStream(inin, 10);
in.setBoundary("#");
BufferedBoundaryInputStream in = getBufferedBoundaryInputStream(
"#aaaaaaaaaaaa#aa#aaaaaaaaaaaaaaa#", "#", 10);
assertEquals(-1, in.read());
assertTrue(in.hasNext());
@ -226,10 +239,8 @@ public class BufferedBoundaryInputStreamTest {
}
@Test
public void read_largeDataOnlyNext() throws IOException {
String data = "#aaaaaaaaaaaa#aa#aaaaaaaaaaaaaaa#";
StringInputStream inin = new StringInputStream(data);
BufferedBoundaryInputStream in = new BufferedBoundaryInputStream(inin, 10);
in.setBoundary("#");
BufferedBoundaryInputStream in = getBufferedBoundaryInputStream(
"#aaaaaaaaaaaa#aa#aaaaaaaaaaaaaaa#", "#", 10);
in.next();
for (int i=0; i<12; ++i)
@ -247,10 +258,8 @@ public class BufferedBoundaryInputStreamTest {
}
@Test
public void readArr_largeData() throws IOException {
String data = "aaaaaaaaaaaa#aa#aaaaaaaaaaaaaaa#";
StringInputStream inin = new StringInputStream(data);
BufferedBoundaryInputStream in = new BufferedBoundaryInputStream(inin, 10);
in.setBoundary("#");
BufferedBoundaryInputStream in = getBufferedBoundaryInputStream(
"aaaaaaaaaaaa#aa#aaaaaaaaaaaaaaa#", "#", 10);
byte[] buff = new byte[100];
int n = 0;
@ -270,4 +279,82 @@ public class BufferedBoundaryInputStreamTest {
assertEquals(-1, in.read());
assertFalse(in.hasNext());
}
@Test
public void readArr_splitBoundary() throws IOException {
BufferedBoundaryInputStream in = getBufferedBoundaryInputStream(
"aaaaaaaa####aaaaaaaa", "####", 10);
byte[] buff = new byte[10];
assertEquals(4, in.read(buff, 0 , 4));
int n = 0;
n += in.read(buff, 0 , 10);
n += in.read(buff, 0 , 10);
assertEquals(4, n);
assertEquals(-1, in.read(buff, 0 , 6));
in.next();
assertEquals(6, in.read(buff, 0 , 6));
}
@Test
public void read_mark() throws IOException {
BufferedBoundaryInputStream in = getBufferedBoundaryInputStream(
"0123456789#abcdefghijklmn#opqrstuvwxyz", "#");
in.read();in.read();in.read();
assertEquals('3', in.read());
in.mark(10); // mark '4'
assertEquals('4', in.read());
in.read();in.read();in.read();
assertEquals('8', in.read());
in.reset(); // go back to '4'
assertEquals('4', in.read());
}
@Test
public void readArr_mark() throws IOException {
BufferedBoundaryInputStream in = getBufferedBoundaryInputStream(
"0123456789#abcdefghijklmn#opqrstuvwxyz", "#");
readAndAssertArray(new byte[]{'0','1','2','3'}, in, 4);
in.mark(10); // mark '4'
readAndAssertArray(new byte[]{'4','5','6','7'}, in, 4);
readAndAssertArray(new byte[]{'8','9'}, in, 2);
in.reset(); // go back to '4'
readAndAssertArray(new byte[]{'4','5','6','7'}, in, 4);
}
@Test
public void readArr_markBoundary() throws IOException {
BufferedBoundaryInputStream in = getBufferedBoundaryInputStream(
"0123456789#abcdefghijklmn#opqrstuvwxyz", "#");
readAndAssertArray(new byte[]{'0','1','2','3'}, in, 4);
in.mark(30); // mark '4'
readAndAssertArray(new byte[]{'4','5','6','7','8','9'}, in, 6);
assertEquals(-1, in.read()); // boundary
in.next();
readAndAssertArray(new byte[]{'a','b'}, in, 2);
in.reset(); // go back to '4'
readAndAssertArray(new byte[]{'4','5','6','7','8','9'}, in, 6);
assertEquals(-1, in.read()); // is boundary still there
}
@Test
public void readArr_markLargeData() throws IOException {
BufferedBoundaryInputStream in = getBufferedBoundaryInputStream(
"0123456789#abcdefghijklmn#opqrstuvwxyz", "#", 10);
readAndAssertArray(new byte[]{'0','1','2','3'}, in, 4);
in.mark(30); // mark '4'
readAndAssertArray(new byte[]{'4','5','6','7','8','9'}, in, 6);
assertEquals(-1, in.read()); // boundary
in.next();
readAndAssertArray(new byte[]{'a','b','c','d','e','f'}, in, 6);
try{
in.reset(); // Exception we have passed buffer limit
fail();
} catch (IOException e){}
readAndAssertArray(new byte[]{'g','h'}, in, 2);
}
}

17
test/zutil/net/http/multipart/MultipartParserTest.java
View file

@ -33,13 +33,15 @@ public class MultipartParserTest {
// Assertions
Iterator<MultipartField> it = parser.iterator();
assertTrue(it.hasNext());
MultipartField field = it.next();
assertTrue(field instanceof MultipartStringField);
MultipartStringField stringField = (MultipartStringField) field;
assertEquals("foo", stringField.getName());
assertEquals("bar", stringField.getValue());
//assertFalse(it.hasNext()); //TODO: does not work, how to solve this?
assertFalse(it.hasNext());
assertEquals(null, it.next());
assertEquals(null, it.next());
}
@ -54,19 +56,21 @@ public class MultipartParserTest {
String input_data =
"?PNG\n" +
"\n" +
"lkuytrewacvbnmloiuytrewrtyuiol,mnbvdc xswertyuioplm cdsertyuioölkjgf\n" +
"kgkfdgfhgfhgkhgvytvjgxslkyöiyfödgjdjhföjhdlgdgjfhföjhföiyföudlögföudöfö\n" +
"ögdljgdjhöfjhfdfsgdfg ryrt dtrd ytfc uhöiugljfkdkhdjgd\n" +
"lkuytrewacvbnmloiuytrewrtyuiol,mnbvdc xswertyuioplm cdsertyuiojlkjgf\n" +
"kgkfdgfhgfhgkhgvytvjgxslkysiyfedgjdjhfkjhdlgdgjfhfcjhfqiyfyudlmgfeudcfa\n" +
"bgdljgdjhffjhfdfsgdfg ryrt dtrd ytfc uhhiugljfkdkhdjgd\n" +
" xx\n" +
" kuykutfytdh ytrd trutrd trxxx";
String input_end = "\n------------------------------83ff53821b7c--";
String input = input_start+input_data+input_end;
MultipartParser parser = new MultipartParser(
new StringInputStream(input_start+input_data+input_end),
new StringInputStream(input),
"----------------------------83ff53821b7c",
0);
// Assertions
Iterator<MultipartField> it = parser.iterator();
assertTrue(it.hasNext());
MultipartField field = it.next();
assertTrue(field instanceof MultipartFileField);
@ -75,7 +79,8 @@ public class MultipartParserTest {
assertEquals("a.png", fileField.getFilename());
assertEquals("application/octet-stream", fileField.getContentType());
assertEquals(input_data, new String(fileField.getContent()));
//assertFalse(it.hasNext()); //TODO: does not work, how to solve this?
assertFalse(it.hasNext());
}
//Test