From 7a583394d0e81993e31c830a9d22f3ebb2a6de3e Mon Sep 17 00:00:00 2001
From: Srihari Raghavan <srihari@cisco.com>
Date: Sun, 26 Feb 2017 21:15:32 +0530
Subject: HC2VPP-63

Fix mistakenly used addStructuralReader. Thanks Jan Srnicek.

Change-Id: I2b3eb827ebd98a9260a514041489c602e2d409e4
Signed-off-by: Srihari Raghavan <srihari@cisco.com>
---
 .../impl/config/IoamPotWriterCustomizerTest.java     | 20 ++++++++++----------
 .../impl/oper/PotProfileReaderCustomizerTest.java    | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'ioam/impl/src/test')

diff --git a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamPotWriterCustomizerTest.java b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamPotWriterCustomizerTest.java
index 65727a573..fa4c959c3 100644
--- a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamPotWriterCustomizerTest.java
+++ b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamPotWriterCustomizerTest.java
@@ -47,7 +47,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 public class IoamPotWriterCustomizerTest extends WriterCustomizerTest {
 
     @Mock
-    protected FutureJVppIoampot jVppIoampot;
+    protected FutureJVppIoampot jVppIoamPot;
 
     private IoamPotWriterCustomizer customizer;
 
@@ -55,7 +55,7 @@ public class IoamPotWriterCustomizerTest extends WriterCustomizerTest {
 
     @Override
     public void setUpTest() throws Exception {
-        customizer = new IoamPotWriterCustomizer(jVppIoampot);
+        customizer = new IoamPotWriterCustomizer(jVppIoamPot);
     }
 
     private static PotProfileList generatePotProfileList() {
@@ -91,21 +91,21 @@ public class IoamPotWriterCustomizerTest extends WriterCustomizerTest {
     private void whenPotAddThenSuccess() {
         final PotProfileAddReply reply = new PotProfileAddReply();
         reply.context = 1;
-        doReturn(future(reply)).when(jVppIoampot).potProfileAdd(any(PotProfileAdd.class));
+        doReturn(future(reply)).when(jVppIoamPot).potProfileAdd(any(PotProfileAdd.class));
     }
 
     private void whenPotAddThenFailure() {
-        doReturn(failedFuture()).when(jVppIoampot).potProfileAdd(any(PotProfileAdd.class));
+        doReturn(failedFuture()).when(jVppIoamPot).potProfileAdd(any(PotProfileAdd.class));
     }
 
     private void whenPotDelThenSuccess() {
         final PotProfileDelReply reply = new PotProfileDelReply();
         reply.context = 1;
-        doReturn(future(reply)).when(jVppIoampot).potProfileDel(any(PotProfileDel.class));
+        doReturn(future(reply)).when(jVppIoamPot).potProfileDel(any(PotProfileDel.class));
     }
 
     private void whenPotDelThenFailure() {
-        doReturn(failedFuture()).when(jVppIoampot).potProfileDel(any(PotProfileDel.class));
+        doReturn(failedFuture()).when(jVppIoamPot).potProfileDel(any(PotProfileDel.class));
     }
 
     private static PotProfileAdd generatePotProfileAdd() {
@@ -141,7 +141,7 @@ public class IoamPotWriterCustomizerTest extends WriterCustomizerTest {
 
         customizer.writeCurrentAttributes(id, potProfileSet, writeContext);
 
-        verify(jVppIoampot).potProfileAdd(generatePotProfileAdd());
+        verify(jVppIoamPot).potProfileAdd(generatePotProfileAdd());
     }
 
     @Test
@@ -154,7 +154,7 @@ public class IoamPotWriterCustomizerTest extends WriterCustomizerTest {
         try {
             customizer.writeCurrentAttributes(id, potProfileSet, writeContext);
         } catch (WriteFailedException e) {
-            verify(jVppIoampot).potProfileAdd(generatePotProfileAdd());
+            verify(jVppIoamPot).potProfileAdd(generatePotProfileAdd());
 
             return;
         }
@@ -170,7 +170,7 @@ public class IoamPotWriterCustomizerTest extends WriterCustomizerTest {
 
         customizer.deleteCurrentAttributes(id, potProfileSet, writeContext);
 
-        verify(jVppIoampot).potProfileDel(generatePotProfileDel(POT_TEST_NAME));
+        verify(jVppIoamPot).potProfileDel(generatePotProfileDel(POT_TEST_NAME));
     }
 
     @Test
@@ -183,7 +183,7 @@ public class IoamPotWriterCustomizerTest extends WriterCustomizerTest {
         try {
             customizer.deleteCurrentAttributes(id, potProfileSet, writeContext);
         } catch (WriteFailedException e) {
-            verify(jVppIoampot).potProfileDel(generatePotProfileDel(POT_TEST_NAME));
+            verify(jVppIoamPot).potProfileDel(generatePotProfileDel(POT_TEST_NAME));
             return;
         }
         fail("WriteFailedException.DeleteFailedException was expected");
diff --git a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/oper/PotProfileReaderCustomizerTest.java b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/oper/PotProfileReaderCustomizerTest.java
index 779ec19fe..80e71f610 100644
--- a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/oper/PotProfileReaderCustomizerTest.java
+++ b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/oper/PotProfileReaderCustomizerTest.java
@@ -45,19 +45,19 @@ public class PotProfileReaderCustomizerTest extends ListReaderCustomizerTest<Pot
         PotProfileListBuilder>{
 
     @Mock
-    FutureJVppIoampot jVppIoampot;
+    FutureJVppIoampot jVppIoamPot;
 
-    public PotProfileReaderCustomizerTest(){
+    public PotProfileReaderCustomizerTest() {
         super(PotProfileList.class, PotProfileSetBuilder.class);
     }
 
     @Override
     protected ReaderCustomizer<PotProfileList, PotProfileListBuilder> initCustomizer() {
-        return new PotProfileReaderCustomizer(jVppIoampot);
+        return new PotProfileReaderCustomizer(jVppIoamPot);
     }
 
     @Override
-    public void setUp(){
+    public void setUp() {
         final PotProfileShowConfigDetailsReplyDump replyDump = new PotProfileShowConfigDetailsReplyDump();
         final PotProfileShowConfigDetails replyDetails = new PotProfileShowConfigDetails();
         replyDetails.bitMask = (long)0xF;
@@ -69,7 +69,7 @@ public class PotProfileReaderCustomizerTest extends ListReaderCustomizerTest<Pot
         replyDetails.secretShare = 1234;
         replyDetails.validator = 1;
         replyDump.potProfileShowConfigDetails = Lists.newArrayList(replyDetails);
-        doReturn(future(replyDump)).when(jVppIoampot).potProfileShowConfigDump(any(PotProfileShowConfigDump.class));
+        doReturn(future(replyDump)).when(jVppIoamPot).potProfileShowConfigDump(any(PotProfileShowConfigDump.class));
     }
 
     private InstanceIdentifier<PotProfileList> getPotProfileListId(int id){
-- 
cgit 1.2.3-korg