From 98666a011d7538ac9742a8351856f76fbe7d8e69 Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Mon, 9 Jan 2017 08:23:45 +0100
Subject: 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>
---
 .../translate/impl/read/GenericReaderTest.java     | 58 +++-------------------
 1 file changed, 6 insertions(+), 52 deletions(-)

(limited to 'infra/translate-impl/src/test/java/io/fd/honeycomb/translate/impl/read/GenericReaderTest.java')

diff --git a/infra/translate-impl/src/test/java/io/fd/honeycomb/translate/impl/read/GenericReaderTest.java b/infra/translate-impl/src/test/java/io/fd/honeycomb/translate/impl/read/GenericReaderTest.java
index 02baab2eb..7b999bec0 100644
--- a/infra/translate-impl/src/test/java/io/fd/honeycomb/translate/impl/read/GenericReaderTest.java
+++ b/infra/translate-impl/src/test/java/io/fd/honeycomb/translate/impl/read/GenericReaderTest.java
@@ -16,64 +16,18 @@
 
 package io.fd.honeycomb.translate.impl.read;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import io.fd.honeycomb.translate.read.ReadContext;
 import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-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.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class GenericReaderTest {
 
-    private static final InstanceIdentifier<DataObject>
-            DATA_OBJECT_ID = InstanceIdentifier.create(DataObject.class);
-    @Mock
-    private ReaderCustomizer<DataObject, Builder<DataObject>> customizer;
-    @Mock
-    private Builder<DataObject> builder;
-    @Mock
-    private DataObject data;
-    @Mock
-    private ReadContext ctx;
-    private GenericReader<DataObject, Builder<DataObject>> reader;
+public class GenericReaderTest extends AbstractReaderTest {
 
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        when(customizer.getBuilder(DATA_OBJECT_ID)).thenReturn(builder);
-        reader = new GenericReader<>(DATA_OBJECT_ID, customizer);
-        when(builder.build()).thenReturn(data);
+    public GenericReaderTest() {
+        super(ReaderCustomizer.class);
     }
 
-    @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);
-    }
-
-    @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);
+    @Override
+    protected GenericReader<DataObject,Builder<DataObject>> initReader() {
+        return new GenericReader<>(DATA_OBJECT_ID, getCustomizer());
     }
 }
\ No newline at end of file
-- 
cgit 1.2.3-korg