added stream test for two consecutive objects

Author: Antonio Sanchez

src/test/java/org/json/simple/JSONStreamTest.java

@@ -10,6 +10,8 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
+import org.json.simple.parser.ContentHandler;
+import org.json.simple.parser.DefaultContentHandler;
 import org.json.simple.parser.JSONParser;
 import org.junit.Assert;
 import org.junit.Test;
@@ -73,11 +75,6 @@ public Socket call() throws Exception {
 		}
 
 	}
-
-	public static String getJSONSample() {
-		//return getJSONSampleLong();
-		return getJSONSampleMedium();
-	}
 
 	public static String getJSONSampleMedium() {
 		String json = "{\"widget\": {\n"+
@@ -220,7 +217,7 @@ public void testJSONStreamer() throws Exception {
 		BufferedReader reader = new BufferedReader(new InputStreamReader(rsocket.getInputStream()));
 		PrintWriter writer = new PrintWriter(wsocket.getOutputStream());
 
-		String jsonSample = getJSONSample();
+		String jsonSample = getJSONSampleMedium();
 
 		DelayedChunkWriter chunkWriter = new DelayedChunkWriter(writer, jsonSample, 10, 10);
 		executor.execute(chunkWriter);
@@ -238,5 +235,59 @@ public void testJSONStreamer() throws Exception {
 		wsocket.close();
 		server.close();
 	}
+	
+	@Test
+	public void testJSONMultipleStreamer() throws Exception {
+
+		ServerSocket server = new ServerSocket(0);
+		int port = server.getLocalPort();
+
+		Socket rsocket;
+		Socket wsocket;
+
+		ExecutorService executor = Executors.newSingleThreadExecutor();
+		Future<Socket> ss = executor.submit(new SocketConnector(server));
+
+		wsocket = new Socket("localhost", port);
+		rsocket = ss.get();
+
+		// send message locally 
+		BufferedReader reader = new BufferedReader(new InputStreamReader(rsocket.getInputStream()));
+		PrintWriter writer = new PrintWriter(wsocket.getOutputStream());
+
+		String jsonSample = getJSONSampleMedium();
+		DelayedChunkWriter chunkWriter = new DelayedChunkWriter(writer, jsonSample, 10, 10);
+		executor.execute(chunkWriter);
+
+		JSONParser parser = new JSONParser();
+		// entire string at once
+		DefaultContentHandler handler = new DefaultContentHandler();
+		parser.parse(jsonSample, handler);
+		JSONObject reference = (JSONObject)(handler.getContent());
+		// from streaming input
+		JSONObject obj = (JSONObject)(parser.parse(reader));
+		
+		Assert.assertEquals("First parsed JSON equal", reference, obj);
+		
+		// second streamed object
+		jsonSample = getJSONSampleLong();
+		chunkWriter = new DelayedChunkWriter(writer, jsonSample, 10, 10);
+		executor.execute(chunkWriter);
+
+		// entire string at once
+		handler = new DefaultContentHandler();
+		parser.parse(jsonSample, handler);
+		reference = (JSONObject)(handler.getContent());
+		// from streaming input
+		obj = (JSONObject)(parser.parse(reader));
+
+		
+		Assert.assertEquals("Second parsed JSON equal", reference, obj);
+		
+		// close communication
+		rsocket.close();
+		wsocket.close();
+		server.close();
+	}
 
 }