From 9aaeffae596a4960b0b21e5060026df279026ab9 Mon Sep 17 00:00:00 2001
From: Shudong Zhou <shudongzhou@gmail.com>
Date: Tue, 25 Jun 2013 15:09:26 -0700
Subject: [PATCH] Unit test fixes
---
.../java/net/floodlightcontroller/packet/ICMPTest.java | 2 +-
.../java/net/floodlightcontroller/packet/IPv4Test.java | 8 ++++----
.../java/net/floodlightcontroller/packet/PacketTest.java | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/test/java/net/floodlightcontroller/packet/ICMPTest.java b/src/test/java/net/floodlightcontroller/packet/ICMPTest.java
index 2161a3136..fe71d9fc9 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() throws PacketParsingException {
+ public void testDeserialize() throws Exception {
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 dd5588562..9aa9e3d10 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() throws PacketParsingException {
+ public void testDeserialize() throws Exception {
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() throws PacketParsingException {
+ public void testDeserializePadded() throws Exception {
// 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() throws PacketParsingException {
+ public void testDeserializeFragment() throws Exception {
// 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() throws PacketParsingException {
+ public void testDeserializeDontFragment() throws Exception {
// 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 ca712142a..c5a1bb227 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) throws PacketParsingException {
+ protected void doTestClone(IPacket pkt) throws Exception {
if (pkt.getPayload() != null)
doTestClone(pkt.getPayload());
IPacket newPkt = (IPacket)pkt.clone();
@@ -136,7 +136,7 @@ public class PacketTest {
}
@Test
- public void testClone() throws PacketParsingException {
+ public void testClone() throws Exception {
for (IPacket pkt: packets) {
doTestClone(pkt);
}
--
GitLab