1 files changed, 14 insertions, 13 deletions

diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/AclCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/AclCustomizerTest.java
index 8977a74bf..b04b94430 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/AclCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/AclCustomizerTest.java
@@ -17,10 +17,11 @@
 package io.fd.honeycomb.translate.v3po.interfacesstate;
 
 import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
+import io.fd.honeycomb.translate.read.ReadFailedException;
 import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
 import io.fd.honeycomb.translate.v3po.util.NamingContext;
 import io.fd.honeycomb.translate.v3po.vppclassifier.VppClassifierContextManager;
@@ -36,7 +37,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces.state._interface.Acl;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces.state._interface.AclBuilder;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.openvpp.jvpp.core.dto.ClassifyTableByInterface;
 import org.openvpp.jvpp.core.dto.ClassifyTableByInterfaceReply;
 
 public class AclCustomizerTest extends ReaderCustomizerTest<Acl, AclBuilder> {
@@ -45,6 +45,9 @@ public class AclCustomizerTest extends ReaderCustomizerTest<Acl, AclBuilder> {
     private static final int IF_INDEX = 1;
     private static final int TABLE_INDEX = 123;
     private static final String TABLE_NAME = "table123";
+    private static final InstanceIdentifier<Acl> IID =
+        InstanceIdentifier.create(InterfacesState.class).child(Interface.class, new InterfaceKey(IF_NAME))
+            .augmentation(VppInterfaceStateAugmentation.class).child(Acl.class);
 
     private static final String IFC_CTX_NAME = "ifc-test-instance";
 
@@ -68,30 +71,28 @@ public class AclCustomizerTest extends ReaderCustomizerTest<Acl, AclBuilder> {
         return new AclCustomizer(api, interfaceContext, classifyTableContext);
     }
 
-    private InstanceIdentifier<Acl> getAclId(final String name) {
-        return InstanceIdentifier.create(InterfacesState.class).child(Interface.class, new InterfaceKey(name))
-            .augmentation(
-                VppInterfaceStateAugmentation.class).child(Acl.class);
-    }
-
     @Test
-    public void testRead() throws Exception {
-        final InstanceIdentifier<Acl> id = getAclId(IF_NAME);
+    public void testRead() throws ReadFailedException {
         final AclBuilder builder = mock(AclBuilder.class);
 
         final ClassifyTableByInterfaceReply reply = new ClassifyTableByInterfaceReply();
         reply.l2TableId = TABLE_INDEX;
         reply.ip4TableId = ~0;
         reply.ip6TableId = ~0;
-        doReturn(future(reply)).when(api).classifyTableByInterface(any(ClassifyTableByInterface.class));
+        when(api.classifyTableByInterface(any())).thenReturn(future(reply));
 
-        doReturn(TABLE_NAME).when(classifyTableContext).getTableName(TABLE_INDEX, mappingContext);
+        when(classifyTableContext.getTableName(TABLE_INDEX, mappingContext)).thenReturn(TABLE_NAME);
 
-        getCustomizer().readCurrentAttributes(id, builder, ctx);
+        getCustomizer().readCurrentAttributes(IID, builder, ctx);
 
         verify(builder).setL2Acl(new L2AclBuilder().setClassifyTable(TABLE_NAME).build());
         verify(builder).setIp4Acl(null);
         verify(builder).setIp6Acl(null);
     }
 
+    @Test(expected = ReadFailedException.class)
+    public void testReadFailed() throws ReadFailedException {
+        when(api.classifyTableByInterface(any())).thenReturn(failedFuture());
+        getCustomizer().readCurrentAttributes(IID, mock(AclBuilder.class), ctx);
+    }
 }
\ No newline at end of file