X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2FAbstractConfigTest.java;h=001af7525bb28a915e7b9ec0306bbd03046f24f1;hb=4b5f54e25c08fc21c955ff75901abe96b12d3340;hp=64ce14e8f1733b8ab28465a9edd4a191141a6a09;hpb=58fa0dd65634800eccaa1bbe85769835a0e6e071;p=controller.git

diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractConfigTest.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractConfigTest.java
index 64ce14e8f1..001af7525b 100644
--- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractConfigTest.java
+++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractConfigTest.java
@@ -23,6 +23,7 @@ import org.opendaylight.controller.config.manager.testingservices.threadpool.Tes
 import org.opendaylight.controller.config.spi.Module;
 import org.opendaylight.controller.config.util.ConfigRegistryJMXClient;
 import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
+import org.opendaylight.yangtools.yang.data.impl.codec.CodecRegistry;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 import org.slf4j.Logger;
@@ -97,7 +98,7 @@ public abstract class AbstractConfigTest extends
         baseJmxRegistrator = new BaseJMXRegistrator(internalJmxRegistrator);
 
         configRegistry = new ConfigRegistryImpl(resolver,
-                platformMBeanServer, baseJmxRegistrator);
+                platformMBeanServer, baseJmxRegistrator, getCodecRegistry());
 
         try {
             configRegistryJMXRegistrator.registerToJMX(configRegistry);
@@ -208,6 +209,9 @@ public abstract class AbstractConfigTest extends
         return new ClassBasedModuleFactory(implementationName, configBeanClass);
     }
 
+    protected CodecRegistry getCodecRegistry() {
+        return mock(CodecRegistry.class);
+    }
 
     public static interface BundleContextServiceRegistrationHandler {
 
@@ -215,10 +219,10 @@ public abstract class AbstractConfigTest extends
 
     }
 
-    private class RegisterServiceAnswer implements Answer {
+    private class RegisterServiceAnswer implements Answer<ServiceRegistration<?>> {
 
         @Override
-        public Object answer(InvocationOnMock invocation) throws Throwable {
+        public ServiceRegistration<?> answer(InvocationOnMock invocation) throws Throwable {
             Object[] args = invocation.getArguments();
 
             Preconditions.checkArgument(args.length == 3, "Unexpected arguments size (expected 3 was %s)", args.length);