From 9612f13c472d0ce230d8b9a72ada9e6d4afdec71 Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Thu, 19 Mar 2015 14:04:57 +0100 Subject: [PATCH] Bug 868: Removed test code-duplicated from MD-SAL Signed-off-by: Tony Tkacik --- applications/forwardingrules-manager/pom.xml | 9 +- .../mock/util/AbstractDataBrokerTest.java | 60 ---------- .../mock/util/AbstractSchemaAwareTest.java | 44 -------- .../mock/util/DataBrokerTestCustomizer.java | 105 ------------------ .../src/test/java/test/mock/util/FRMTest.java | 8 +- .../test/mock/util/MockSchemaService.java | 61 ---------- applications/statistics-manager/pom.xml | 7 ++ .../mock/util/AbstractDataBrokerTest.java | 60 ---------- .../mock/util/AbstractSchemaAwareTest.java | 44 -------- .../mock/util/DataBrokerTestCustomizer.java | 104 ----------------- .../test/mock/util/MockSchemaService.java | 61 ---------- .../test/mock/util/StatisticsManagerTest.java | 2 +- 12 files changed, 20 insertions(+), 545 deletions(-) delete mode 100644 applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractDataBrokerTest.java delete mode 100644 applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractSchemaAwareTest.java delete mode 100644 applications/forwardingrules-manager/src/test/java/test/mock/util/DataBrokerTestCustomizer.java delete mode 100644 applications/forwardingrules-manager/src/test/java/test/mock/util/MockSchemaService.java delete mode 100644 applications/statistics-manager/src/test/java/test/mock/util/AbstractDataBrokerTest.java delete mode 100644 applications/statistics-manager/src/test/java/test/mock/util/AbstractSchemaAwareTest.java delete mode 100644 applications/statistics-manager/src/test/java/test/mock/util/DataBrokerTestCustomizer.java delete mode 100644 applications/statistics-manager/src/test/java/test/mock/util/MockSchemaService.java diff --git a/applications/forwardingrules-manager/pom.xml b/applications/forwardingrules-manager/pom.xml index db549ac975..befd4010f3 100644 --- a/applications/forwardingrules-manager/pom.xml +++ b/applications/forwardingrules-manager/pom.xml @@ -30,7 +30,14 @@ org.opendaylight.controller sal-binding-broker-impl - provided + test + + + org.opendaylight.controller + sal-binding-broker-impl + ${mdsal.version} + test + test-jar diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractDataBrokerTest.java b/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractDataBrokerTest.java deleted file mode 100644 index f9efa51d41..0000000000 --- a/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractDataBrokerTest.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package test.mock.util; - -import com.google.common.util.concurrent.ListenableFuture; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; - -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -public class AbstractDataBrokerTest extends AbstractSchemaAwareTest { - - private DataBrokerTestCustomizer testCustomizer; - private DataBroker dataBroker; - private DOMDataBroker domBroker; - - - @Override - protected void setupWithSchema(final SchemaContext context) { - testCustomizer = createDataBrokerTestCustomizer(); - dataBroker = testCustomizer.createDataBroker(); - domBroker = testCustomizer.createDOMDataBroker(); - testCustomizer.updateSchema(context); - setupWithDataBroker(dataBroker); - } - - protected void setupWithDataBroker(final DataBroker dataBroker) { - // Intentionally left No-op, subclasses may customize it - } - - protected DataBrokerTestCustomizer createDataBrokerTestCustomizer() { - return new DataBrokerTestCustomizer(); - } - - public DataBroker getDataBroker() { - return dataBroker; - } - - public DOMDataBroker getDomBroker() { - return domBroker; - } - - protected static final void assertCommit(final ListenableFuture commit) { - try { - commit.get(500, TimeUnit.MILLISECONDS); - } catch (InterruptedException | ExecutionException | TimeoutException e) { - throw new IllegalStateException(e); - } - } - - -} diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractSchemaAwareTest.java b/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractSchemaAwareTest.java deleted file mode 100644 index d520d59cdd..0000000000 --- a/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractSchemaAwareTest.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package test.mock.util; - -import org.junit.Before; -import org.opendaylight.yangtools.sal.binding.generator.impl.ModuleInfoBackedContext; -import org.opendaylight.yangtools.yang.binding.YangModuleInfo; -import org.opendaylight.yangtools.yang.binding.util.BindingReflections; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; - -public abstract class AbstractSchemaAwareTest { - - private Iterable moduleInfos; - private SchemaContext schemaContext; - - - protected Iterable getModuleInfos() { - return BindingReflections.loadModuleInfos(); - } - - - @Before - public final void setup() { - moduleInfos = getModuleInfos(); - ModuleInfoBackedContext moduleContext = ModuleInfoBackedContext.create(); - moduleContext.addModuleInfos(moduleInfos); - schemaContext = moduleContext.tryToCreateSchemaContext().get(); - setupWithSchema(schemaContext); - } - - /** - * Setups test with Schema context. - * This method is called before {@link #setupWithSchemaService(SchemaService)} - * - * @param context - */ - protected abstract void setupWithSchema(SchemaContext context); - -} diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/util/DataBrokerTestCustomizer.java b/applications/forwardingrules-manager/src/test/java/test/mock/util/DataBrokerTestCustomizer.java deleted file mode 100644 index 57961da00c..0000000000 --- a/applications/forwardingrules-manager/src/test/java/test/mock/util/DataBrokerTestCustomizer.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package test.mock.util; - -import com.google.common.collect.ImmutableMap; -import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.common.util.concurrent.MoreExecutors; -import javassist.ClassPool; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec; -import org.opendaylight.controller.md.sal.binding.impl.ForwardedBindingDataBroker; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; -import org.opendaylight.controller.md.sal.dom.broker.impl.SerializedDOMDataBroker; -import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore; -import org.opendaylight.controller.sal.core.api.model.SchemaService; -import org.opendaylight.controller.sal.core.spi.data.DOMStore; -import org.opendaylight.yangtools.binding.data.codec.gen.impl.DataObjectSerializerGenerator; -import org.opendaylight.yangtools.binding.data.codec.gen.impl.StreamWriterGenerator; -import org.opendaylight.yangtools.binding.data.codec.impl.BindingNormalizedNodeCodecRegistry; -import org.opendaylight.yangtools.sal.binding.generator.impl.GeneratedClassLoadingStrategy; -import org.opendaylight.yangtools.sal.binding.generator.impl.RuntimeGeneratedMappingServiceImpl; -import org.opendaylight.yangtools.sal.binding.generator.util.JavassistUtils; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; - -public class DataBrokerTestCustomizer { - - private DOMDataBroker domDataBroker; - private final RuntimeGeneratedMappingServiceImpl mappingService; - private final MockSchemaService schemaService; - private ImmutableMap datastores; - private final BindingToNormalizedNodeCodec bindingToNormalized ; - - public ImmutableMap createDatastores() { - return ImmutableMap.builder() - .put(LogicalDatastoreType.OPERATIONAL, createOperationalDatastore()) - .put(LogicalDatastoreType.CONFIGURATION,createConfigurationDatastore()) - .build(); - } - - public DataBrokerTestCustomizer() { - schemaService = new MockSchemaService(); - ClassPool pool = ClassPool.getDefault(); - mappingService = new RuntimeGeneratedMappingServiceImpl(pool); - DataObjectSerializerGenerator generator = StreamWriterGenerator.create(JavassistUtils.forClassPool(pool)); - BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry(generator); - GeneratedClassLoadingStrategy loading = GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(); - bindingToNormalized = new BindingToNormalizedNodeCodec(loading, mappingService, codecRegistry); - schemaService.registerSchemaContextListener(bindingToNormalized); - } - - public DOMStore createConfigurationDatastore() { - InMemoryDOMDataStore store = new InMemoryDOMDataStore("CFG", MoreExecutors.sameThreadExecutor()); - schemaService.registerSchemaContextListener(store); - return store; - } - - public DOMStore createOperationalDatastore() { - InMemoryDOMDataStore store = new InMemoryDOMDataStore("OPER", MoreExecutors.sameThreadExecutor()); - schemaService.registerSchemaContextListener(store); - return store; - } - - public DOMDataBroker createDOMDataBroker() { - return new SerializedDOMDataBroker(getDatastores(), getCommitCoordinatorExecutor()); - } - - public ListeningExecutorService getCommitCoordinatorExecutor() { - return MoreExecutors.sameThreadExecutor(); - } - - public DataBroker createDataBroker() { - return new ForwardedBindingDataBroker(getDOMDataBroker(), bindingToNormalized, schemaService ); - } - - - private SchemaService getSchemaService() { - return schemaService; - } - - private DOMDataBroker getDOMDataBroker() { - if(domDataBroker == null) { - domDataBroker = createDOMDataBroker(); - } - return domDataBroker; - } - - private synchronized ImmutableMap getDatastores() { - if (datastores == null) { - datastores = createDatastores(); - } - return datastores; - } - - public void updateSchema(final SchemaContext ctx) { - schemaService.changeSchema(ctx); - mappingService.onGlobalContextUpdated(ctx); - } - -} diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/util/FRMTest.java b/applications/forwardingrules-manager/src/test/java/test/mock/util/FRMTest.java index 811d6ca742..a92c33432d 100644 --- a/applications/forwardingrules-manager/src/test/java/test/mock/util/FRMTest.java +++ b/applications/forwardingrules-manager/src/test/java/test/mock/util/FRMTest.java @@ -1,6 +1,9 @@ package test.mock.util; +import java.util.Collections; +import java.util.concurrent.ExecutionException; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; +import org.opendaylight.controller.md.sal.binding.test.AbstractDataBrokerTest; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeBuilder; @@ -11,10 +14,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.N import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import java.util.Collections; -import java.util.concurrent.ExecutionException; - -public abstract class FRMTest extends AbstractDataBrokerTest{ +public abstract class FRMTest extends AbstractDataBrokerTest { public void addFlowCapableNode(NodeKey nodeKey) throws ExecutionException, InterruptedException { Nodes nodes = new NodesBuilder().setNode(Collections.emptyList()).build(); diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/util/MockSchemaService.java b/applications/forwardingrules-manager/src/test/java/test/mock/util/MockSchemaService.java deleted file mode 100644 index f6f594b34f..0000000000 --- a/applications/forwardingrules-manager/src/test/java/test/mock/util/MockSchemaService.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package test.mock.util; - -import org.opendaylight.controller.sal.core.api.model.SchemaService; -import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.util.ListenerRegistry; -import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaContextListener; -import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider; - -public final class MockSchemaService implements SchemaService, SchemaContextProvider { - - private SchemaContext schemaContext; - - ListenerRegistry listeners = ListenerRegistry.create(); - - @Override - public void addModule(final Module module) { - throw new UnsupportedOperationException(); - } - - @Override - public synchronized SchemaContext getGlobalContext() { - return schemaContext; - } - - @Override - public synchronized SchemaContext getSessionContext() { - return schemaContext; - } - - @Override - public ListenerRegistration registerSchemaContextListener( - final SchemaContextListener listener) { - return listeners.register(listener); - } - - @Override - public void removeModule(final Module module) { - throw new UnsupportedOperationException(); - } - - @Override - public synchronized SchemaContext getSchemaContext() { - return schemaContext; - } - - public synchronized void changeSchema(final SchemaContext newContext) { - schemaContext = newContext; - for (ListenerRegistration listener : listeners) { - listener.getInstance().onGlobalContextUpdated(schemaContext); - } - } -} diff --git a/applications/statistics-manager/pom.xml b/applications/statistics-manager/pom.xml index abd3c02597..8f626c57e5 100644 --- a/applications/statistics-manager/pom.xml +++ b/applications/statistics-manager/pom.xml @@ -25,6 +25,13 @@ sal-binding-broker-impl test + + org.opendaylight.controller + sal-binding-broker-impl + ${mdsal.version} + test + test-jar + org.opendaylight.controller sal-binding-api diff --git a/applications/statistics-manager/src/test/java/test/mock/util/AbstractDataBrokerTest.java b/applications/statistics-manager/src/test/java/test/mock/util/AbstractDataBrokerTest.java deleted file mode 100644 index f9efa51d41..0000000000 --- a/applications/statistics-manager/src/test/java/test/mock/util/AbstractDataBrokerTest.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package test.mock.util; - -import com.google.common.util.concurrent.ListenableFuture; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; - -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -public class AbstractDataBrokerTest extends AbstractSchemaAwareTest { - - private DataBrokerTestCustomizer testCustomizer; - private DataBroker dataBroker; - private DOMDataBroker domBroker; - - - @Override - protected void setupWithSchema(final SchemaContext context) { - testCustomizer = createDataBrokerTestCustomizer(); - dataBroker = testCustomizer.createDataBroker(); - domBroker = testCustomizer.createDOMDataBroker(); - testCustomizer.updateSchema(context); - setupWithDataBroker(dataBroker); - } - - protected void setupWithDataBroker(final DataBroker dataBroker) { - // Intentionally left No-op, subclasses may customize it - } - - protected DataBrokerTestCustomizer createDataBrokerTestCustomizer() { - return new DataBrokerTestCustomizer(); - } - - public DataBroker getDataBroker() { - return dataBroker; - } - - public DOMDataBroker getDomBroker() { - return domBroker; - } - - protected static final void assertCommit(final ListenableFuture commit) { - try { - commit.get(500, TimeUnit.MILLISECONDS); - } catch (InterruptedException | ExecutionException | TimeoutException e) { - throw new IllegalStateException(e); - } - } - - -} diff --git a/applications/statistics-manager/src/test/java/test/mock/util/AbstractSchemaAwareTest.java b/applications/statistics-manager/src/test/java/test/mock/util/AbstractSchemaAwareTest.java deleted file mode 100644 index d520d59cdd..0000000000 --- a/applications/statistics-manager/src/test/java/test/mock/util/AbstractSchemaAwareTest.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package test.mock.util; - -import org.junit.Before; -import org.opendaylight.yangtools.sal.binding.generator.impl.ModuleInfoBackedContext; -import org.opendaylight.yangtools.yang.binding.YangModuleInfo; -import org.opendaylight.yangtools.yang.binding.util.BindingReflections; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; - -public abstract class AbstractSchemaAwareTest { - - private Iterable moduleInfos; - private SchemaContext schemaContext; - - - protected Iterable getModuleInfos() { - return BindingReflections.loadModuleInfos(); - } - - - @Before - public final void setup() { - moduleInfos = getModuleInfos(); - ModuleInfoBackedContext moduleContext = ModuleInfoBackedContext.create(); - moduleContext.addModuleInfos(moduleInfos); - schemaContext = moduleContext.tryToCreateSchemaContext().get(); - setupWithSchema(schemaContext); - } - - /** - * Setups test with Schema context. - * This method is called before {@link #setupWithSchemaService(SchemaService)} - * - * @param context - */ - protected abstract void setupWithSchema(SchemaContext context); - -} diff --git a/applications/statistics-manager/src/test/java/test/mock/util/DataBrokerTestCustomizer.java b/applications/statistics-manager/src/test/java/test/mock/util/DataBrokerTestCustomizer.java deleted file mode 100644 index 9907024b2d..0000000000 --- a/applications/statistics-manager/src/test/java/test/mock/util/DataBrokerTestCustomizer.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package test.mock.util; - -import com.google.common.collect.ImmutableMap; -import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.common.util.concurrent.MoreExecutors; -import javassist.ClassPool; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec; -import org.opendaylight.controller.md.sal.binding.impl.ForwardedBindingDataBroker; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; -import org.opendaylight.controller.md.sal.dom.broker.impl.SerializedDOMDataBroker; -import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore; -import org.opendaylight.controller.sal.core.api.model.SchemaService; -import org.opendaylight.controller.sal.core.spi.data.DOMStore; -import org.opendaylight.yangtools.binding.data.codec.gen.impl.DataObjectSerializerGenerator; -import org.opendaylight.yangtools.binding.data.codec.gen.impl.StreamWriterGenerator; -import org.opendaylight.yangtools.binding.data.codec.impl.BindingNormalizedNodeCodecRegistry; -import org.opendaylight.yangtools.sal.binding.generator.impl.GeneratedClassLoadingStrategy; -import org.opendaylight.yangtools.sal.binding.generator.impl.RuntimeGeneratedMappingServiceImpl; -import org.opendaylight.yangtools.sal.binding.generator.util.JavassistUtils; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; - -public class DataBrokerTestCustomizer { - - private DOMDataBroker domDataBroker; - private final RuntimeGeneratedMappingServiceImpl mappingService; - private final MockSchemaService schemaService; - private ImmutableMap datastores; - private final BindingToNormalizedNodeCodec bindingToNormalized ; - - public ImmutableMap createDatastores() { - return ImmutableMap.builder() - .put(LogicalDatastoreType.OPERATIONAL, createOperationalDatastore()) - .put(LogicalDatastoreType.CONFIGURATION,createConfigurationDatastore()) - .build(); - } - - public DataBrokerTestCustomizer() { - schemaService = new MockSchemaService(); - ClassPool pool = ClassPool.getDefault(); - mappingService = new RuntimeGeneratedMappingServiceImpl(pool); - DataObjectSerializerGenerator generator = StreamWriterGenerator.create(JavassistUtils.forClassPool(pool)); - BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry(generator); - GeneratedClassLoadingStrategy loading = GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(); - bindingToNormalized = new BindingToNormalizedNodeCodec(loading, mappingService, codecRegistry); - schemaService.registerSchemaContextListener(bindingToNormalized); - } - - public DOMStore createConfigurationDatastore() { - InMemoryDOMDataStore store = new InMemoryDOMDataStore("CFG", MoreExecutors.sameThreadExecutor()); - schemaService.registerSchemaContextListener(store); - return store; - } - - public DOMStore createOperationalDatastore() { - InMemoryDOMDataStore store = new InMemoryDOMDataStore("OPER", MoreExecutors.sameThreadExecutor()); - schemaService.registerSchemaContextListener(store); - return store; - } - - public DOMDataBroker createDOMDataBroker() { - return new SerializedDOMDataBroker(getDatastores(), getCommitCoordinatorExecutor()); - } - - public ListeningExecutorService getCommitCoordinatorExecutor() { - return MoreExecutors.sameThreadExecutor(); - } - - public DataBroker createDataBroker() { - return new ForwardedBindingDataBroker(getDOMDataBroker(), bindingToNormalized, schemaService ); - } - - private SchemaService getSchemaService() { - return schemaService; - } - - private DOMDataBroker getDOMDataBroker() { - if(domDataBroker == null) { - domDataBroker = createDOMDataBroker(); - } - return domDataBroker; - } - - private synchronized ImmutableMap getDatastores() { - if (datastores == null) { - datastores = createDatastores(); - } - return datastores; - } - - public void updateSchema(final SchemaContext ctx) { - schemaService.changeSchema(ctx); - mappingService.onGlobalContextUpdated(ctx); - } - -} diff --git a/applications/statistics-manager/src/test/java/test/mock/util/MockSchemaService.java b/applications/statistics-manager/src/test/java/test/mock/util/MockSchemaService.java deleted file mode 100644 index f6f594b34f..0000000000 --- a/applications/statistics-manager/src/test/java/test/mock/util/MockSchemaService.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package test.mock.util; - -import org.opendaylight.controller.sal.core.api.model.SchemaService; -import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.util.ListenerRegistry; -import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaContextListener; -import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider; - -public final class MockSchemaService implements SchemaService, SchemaContextProvider { - - private SchemaContext schemaContext; - - ListenerRegistry listeners = ListenerRegistry.create(); - - @Override - public void addModule(final Module module) { - throw new UnsupportedOperationException(); - } - - @Override - public synchronized SchemaContext getGlobalContext() { - return schemaContext; - } - - @Override - public synchronized SchemaContext getSessionContext() { - return schemaContext; - } - - @Override - public ListenerRegistration registerSchemaContextListener( - final SchemaContextListener listener) { - return listeners.register(listener); - } - - @Override - public void removeModule(final Module module) { - throw new UnsupportedOperationException(); - } - - @Override - public synchronized SchemaContext getSchemaContext() { - return schemaContext; - } - - public synchronized void changeSchema(final SchemaContext newContext) { - schemaContext = newContext; - for (ListenerRegistration listener : listeners) { - listener.getInstance().onGlobalContextUpdated(schemaContext); - } - } -} diff --git a/applications/statistics-manager/src/test/java/test/mock/util/StatisticsManagerTest.java b/applications/statistics-manager/src/test/java/test/mock/util/StatisticsManagerTest.java index c073be4bf3..2ad3774d32 100644 --- a/applications/statistics-manager/src/test/java/test/mock/util/StatisticsManagerTest.java +++ b/applications/statistics-manager/src/test/java/test/mock/util/StatisticsManagerTest.java @@ -5,10 +5,10 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.concurrent.ExecutionException; - import org.junit.Before; import org.junit.BeforeClass; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; +import org.opendaylight.controller.md.sal.binding.test.AbstractDataBrokerTest; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.openflowplugin.applications.statistics.manager.StatisticsManager; import org.opendaylight.openflowplugin.applications.statistics.manager.impl.StatisticsManagerConfig; -- 2.36.6