X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=fibmanager%2Ffibmanager-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fvpnservice%2Ffibmanager%2Ftest%2FFibManagerTest.java;fp=fibmanager%2Ffibmanager-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fvpnservice%2Ffibmanager%2Ftest%2FFibManagerTest.java;h=49b0645a76a53ca8d48319c535c9c1a022c25421;hb=bf763e40df1a5d0e6831e1d8a6005bd2d721b8fa;hp=6af4c4335e569490a8c1e2c2992623485d9b14f3;hpb=2654766bf8e84f41e72fae4af450bf1705641506;p=vpnservice.git

diff --git a/fibmanager/fibmanager-impl/src/test/java/org/opendaylight/vpnservice/fibmanager/test/FibManagerTest.java b/fibmanager/fibmanager-impl/src/test/java/org/opendaylight/vpnservice/fibmanager/test/FibManagerTest.java
index 6af4c433..49b0645a 100644
--- a/fibmanager/fibmanager-impl/src/test/java/org/opendaylight/vpnservice/fibmanager/test/FibManagerTest.java
+++ b/fibmanager/fibmanager-impl/src/test/java/org/opendaylight/vpnservice/fibmanager/test/FibManagerTest.java
@@ -7,27 +7,25 @@
  */
 package org.opendaylight.vpnservice.fibmanager.test;
 
+import java.math.BigInteger;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-
 import static org.junit.Assert.*;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.when;
-
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -85,19 +83,20 @@ public class FibManagerTest {
 
   MockDataChangedEvent dataChangeEvent;
   FibManager fibmgr;
-  Long EgressPointer = 11L;
+  private static final Long EgressPointer = 11L;
   VrfEntry vrfEntry;
   InstanceIdentifier<VrfEntry> identifier;
   VrfEntryBuilder vrfbuilder;
-  String rd = "routeDis";
-  String prefix = "0.1.2.3";
-  String nexthop = "1.1.1.1";
-  int label = 10;
-  List<Long> Dpns;
+  private static final String rd = "routeDis";
+  private static final String prefix = "0.1.2.3";
+  private static final String nexthop = "1.1.1.1";
+  private static final int label = 10;
+  List<BigInteger> Dpns;
+  private static final long vpnId = 101L;
 
   private void SetupMocks() {
-    Dpns = new ArrayList<Long>();
-    Dpns.add(100000L);
+    Dpns = new ArrayList<BigInteger>();
+    Dpns.add(BigInteger.valueOf(100000L));
     identifier = buildVrfEntryId(rd, prefix);
     vrfEntry = buildVrfEntry(rd, prefix, nexthop, label);
     fibmgr.setMdsalManager(mdsalManager);
@@ -117,13 +116,13 @@ public class FibManagerTest {
     dataChangeEvent = new MockDataChangedEvent();
     vrfbuilder = new VrfEntryBuilder();
     fibmgr = new FibManager(dataBroker, l3nexthopService) {
-      protected GetEgressPointerOutput resolveAdjacency(final long dpId, final long vpnId,
+      protected GetEgressPointerOutput resolveAdjacency(final BigInteger dpId, final long vpnId,
           final VrfEntry vrfEntry) {
         return adjacency;
       }
 
       protected Long getVpnId(String rd) {
-        return 101L;
+        return vpnId;
       }
     };
     SetupMocks();