diff --git a/src/test/java/net/floodlightcontroller/packet/ICMPTest.java b/src/test/java/net/floodlightcontroller/packet/ICMPTest.java index e554c4e7bc73a6093a390f7be263a56412af5b2a..2161a3136e994d5cbabff044818e92d46a8e7499 100644 --- a/src/test/java/net/floodlightcontroller/packet/ICMPTest.java +++ b/src/test/java/net/floodlightcontroller/packet/ICMPTest.java @@ -58,7 +58,7 @@ public class ICMPTest { } @Test - public void testDeserialize() { + public void testDeserialize() throws PacketParsingException { IPacket packet = new IPv4(); packet.deserialize(pktSerialized, 0, pktSerialized.length); byte[] pktSerialized1 = packet.serialize(); diff --git a/src/test/java/net/floodlightcontroller/packet/IPv4Test.java b/src/test/java/net/floodlightcontroller/packet/IPv4Test.java index c9a86b03c73e3d7a7ba374c18f5f10c475dfbe06..dd55885621fc96fd52ebfd31c0942a23ae2b82d3 100644 --- a/src/test/java/net/floodlightcontroller/packet/IPv4Test.java +++ b/src/test/java/net/floodlightcontroller/packet/IPv4Test.java @@ -85,7 +85,7 @@ public class IPv4Test { }; @Test - public void testDeserialize() { + public void testDeserialize() throws PacketParsingException { IPv4 packet = new IPv4(); packet.deserialize(pktSerialized, 0, pktSerialized.length); byte[] pktSerialized1 = packet.serialize(); @@ -93,7 +93,7 @@ public class IPv4Test { } @Test - public void testDeserializePadded() { + public void testDeserializePadded() throws PacketParsingException { // A real TLSv1 packet with crap added to the end byte[] pktSerializedPadded = new byte[] { 0x45, 0x00, 0x00, 0x2e, 0x41, (byte) 0xbe, 0x40, 0x00, 0x40, 0x06, @@ -112,7 +112,7 @@ public class IPv4Test { } @Test - public void testDeserializeFragment() { + public void testDeserializeFragment() throws PacketParsingException { // IP packet with more frag bit set byte[] pktSerializedFirstFrag = new byte[] { 0x45, 0x00, 0x00, 0x2e, 0x41, (byte) 0xbe, 0x20, 0x00, 0x40, 0x06, @@ -145,7 +145,7 @@ public class IPv4Test { } @Test - public void testDeserializeDontFragment() { + public void testDeserializeDontFragment() throws PacketParsingException { // IP packet with more frag bit set byte[] pktSerializedDontFrag = new byte[] { 0x45, 0x00, 0x00, 0x2e, 0x41, (byte) 0xbe, 0x60, 0x00, 0x40, 0x06, diff --git a/src/test/java/net/floodlightcontroller/packet/PacketTest.java b/src/test/java/net/floodlightcontroller/packet/PacketTest.java index b975166fafc0576306e0fdde88d740adb31d13de..ca712142a270fc59b135b63de25f1e4bc073fab2 100644 --- a/src/test/java/net/floodlightcontroller/packet/PacketTest.java +++ b/src/test/java/net/floodlightcontroller/packet/PacketTest.java @@ -100,7 +100,7 @@ public class PacketTest { this.packets = new IPacket[] { pkt1, pkt2, pkt3, pkt4 }; } - protected void doTestClone(IPacket pkt) { + protected void doTestClone(IPacket pkt) throws PacketParsingException { if (pkt.getPayload() != null) doTestClone(pkt.getPayload()); IPacket newPkt = (IPacket)pkt.clone(); @@ -127,16 +127,16 @@ public class PacketTest { assertEquals(false, Arrays.equals(newArp.getSenderProtocolAddress(), arp.getSenderProtocolAddress())); assertEquals(false, newPkt.equals(pkt)); + } else { + byte[] dummyData = dummyPkt.serialize().clone(); + newPkt = (IPacket)pkt.clone(); + newPkt.deserialize(dummyData, 0, dummyData.length); + assertEquals(false, newPkt.equals(pkt)); } - - byte[] dummyData = dummyPkt.serialize().clone(); - newPkt = (IPacket)pkt.clone(); - newPkt.deserialize(dummyData, 0, dummyData.length); - assertEquals(false, newPkt.equals(pkt)); } @Test - public void testClone() { + public void testClone() throws PacketParsingException { for (IPacket pkt: packets) { doTestClone(pkt); } diff --git a/src/test/java/net/floodlightcontroller/packet/TCPTest.java b/src/test/java/net/floodlightcontroller/packet/TCPTest.java index fcd5422f32e1c99f3f9ce9993953764af4ea9698..b453f972f17eff36c30fe036016dc07d066556fa 100644 --- a/src/test/java/net/floodlightcontroller/packet/TCPTest.java +++ b/src/test/java/net/floodlightcontroller/packet/TCPTest.java @@ -65,7 +65,7 @@ public class TCPTest { } @Test - public void testDeserialize() { + public void testDeserialize() throws PacketParsingException { IPacket packet = new IPv4(); packet.deserialize(pktSerialized, 0, pktSerialized.length); byte[] pktSerialized1 = packet.serialize();