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 --- .../test/java/io/fd/hc2vpp/acl/AclModuleTest.java | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'acl') diff --git a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/AclModuleTest.java b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/AclModuleTest.java index f2c47f7b5..498b5e02a 100644 --- a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/AclModuleTest.java +++ b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/AclModuleTest.java @@ -16,6 +16,14 @@ package io.fd.hc2vpp.acl; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.Matchers.empty; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.MockitoAnnotations.initMocks; + import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Provider; @@ -29,9 +37,12 @@ import io.fd.honeycomb.translate.impl.read.registry.CompositeReaderRegistryBuild import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; +import io.fd.honeycomb.translate.util.YangDAG; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.vpp.jvpp.JVppRegistry; import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import java.util.HashSet; +import java.util.Set; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; @@ -41,17 +52,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces. import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import java.util.HashSet; -import java.util.Set; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.Matchers.empty; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.MockitoAnnotations.initMocks; - public class AclModuleTest { @@ -100,7 +100,7 @@ public class AclModuleTest { public void testWriterFactories() throws Exception { assertThat(writerFactories, is(not(empty()))); - final FlatWriterRegistryBuilder registryBuilder = new FlatWriterRegistryBuilder(); + final FlatWriterRegistryBuilder registryBuilder = new FlatWriterRegistryBuilder(new YangDAG()); writerFactories.forEach(factory -> factory.init(registryBuilder)); assertNotNull(registryBuilder.build()); } @@ -109,7 +109,7 @@ public class AclModuleTest { public void testReaderFactories() throws Exception { assertThat(readerFactories, is(not(empty()))); - final CompositeReaderRegistryBuilder registryBuilder = new CompositeReaderRegistryBuilder(); + final CompositeReaderRegistryBuilder registryBuilder = new CompositeReaderRegistryBuilder(new YangDAG()); readerFactories.forEach(factory -> factory.init(registryBuilder)); assertNotNull(registryBuilder.build()); } -- cgit 1.2.3-korg