diff options
Diffstat (limited to 'v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry')
2 files changed, 18 insertions, 42 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 ec407b685..da7ac0947 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 @@ -31,13 +31,13 @@ public class FlatWriterRegistryBuilderTest { 1 -> 2 -> 3 -> 4 */ - flatWriterRegistryBuilder.addWriter(mockWriter(DataObject3.class)); - flatWriterRegistryBuilder.addWriter(mockWriter(DataObject4.class)); - flatWriterRegistryBuilder.addWriterBefore(mockWriter(DataObject2.class), + flatWriterRegistryBuilder.add(mockWriter(DataObject3.class)); + flatWriterRegistryBuilder.add(mockWriter(DataObject4.class)); + flatWriterRegistryBuilder.addBefore(mockWriter(DataObject2.class), Lists.newArrayList(DataObject3.IID, DataObject4.IID)); - flatWriterRegistryBuilder.addWriterBefore(mockWriter(DataObject1.class), DataObject2.IID); + flatWriterRegistryBuilder.addBefore(mockWriter(DataObject1.class), DataObject2.IID); final ImmutableMap<InstanceIdentifier<?>, Writer<?>> mappedWriters = - flatWriterRegistryBuilder.getMappedWriters(); + flatWriterRegistryBuilder.getMappedHandlers(); final ArrayList<InstanceIdentifier<?>> typesInList = Lists.newArrayList(mappedWriters.keySet()); assertEquals(DataObject1.IID, typesInList.get(0)); @@ -53,12 +53,12 @@ public class FlatWriterRegistryBuilderTest { 1 -> 2 -> 3 -> 4 */ - flatWriterRegistryBuilder.addWriter(mockWriter(DataObject1.class)); - flatWriterRegistryBuilder.addWriterAfter(mockWriter(DataObject2.class), DataObject1.IID); - flatWriterRegistryBuilder.addWriterAfter(mockWriter(DataObject3.class), DataObject2.IID); - flatWriterRegistryBuilder.addWriterAfter(mockWriter(DataObject4.class), DataObject2.IID); + 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); final ImmutableMap<InstanceIdentifier<?>, Writer<?>> mappedWriters = - flatWriterRegistryBuilder.getMappedWriters(); + flatWriterRegistryBuilder.getMappedHandlers(); final List<InstanceIdentifier<?>> typesInList = Lists.newArrayList(mappedWriters.keySet()); assertEquals(DataObject1.IID, typesInList.get(0)); @@ -73,27 +73,27 @@ public class FlatWriterRegistryBuilderTest { /* 1 -> 2 -> 1 */ - flatWriterRegistryBuilder.addWriter(mockWriter(DataObject1.class)); - flatWriterRegistryBuilder.addWriterAfter(mockWriter(DataObject2.class), DataObject1.IID); - flatWriterRegistryBuilder.addWriterAfter(mockWriter(DataObject1.class), DataObject2.IID); + flatWriterRegistryBuilder.add(mockWriter(DataObject1.class)); + flatWriterRegistryBuilder.addAfter(mockWriter(DataObject2.class), DataObject1.IID); + flatWriterRegistryBuilder.addAfter(mockWriter(DataObject1.class), DataObject2.IID); } @Test(expected = IllegalArgumentException.class) public void testAddWriterTwice() throws Exception { final FlatWriterRegistryBuilder flatWriterRegistryBuilder = new FlatWriterRegistryBuilder(); - flatWriterRegistryBuilder.addWriter(mockWriter(DataObject1.class)); - flatWriterRegistryBuilder.addWriter(mockWriter(DataObject1.class)); + flatWriterRegistryBuilder.add(mockWriter(DataObject1.class)); + flatWriterRegistryBuilder.add(mockWriter(DataObject1.class)); } @Test public void testAddSubtreeWriter() throws Exception { final FlatWriterRegistryBuilder flatWriterRegistryBuilder = new FlatWriterRegistryBuilder(); - flatWriterRegistryBuilder.addSubtreeWriter( + flatWriterRegistryBuilder.subtreeAdd( Sets.newHashSet(DataObject4.DataObject5.IID, DataObject4.DataObject5.IID), mockWriter(DataObject4.class)); final ImmutableMap<InstanceIdentifier<?>, Writer<?>> mappedWriters = - flatWriterRegistryBuilder.getMappedWriters(); + flatWriterRegistryBuilder.getMappedHandlers(); final ArrayList<InstanceIdentifier<?>> typesInList = Lists.newArrayList(mappedWriters.keySet()); assertEquals(DataObject4.IID, typesInList.get(0)); 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 df3296557..1b4a059ea 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 @@ -20,7 +20,7 @@ import com.google.common.collect.Multimap; import io.fd.honeycomb.v3po.translate.write.DataObjectUpdate; import io.fd.honeycomb.v3po.translate.write.WriteContext; import io.fd.honeycomb.v3po.translate.write.Writer; -import io.fd.honeycomb.v3po.translate.write.WriterRegistry; +import io.fd.honeycomb.v3po.translate.write.registry.WriterRegistry; import org.junit.Before; import org.junit.Test; import org.mockito.InOrder; @@ -49,19 +49,6 @@ public class FlatWriterRegistryTest { } @Test - public void testSingleUpdate() throws Exception { - final FlatWriterRegistry flatWriterRegistry = - new FlatWriterRegistry(ImmutableMap.of(DataObject1.IID, writer1)); - - final InstanceIdentifier<DataObject1> iid = InstanceIdentifier.create(DataObject1.class); - final DataObject1 before = mock(DataObject1.class); - final DataObject1 after = mock(DataObject1.class); - flatWriterRegistry.update(iid, before, after, ctx); - - verify(writer1).update(iid, before, after, ctx); - } - - @Test public void testMultipleUpdatesForSingleWriter() throws Exception { final FlatWriterRegistry flatWriterRegistry = new FlatWriterRegistry(ImmutableMap.of(DataObject1.IID, writer1, DataObject2.IID, writer2)); @@ -272,17 +259,6 @@ public class FlatWriterRegistryTest { updates.put(iid, DataObjectUpdate.create(iid, mock(type), mock(type))); } - @Test(expected = IllegalArgumentException.class) - public void testSingleUpdateMissingWriter() throws Exception { - final FlatWriterRegistry flatWriterRegistry = - new FlatWriterRegistry(ImmutableMap.of()); - - final InstanceIdentifier<DataObject1> iid = InstanceIdentifier.create(DataObject1.class); - final DataObject1 before = mock(DataObject1.class); - final DataObject1 after = mock(DataObject1.class); - flatWriterRegistry.update(iid, before, after, ctx); - } - private abstract static class DataObject1 implements DataObject { static final InstanceIdentifier<DataObject1> IID = InstanceIdentifier.create(DataObject1.class); } |