Simplify config loader tests

Change-Id: I8c04f7f27aafb9a4760bb5d043db2f08bdee91d9
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>

diff --git a/config-loader/bmp-monitors-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/bmp/BmpMonitorConfigFileProcessorTest.java b/config-loader/bmp-monitors-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/bmp/BmpMonitorConfigFileProcessorTest.java
index a213c17bb5927e5744177555754de0a281942b66..b7c1f391da39a8b01922d3a828283b9faf589f8e 100644 (file)
--- a/config-loader/bmp-monitors-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/bmp/BmpMonitorConfigFileProcessorTest.java
+++ b/config-loader/bmp-monitors-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/bmp/BmpMonitorConfigFileProcessorTest.java
@@ -17,9 +17,7 @@ import static org.opendaylight.protocol.util.CheckUtil.checkPresentConfiguration
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.bgpcep.config.loader.impl.AbstractConfigLoader;
-import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.monitor.config.rev171207.OdlBmpMonitors;
-import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
 public class BmpMonitorConfigFileProcessorTest extends AbstractConfigLoader {
@@ -30,12 +28,6 @@ public class BmpMonitorConfigFileProcessorTest extends AbstractConfigLoader {
         super.setUp();
     }
 
-    @Override
-    protected void registerModules(final ModuleInfoBackedContext moduleInfoBackedContext) throws Exception {
-        moduleInfoBackedContext.registerModuleInfo(BindingReflections.getModuleInfo(OdlBmpMonitors.class));
-
-    }
-
     @Test
     public void configFileTest() throws Exception {
         checkNotPresentConfiguration(getDataBroker(), ODL_BMP_MONITORS_IID);

diff --git a/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/AbstractConfigLoader.java b/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/AbstractConfigLoader.java
index 8373a110787d4e8f8b61d96a98b2a77a05f7d3d8..dc843c23fc32240ad66de2046e329af6ac644ce7 100644 (file)
--- a/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/AbstractConfigLoader.java
+++ b/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/AbstractConfigLoader.java
@@ -17,20 +17,15 @@ import java.nio.file.WatchKey;
 import java.nio.file.WatchService;
 import java.util.ArrayList;
 import java.util.List;
-import javassist.ClassPool;
 import javax.annotation.concurrent.GuardedBy;
 import org.junit.After;
 import org.junit.Before;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.opendaylight.bgpcep.config.loader.spi.ConfigFileProcessor;
+import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec;
 import org.opendaylight.controller.md.sal.binding.test.AbstractConcurrentDataBrokerTest;
-import org.opendaylight.mdsal.binding.dom.adapter.BindingToNormalizedNodeCodec;
-import org.opendaylight.mdsal.binding.dom.codec.gen.impl.StreamWriterGenerator;
-import org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry;
-import org.opendaylight.mdsal.binding.generator.impl.GeneratedClassLoadingStrategy;
-import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext;
-import org.opendaylight.mdsal.binding.generator.util.JavassistUtils;
+import org.opendaylight.controller.md.sal.binding.test.AbstractDataBrokerTestCustomizer;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 public abstract class AbstractConfigLoader extends AbstractConcurrentDataBrokerTest {
@@ -40,24 +35,18 @@ public abstract class AbstractConfigLoader extends AbstractConcurrentDataBrokerT
     @Mock
     protected WatchService watchService;
     @Mock
+    protected ConfigFileProcessor processor;
+    @Mock
     private WatchKey watchKey;
     @Mock
     private WatchEvent<?> watchEvent;
     @Mock
-    protected ConfigFileProcessor processor;
-    @Mock
     private FileWatcher fileWatcher;
+    private BindingToNormalizedNodeCodec mappingService;
 
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
-        final BindingToNormalizedNodeCodec mappingService = new BindingToNormalizedNodeCodec(
-                GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(),
-                new BindingNormalizedNodeCodecRegistry(
-                        StreamWriterGenerator.create(JavassistUtils.forClassPool(ClassPool.getDefault()))));
-        final ModuleInfoBackedContext moduleInfoBackedContext = ModuleInfoBackedContext.create();
-        registerModules(moduleInfoBackedContext);
-        mappingService.onGlobalContextUpdated(moduleInfoBackedContext.tryToCreateSchemaContext().get());
         doAnswer(invocation -> true).when(this.watchKey).reset();
         doReturn(this.eventList).when(this.watchKey).pollEvents();
         doReturn(this.watchKey).when(this.watchService).take();
@@ -71,11 +60,17 @@ public abstract class AbstractConfigLoader extends AbstractConcurrentDataBrokerT
             return null;
         }).when(this.processor).loadConfiguration(any());
         final SchemaContext schemaContext = getSchemaContext();
-        this.configLoader = new ConfigLoaderImpl(schemaContext,
-                mappingService, this.fileWatcher);
+        this.configLoader = new ConfigLoaderImpl(schemaContext, this.mappingService, this.fileWatcher);
         this.configLoader.init();
     }
 
+    @Override
+    protected AbstractDataBrokerTestCustomizer createDataBrokerTestCustomizer() {
+        final AbstractDataBrokerTestCustomizer customizer = super.createDataBrokerTestCustomizer();
+        this.mappingService = customizer.getBindingToNormalized();
+        return customizer;
+    }
+
     private synchronized void clearEvent() {
         this.eventList.clear();
     }
