diff options
author | Marek Gradzki <mgradzki@cisco.com> | 2017-01-09 08:23:45 +0100 |
---|---|---|
committer | Marek Gradzki <mgradzki@cisco.com> | 2017-01-10 07:41:32 +0000 |
commit | 98666a011d7538ac9742a8351856f76fbe7d8e69 (patch) | |
tree | 1b955cd53a0a78eefb9e1c04413fd3f7dd0b6b9a /infra/translate-impl/src/test/java/io/fd/honeycomb/translate/impl/read/GenericListReaderTest.java | |
parent | 75f0efb8b1aff9e9be8d222fd90d1df7ce542bbc (diff) |
HONEYCOMB-331: unify initialization handling
Due to incorrect instance of check, InitSubtreeReader was never created
in CompositeReaderRegistryBuilder.getSubtreeHandler().
As a consequence, initializers registered by subtreeAdd*, were not invoked.
The patch:
- fixes mentioned check,
- makes readers implement InitReader instead of directly
implementing Initializer
- includes missing unit tests for GenericReaders.
Change-Id: I93be59fafddb60dce00191958b5c8c62e7c2d289
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'infra/translate-impl/src/test/java/io/fd/honeycomb/translate/impl/read/GenericListReaderTest.java')
-rw-r--r-- | infra/translate-impl/src/test/java/io/fd/honeycomb/translate/impl/read/GenericListReaderTest.java | 101 |
1 files changed, 6 insertions, 95 deletions
diff --git a/infra/translate-impl/src/test/java/io/fd/honeycomb/translate/impl/read/GenericListReaderTest.java b/infra/translate-impl/src/test/java/io/fd/honeycomb/translate/impl/read/GenericListReaderTest.java index 3ed400dba..d3959ed3c 100644 --- a/infra/translate-impl/src/test/java/io/fd/honeycomb/translate/impl/read/GenericListReaderTest.java +++ b/infra/translate-impl/src/test/java/io/fd/honeycomb/translate/impl/read/GenericListReaderTest.java @@ -16,106 +16,17 @@ package io.fd.honeycomb.translate.impl.read; -import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import com.google.common.collect.Lists; -import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; -import java.util.List; -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; import org.opendaylight.yangtools.concepts.Builder; -import org.opendaylight.yangtools.yang.binding.DataContainer; -import org.opendaylight.yangtools.yang.binding.DataObject; -import org.opendaylight.yangtools.yang.binding.Identifiable; -import org.opendaylight.yangtools.yang.binding.Identifier; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; - -public class GenericListReaderTest { - - private static final InstanceIdentifier<TestingData> - DATA_OBJECT_ID = InstanceIdentifier.create(TestingData.class); - @Mock - private ListReaderCustomizer<TestingData, TestingData.TestingKey, Builder<TestingData>> customizer; - @Mock - private Builder<TestingData> builder; - @Mock - private TestingData data; - @Mock - private ReadContext ctx; - private GenericListReader<TestingData, TestingData.TestingKey, Builder<TestingData>> reader; - private List<TestingData.TestingKey> keys = Lists.newArrayList(new TestingData.TestingKey(), - new TestingData.TestingKey()); - - @SuppressWarnings("unchecked") - @Before - public void setUp() throws Exception { - MockitoAnnotations.initMocks(this); - when(customizer.getBuilder(any(InstanceIdentifier.class))).thenReturn(builder); - when(customizer.getAllIds(DATA_OBJECT_ID, ctx)).thenReturn(keys); - reader = new GenericListReader<>(DATA_OBJECT_ID, customizer); - when(builder.build()).thenReturn(data); - } - @Test - public void testGetBuilder() throws Exception { - assertEquals(builder, reader.getBuilder(DATA_OBJECT_ID)); - verify(customizer).getBuilder(DATA_OBJECT_ID); - } - - @Test - public void testManagedType() throws Exception { - assertEquals(DATA_OBJECT_ID, reader.getManagedDataObjectType()); - } - - @Test - public void testMerge() throws Exception { - reader.merge(builder, data); - verify(customizer).merge(builder, data); - } +public class GenericListReaderTest extends AbstractListReaderTest { - @Test - public void testAllIds() throws Exception { - assertEquals(keys, reader.getAllIds(DATA_OBJECT_ID, ctx)); - verify(customizer).getAllIds(DATA_OBJECT_ID, ctx); + public GenericListReaderTest() { + super(ListReaderCustomizer.class); } - @Test - public void testRead() throws Exception { - reader.read(DATA_OBJECT_ID, ctx); - - verify(customizer).getBuilder(DATA_OBJECT_ID); - verify(customizer).readCurrentAttributes(DATA_OBJECT_ID, builder, ctx); - } - - @SuppressWarnings("unchecked") - @Test - public void testReadList() throws Exception { - reader.readList(DATA_OBJECT_ID, ctx); - - verify(customizer, times(2)).getBuilder(any(InstanceIdentifier.class)); - verify(customizer, times(2)) - .readCurrentAttributes(any(InstanceIdentifier.class), any(Builder.class), any(ReadContext.class)); - } - - static class TestingData implements DataObject, Identifiable<TestingData.TestingKey> { - - @Override - public Class<? extends DataContainer> getImplementedInterface() { - return DataObject.class; - } - - @Override - public TestingKey getKey() { - return new TestingKey(); - } - - static class TestingKey implements Identifier<TestingData> {} + @Override + protected GenericListReader<TestingData, TestingData.TestingKey, Builder<TestingData>> initReader() { + return new GenericListReader<>(DATA_OBJECT_ID, getCustomizer()); } }
\ No newline at end of file |