Unit tests for Neighbour Resolution Service.
This patch involves a refactoring to split the neighbour actions
implementation out from the main NeighbourResolutionManager class.
ONOS-5276
Change-Id: I082b401ae9046a1ed983610af05da112bd2683d3
diff --git a/core/api/src/test/java/org/onosproject/net/edge/EdgePortServiceAdapter.java b/core/api/src/test/java/org/onosproject/net/edge/EdgePortServiceAdapter.java
new file mode 100644
index 0000000..d38f05e
--- /dev/null
+++ b/core/api/src/test/java/org/onosproject/net/edge/EdgePortServiceAdapter.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2016-present Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.net.edge;
+
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.flow.TrafficTreatment;
+
+import java.nio.ByteBuffer;
+import java.util.Optional;
+
+/**
+ * Adapter for tests involving the edge port service.
+ */
+public class EdgePortServiceAdapter implements EdgePortService {
+ @Override
+ public void addListener(EdgePortListener listener) {
+
+ }
+
+ @Override
+ public void removeListener(EdgePortListener listener) {
+
+ }
+
+ @Override
+ public boolean isEdgePoint(ConnectPoint point) {
+ return false;
+ }
+
+ @Override
+ public Iterable<ConnectPoint> getEdgePoints() {
+ return null;
+ }
+
+ @Override
+ public Iterable<ConnectPoint> getEdgePoints(DeviceId deviceId) {
+ return null;
+ }
+
+ @Override
+ public void emitPacket(ByteBuffer data, Optional<TrafficTreatment> treatment) {
+
+ }
+
+ @Override
+ public void emitPacket(DeviceId deviceId, ByteBuffer data, Optional<TrafficTreatment> treatment) {
+
+ }
+}
diff --git a/core/api/src/test/java/org/onosproject/net/packet/DefaultPacketContextTest.java b/core/api/src/test/java/org/onosproject/net/packet/DefaultPacketContextTest.java
index d8e55db..ea45e09 100644
--- a/core/api/src/test/java/org/onosproject/net/packet/DefaultPacketContextTest.java
+++ b/core/api/src/test/java/org/onosproject/net/packet/DefaultPacketContextTest.java
@@ -15,15 +15,14 @@
*/
package org.onosproject.net.packet;
-import java.nio.ByteBuffer;
-
+import com.google.common.testing.EqualsTester;
import org.junit.Test;
-import org.onosproject.net.flow.TrafficTreatment;
-import org.onosproject.net.intent.IntentTestsMocks;
import org.onlab.packet.Ethernet;
import org.onlab.packet.MacAddress;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.intent.IntentTestsMocks;
-import com.google.common.testing.EqualsTester;
+import java.nio.ByteBuffer;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
@@ -50,30 +49,12 @@
treatment,
byteBuffer);
- static class MockPacketContext extends DefaultPacketContext {
-
- protected MockPacketContext(long time, InboundPacket inPkt,
- OutboundPacket outPkt, boolean block) {
- super(time, inPkt, outPkt, block);
- }
-
- @Override
- public void send() {
-
- }
-
- @Override
- public boolean block() {
- return super.block();
- }
- }
-
final DefaultPacketContext context1 =
- new MockPacketContext(123L, inPacket, outPacket, true);
+ new PacketContextAdapter(123L, inPacket, outPacket, true);
final DefaultPacketContext sameAsContext1 =
- new MockPacketContext(123L, inPacket, outPacket, true);
+ new PacketContextAdapter(123L, inPacket, outPacket, true);
final DefaultPacketContext context2 =
- new MockPacketContext(123123L, inPacket, outPacket, true);
+ new PacketContextAdapter(123123L, inPacket, outPacket, true);
/**
* Checks that the DefaultOutboundPacket class is immutable but can be
diff --git a/core/api/src/test/java/org/onosproject/net/packet/PacketContextAdapter.java b/core/api/src/test/java/org/onosproject/net/packet/PacketContextAdapter.java
new file mode 100644
index 0000000..939eab7
--- /dev/null
+++ b/core/api/src/test/java/org/onosproject/net/packet/PacketContextAdapter.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2016-present Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.net.packet;
+
+/**
+ * Instantiable version of DefaultPacketContext for use in unit tests that need
+ * to provide a PacketContext as input data.
+ */
+public class PacketContextAdapter extends DefaultPacketContext {
+
+ public PacketContextAdapter(long time, InboundPacket inPkt,
+ OutboundPacket outPkt, boolean block) {
+ super(time, inPkt, outPkt, block);
+ }
+
+ @Override
+ public void send() {
+
+ }
+
+}