diff options
Diffstat (limited to 'v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry')
3 files changed, 49 insertions, 93 deletions
diff --git a/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry/FlatWriterRegistryBuilderTest.java b/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry/FlatWriterRegistryBuilderTest.java index da7ac0947..743d84cbf 100644 --- a/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry/FlatWriterRegistryBuilderTest.java +++ b/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry/FlatWriterRegistryBuilderTest.java @@ -13,11 +13,11 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import io.fd.honeycomb.v3po.translate.util.DataObjects; import io.fd.honeycomb.v3po.translate.write.Writer; import java.util.ArrayList; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.yang.binding.ChildOf; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; @@ -31,19 +31,19 @@ public class FlatWriterRegistryBuilderTest { 1 -> 2 -> 3 -> 4 */ - flatWriterRegistryBuilder.add(mockWriter(DataObject3.class)); - flatWriterRegistryBuilder.add(mockWriter(DataObject4.class)); - flatWriterRegistryBuilder.addBefore(mockWriter(DataObject2.class), - Lists.newArrayList(DataObject3.IID, DataObject4.IID)); - flatWriterRegistryBuilder.addBefore(mockWriter(DataObject1.class), DataObject2.IID); + flatWriterRegistryBuilder.add(mockWriter(DataObjects.DataObject3.class)); + flatWriterRegistryBuilder.add(mockWriter(DataObjects.DataObject4.class)); + flatWriterRegistryBuilder.addBefore(mockWriter(DataObjects.DataObject2.class), + Lists.newArrayList(DataObjects.DataObject3.IID, DataObjects.DataObject4.IID)); + flatWriterRegistryBuilder.addBefore(mockWriter(DataObjects.DataObject1.class), DataObjects.DataObject2.IID); final ImmutableMap<InstanceIdentifier<?>, Writer<?>> mappedWriters = flatWriterRegistryBuilder.getMappedHandlers(); final ArrayList<InstanceIdentifier<?>> typesInList = Lists.newArrayList(mappedWriters.keySet()); - assertEquals(DataObject1.IID, typesInList.get(0)); - assertEquals(DataObject2.IID, typesInList.get(1)); - assertThat(typesInList.get(2), anyOf(equalTo(DataObject3.IID), equalTo(DataObject4.IID))); - assertThat(typesInList.get(3), anyOf(equalTo(DataObject3.IID), equalTo(DataObject4.IID))); + assertEquals(DataObjects.DataObject1.IID, typesInList.get(0)); + assertEquals(DataObjects.DataObject2.IID, typesInList.get(1)); + assertThat(typesInList.get(2), anyOf(equalTo(DataObjects.DataObject3.IID), equalTo(DataObjects.DataObject4.IID))); + assertThat(typesInList.get(3), anyOf(equalTo(DataObjects.DataObject3.IID), equalTo(DataObjects.DataObject4.IID))); } @Test @@ -53,18 +53,18 @@ public class FlatWriterRegistryBuilderTest { 1 -> 2 -> 3 -> 4 */ - flatWriterRegistryBuilder.add(mockWriter(DataObject1.class)); - flatWriterRegistryBuilder.addAfter(mockWriter(DataObject2.class), DataObject1.IID); - flatWriterRegistryBuilder.addAfter(mockWriter(DataObject3.class), DataObject2.IID); - flatWriterRegistryBuilder.addAfter(mockWriter(DataObject4.class), DataObject2.IID); + flatWriterRegistryBuilder.add(mockWriter(DataObjects.DataObject1.class)); + flatWriterRegistryBuilder.addAfter(mockWriter(DataObjects.DataObject2.class), DataObjects.DataObject1.IID); + flatWriterRegistryBuilder.addAfter(mockWriter(DataObjects.DataObject3.class), DataObjects.DataObject2.IID); + flatWriterRegistryBuilder.addAfter(mockWriter(DataObjects.DataObject4.class), DataObjects.DataObject2.IID); final ImmutableMap<InstanceIdentifier<?>, Writer<?>> mappedWriters = flatWriterRegistryBuilder.getMappedHandlers(); final List<InstanceIdentifier<?>> typesInList = Lists.newArrayList(mappedWriters.keySet()); - assertEquals(DataObject1.IID, typesInList.get(0)); - assertEquals(DataObject2.IID, typesInList.get(1)); - assertThat(typesInList.get(2), anyOf(equalTo(DataObject3.IID), equalTo(DataObject4.IID))); - assertThat(typesInList.get(3), anyOf(equalTo(DataObject3.IID), equalTo(DataObject4.IID))); + assertEquals(DataObjects.DataObject1.IID, typesInList.get(0)); + assertEquals(DataObjects.DataObject2.IID, typesInList.get(1)); + assertThat(typesInList.get(2), anyOf(equalTo(DataObjects.DataObject3.IID), equalTo(DataObjects.DataObject4.IID))); + assertThat(typesInList.get(3), anyOf(equalTo(DataObjects.DataObject3.IID), equalTo(DataObjects.DataObject4.IID))); } @Test(expected = IllegalArgumentException.class) @@ -73,51 +73,51 @@ public class FlatWriterRegistryBuilderTest { /* 1 -> 2 -> 1 */ - flatWriterRegistryBuilder.add(mockWriter(DataObject1.class)); - flatWriterRegistryBuilder.addAfter(mockWriter(DataObject2.class), DataObject1.IID); - flatWriterRegistryBuilder.addAfter(mockWriter(DataObject1.class), DataObject2.IID); + flatWriterRegistryBuilder.add(mockWriter(DataObjects.DataObject1.class)); + flatWriterRegistryBuilder.addAfter(mockWriter(DataObjects.DataObject2.class), DataObjects.DataObject1.IID); + flatWriterRegistryBuilder.addAfter(mockWriter(DataObjects.DataObject1.class), DataObjects.DataObject2.IID); } @Test(expected = IllegalArgumentException.class) public void testAddWriterTwice() throws Exception { final FlatWriterRegistryBuilder flatWriterRegistryBuilder = new FlatWriterRegistryBuilder(); - flatWriterRegistryBuilder.add(mockWriter(DataObject1.class)); - flatWriterRegistryBuilder.add(mockWriter(DataObject1.class)); + flatWriterRegistryBuilder.add(mockWriter(DataObjects.DataObject1.class)); + flatWriterRegistryBuilder.add(mockWriter(DataObjects.DataObject1.class)); } @Test public void testAddSubtreeWriter() throws Exception { final FlatWriterRegistryBuilder flatWriterRegistryBuilder = new FlatWriterRegistryBuilder(); flatWriterRegistryBuilder.subtreeAdd( - Sets.newHashSet(DataObject4.DataObject5.IID, - DataObject4.DataObject5.IID), - mockWriter(DataObject4.class)); + Sets.newHashSet(DataObjects.DataObject4.DataObject41.IID, + DataObjects.DataObject4.DataObject41.IID), + mockWriter(DataObjects.DataObject4.class)); final ImmutableMap<InstanceIdentifier<?>, Writer<?>> mappedWriters = flatWriterRegistryBuilder.getMappedHandlers(); final ArrayList<InstanceIdentifier<?>> typesInList = Lists.newArrayList(mappedWriters.keySet()); - assertEquals(DataObject4.IID, typesInList.get(0)); + assertEquals(DataObjects.DataObject4.IID, typesInList.get(0)); assertEquals(1, typesInList.size()); } @Test public void testCreateSubtreeWriter() throws Exception { final Writer<?> forWriter = SubtreeWriter.createForWriter(Sets.newHashSet( - DataObject4.DataObject5.IID, - DataObject4.DataObject5.DataObject51.IID, - DataObject4.DataObject6.IID), - mockWriter(DataObject4.class)); + DataObjects.DataObject4.DataObject41.IID, + DataObjects.DataObject4.DataObject41.DataObject411.IID, + DataObjects.DataObject4.DataObject42.IID), + mockWriter(DataObjects.DataObject4.class)); assertThat(forWriter, instanceOf(SubtreeWriter.class)); assertThat(((SubtreeWriter<?>) forWriter).getHandledChildTypes().size(), is(3)); - assertThat(((SubtreeWriter<?>) forWriter).getHandledChildTypes(), hasItems(DataObject4.DataObject5.IID, - DataObject4.DataObject6.IID, DataObject4.DataObject5.DataObject51.IID)); + assertThat(((SubtreeWriter<?>) forWriter).getHandledChildTypes(), hasItems(DataObjects.DataObject4.DataObject41.IID, + DataObjects.DataObject4.DataObject42.IID, DataObjects.DataObject4.DataObject41.DataObject411.IID)); } @Test(expected = IllegalArgumentException.class) public void testCreateInvalidSubtreeWriter() throws Exception { SubtreeWriter.createForWriter(Sets.newHashSet( - InstanceIdentifier.create(DataObject3.class).child(DataObject3.DataObject31.class)), - mockWriter(DataObject4.class)); + InstanceIdentifier.create(DataObjects.DataObject3.class).child(DataObjects.DataObject3.DataObject31.class)), + mockWriter(DataObjects.DataObject4.class)); } @SuppressWarnings("unchecked") @@ -128,29 +128,4 @@ public class FlatWriterRegistryBuilderTest { return mock; } - private abstract static class DataObject1 implements DataObject { - static InstanceIdentifier<DataObject1> IID = InstanceIdentifier.create(DataObject1.class); - } - private abstract static class DataObject2 implements DataObject { - static InstanceIdentifier<DataObject2> IID = InstanceIdentifier.create(DataObject2.class); - } - private abstract static class DataObject3 implements DataObject { - static InstanceIdentifier<DataObject3> IID = InstanceIdentifier.create(DataObject3.class); - private abstract static class DataObject31 implements DataObject, ChildOf<DataObject3> { - static InstanceIdentifier<DataObject31> IID = DataObject3.IID.child(DataObject31.class); - } - } - private abstract static class DataObject4 implements DataObject { - static InstanceIdentifier<DataObject4> IID = InstanceIdentifier.create(DataObject4.class); - private abstract static class DataObject5 implements DataObject, ChildOf<DataObject4> { - static InstanceIdentifier<DataObject5> IID = DataObject4.IID.child(DataObject5.class); - private abstract static class DataObject51 implements DataObject, ChildOf<DataObject5> { - static InstanceIdentifier<DataObject51> IID = DataObject5.IID.child(DataObject51.class); - } - } - private abstract static class DataObject6 implements DataObject, ChildOf<DataObject4> { - static InstanceIdentifier<DataObject6> IID = DataObject4.IID.child(DataObject6.class); - } - } - }
\ No newline at end of file diff --git a/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry/FlatWriterRegistryTest.java b/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry/FlatWriterRegistryTest.java index 1b4a059ea..a72cb4fa7 100644 --- a/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry/FlatWriterRegistryTest.java +++ b/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry/FlatWriterRegistryTest.java @@ -17,6 +17,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; +import io.fd.honeycomb.v3po.translate.util.DataObjects.DataObject1; +import io.fd.honeycomb.v3po.translate.util.DataObjects.DataObject2; +import io.fd.honeycomb.v3po.translate.util.DataObjects.DataObject3; import io.fd.honeycomb.v3po.translate.write.DataObjectUpdate; import io.fd.honeycomb.v3po.translate.write.WriteContext; import io.fd.honeycomb.v3po.translate.write.Writer; @@ -258,14 +261,4 @@ public class FlatWriterRegistryTest { final InstanceIdentifier<D> iid = (InstanceIdentifier<D>) type.getDeclaredField("IID").get(null); updates.put(iid, DataObjectUpdate.create(iid, mock(type), mock(type))); } - - private abstract static class DataObject1 implements DataObject { - static final InstanceIdentifier<DataObject1> IID = InstanceIdentifier.create(DataObject1.class); - } - private abstract static class DataObject2 implements DataObject { - static final InstanceIdentifier<DataObject2> IID = InstanceIdentifier.create(DataObject2.class); - } - private abstract static class DataObject3 implements DataObject { - static final InstanceIdentifier<DataObject3> IID = InstanceIdentifier.create(DataObject3.class); - } }
\ No newline at end of file diff --git a/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry/SubtreeWriterTest.java b/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry/SubtreeWriterTest.java index b7dcadc73..627c69c92 100644 --- a/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry/SubtreeWriterTest.java +++ b/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry/SubtreeWriterTest.java @@ -22,28 +22,28 @@ import static org.junit.Assert.assertThat; import static org.mockito.Mockito.when; import com.google.common.collect.Sets; +import io.fd.honeycomb.v3po.translate.util.DataObjects; import io.fd.honeycomb.v3po.translate.write.Writer; import java.util.Collections; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.opendaylight.yangtools.yang.binding.ChildOf; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class SubtreeWriterTest { @Mock - Writer<DataObject1> writer; + Writer<DataObjects.DataObject4> writer; @Mock - Writer<DataObject1.DataObject11> writer11; + Writer<DataObjects.DataObject4.DataObject41> writer11; @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - when(writer.getManagedDataObjectType()).thenReturn(DataObject1.IID); - when(writer11.getManagedDataObjectType()).thenReturn(DataObject1.DataObject11.IID); + when(writer.getManagedDataObjectType()).thenReturn(DataObjects.DataObject4.IID); + when(writer11.getManagedDataObjectType()).thenReturn(DataObjects.DataObject4.DataObject41.IID); } @Test(expected = IllegalArgumentException.class) @@ -55,15 +55,15 @@ public class SubtreeWriterTest { @Test(expected = IllegalArgumentException.class) public void testSubtreeWriterCreationFailInvalidIid() throws Exception { // The subtree node identified by IID.c(DataObject.class) is not a child of writer.getManagedDataObjectType - SubtreeWriter.createForWriter(Collections.singleton(DataObject1.IID), writer); + SubtreeWriter.createForWriter(Collections.singleton(DataObjects.DataObject4.IID), writer); } @Test public void testSubtreeWriterCreation() throws Exception { final SubtreeWriter<?> forWriter = (SubtreeWriter<?>) SubtreeWriter.createForWriter(Sets.newHashSet( - DataObject1.DataObject11.IID, - DataObject1.DataObject11.DataObject111.IID, - DataObject1.DataObject12.IID), + DataObjects.DataObject4.DataObject41.IID, + DataObjects.DataObject4.DataObject41.DataObject411.IID, + DataObjects.DataObject4.DataObject42.IID), writer); assertEquals(writer.getManagedDataObjectType(), forWriter.getManagedDataObjectType()); @@ -73,24 +73,12 @@ public class SubtreeWriterTest { @Test public void testSubtreeWriterHandledTypes() throws Exception { final SubtreeWriter<?> forWriter = (SubtreeWriter<?>) SubtreeWriter.createForWriter(Sets.newHashSet( - DataObject1.DataObject11.DataObject111.IID), + DataObjects.DataObject4.DataObject41.DataObject411.IID), writer); assertEquals(writer.getManagedDataObjectType(), forWriter.getManagedDataObjectType()); assertEquals(1, forWriter.getHandledChildTypes().size()); - assertThat(forWriter.getHandledChildTypes(), hasItem(DataObject1.DataObject11.DataObject111.IID)); + assertThat(forWriter.getHandledChildTypes(), hasItem(DataObjects.DataObject4.DataObject41.DataObject411.IID)); } - private abstract static class DataObject1 implements DataObject { - static InstanceIdentifier<DataObject1> IID = InstanceIdentifier.create(DataObject1.class); - private abstract static class DataObject11 implements DataObject, ChildOf<DataObject1> { - static InstanceIdentifier<DataObject11> IID = DataObject1.IID.child(DataObject11.class); - private abstract static class DataObject111 implements DataObject, ChildOf<DataObject11> { - static InstanceIdentifier<DataObject111> IID = DataObject11.IID.child(DataObject111.class); - } - } - private abstract static class DataObject12 implements DataObject, ChildOf<DataObject1> { - static InstanceIdentifier<DataObject12> IID = DataObject1.IID.child(DataObject12.class); - } - } }
\ No newline at end of file |