Removed mocks from unit tests

removed mocks breaking API contracts

Change-Id: Ie18f75c213d78c053102722f29450ed209ddb492
Signed-off-by: Martin Sunal <msunal@cisco.com>

diff --git a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/endpoint/EndPointRpcRegistryTest.java b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/endpoint/EndPointRpcRegistryTest.java
index 5193802537dd8c1f539f89057745746b9eb198f0..ad1fa658bc27cbe47594a270c11b636d58695eed 100644 (file)
--- a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/endpoint/EndPointRpcRegistryTest.java
+++ b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/endpoint/EndPointRpcRegistryTest.java
@@ -21,7 +21,10 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistration;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpPrefix;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.EndpointGroupId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.L2BridgeDomainId;
@@ -37,6 +40,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.UnregisterEndpointInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.UnsetEndpointGroupConditionsInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.endpoint.fields.L3Address;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.endpoint.fields.L3AddressBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.has.endpoint.group.conditions.EndpointGroupCondition;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.unregister.endpoint.input.L2;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.unregister.endpoint.input.L3;
@@ -104,18 +108,17 @@ public class EndPointRpcRegistryTest {
 
     private RegisterEndpointInput setRegisterEndpointVariablesForTest() throws Exception{
         RegisterEndpointInputBuilder registerEndpointInputBuilder = new RegisterEndpointInputBuilder();
-        L2BridgeDomainId l2BridgeDomainIdMock = mock(L2BridgeDomainId.class);
-        registerEndpointInputBuilder.setL2Context(l2BridgeDomainIdMock);
-        MacAddress macAddressMock = mock(MacAddress.class);
-        registerEndpointInputBuilder.setMacAddress(macAddressMock);
+        registerEndpointInputBuilder.setL2Context(new L2BridgeDomainId("l2bdId"));
+        registerEndpointInputBuilder.setMacAddress(new MacAddress("5E:83:39:98:4F:1B"));
         return registerEndpointInputBuilder.build();
     }
 
-    private RegisterEndpointInput setL3AddressVariableForTest(){
+    private RegisterEndpointInput setL3AddressVariableForTest() {
         RegisterEndpointInputBuilder registerEndpointInputBuilder = new RegisterEndpointInputBuilder();
-        L3Address l3AddressMock = mock(L3Address.class);
         List<L3Address> l3AddressList = new ArrayList<>();
-        l3AddressList.add(l3AddressMock);
+        l3AddressList.add(new L3AddressBuilder().setL3Context(new L3ContextId("l3c"))
+            .setIpAddress(new IpAddress(new Ipv4Address("1.1.1.1")))
+            .build());
         registerEndpointInputBuilder.setL3Address(l3AddressList);
         return registerEndpointInputBuilder.build();
     }
@@ -128,12 +131,9 @@ public class EndPointRpcRegistryTest {
 
     private RegisterL3PrefixEndpointInput setL3PrefixTestVariables(){
         RegisterL3PrefixEndpointInputBuilder registerL3PrefixEndpointInputBuilder = new RegisterL3PrefixEndpointInputBuilder();
-        L3ContextId l3ContextIdMock = mock(L3ContextId.class);
-        registerL3PrefixEndpointInputBuilder.setL3Context(l3ContextIdMock);
-        IpPrefix ipPrefixMock = mock(IpPrefix.class);
-        registerL3PrefixEndpointInputBuilder.setIpPrefix(ipPrefixMock);
-        TenantId tenantIdMock = mock(TenantId.class);
-        registerL3PrefixEndpointInputBuilder.setTenant(tenantIdMock);
+        registerL3PrefixEndpointInputBuilder.setL3Context(new L3ContextId("l3c"));
+        registerL3PrefixEndpointInputBuilder.setIpPrefix(new IpPrefix(new Ipv4Prefix("1.1.1.0/24")));
+        registerL3PrefixEndpointInputBuilder.setTenant(new TenantId("t1"));
         return registerL3PrefixEndpointInputBuilder.build();
     }
 

diff --git a/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/endpoint/EndpointManagerTest.java b/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/endpoint/EndpointManagerTest.java
index c68d5180864e109d2039a56fbfeb27051c878a27..fc9d69dca3106598e11cc366316f674f19bfc0b1 100644 (file)
--- a/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/endpoint/EndpointManagerTest.java
+++ b/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/endpoint/EndpointManagerTest.java
@@ -66,6 +66,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.EndpointLocation.LocationType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.OfOverlayContext;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.OfOverlayL3Context;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.OfOverlayL3ContextBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.OfOverlayL3Nat;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.napt.translations.fields.NaptTranslations;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.napt.translations.fields.napt.translations.NaptTranslation;
@@ -356,7 +357,6 @@ public class EndpointManagerTest {
         Assert.assertTrue(result.isEmpty());
     }
 
-    @SuppressWarnings("unused")
     @Test
     public void getNaptAugL3EndpointTest() {
         EndpointL3 endpointL3 = mock(EndpointL3.class);
@@ -619,32 +619,31 @@ public class EndpointManagerTest {
 
     @Test
     public void getOfOverlayContextFromL3EndpointTest() throws Exception {
-        OfOverlayL3Context ofL3Ctx = mock(OfOverlayL3Context.class);
+        OfOverlayL3ContextBuilder ofL3CtxBuilder = new OfOverlayL3ContextBuilder();
         OfOverlayContext result;
         Method method = EndpointManager.class.getDeclaredMethod("getOfOverlayContextFromL3Endpoint",
                 OfOverlayL3Context.class);
         method.setAccessible(true);
 
-        result = (OfOverlayContext) method.invoke(manager, ofL3Ctx);
+        result = (OfOverlayContext) method.invoke(manager, ofL3CtxBuilder.build());
         Assert.assertEquals(null, result.getInterfaceId());
         Assert.assertEquals(null, result.getLocationType());
         Assert.assertEquals(null, result.getNodeConnectorId());
         Assert.assertEquals(null, result.getNodeId());
         Assert.assertEquals(null, result.getPortName());
 
-        UniqueId interfaceId = mock(UniqueId.class);
-        when(ofL3Ctx.getInterfaceId()).thenReturn(interfaceId);
+        UniqueId interfaceId = new UniqueId("iface");
+        ofL3CtxBuilder.setInterfaceId(interfaceId);
         LocationType locationType = LocationType.External;
-        when(ofL3Ctx.getLocationType()).thenReturn(locationType);
-        NodeConnectorId nodeConnectorId = mock(NodeConnectorId.class);
-        when(ofL3Ctx.getNodeConnectorId()).thenReturn(nodeConnectorId);
-        NodeId nodeId = mock(NodeId.class);
-        when(ofL3Ctx.getNodeId()).thenReturn(nodeId);
-        Name portName = mock(Name.class);
-        when(portName.getValue()).thenReturn("portName");
-        when(ofL3Ctx.getPortName()).thenReturn(portName);
-
-        result = (OfOverlayContext) method.invoke(manager, ofL3Ctx);
+        ofL3CtxBuilder.setLocationType(locationType);
+        NodeConnectorId nodeConnectorId = new NodeConnectorId("nc");
+        ofL3CtxBuilder.setNodeConnectorId(nodeConnectorId);
+        NodeId nodeId = new NodeId("nId");
+        ofL3CtxBuilder.setNodeId(nodeId);
+        Name portName = new Name("pName");
+        ofL3CtxBuilder.setPortName(portName);
+
+        result = (OfOverlayContext) method.invoke(manager, ofL3CtxBuilder.build());
         Assert.assertEquals(interfaceId, result.getInterfaceId());
         Assert.assertEquals(locationType, result.getLocationType());
         Assert.assertEquals(nodeConnectorId, result.getNodeConnectorId());