From aea3b9467e3c0a68230ddaf92edb2a65e3e030b7 Mon Sep 17 00:00:00 2001
From: Ziver Koc <Ziver@users.noreply.github.com>
Date: Wed, 28 Oct 2015 17:01:45 +0100
Subject: [PATCH] Updated junit test

---
 src/zutil/net/ssdp/SSDPClient.java      |  4 ++--
 test/zutil/test/JSONSerializerTest.java | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 test/zutil/test/JSONSerializerTest.java

diff --git a/src/zutil/net/ssdp/SSDPClient.java b/src/zutil/net/ssdp/SSDPClient.java
index 1b817bb..7406a4c 100755
--- a/src/zutil/net/ssdp/SSDPClient.java
+++ b/src/zutil/net/ssdp/SSDPClient.java
@@ -102,9 +102,9 @@ public class SSDPClient extends ThreadedUDPNetwork implements ThreadedUDPNetwork
 					http.setHeader(key, headers.get(key));
 				}
 			}
+			logger.log(Level.FINEST, "Sending Multicast: "+ http);
 			http.flush();
 
-			logger.log(Level.FINEST, "Sending Multicast: \n"+msg);
 			byte[] data = msg.toString().getBytes();
 			DatagramPacket packet = new DatagramPacket( 
 					data, data.length, 
@@ -179,7 +179,7 @@ public class SSDPClient extends ThreadedUDPNetwork implements ThreadedUDPNetwork
 	 */
 	public void receivedPacket(DatagramPacket packet, ThreadedUDPNetwork network) {
 		HttpHeaderParser header = new HttpHeaderParser( new String( packet.getData() ) );
-		logger.log(Level.FINEST, "Recived(from: "+packet.getAddress()+"): \n" + header);
+		logger.log(Level.FINEST, "Received(from: "+packet.getAddress()+"): "+ header);
 		
 		String usn = header.getHeader("USN");
 		String st = header.getHeader("ST");
diff --git a/test/zutil/test/JSONSerializerTest.java b/test/zutil/test/JSONSerializerTest.java
old mode 100644
new mode 100755
index 34bbb79..c692f36
--- a/test/zutil/test/JSONSerializerTest.java
+++ b/test/zutil/test/JSONSerializerTest.java
@@ -48,7 +48,7 @@ public class JSONSerializerTest{
         data = data.replace("\"", "'");
 
         assertEquals(
-                "{'str': 'abcd', '@class': 'zutil.test.JSONSerializerTest$TestClass', 'obj1': {'@class': 'zutil.test.JSONSerializerTest$TestObj', 'value': 42, '@object_id': 2}, 'obj2': {'@class': 'zutil.test.JSONSerializerTest$TestObj', 'value': 42, '@object_id': 3}, 'decimal': 1.1, '@object_id': 1}",
+                "{'str': 'abcd', '@class': 'zutil.test.JSONSerializerTest$TestClass', 'obj2': {'@class': 'zutil.test.JSONSerializerTest$TestObj', '@object_id': 3, 'value': 42}, '@object_id': 1, 'obj1': {'@class': 'zutil.test.JSONSerializerTest$TestObj', '@object_id': 2, 'value': 42}, 'decimal': 1.1}\n",
                 data);
     }
 	
@@ -69,7 +69,7 @@ public class JSONSerializerTest{
         data = data.replace("\"", "'");
 
         assertEquals(
-                "{'@class': 'zutil.test.JSONSerializerTest$TestClassObjClone', 'obj1': {'@class': 'zutil.test.JSONSerializerTest$TestObj', 'value': 42, '@object_id': 2}, 'obj2': {'@object_id': 2}, '@object_id': 1}",
+                "{'@class': 'zutil.test.JSONSerializerTest$TestClassObjClone', 'obj2': {'@object_id': 2}, '@object_id': 1, 'obj1': {'@class': 'zutil.test.JSONSerializerTest$TestObj', '@object_id': 2, 'value': 42}}\n",
                 data);
     }
 	
@@ -90,7 +90,7 @@ public class JSONSerializerTest{
         data = data.replace("\"", "'");
 
         assertEquals(
-                "{'@class': 'zutil.test.JSONSerializerTest$TestClassArray', 'array': [1, 2, 3, 4], '@object_id': 1}",
+                "{'@class': 'zutil.test.JSONSerializerTest$TestClassArray', 'array': [1, 2, 3, 4], '@object_id': 1}\n",
                 data);
     }
 
@@ -119,7 +119,7 @@ public class JSONSerializerTest{
 		String data = writeObjectToJson(sourceObj, false);
 		data = data.replace("\"", "'");
 		assertEquals(
-				"{'decimal': 0.0}",
+				"{'decimal': 0.0}\n",
 				data);
 
         TestClass targetObj = sendReceiveObject(sourceObj);
@@ -133,7 +133,7 @@ public class JSONSerializerTest{
 		String data = writeObjectToJson(sourceObj, false);
 		data = data.replace("\"", "'");
 		assertEquals(
-				"{'map': {'key2': 'value2', 'key1': 'value1'}}",
+				"{'map': {'key1': 'value1', 'key2': 'value2'}}\n",
 				data);
 
         TestClassMap targetObj = sendReceiveObject(sourceObj);
@@ -147,7 +147,7 @@ public class JSONSerializerTest{
         String data = writeObjectToJson(sourceObj, false);
         data = data.replace("\"", "'");
         assertEquals(
-                "{'list': ['value1', 'value2']}",
+                "{'list': ['value1', 'value2']}\n",
                 data);
 
         TestClassList targetObj = sendReceiveObject(sourceObj);