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

Updated junit test

Browse source
This commit is contained in:
Ziver Koc 2015-10-28 17:01:45 +01:00
parent d952b3bcb7
commit aea3b9467e
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/zutil/net/ssdp/SSDPClient.java
View file

@ -102,9 +102,9 @@ public class SSDPClient extends ThreadedUDPNetwork implements ThreadedUDPNetwork
http.setHeader(key, headers.get(key)); http.setHeader(key, headers.get(key));
} }
} }
logger.log(Level.FINEST, "Sending Multicast: "+ http);
http.flush(); http.flush();
logger.log(Level.FINEST, "Sending Multicast: \n"+msg);
byte[] data = msg.toString().getBytes(); byte[] data = msg.toString().getBytes();
DatagramPacket packet = new DatagramPacket( DatagramPacket packet = new DatagramPacket(
data, data.length, data, data.length,
@ -179,7 +179,7 @@ public class SSDPClient extends ThreadedUDPNetwork implements ThreadedUDPNetwork
*/ */
public void receivedPacket(DatagramPacket packet, ThreadedUDPNetwork network) { public void receivedPacket(DatagramPacket packet, ThreadedUDPNetwork network) {
HttpHeaderParser header = new HttpHeaderParser( new String( packet.getData() ) ); 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 usn = header.getHeader("USN");
String st = header.getHeader("ST"); String st = header.getHeader("ST");

12
test/zutil/test/JSONSerializerTest.java Normal file → Executable file
View file

@ -48,7 +48,7 @@ public class JSONSerializerTest{
data = data.replace("\"", "'"); data = data.replace("\"", "'");
assertEquals( 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); data);
} }
@ -69,7 +69,7 @@ public class JSONSerializerTest{
data = data.replace("\"", "'"); data = data.replace("\"", "'");
assertEquals( 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); data);
} }
@ -90,7 +90,7 @@ public class JSONSerializerTest{
data = data.replace("\"", "'"); data = data.replace("\"", "'");
assertEquals( 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); data);
} }
@ -119,7 +119,7 @@ public class JSONSerializerTest{
String data = writeObjectToJson(sourceObj, false); String data = writeObjectToJson(sourceObj, false);
data = data.replace("\"", "'"); data = data.replace("\"", "'");
assertEquals( assertEquals(
"{'decimal': 0.0}", "{'decimal': 0.0}\n",
data); data);
TestClass targetObj = sendReceiveObject(sourceObj); TestClass targetObj = sendReceiveObject(sourceObj);
@ -133,7 +133,7 @@ public class JSONSerializerTest{
String data = writeObjectToJson(sourceObj, false); String data = writeObjectToJson(sourceObj, false);
data = data.replace("\"", "'"); data = data.replace("\"", "'");
assertEquals( assertEquals(
"{'map': {'key2': 'value2', 'key1': 'value1'}}", "{'map': {'key1': 'value1', 'key2': 'value2'}}\n",
data); data);
TestClassMap targetObj = sendReceiveObject(sourceObj); TestClassMap targetObj = sendReceiveObject(sourceObj);
@ -147,7 +147,7 @@ public class JSONSerializerTest{
String data = writeObjectToJson(sourceObj, false); String data = writeObjectToJson(sourceObj, false);
data = data.replace("\"", "'"); data = data.replace("\"", "'");
assertEquals( assertEquals(
"{'list': ['value1', 'value2']}", "{'list': ['value1', 'value2']}\n",
data); data);
TestClassList targetObj = sendReceiveObject(sourceObj); TestClassList targetObj = sendReceiveObject(sourceObj);