diff options
author | 2016-10-14 20:59:34 +0800 | |
---|---|---|
committer | 2016-10-14 06:58:28 +0000 | |
commit | 4469dd3495c36d8b63fbae325b951fad694638d0 (patch) | |
tree | 8542a4a4a302fe7ce6199181c30e1f366eef00da /nsh/impl/src/main/java | |
parent | fc788553055ed528dd5b8e27d8ec0e960af8a737 (diff) |
Raise test coverage of nsh plugin to 80%. HONEYCOMB-198
Change-Id: Ia1ebc0330544d63c66b6462a33563b86358ace6c
Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
Diffstat (limited to 'nsh/impl/src/main/java')
-rwxr-xr-x | nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/VppNshModule.java | 14 | ||||
-rwxr-xr-x | nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/JVppNshProvider.java | 3 |
2 files changed, 15 insertions, 2 deletions
diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/VppNshModule.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/VppNshModule.java index 94399a5fa..cd21e0e76 100755 --- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/VppNshModule.java +++ b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/VppNshModule.java @@ -16,10 +16,12 @@ package io.fd.honeycomb.vppnsh.impl; +import com.google.common.annotations.VisibleForTesting; import com.google.inject.AbstractModule; import com.google.inject.Singleton; import com.google.inject.multibindings.Multibinder; import com.google.inject.name.Names; +import com.google.inject.Provider; import io.fd.honeycomb.data.init.DataTreeInitializer; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.vpp.util.NamingContext; @@ -29,6 +31,7 @@ import io.fd.honeycomb.vppnsh.impl.init.VppNshInitializer; import io.fd.honeycomb.vppnsh.impl.oper.VppNshReaderFactory; import io.fd.honeycomb.vppnsh.impl.util.JVppNshProvider; import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.vpp.jvpp.nsh.future.FutureJVppNshFacade; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,6 +41,15 @@ import org.slf4j.LoggerFactory; public final class VppNshModule extends AbstractModule { private static final Logger LOG = LoggerFactory.getLogger(VppNshModule.class); + private final Class<? extends Provider<FutureJVppNshFacade>> jvppNshProviderClass; + + public VppNshModule() { + this(JVppNshProvider.class); + } + @VisibleForTesting + VppNshModule(Class<? extends Provider<FutureJVppNshFacade>> jvppNshProvider) { + this.jvppNshProviderClass = jvppNshProvider; + } @Override protected void configure() { @@ -53,7 +65,7 @@ public final class VppNshModule extends AbstractModule { .toInstance(new NamingContext("nsh-map-", "nsh-map-context")); // Bind to Plugin's JVPP. - bind(FutureJVppNsh.class).toProvider(JVppNshProvider.class).in(Singleton.class); + bind(FutureJVppNsh.class).toProvider(jvppNshProviderClass).in(Singleton.class); // Below are classes picked up by HC framework Multibinder.newSetBinder(binder(), WriterFactory.class).addBinding().to(VppNshWriterFactory.class); diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/JVppNshProvider.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/JVppNshProvider.java index 04b3ed928..56f73dedf 100755 --- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/JVppNshProvider.java +++ b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/JVppNshProvider.java @@ -17,6 +17,7 @@ package io.fd.honeycomb.vppnsh.impl.util; import com.google.inject.Inject; +import com.google.inject.Provider; import io.fd.honeycomb.infra.distro.ProviderTrait; import java.io.IOException; import io.fd.vpp.jvpp.JVppRegistry; @@ -30,7 +31,7 @@ import org.slf4j.LoggerFactory; * Provides future API for jvpp-nsh plugin. Must be a singleton due to shutdown hook usage. * Registers shutdown hook to free plugin's resources on shutdown. */ -public final class JVppNshProvider extends ProviderTrait<FutureJVppNsh> { +public final class JVppNshProvider extends ProviderTrait<FutureJVppNshFacade> { private static final Logger LOG = LoggerFactory.getLogger(JVppNshProvider.class); |