Tests for neutron-ovsdb

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

diff --git a/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/EndpointHelperTest.java b/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/EndpointHelperTest.java
index 134db052e4713fa8bd6da6f95606f041880fbce4..6c498e4cec5d34a72953861af03e693a4ade6608 100644 (file)
--- a/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/EndpointHelperTest.java
+++ b/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/EndpointHelperTest.java
@@ -8,12 +8,15 @@
 
 package org.opendaylight.groupbasedpolicy.neutron.ovsdb.util;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.junit.Assert;
+import com.google.common.base.Optional;
+import com.google.common.util.concurrent.CheckedFuture;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
@@ -30,34 +33,31 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.OfOverlayContext;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.CheckedFuture;
-
 public class EndpointHelperTest {
 
-    EndpointKey epKey;
-    Endpoint endpoint;
-    ReadOnlyTransaction readTransaction;
-    ReadWriteTransaction writeTransaction;
-    Optional<Endpoint> readOptional;
-    CheckedFuture<Void, TransactionCommitFailedException> submitFuture;
+    private EndpointKey epKey;
+    private Endpoint endpoint;
+    private ReadOnlyTransaction readTransaction;
+    private ReadWriteTransaction writeTransaction;
+    private Optional<Endpoint> readOptional;
+    private CheckedFuture<Void, TransactionCommitFailedException> submitFuture;
 
     @SuppressWarnings("unchecked")
     @Before
-    public void initialise() throws Exception {
+    public void init() throws Exception {
         epKey = mock(EndpointKey.class);
         OfOverlayContext ofc = mock(OfOverlayContext.class);
         endpoint = new EndpointBuilder().setL2Context(new L2BridgeDomainId("foo"))
-                .setMacAddress(new MacAddress("01:23:45:67:89:AB"))
-                .setTenant(new TenantId("fooTenant"))
-                .addAugmentation(OfOverlayContext.class, ofc)
-                .build();
+            .setMacAddress(new MacAddress("01:23:45:67:89:AB"))
+            .setTenant(new TenantId("fooTenant"))
+            .addAugmentation(OfOverlayContext.class, ofc)
+            .build();
         readTransaction = mock(ReadOnlyTransaction.class);
         writeTransaction = mock(ReadWriteTransaction.class);
 
         CheckedFuture<Optional<Endpoint>, ReadFailedException> readFuture = mock(CheckedFuture.class);
-        when(readTransaction.read(any(LogicalDatastoreType.class), any(InstanceIdentifier.class))).thenReturn(
-                readFuture);
+        when(readTransaction.read(any(LogicalDatastoreType.class), any(InstanceIdentifier.class)))
+            .thenReturn(readFuture);
         readOptional = mock(Optional.class);
         when(readFuture.checkedGet()).thenReturn(readOptional);
 
@@ -66,22 +66,22 @@ public class EndpointHelperTest {
     }
 
     @Test
-    public void lookupEndpointTest() {
+    public void testLookupEndpoint() {
         when(readOptional.isPresent()).thenReturn(true);
         when(readOptional.get()).thenReturn(endpoint);
         Endpoint result = EndpointHelper.lookupEndpoint(epKey, readTransaction);
-        Assert.assertEquals(result, endpoint);
+        assertEquals(result, endpoint);
     }
 
     @Test
-    public void lookupEndpointTestNull() {
+    public void testLookupEndpoint_NotPresent() {
         when(readOptional.isPresent()).thenReturn(false);
         Endpoint result = EndpointHelper.lookupEndpoint(epKey, readTransaction);
-        Assert.assertNull(result);
+        assertNull(result);
     }
 
     @Test
-    public void updateEndpointWithLocationTest() throws Exception {
+    public void testUpdateEndpointWithLocation() throws Exception {
         String nodeIdString = "nodeIdString";
         String nodeConnectorIdString = "nodeConnectorIdString";
         EndpointHelper.updateEndpointWithLocation(endpoint, nodeIdString, nodeConnectorIdString, writeTransaction);
@@ -89,7 +89,7 @@ public class EndpointHelperTest {
     }
 
     @Test
-    public void updateEndpointRemoveLocationTest() throws Exception {
+    public void testUpdateEndpointRemoveLocation() throws Exception {
         EndpointHelper.updateEndpointRemoveLocation(endpoint, writeTransaction);
         verify(submitFuture).checkedGet();
     }