Skip to content

Commit dd01467

Browse files
committed
Rewrote test case to use StreamValidator as suggested in issue #29.
1 parent 30d2297 commit dd01467

File tree

1 file changed

+40
-40
lines changed

1 file changed

+40
-40
lines changed

src/test/java/org/culturegraph/mf/stream/pipe/StreamBufferTest.java

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -15,54 +15,54 @@
1515
*/
1616
package org.culturegraph.mf.stream.pipe;
1717

18-
import org.culturegraph.mf.stream.pipe.StreamBuffer;
19-
import org.junit.Ignore;
20-
import org.junit.Test;
18+
import static org.junit.Assert.fail;
19+
20+
import org.culturegraph.mf.exceptions.FormatException;
21+
import org.culturegraph.mf.framework.StreamReceiver;
22+
import org.culturegraph.mf.stream.sink.EventList;
23+
import org.culturegraph.mf.stream.sink.StreamValidator;
24+
import org.junit.Ignore;
25+
import org.junit.Test;
2126

2227

2328
/**
2429
* Tests {@link StreamBuffer}.
2530
*
26-
* @author Markus Michael Geipel
31+
* @author Markus Michael Geipel
32+
* @author Christoph Böhme
2733
*/
2834
public final class StreamBufferTest {
2935

3036
@Test
3137
@Ignore
32-
public void testCorrectBuffering(){
33-
// // prepare reference
34-
// final ResourceOpener opener = new ResourceOpener();
35-
// final PicaDecoder picaDecoder = new PicaDecoder();
36-
// final StringWriter referenceWriter = new StringWriter();
37-
//
38-
// opener.setReceiver(new LineReader())
39-
// .setReceiver(picaDecoder)
40-
// .setReceiver(new StreamWriter(referenceWriter));
41-
//
42-
// opener.process(DataFilePath.PND_PICA);
43-
// opener.closeStream();
44-
//
45-
// // prepare buffer
46-
// final StreamBuffer buffer = new StreamBuffer();
47-
// final StringWriter finalWriter = new StringWriter();
48-
//
49-
// picaDecoder.setReceiver(buffer)
50-
// .setReceiver(new StreamWriter(finalWriter));
51-
//
52-
// // buffer
53-
// opener.process(DataFilePath.PND_PICA);
54-
//
55-
// // replay
56-
// try {
57-
// buffer.replay();
58-
// } catch (FormatException e) {
59-
// Assert.fail("Error during replay: " + e);
60-
// }
61-
//
62-
// opener.closeStream();
63-
//
64-
// // check result
65-
// Assert.assertEquals(referenceWriter.toString(), finalWriter.toString());
66-
//
67-
}
38+
public void testCorrectBuffering(){
39+
final EventList list = new EventList();
40+
execTestEvents(list);
41+
final StreamValidator validator = new StreamValidator(list.getEvents());
42+
43+
final StreamBuffer buffer = new StreamBuffer();
44+
buffer.setReceiver(validator);
45+
execTestEvents(buffer);
46+
47+
try {
48+
buffer.replay();
49+
buffer.closeStream();
50+
} catch (FormatException e) {
51+
fail("Error during replay: " + e);
52+
}
53+
}
54+
55+
private void execTestEvents(final StreamReceiver receiver) {
56+
receiver.startRecord("1");
57+
receiver.literal("l1", "value1");
58+
receiver.literal("l1", "value2");
59+
receiver.startEntity("e1");
60+
receiver.literal("l2", "value3");
61+
receiver.endEntity();
62+
receiver.endRecord();
63+
receiver.startRecord("2");
64+
receiver.literal("l3", "value4");
65+
receiver.endRecord();
66+
}
67+
6868
}

0 commit comments

Comments
 (0)