Fix codestyle

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / services / sal / SalRoleServiceImplTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalRoleServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalRoleServiceImplTest.java
index 5a2a174e67dbb4c6aacb3363fb47ffc388e760a9..91e3eb8063fca0f165bc8b9bb80ce3ec7ff56de8 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalRoleServiceImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalRoleServiceImplTest.java
@@ -20,7 +20,6 @@ import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter;
 import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueue;
 import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
@@ -49,9 +48,6 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 
-/**
- * Created by kramesha on 8/27/15.
- */
 public class SalRoleServiceImplTest {
 
     @Mock
@@ -60,9 +56,6 @@ public class SalRoleServiceImplTest {
     @Mock
     private DeviceContext mockDeviceContext;
 
-    @Mock
-    private ConnectionAdapter mockConnectionAdapter;
-
     @Mock
     private FeaturesReply mockFeaturesReply;
 
@@ -89,14 +82,12 @@ public class SalRoleServiceImplTest {
 
     private NodeId testNodeId = new NodeId(Uri.getDefaultInstance("openflow:1"));
 
-    private static short testVersion = 4;
-
     private static long testXid = 100L;
 
-    private static final String ROLEREQUESTFAILED =
-            org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ErrorType.ROLEREQUESTFAILED.name();
+    private static final String ROLEREQUESTFAILED = org.opendaylight.yang.gen.v1.urn
+            .opendaylight.openflow.common.types.rev130731.ErrorType.ROLEREQUESTFAILED.name();
 
-    private static final String ROLES_UNSUPPORTED = "Device reported error type "+ ROLEREQUESTFAILED +" code UNSUP";
+    private static final String ROLES_UNSUPPORTED = "Device reported error type " + ROLEREQUESTFAILED + " code UNSUP";
 
     private NodeRef nodeRef;
 
@@ -105,6 +96,7 @@ public class SalRoleServiceImplTest {
         MockitoAnnotations.initMocks(this);
         Mockito.when(mockDeviceInfo.getNodeId()).thenReturn(testNodeId);
         Mockito.when(mockDeviceInfo.getDatapathId()).thenReturn(BigInteger.TEN);
+        short testVersion = 4;
         Mockito.when(mockFeaturesOutput.getVersion()).thenReturn(testVersion);
         Mockito.when(mockDeviceContext.getDeviceState()).thenReturn(mockDeviceState);
         Mockito.when(mockDeviceContext.getDeviceInfo()).thenReturn(mockDeviceInfo);
@@ -116,7 +108,8 @@ public class SalRoleServiceImplTest {
         Mockito.when(mockRequestContextStack.<RoleRequestOutput>createRequestContext()).thenReturn(mockRequestContext);
         Mockito.when(mockRequestContext.getXid()).thenReturn(new Xid(testXid));
         Mockito.when(mockConnectionContext.getOutboundQueueProvider()).thenReturn(mockOutboundQueue);
-        Mockito.when(mockDeviceContext.getPrimaryConnectionContext().getConnectionState()).thenReturn(ConnectionContext.CONNECTION_STATE.WORKING);
+        Mockito.when(mockDeviceContext.getPrimaryConnectionContext().getConnectionState())
+                .thenReturn(ConnectionContext.CONNECTION_STATE.WORKING);
 
         NodeKey key = new NodeKey(testNodeId);
         InstanceIdentifier<Node> path = InstanceIdentifier.<Nodes>builder(Nodes.class)