apply checkstyle check during build for neutron-ovsdb

[groupbasedpolicy.git] / neutron-ovsdb / src / test / java / org / opendaylight / groupbasedpolicy / neutron / ovsdb / util / InventoryHelperTest.java

diff --git a/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelperTest.java b/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelperTest.java
index b20fc2f8d5f293b6e73ae74c54fc445802a24fce..d7b23e2a8b4c063ae2f7bb1c0908dbfa64ce83f5 100644 (file)
--- a/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelperTest.java
+++ b/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelperTest.java
@@ -18,10 +18,11 @@ import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.Collections;
-
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.CheckedFuture;
+
+import java.util.Collections;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
@@ -32,7 +33,7 @@ import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.groupbasedpolicy.neutron.ovsdb.AbstractTunnelType;
 import org.opendaylight.ovsdb.southbound.SouthboundConstants;
-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.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.OfOverlayNodeConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.nodes.node.Tunnel;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.nodes.node.TunnelKey;
@@ -325,8 +326,6 @@ public class InventoryHelperTest {
     @SuppressWarnings({"unchecked", "rawtypes"})
     @Test
     public void testUpdateOfOverlayConfig() throws Exception {
-        IpAddress ip = mock(IpAddress.class);
-        String nodeConnectorIdString = "nodeConnectorIdString";
         AbstractTunnelType tunnelType = mock(AbstractTunnelType.class);
 
         when(writeTransaction.read(any(LogicalDatastoreType.class), any(InstanceIdentifier.class)))
@@ -344,6 +343,8 @@ public class InventoryHelperTest {
         CheckedFuture<Void, TransactionCommitFailedException> submitFuture = mock(CheckedFuture.class);
         when(writeTransaction.submit()).thenReturn(submitFuture);
 
+        IpAddress ip = mock(IpAddress.class);
+        String nodeConnectorIdString = "nodeConnectorIdString";
         InventoryHelper.updateOfOverlayConfig(ip, nodeIdString, nodeConnectorIdString, tunnelType, dataBroker);
         verify(writeTransaction).submit();
     }
@@ -363,10 +364,6 @@ public class InventoryHelperTest {
     @SuppressWarnings("unchecked")
     @Test
     public void testUpdateOfOverlayConfig_OfConfigNull() throws Exception {
-        IpAddress ip = mock(IpAddress.class);
-        String nodeConnectorIdString = "nodeConnectorIdString";
-        AbstractTunnelType tunnelType = mock(AbstractTunnelType.class);
-
         when(writeTransaction.read(any(LogicalDatastoreType.class), any(InstanceIdentifier.class)))
             .thenReturn(nodeConfigFuture);
         when(nodeConfigOptional.isPresent()).thenReturn(false);
@@ -374,6 +371,9 @@ public class InventoryHelperTest {
         CheckedFuture<Void, TransactionCommitFailedException> submitFuture = mock(CheckedFuture.class);
         when(writeTransaction.submit()).thenReturn(submitFuture);
 
+        IpAddress ip = mock(IpAddress.class);
+        String nodeConnectorIdString = "nodeConnectorIdString";
+        AbstractTunnelType tunnelType = mock(AbstractTunnelType.class);
         InventoryHelper.updateOfOverlayConfig(ip, nodeIdString, nodeConnectorIdString, tunnelType, dataBroker);
         verify(writeTransaction).submit();
     }