@@ -84,8 +79,6 @@ public abstract class AbstractConfigLoader extends AbstractConcurrentDataBrokerT
         return ClassLoader.getSystemClassLoader().getResource("initial").getPath();
     }
 
-    protected abstract void registerModules(ModuleInfoBackedContext moduleInfoBackedContext) throws Exception;
-
     protected synchronized void triggerEvent(final String filename) {
         doReturn(filename).when(this.watchEvent).context();
         this.eventList.add(this.watchEvent);
@@ -93,6 +86,6 @@ public abstract class AbstractConfigLoader extends AbstractConcurrentDataBrokerT
 
     @After
     public final void tearDown() throws Exception {
-        ((ConfigLoaderImpl) this.configLoader).close();
+        this.configLoader.close();
     }
 }

diff --git a/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImplTest.java b/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImplTest.java
index 981c9553a37791aab1e018cc433626c5d8bd6c07..ae7dee5f1b0c3a1cd55a3b771c78b1c4f9c6436c 100644 (file)
--- a/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImplTest.java
+++ b/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImplTest.java
@@ -16,12 +16,10 @@ import static org.mockito.Mockito.verify;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.NetworkInstances;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.network.instances.NetworkInstance;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.network.instances.network.instance.Protocols;
 import org.opendaylight.yangtools.concepts.AbstractRegistration;
-import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
 public class ConfigLoaderImplTest extends AbstractConfigLoader {
@@ -40,11 +38,6 @@ public class ConfigLoaderImplTest extends AbstractConfigLoader {
         return ClassLoader.getSystemClassLoader().getResource("etc/opendaylight/bgpcep").getPath();
     }
 
-    @Override
-    protected void registerModules(final ModuleInfoBackedContext moduleInfoBackedContext) throws Exception {
-        moduleInfoBackedContext.registerModuleInfo(BindingReflections.getModuleInfo(NetworkInstances.class));
-    }
-
     @Test
     public void configLoaderImplTest() throws Exception {
         assertNotNull(ClassLoader.getSystemClassLoader().getResource("etc/opendaylight/bgpcep/protocols-config.xml"));

diff --git a/config-loader/protocols-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/protocols/ProtocolsConfigFileProcessorTest.java b/config-loader/protocols-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/protocols/ProtocolsConfigFileProcessorTest.java
index 3ea30e1eb9011f73d5df68718bae3e688106c702..a95b17fef10260e27ecd6168f2ccc5ed59b6ba7d 100644 (file)
--- a/config-loader/protocols-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/protocols/ProtocolsConfigFileProcessorTest.java
+++ b/config-loader/protocols-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/protocols/ProtocolsConfigFileProcessorTest.java
@@ -16,20 +16,12 @@ import static org.opendaylight.protocol.util.CheckUtil.checkPresentConfiguration
 
 import org.junit.Test;
 import org.opendaylight.bgpcep.config.loader.impl.AbstractConfigLoader;
-import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.NetworkInstances;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.network.instances.NetworkInstance;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.network.instances.network.instance.Protocols;
-import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
 public class ProtocolsConfigFileProcessorTest extends AbstractConfigLoader {
-    @Override
-    protected void registerModules(final ModuleInfoBackedContext moduleInfoBackedContext) throws Exception {
-        moduleInfoBackedContext.registerModuleInfo(BindingReflections.getModuleInfo(NetworkInstance.class));
-        moduleInfoBackedContext.registerModuleInfo(BindingReflections.getModuleInfo(Protocols.class));
-    }
-
     @Test
     public void configFileTest() throws Exception {
         checkNotPresentConfiguration(getDataBroker(), BGP_PROTOCOLS_IID);

diff --git a/config-loader/topology-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/topology/NetworkTopologyConfigFileProcessorTest.java b/config-loader/topology-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/topology/NetworkTopologyConfigFileProcessorTest.java
index be12de595d562f83a7121a71caa4478a665a4c36..69b0346381107ad1b2430beb65df02eae5863a3e 100644 (file)
--- a/config-loader/topology-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/topology/NetworkTopologyConfigFileProcessorTest.java
+++ b/config-loader/topology-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/topology/NetworkTopologyConfigFileProcessorTest.java
@@ -16,23 +16,15 @@ import static org.opendaylight.protocol.util.CheckUtil.checkPresentConfiguration
 import org.junit.Test;
 import org.opendaylight.bgpcep.config.loader.impl.AbstractConfigLoader;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
-import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
 public class NetworkTopologyConfigFileProcessorTest extends AbstractConfigLoader {
-    @Override
-    protected void registerModules(final ModuleInfoBackedContext moduleInfoBackedContext) throws Exception {
-        moduleInfoBackedContext.registerModuleInfo(BindingReflections.getModuleInfo(NetworkTopology.class));
-        moduleInfoBackedContext.registerModuleInfo(BindingReflections.getModuleInfo(Topology.class));
-    }
-
     @Test
     public void configFileTest() throws ReadFailedException, InterruptedException {
         final KeyedInstanceIdentifier<Topology, TopologyKey> topologyIIdKeyed =