|
10 | 10 | import java.util.concurrent.Executors;
|
11 | 11 | import java.util.concurrent.Future;
|
12 | 12 |
|
13 |
| -import org.json.simple.parser.ContentHandler; |
14 |
| -import org.json.simple.parser.DefaultContentHandler; |
15 | 13 | import org.json.simple.parser.JSONParser;
|
16 | 14 | import org.junit.Assert;
|
17 | 15 | import org.junit.Test;
|
@@ -255,29 +253,25 @@ public void testJSONMultipleStreamer() throws Exception {
|
255 | 253 | BufferedReader reader = new BufferedReader(new InputStreamReader(rsocket.getInputStream()));
|
256 | 254 | PrintWriter writer = new PrintWriter(wsocket.getOutputStream());
|
257 | 255 |
|
258 |
| - String jsonSample = getJSONSampleMedium(); |
| 256 | + String jsonFirst = getJSONSampleMedium(); |
| 257 | + String jsonSecond = getJSONSampleLong(); |
| 258 | + |
| 259 | + String jsonSample = jsonFirst + "\n" + jsonSecond; |
259 | 260 | DelayedChunkWriter chunkWriter = new DelayedChunkWriter(writer, jsonSample, 10, 10);
|
260 | 261 | executor.execute(chunkWriter);
|
261 | 262 |
|
262 | 263 | JSONParser parser = new JSONParser();
|
263 | 264 | // entire string at once
|
264 |
| - DefaultContentHandler handler = new DefaultContentHandler(); |
265 |
| - parser.parse(jsonSample, handler); |
266 |
| - JSONObject reference = (JSONObject)(handler.getContent()); |
| 265 | + JSONObject reference = (JSONObject)(parser.parse(jsonFirst)); |
267 | 266 | // from streaming input
|
268 | 267 | JSONObject obj = (JSONObject)(parser.parse(reader));
|
269 | 268 |
|
270 | 269 | Assert.assertEquals("First parsed JSON equal", reference, obj);
|
271 | 270 |
|
272 | 271 | // second streamed object
|
273 |
| - jsonSample = getJSONSampleLong(); |
274 |
| - chunkWriter = new DelayedChunkWriter(writer, jsonSample, 10, 10); |
275 |
| - executor.execute(chunkWriter); |
276 | 272 |
|
277 | 273 | // entire string at once
|
278 |
| - handler = new DefaultContentHandler(); |
279 |
| - parser.parse(jsonSample, handler); |
280 |
| - reference = (JSONObject)(handler.getContent()); |
| 274 | + reference = (JSONObject)(parser.parse(jsonSecond)); |
281 | 275 | // from streaming input
|
282 | 276 | obj = (JSONObject)(parser.parse(reader));
|
283 | 277 |
|
|
0 commit comments