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/intent/ConstrainedBFSTreeTest.java

diff --git a/src/test/java/net/onrc/onos/core/intent/ConstrainedBFSTreeTest.java b/src/test/java/net/onrc/onos/core/intent/ConstrainedBFSTreeTest.java
index 8d5a6d6..0e4ce87 100644
--- a/src/test/java/net/onrc/onos/core/intent/ConstrainedBFSTreeTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/ConstrainedBFSTreeTest.java
@@ -14,7 +14,7 @@
  * @author Toshio Koide (t-koide@onlab.us)
  */
 public class ConstrainedBFSTreeTest {
-    static long LOCAL_PORT = 0xFFFEL;
+    static final long LOCAL_PORT = 0xFFFEL;
 
     @Before
     public void setUp() throws Exception {
@@ -141,4 +141,4 @@
 
         assertNull(path3);
     }
-}
\ No newline at end of file
+}

src/test/java/net/onrc/onos/core/intent/ConstrainedShortestPathIntentTest.java

diff --git a/src/test/java/net/onrc/onos/core/intent/ConstrainedShortestPathIntentTest.java b/src/test/java/net/onrc/onos/core/intent/ConstrainedShortestPathIntentTest.java
index 6b13f6d..c8a4e0d 100644
--- a/src/test/java/net/onrc/onos/core/intent/ConstrainedShortestPathIntentTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/ConstrainedShortestPathIntentTest.java
@@ -50,7 +50,7 @@
         kryo.writeObject(output, intent1);
 
         output.close();
-        byte bytes[] = output.toBytes();
+        byte[] bytes = output.toBytes();
 
         Input input = new Input(bytes);
         ConstrainedShortestPathIntent intent2 = kryo.readObject(input, ConstrainedShortestPathIntent.class);

src/test/java/net/onrc/onos/core/intent/MockTopology.java

diff --git a/src/test/java/net/onrc/onos/core/intent/MockTopology.java b/src/test/java/net/onrc/onos/core/intent/MockTopology.java
index 680acc2..27fd96a 100644
--- a/src/test/java/net/onrc/onos/core/intent/MockTopology.java
+++ b/src/test/java/net/onrc/onos/core/intent/MockTopology.java
@@ -20,7 +20,7 @@
     // We may well need a MockTopology, but that's not what this class is
     // doing.
 
-    public static Long LOCAL_PORT = 0xFFFEL;
+    public static final Long LOCAL_PORT = 0xFFFEL;
     public SwitchImpl sw1, sw2, sw3, sw4;
 
     public Switch addSwitch(Long switchId) {

src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java

diff --git a/src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java b/src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java
index 2d57cfe..ff25bac 100644
--- a/src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java
@@ -139,7 +139,7 @@
      * Intent with the specified Intent Id.
      */
     public static class EntryForIntentMatcher extends TypeSafeMatcher<Collection<Intent>> {
-        final private String id;
+        private final String id;
 
         public EntryForIntentMatcher(String idValue) {
             id = idValue;
@@ -179,8 +179,8 @@
      * and that entry has a given state.
      */
     public static class IntentsHaveIntentWithStateMatcher extends TypeSafeMatcher<IntentMap> {
-        final private String id;
-        final private IntentState state;
+        private final String id;
+        private final IntentState state;
         private Intent intent;
 
         public IntentsHaveIntentWithStateMatcher(String idValue,

src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java

diff --git a/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java b/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java
index 8cacabc..30e2845 100644
--- a/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java
@@ -67,14 +67,14 @@
     private IEventChannel<Long, IntentOperationList> intentOperationChannel;
     private IEventChannel<Long, IntentStateList> intentStateChannel;
 
-    private static Long LOCAL_PORT = 0xFFFEL;
+    private static final Long LOCAL_PORT = 0xFFFEL;
 
     @SuppressWarnings("unchecked")
     @Before
     public void setUp() throws Exception {
-        MockTopology topology = new MockTopology();
-        topology.createSampleTopology1();
-        this.topology = topology;
+        MockTopology mockTopology = new MockTopology();
+        mockTopology.createSampleTopology1();
+        this.topology = mockTopology;
 
         datagridService = createMock(IDatagridService.class);
         topologyService = createMock(ITopologyService.class);
@@ -100,7 +100,7 @@
         expect(modContext.getServiceImpl(IRestApiService.class))
                 .andReturn(restApi).once();
 
-        expect(topologyService.getTopology()).andReturn(topology).anyTimes();
+        expect(topologyService.getTopology()).andReturn(mockTopology).anyTimes();
         topologyService.registerTopologyListener(anyObject(ITopologyListener.class));
         expectLastCall();