From 7a7a31ae0a390113399119835bdaa3a4ed694170 Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Sun, 18 Sep 2016 15:17:02 +0200
Subject: HONEYCOMB-116: refactor v3po tests to use CTU.mockMapping

Change-Id: I72d3a545d66e1280e34beff72adcdf876dae86fd
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 .../translate/v3po/vppstate/L2FibEntryCustomizerTest.java |  4 +---
 .../translate/v3po/vppstate/VersionCustomizerTest.java    |  8 ++++----
 .../honeycomb/translate/v3po/vppstate/VppStateTest.java   | 15 +++++++--------
 3 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate')

diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/L2FibEntryCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/L2FibEntryCustomizerTest.java
index 8e7e8bddc..4ccaa636b 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/L2FibEntryCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/L2FibEntryCustomizerTest.java
@@ -65,6 +65,7 @@ public class L2FibEntryCustomizerTest extends ListReaderCustomizerTest<L2FibEntr
     @Override
     public void setUpBefore() {
         bdContext = new NamingContext("generatedBdName", BD_CTX_NAME);
+        ContextTestUtils.mockMapping(mappingContext, BD_NAME, BD_ID, BD_CTX_NAME);
         interfacesContext = new NamingContext("generatedIfaceName", IFC_CTX_NAME);
     }
 
@@ -100,8 +101,6 @@ public class L2FibEntryCustomizerTest extends ListReaderCustomizerTest<L2FibEntr
     public void testRead() throws Exception {
         final long address_vpp = 0x0000010203040506L;
         final PhysAddress address = new PhysAddress("01:02:03:04:05:06");
-
-        ContextTestUtils.mockMapping(mappingContext, BD_NAME, BD_ID, BD_CTX_NAME);
         ContextTestUtils.mockMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
 
         whenL2FibTableDumpThenReturn(Collections.singletonList(generateL2FibEntry(address_vpp)));
@@ -128,7 +127,6 @@ public class L2FibEntryCustomizerTest extends ListReaderCustomizerTest<L2FibEntr
     public void testGetAllIds() throws Exception {
         final long address_vpp = 0x0000112233445566L;
         final PhysAddress address = new PhysAddress("11:22:33:44:55:66");
-        ContextTestUtils.mockMapping(mappingContext, BD_NAME, BD_ID, BD_CTX_NAME);
 
         whenL2FibTableDumpThenReturn(Collections.singletonList(generateL2FibEntry(address_vpp)));
 
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/VersionCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/VersionCustomizerTest.java
index aa4d4326c..1e0ff2429 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/VersionCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/VersionCustomizerTest.java
@@ -55,10 +55,10 @@ public class VersionCustomizerTest extends ReaderCustomizerTest<Version, Version
     public void testReadCurrentAttributes() throws Exception {
         final CompletableFuture<ShowVersionReply> replyFuture = new CompletableFuture<>();
         final ShowVersionReply reply = new ShowVersionReply();
-        reply.version = new byte[]{};
-        reply.program = new byte[]{};
-        reply.buildDate = new byte[]{};
-        reply.buildDirectory = new byte[]{};
+        reply.version = new byte[] {};
+        reply.program = new byte[] {};
+        reply.buildDate = new byte[] {};
+        reply.buildDirectory = new byte[] {};
         replyFuture.complete(reply);
 
         when(api.showVersion(any(ShowVersion.class))).thenReturn(replyFuture);
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/VppStateTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/VppStateTest.java
index 208fa2d8c..6b7ab71a2 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/VppStateTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/VppStateTest.java
@@ -73,6 +73,7 @@ import org.openvpp.jvpp.core.future.FutureJVppCore;
 
 public class VppStateTest {
 
+    private static final String BD_CTX_NAME = "bd-test-instance";
     @Mock
     private FutureJVppCore api;
     @Mock
@@ -92,7 +93,7 @@ public class VppStateTest {
         doReturn(cache).when(ctx).getModificationCache();
         doReturn(mappingContext).when(ctx).getMappingContext();
 
-        bdContext = new NamingContext("generatedBdName", "bd-test-instance");
+        bdContext = new NamingContext("generatedBdName", BD_CTX_NAME);
         interfaceContext = new NamingContext("generatedIfaceName", "ifc-test-instance");
         readerRegistry = VppStateTestUtils.getVppStateReader(api, bdContext);
     }
@@ -239,7 +240,7 @@ public class VppStateTest {
     }
 
     private void mockBdMapping(final BridgeDomainDetails bd, final String bdName) {
-        ContextTestUtils.mockMapping(mappingContext, bdName, bd.bdId, "bd-test-instance");
+        ContextTestUtils.mockMapping(mappingContext, bdName, bd.bdId, BD_CTX_NAME);
     }
 
     @Test
@@ -286,13 +287,11 @@ public class VppStateTest {
 
     @Test(expected = ReadFailedException.class)
     public void testReadBridgeDomainNotExisting() throws Exception {
-        doReturn(Optional.absent()).when(mappingContext).read(
-                ContextTestUtils.getMappingIid("NOT EXISTING", "bd-test-instance"));
+        final String nonExistingBdName = "NOT EXISTING";
+        ContextTestUtils.mockEmptyMapping(mappingContext, nonExistingBdName, BD_CTX_NAME);
 
-        final Optional<? extends DataObject> read =
-            readerRegistry.read(InstanceIdentifier.create(VppState.class).child(BridgeDomains.class).child(
-                BridgeDomain.class, new BridgeDomainKey("NOT EXISTING")), ctx);
-        assertFalse(read.isPresent());
+        readerRegistry.read(InstanceIdentifier.create(VppState.class).child(BridgeDomains.class).child(
+            BridgeDomain.class, new BridgeDomainKey(nonExistingBdName)), ctx);
     }
 
     @Test
-- 
cgit 1.2.3-korg