diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2016-04-01 12:33:39 +0200 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2016-04-01 12:53:15 +0200 |
| commit | 355c2205a7088bc7b3ccabc278c477b838975c65 (patch) | |
| tree | 18f5f82861513318c2ee14dfd18cc63001b4fdfd /v3po/impl/src/test/java/io/fd/honeycomb/v3po/impl/vpp/VppTest.java | |
| parent | 4c4f1743dc29e87b0ab4b39087f79f7f01befa49 (diff) | |
VPP API <-> YANG translation layer integration #2(Writers)
Change-Id: If91364f1900693b040aee163f1c6e092381b0efd
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'v3po/impl/src/test/java/io/fd/honeycomb/v3po/impl/vpp/VppTest.java')
| -rw-r--r-- | v3po/impl/src/test/java/io/fd/honeycomb/v3po/impl/vpp/VppTest.java | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/v3po/impl/src/test/java/io/fd/honeycomb/v3po/impl/vpp/VppTest.java b/v3po/impl/src/test/java/io/fd/honeycomb/v3po/impl/vpp/VppTest.java index beec76ab1..bf7b9de4b 100644 --- a/v3po/impl/src/test/java/io/fd/honeycomb/v3po/impl/vpp/VppTest.java +++ b/v3po/impl/src/test/java/io/fd/honeycomb/v3po/impl/vpp/VppTest.java @@ -16,6 +16,7 @@ package io.fd.honeycomb.v3po.impl.vpp; +import static io.fd.honeycomb.v3po.impl.vpp.BridgeDomainTestUtils.BD_NAME_TO_ID_ANSWER; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; @@ -33,8 +34,6 @@ import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.Vpp; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VppBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.vpp.BridgeDomains; @@ -71,14 +70,8 @@ public class VppTest { public void setUp() throws Exception { api = PowerMockito.mock(vppApi.class); ctx = mock(WriteContext.class); - PowerMockito.doAnswer(new Answer<Integer>() { - @Override - public Integer answer(final InvocationOnMock invocationOnMock) throws Throwable { - final String bName = (String) invocationOnMock.getArguments()[0]; - return Integer.parseInt(((Character)bName.charAt(bName.length() - 1)).toString()); - } - }).when(api).findOrAddBridgeDomainId(anyString()); - PowerMockito.doReturn(1).when(api).bridgeDomainIdFromName(anyString()); + PowerMockito.doAnswer(BD_NAME_TO_ID_ANSWER).when(api).findOrAddBridgeDomainId(anyString()); + PowerMockito.doAnswer(BD_NAME_TO_ID_ANSWER).when(api).bridgeDomainIdFromName(anyString()); PowerMockito.doReturn(1).when(api).getRetval(anyInt(), anyInt()); vppWriter = VppUtils.getVppWriter(api); rootRegistry = new DelegatingWriterRegistry( |