From 2473ca2213719eafb812681b620ccd09957ff3a8 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Fri, 9 Jun 2017 13:08:17 +0200 Subject: Update module tests after introducing YangDAG Change-Id: I3ce66e2e1fbed7b9a333382c664b5dd8ed501df0 Signed-off-by: Marek Gradzki --- v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/V3poModuleTest.java | 5 +++-- .../src/test/java/io/fd/hc2vpp/v3po/l2state/L2StateTest.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'v3po') diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/V3poModuleTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/V3poModuleTest.java index 9d799d850..b7f19867e 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/V3poModuleTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/V3poModuleTest.java @@ -32,6 +32,7 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.impl.read.registry.CompositeReaderRegistryBuilder; import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder; import io.fd.honeycomb.translate.read.ReaderFactory; +import io.fd.honeycomb.translate.util.YangDAG; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.vpp.jvpp.core.future.FutureJVppCore; import java.util.HashSet; @@ -79,7 +80,7 @@ public class V3poModuleTest { assertThat(readerFactories, is(not(empty()))); // Test registration process (all dependencies present, topological order of readers does exist, etc.) - final CompositeReaderRegistryBuilder registryBuilder = new CompositeReaderRegistryBuilder(); + final CompositeReaderRegistryBuilder registryBuilder = new CompositeReaderRegistryBuilder(new YangDAG()); readerFactories.stream().forEach(factory -> factory.init(registryBuilder)); assertNotNull(registryBuilder.build()); } @@ -89,7 +90,7 @@ public class V3poModuleTest { assertThat(writerFactories, is(not(empty()))); // Test registration process (all dependencies present, topological order of writers does exist, etc.) - final FlatWriterRegistryBuilder registryBuilder = new FlatWriterRegistryBuilder(); + final FlatWriterRegistryBuilder registryBuilder = new FlatWriterRegistryBuilder(new YangDAG()); writerFactories.stream().forEach(factory -> factory.init(registryBuilder)); assertNotNull(registryBuilder.build()); } diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2state/L2StateTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2state/L2StateTest.java index 24b85587c..16e118b58 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2state/L2StateTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2state/L2StateTest.java @@ -37,6 +37,7 @@ import io.fd.honeycomb.translate.impl.read.registry.CompositeReaderRegistryBuild import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.read.registry.ReaderRegistry; +import io.fd.honeycomb.translate.util.YangDAG; import io.fd.vpp.jvpp.core.dto.BridgeDomainDetails; import io.fd.vpp.jvpp.core.dto.BridgeDomainDetailsReplyDump; import io.fd.vpp.jvpp.core.dto.BridgeDomainDump; @@ -80,7 +81,7 @@ public class L2StateTest implements FutureProducer, NamingContextHelper { */ private static ReaderRegistry getVppStateReader(@Nonnull final FutureJVppCore jVpp, @Nonnull final NamingContext bdContext) { - final CompositeReaderRegistryBuilder registry = new CompositeReaderRegistryBuilder(); + final CompositeReaderRegistryBuilder registry = new CompositeReaderRegistryBuilder(new YangDAG()); // BridgeDomains(Structural) bridgeDomainsId = InstanceIdentifier.create(BridgeDomainsState.class); -- cgit 1.2.3-korg