From 757222979bc02d0aaba1870eea36413383d15bde Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Tue, 8 Nov 2016 10:13:36 +0100 Subject: HONEYCOMB-270 Add isPresent() to Readers/Customizers So that they can influence whether empty data is to be considered as present + Move registries implementations from util to impl + Introduce DelegatingReader trait + Extend GenericReader where possible to reduce duplication Change-Id: I5a416acd0c4eab1fbc30fcbe585719991dbe9215 Signed-off-by: Maros Marsalek --- .../read/registry/CompositeReaderRegistryTest.java | 112 --------------------- 1 file changed, 112 deletions(-) delete mode 100644 infra/translate-utils/src/test/java/io/fd/honeycomb/translate/util/read/registry/CompositeReaderRegistryTest.java (limited to 'infra/translate-utils/src/test/java/io/fd/honeycomb/translate/util/read/registry/CompositeReaderRegistryTest.java') diff --git a/infra/translate-utils/src/test/java/io/fd/honeycomb/translate/util/read/registry/CompositeReaderRegistryTest.java b/infra/translate-utils/src/test/java/io/fd/honeycomb/translate/util/read/registry/CompositeReaderRegistryTest.java deleted file mode 100644 index 06cb8498f..000000000 --- a/infra/translate-utils/src/test/java/io/fd/honeycomb/translate/util/read/registry/CompositeReaderRegistryTest.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (c) 2016 Cisco and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.fd.honeycomb.translate.util.read.registry; - -import static io.fd.honeycomb.translate.util.DataObjects.DataObject3; -import static io.fd.honeycomb.translate.util.DataObjects.DataObject3.DataObject31; -import static io.fd.honeycomb.translate.util.DataObjects.DataObject4; -import static io.fd.honeycomb.translate.util.DataObjects.DataObject4.DataObject41; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.inOrder; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import com.google.common.base.Optional; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import io.fd.honeycomb.translate.read.ReadContext; -import io.fd.honeycomb.translate.read.Reader; -import org.junit.Before; -import org.junit.Test; -import org.mockito.InOrder; -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 CompositeReaderRegistryTest { - - @Mock - private ReadContext ctx; - private CompositeReaderRegistry reg; - private Reader> reader31; - private Reader> rootReader3; - private Reader> reader41; - private Reader> rootReader4; - - @Before - public void setUp() throws Exception { - MockitoAnnotations.initMocks(this); - - reader31 = mockReader(DataObject31.class); - rootReader3 = - spy(CompositeReader.createForReader( - mockReader(DataObject3.class), - ImmutableMap.of(DataObject31.class, reader31))); - - reader41 = mockReader(DataObject41.class); - rootReader4 = - spy(CompositeReader.createForReader( - mockReader(DataObject4.class), ImmutableMap.of( - DataObject41.class, reader41))); - - reg = new CompositeReaderRegistry(Lists.newArrayList(rootReader3, rootReader4)); - } - - @Test - public void testReadAll() throws Exception { - reg.readAll(ctx); - - // Invoked according to composite ordering - final InOrder inOrder = inOrder(rootReader3, rootReader4, reader31, reader41); - inOrder.verify(rootReader3).read(any(InstanceIdentifier.class), any(ReadContext.class)); - inOrder.verify(reader31).read(any(InstanceIdentifier.class), any(ReadContext.class)); - inOrder.verify(rootReader4).read(any(InstanceIdentifier.class), any(ReadContext.class)); - inOrder.verify(reader41).read(any(InstanceIdentifier.class), any(ReadContext.class)); - } - - @Test - public void testReadSingleRoot() throws Exception { - reg.read(DataObject3.IID, ctx); - - // Invoked according to composite ordering - final InOrder inOrder = inOrder(rootReader3, rootReader4, reader31, reader41); - inOrder.verify(rootReader3).read(any(InstanceIdentifier.class), any(ReadContext.class)); - inOrder.verify(reader31).read(any(InstanceIdentifier.class), any(ReadContext.class)); - - // Only subtree under DataObject3 should be read - verify(rootReader4, times(0)).read(any(InstanceIdentifier.class), any(ReadContext.class)); - verify(reader41, times(0)).read(any(InstanceIdentifier.class), any(ReadContext.class)); - } - - @SuppressWarnings("unchecked") - static > Reader mockReader(final Class dataType) - throws Exception { - final Reader r = mock(Reader.class); - final Object iid = dataType.getDeclaredField("IID").get(null); - when(r.getManagedDataObjectType()).thenReturn((InstanceIdentifier) iid); - final Builder builder = mock(Builder.class); - when(builder.build()).thenReturn(mock(dataType)); - when(r.getBuilder(any(InstanceIdentifier.class))).thenReturn(builder); - when(r.read(any(InstanceIdentifier.class), any(ReadContext.class))).thenReturn(Optional.of(mock(dataType))); - return (Reader) r; - } -} \ No newline at end of file -- cgit 1.2.3-korg