diff options
author | Marek Gradzki <mgradzki@cisco.com> | 2017-06-09 13:08:17 +0200 |
---|---|---|
committer | Marek Gradzki <mgradzki@cisco.com> | 2017-06-09 13:10:36 +0200 |
commit | 2473ca2213719eafb812681b620ccd09957ff3a8 (patch) | |
tree | 2e27d90d300d7f106d27923eed182877e198668f /nat/nat2vpp/src/test | |
parent | ca6cda948df343f56164ce38e258735ead68dc6e (diff) |
Update module tests after introducing YangDAG
Change-Id: I3ce66e2e1fbed7b9a333382c664b5dd8ed501df0
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'nat/nat2vpp/src/test')
-rw-r--r-- | nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/NatModuleTest.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/NatModuleTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/NatModuleTest.java index f89129d63..041a1fc0d 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/NatModuleTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/NatModuleTest.java @@ -16,6 +16,14 @@ package io.fd.hc2vpp.nat; +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,8 +37,11 @@ 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.snat.future.FutureJVppSnatFacade; +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.InterfaceBuilder; 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 NatModuleTest { @Named("honeycomb-context") @@ -102,7 +102,7 @@ public class NatModuleTest { 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.forEach(factory -> factory.init(registryBuilder)); assertNotNull(registryBuilder.build()); } @@ -112,7 +112,7 @@ public class NatModuleTest { 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.forEach(factory -> factory.init(registryBuilder)); assertNotNull(registryBuilder.build()); } |