commit 44a0b3517a7521e27212df30668e0122d5198c80
author Yuta HIGUCHI <y-higuchi@onlab.us> Wed May 14 21:32:48 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Fri May 16 15:15:18 2014 -0700
tree 1325aba4b13bfce025149195514e7a4246154e60
parent 6dd9b942b2cc1302738641286a44b19f315588f9

Checkstyle fixes for tests

- Fixed some checkstyle errors which seemed easier to fix.

Change-Id: I9dadd2e8f98b560fadcc2b704ac52ff8f8b93913

src/test/java/net/onrc/onos/core/registry/ZookeeperRegistryTest.java

diff --git a/src/test/java/net/onrc/onos/core/registry/ZookeeperRegistryTest.java b/src/test/java/net/onrc/onos/core/registry/ZookeeperRegistryTest.java
index 8275a84..0f9d61e 100644
--- a/src/test/java/net/onrc/onos/core/registry/ZookeeperRegistryTest.java
+++ b/src/test/java/net/onrc/onos/core/registry/ZookeeperRegistryTest.java
@@ -49,20 +49,21 @@
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({ZookeeperRegistry.class, CuratorFramework.class, CuratorFrameworkFactory.class,
         ServiceDiscoveryBuilder.class, ServiceDiscovery.class, ServiceCache.class, PathChildrenCache.class,
-        ZookeeperRegistry.SwitchPathCacheListener.class})
+        ZookeeperRegistry.SwitchPathCacheListener.class })
 public class ZookeeperRegistryTest extends FloodlightTestCase {
-    private final static Long ID_BLOCK_SIZE = 0x100000000L;
+    private static final Long ID_BLOCK_SIZE = 0x100000000L;
 
     protected ZookeeperRegistry registry;
     protected CuratorFramework client;
 
     protected PathChildrenCacheListener pathChildrenCacheListener;
-    protected final String CONTROLLER_ID = "controller2013";
+    protected static final String CONTROLLER_ID = "controller2013";
 
     /**
      * Initialize {@link ZookeeperRegistry} Object and inject initial value with {@link ZookeeperRegistry#init(FloodlightModuleContext)} method.
      * This setup code also tests {@link ZookeeperRegistry#init(FloodlightModuleContext)} method itself.
      */
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();
@@ -90,6 +91,7 @@
     /**
      * Clean up member variables (empty for now).
      */
+    @Override
     @After
     public void tearDown() throws Exception {
         super.tearDown();
@@ -395,7 +397,7 @@
      * @return Created mock object
      * @throws Exception
      */
-    @SuppressWarnings({"serial", "unchecked"})
+    @SuppressWarnings({"serial", "unchecked" })
     private CuratorFramework createCuratorFrameworkMock() throws Exception {
         // Mock of AtomicValue
         AtomicValue<Long> atomicValue = EasyMock.createMock(AtomicValue.class);
@@ -464,10 +466,10 @@
         ServiceCache<ControllerService> serviceCache = EasyMock.createMock(ServiceCache.class);
         serviceCache.start();
         EasyMock.expectLastCall().once();
-        EasyMock.expect(serviceCache.getInstances()).andReturn(new ArrayList<ServiceInstance<ControllerService>>() {{
+        EasyMock.expect(serviceCache.getInstances()).andReturn(new ArrayList<ServiceInstance<ControllerService>>() { {
             add(createServiceInstanceMock("controller1"));
             add(createServiceInstanceMock("controller2"));
-        }}).anyTimes();
+        } }).anyTimes();
         EasyMock.replay(serviceCache);
 
         // Mock ServiceCacheBuilder
@@ -486,15 +488,15 @@
         EasyMock.replay(serviceDiscovery);
 
         // Mock CuratorFramework
-        CuratorFramework client = EasyMock.createMock(CuratorFramework.class);
-        client.start();
+        CuratorFramework mockClient = EasyMock.createMock(CuratorFramework.class);
+        mockClient.start();
         EasyMock.expectLastCall().once();
-        EasyMock.expect(client.usingNamespace(EasyMock.anyObject(String.class))).andReturn(client);
-        EasyMock.replay(client);
+        EasyMock.expect(mockClient.usingNamespace(EasyMock.anyObject(String.class))).andReturn(mockClient);
+        EasyMock.replay(mockClient);
 
         // Mock ServiceDiscoveryBuilder
         ServiceDiscoveryBuilder<ControllerService> builder = EasyMock.createMock(ServiceDiscoveryBuilder.class);
-        EasyMock.expect(builder.client(client)).andReturn(builder).once();
+        EasyMock.expect(builder.client(mockClient)).andReturn(builder).once();
         EasyMock.expect(builder.basePath(EasyMock.anyObject(String.class))).andReturn(builder);
         EasyMock.expect(builder.build()).andReturn(serviceDiscovery);
         EasyMock.replay(builder);
@@ -503,7 +505,7 @@
         EasyMock.expect(ServiceDiscoveryBuilder.builder(ControllerService.class)).andReturn(builder).once();
         PowerMock.replay(ServiceDiscoveryBuilder.class);
 
-        return client;
+        return mockClient;
     }
 
     /**