From 66588c9dbb53da4656af2983bb8f71ade863420c Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Mon, 26 Sep 2016 08:20:34 +0200 Subject: HONEYCOMB-116: generic merge test for reader customizers Change-Id: I5c2505e6b3bcf622312f8dc324912507f6519a5b Signed-off-by: Marek Gradzki --- .../v3po/vppclassifier/ClassifySessionReaderTest.java | 11 +---------- .../translate/v3po/vppclassifier/ClassifyTableReaderTest.java | 10 +--------- 2 files changed, 2 insertions(+), 19 deletions(-) (limited to 'v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier') diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifySessionReaderTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifySessionReaderTest.java index f45367098..31a1e1292 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifySessionReaderTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifySessionReaderTest.java @@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals; 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.ModificationCache; @@ -58,7 +57,7 @@ public class ClassifySessionReaderTest extends private VppClassifierContextManager classifierContext; public ClassifySessionReaderTest() { - super(ClassifySession.class); + super(ClassifySession.class, ClassifyTableBuilder.class); } @Override @@ -73,14 +72,6 @@ public class ClassifySessionReaderTest extends .child(ClassifySession.class, new ClassifySessionKey(new HexString(match))); } - @Test - public void testMerge() { - final ClassifyTableBuilder builder = mock(ClassifyTableBuilder.class); - final List value = mock(List.class); - getCustomizer().merge(builder, value); - verify(builder).setClassifySession(value); - } - @Test public void testReadWithCache() throws ReadFailedException { final InstanceIdentifier id = getClassifySessionId(TABLE_NAME, MATCH_1); diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifyTableReaderTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifyTableReaderTest.java index 95864ce6e..cc5ac6b7d 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifyTableReaderTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifyTableReaderTest.java @@ -58,7 +58,7 @@ public class ClassifyTableReaderTest extends private VppClassifierContextManager classifierContext; public ClassifyTableReaderTest() { - super(ClassifyTable.class); + super(ClassifyTable.class, VppClassifierStateBuilder.class); } @Override @@ -94,14 +94,6 @@ public class ClassifyTableReaderTest extends verify(builder).setActiveSessions(0L); } - @Test - public void testMerge() { - final VppClassifierStateBuilder builder = mock(VppClassifierStateBuilder.class); - final List value = mock(List.class); - getCustomizer().merge(builder, value); - verify(builder).setClassifyTable(value); - } - @Test public void testRead() throws ReadFailedException { doReturn(future(generateClassifyTableInfoReply())).when(api).classifyTableInfo(any(ClassifyTableInfo.class)); -- cgit 1.2.3-korg