From 1a0f14b5b67945d58aaa8d84342e0bb8144e2329 Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Wed, 26 Aug 2015 11:40:24 +0200 Subject: [PATCH] Renamed test packages to use org.opendaylight.mdsal Change-Id: Ie3272a21a39328c363a8f278cd734cdd927c995b Signed-off-by: Tony Tkacik --- .../dom/adapter/test/Bug1125RegressionTest.java | 8 +++----- .../test/Bug1333DataChangeListenerTest.java | 16 +++++++--------- .../adapter/test/Bug1418AugmentationTest.java | 12 +++++------- .../adapter/test/DataTreeChangeListenerTest.java | 16 +++++++--------- .../ListInsertionDataChangeListenerTest.java | 10 ++++------ .../NormalizedNodeSerializeDeserializeTest.java | 4 ++-- .../test/model/util/ListsBindingUtils.java | 2 +- .../test}/BlockingTransactionChainListener.java | 2 +- .../broker/test}/DOMBrokerPerformanceTest.java | 6 +++--- .../dom/broker/test}/DOMBrokerTest.java | 6 +++--- .../broker/test}/DOMDataTreeListenerTest.java | 6 +++--- .../broker/test}/DOMTransactionChainTest.java | 6 +++--- .../dom/broker/test}/MountPointServiceTest.java | 2 +- .../dom/broker/test/util}/TestModel.java | 9 ++++----- 14 files changed, 47 insertions(+), 58 deletions(-) rename binding/mdsal-binding-test-model/src/main/java/org/opendaylight/{controller/md/sal => mdsal/binding}/test/model/util/ListsBindingUtils.java (98%) rename dom/mdsal-dom-broker/src/test/java/org/opendaylight/{controller/md/sal/dom/broker/impl => mdsal/dom/broker/test}/BlockingTransactionChainListener.java (96%) rename dom/mdsal-dom-broker/src/test/java/org/opendaylight/{controller/md/sal/dom/broker/impl => mdsal/dom/broker/test}/DOMBrokerPerformanceTest.java (98%) rename dom/mdsal-dom-broker/src/test/java/org/opendaylight/{controller/md/sal/dom/broker/impl => mdsal/dom/broker/test}/DOMBrokerTest.java (99%) rename dom/mdsal-dom-broker/src/test/java/org/opendaylight/{controller/md/sal/dom/broker/impl => mdsal/dom/broker/test}/DOMDataTreeListenerTest.java (99%) rename dom/mdsal-dom-broker/src/test/java/org/opendaylight/{controller/md/sal/dom/broker/impl => mdsal/dom/broker/test}/DOMTransactionChainTest.java (98%) rename dom/mdsal-dom-broker/src/test/java/org/opendaylight/{controller/md/sal/dom/broker/impl => mdsal/dom/broker/test}/MountPointServiceTest.java (96%) rename dom/mdsal-dom-broker/src/test/java/org/opendaylight/{controller/md/sal/dom/store/impl => mdsal/dom/broker/test/util}/TestModel.java (97%) diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/Bug1125RegressionTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/Bug1125RegressionTest.java index 1edf2efb49..d8778957af 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/Bug1125RegressionTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/Bug1125RegressionTest.java @@ -8,16 +8,14 @@ package org.opendaylight.mdsal.binding.dom.adapter.test; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.TOP_FOO_KEY; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.path; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.topLevelList; import static org.opendaylight.mdsal.binding.dom.adapter.test.AssertCollections.assertContains; import static org.opendaylight.mdsal.binding.dom.adapter.test.AssertCollections.assertEmpty; - +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.TOP_FOO_KEY; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.path; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.topLevelList; import org.opendaylight.mdsal.common.api.AsyncDataChangeEvent; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.common.api.AsyncDataBroker.DataChangeScope; - import org.opendaylight.mdsal.binding.api.WriteTransaction; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeComplexUsesAugment; diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/Bug1333DataChangeListenerTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/Bug1333DataChangeListenerTest.java index 759971afad..cc9dea205a 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/Bug1333DataChangeListenerTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/Bug1333DataChangeListenerTest.java @@ -7,22 +7,20 @@ */ package org.opendaylight.mdsal.binding.dom.adapter.test; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.TOP_FOO_KEY; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.USES_ONE_KEY; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.USES_TWO_KEY; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.complexUsesAugment; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.path; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.top; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.topLevelList; import static org.opendaylight.mdsal.binding.dom.adapter.test.AssertCollections.assertContains; import static org.opendaylight.mdsal.binding.dom.adapter.test.AssertCollections.assertEmpty; import static org.opendaylight.mdsal.binding.dom.adapter.test.AssertCollections.assertNotContains; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.TOP_FOO_KEY; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.USES_ONE_KEY; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.USES_TWO_KEY; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.complexUsesAugment; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.path; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.top; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.topLevelList; import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION; - import org.opendaylight.mdsal.common.api.AsyncDataChangeEvent; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.common.api.AsyncDataBroker.DataChangeScope; - import org.opendaylight.mdsal.binding.api.ReadWriteTransaction; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeComplexUsesAugment; diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/Bug1418AugmentationTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/Bug1418AugmentationTest.java index 756ed41d47..80f8bf8275 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/Bug1418AugmentationTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/Bug1418AugmentationTest.java @@ -9,18 +9,16 @@ package org.opendaylight.mdsal.binding.dom.adapter.test; import static org.junit.Assert.assertTrue; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.TOP_FOO_KEY; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.complexUsesAugment; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.leafOnlyUsesAugment; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.top; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.topLevelList; import static org.opendaylight.mdsal.binding.dom.adapter.test.AssertCollections.assertContains; import static org.opendaylight.mdsal.binding.dom.adapter.test.AssertCollections.assertEmpty; - +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.TOP_FOO_KEY; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.complexUsesAugment; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.leafOnlyUsesAugment; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.top; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.topLevelList; import org.opendaylight.mdsal.common.api.AsyncDataBroker; import org.opendaylight.mdsal.common.api.AsyncDataChangeEvent; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; - import org.opendaylight.mdsal.binding.api.WriteTransaction; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeComplexUsesAugment; diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/DataTreeChangeListenerTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/DataTreeChangeListenerTest.java index d4bfa40c61..0d3fdf93b9 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/DataTreeChangeListenerTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/DataTreeChangeListenerTest.java @@ -11,16 +11,14 @@ package org.opendaylight.mdsal.binding.dom.adapter.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.TOP_BAR_KEY; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.TOP_FOO_KEY; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.USES_ONE_KEY; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.complexUsesAugment; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.path; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.top; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.topLevelList; - +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.TOP_BAR_KEY; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.TOP_FOO_KEY; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.USES_ONE_KEY; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.complexUsesAugment; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.path; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.top; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.topLevelList; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; - import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.DataObjectModification; import org.opendaylight.mdsal.binding.api.DataTreeChangeListener; diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/ListInsertionDataChangeListenerTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/ListInsertionDataChangeListenerTest.java index 3fa7e74d6d..d1017cd807 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/ListInsertionDataChangeListenerTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/ListInsertionDataChangeListenerTest.java @@ -7,18 +7,16 @@ */ package org.opendaylight.mdsal.binding.dom.adapter.test; import static org.junit.Assert.assertFalse; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.TOP_BAR_KEY; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.TOP_FOO_KEY; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.top; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.topLevelList; import static org.opendaylight.mdsal.binding.dom.adapter.test.AssertCollections.assertContains; import static org.opendaylight.mdsal.binding.dom.adapter.test.AssertCollections.assertEmpty; import static org.opendaylight.mdsal.binding.dom.adapter.test.AssertCollections.assertNotContains; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.TOP_BAR_KEY; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.TOP_FOO_KEY; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.top; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.topLevelList; import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION; - import org.opendaylight.mdsal.common.api.AsyncDataChangeEvent; import org.opendaylight.mdsal.common.api.AsyncDataBroker.DataChangeScope; - import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.ReadWriteTransaction; import org.opendaylight.mdsal.binding.api.WriteTransaction; diff --git a/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/yangtools/binding/data/codec/test/NormalizedNodeSerializeDeserializeTest.java b/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/yangtools/binding/data/codec/test/NormalizedNodeSerializeDeserializeTest.java index 59348264d4..f595dc5b8b 100644 --- a/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/yangtools/binding/data/codec/test/NormalizedNodeSerializeDeserializeTest.java +++ b/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/yangtools/binding/data/codec/test/NormalizedNodeSerializeDeserializeTest.java @@ -8,8 +8,8 @@ package org.opendaylight.yangtools.binding.data.codec.test; import static org.junit.Assert.assertEquals; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.top; -import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.topLevelList; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.top; +import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.topLevelList; import static org.opendaylight.yangtools.yang.data.impl.schema.Builders.augmentationBuilder; import static org.opendaylight.yangtools.yang.data.impl.schema.Builders.choiceBuilder; import static org.opendaylight.yangtools.yang.data.impl.schema.Builders.containerBuilder; diff --git a/binding/mdsal-binding-test-model/src/main/java/org/opendaylight/controller/md/sal/test/model/util/ListsBindingUtils.java b/binding/mdsal-binding-test-model/src/main/java/org/opendaylight/mdsal/binding/test/model/util/ListsBindingUtils.java similarity index 98% rename from binding/mdsal-binding-test-model/src/main/java/org/opendaylight/controller/md/sal/test/model/util/ListsBindingUtils.java rename to binding/mdsal-binding-test-model/src/main/java/org/opendaylight/mdsal/binding/test/model/util/ListsBindingUtils.java index 9d24e59c77..1ace5ad932 100644 --- a/binding/mdsal-binding-test-model/src/main/java/org/opendaylight/controller/md/sal/test/model/util/ListsBindingUtils.java +++ b/binding/mdsal-binding-test-model/src/main/java/org/opendaylight/mdsal/binding/test/model/util/ListsBindingUtils.java @@ -5,7 +5,7 @@ * 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 org.opendaylight.controller.md.sal.test.model.util; +package org.opendaylight.mdsal.binding.test.model.util; import com.google.common.collect.ImmutableList; import java.util.Arrays; diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/BlockingTransactionChainListener.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/test/BlockingTransactionChainListener.java similarity index 96% rename from dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/BlockingTransactionChainListener.java rename to dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/test/BlockingTransactionChainListener.java index 8b64e6d9e5..4afc431e90 100644 --- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/BlockingTransactionChainListener.java +++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/test/BlockingTransactionChainListener.java @@ -5,7 +5,7 @@ * 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 org.opendaylight.controller.md.sal.dom.broker.impl; +package org.opendaylight.mdsal.dom.broker.test; import org.opendaylight.mdsal.common.api.AsyncTransaction; import org.opendaylight.mdsal.common.api.TransactionChain; diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerPerformanceTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/test/DOMBrokerPerformanceTest.java similarity index 98% rename from dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerPerformanceTest.java rename to dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/test/DOMBrokerPerformanceTest.java index d9c3f9f615..aa3af55d50 100644 --- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerPerformanceTest.java +++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/test/DOMBrokerPerformanceTest.java @@ -6,15 +6,16 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.md.sal.dom.broker.impl; +package org.opendaylight.mdsal.dom.broker.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION; import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.OPERATIONAL; -import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStore; +import org.opendaylight.mdsal.dom.broker.test.util.TestModel; +import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStore; import org.opendaylight.mdsal.dom.spi.store.DOMStore; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.broker.AbstractDOMDataBroker; @@ -33,7 +34,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.Executors; import org.junit.Before; import org.junit.Test; -import org.opendaylight.controller.md.sal.dom.store.impl.TestModel; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/test/DOMBrokerTest.java similarity index 99% rename from dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerTest.java rename to dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/test/DOMBrokerTest.java index 6552a91050..4b37487e4c 100644 --- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerTest.java +++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/test/DOMBrokerTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.md.sal.dom.broker.impl; +package org.opendaylight.mdsal.dom.broker.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -15,8 +15,9 @@ import static org.junit.Assert.assertTrue; import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION; import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.OPERATIONAL; -import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStore; +import org.opendaylight.mdsal.dom.broker.test.util.TestModel; +import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStore; import org.opendaylight.mdsal.dom.spi.store.DOMStore; import org.opendaylight.mdsal.common.api.AsyncDataChangeEvent; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; @@ -49,7 +50,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.opendaylight.controller.md.sal.dom.store.impl.TestModel; import org.opendaylight.yangtools.util.concurrent.DeadlockDetectingListeningExecutorService; import org.opendaylight.yangtools.util.concurrent.SpecialExecutors; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataTreeListenerTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/test/DOMDataTreeListenerTest.java similarity index 99% rename from dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataTreeListenerTest.java rename to dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/test/DOMDataTreeListenerTest.java index 0d47f6dcff..9cc10319c9 100644 --- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataTreeListenerTest.java +++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/test/DOMDataTreeListenerTest.java @@ -5,7 +5,7 @@ * 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 org.opendaylight.controller.md.sal.dom.broker.impl; +package org.opendaylight.mdsal.dom.broker.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -14,8 +14,9 @@ import static org.junit.Assert.assertTrue; import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION; import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.OPERATIONAL; -import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStore; +import org.opendaylight.mdsal.dom.broker.test.util.TestModel; +import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStore; import org.opendaylight.mdsal.dom.spi.store.DOMStore; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.common.api.TransactionCommitDeadlockException; @@ -42,7 +43,6 @@ import javax.annotation.Nonnull; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.opendaylight.controller.md.sal.dom.store.impl.TestModel; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.util.concurrent.DeadlockDetectingListeningExecutorService; import org.opendaylight.yangtools.util.concurrent.SpecialExecutors; diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMTransactionChainTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/test/DOMTransactionChainTest.java similarity index 98% rename from dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMTransactionChainTest.java rename to dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/test/DOMTransactionChainTest.java index e7ba3ff7b7..32db3b5250 100644 --- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMTransactionChainTest.java +++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/test/DOMTransactionChainTest.java @@ -5,7 +5,7 @@ * 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 org.opendaylight.controller.md.sal.dom.broker.impl; +package org.opendaylight.mdsal.dom.broker.test; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -13,8 +13,9 @@ import static org.junit.Assert.fail; import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION; import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.OPERATIONAL; -import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStore; +import org.opendaylight.mdsal.dom.broker.test.util.TestModel; +import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStore; import org.opendaylight.mdsal.dom.spi.store.DOMStore; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.broker.AbstractDOMDataBroker; @@ -33,7 +34,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.junit.Before; import org.junit.Test; -import org.opendaylight.controller.md.sal.dom.store.impl.TestModel; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.SchemaContext; diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/MountPointServiceTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/test/MountPointServiceTest.java similarity index 96% rename from dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/MountPointServiceTest.java rename to dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/test/MountPointServiceTest.java index 0f66d199c3..d1082c6957 100644 --- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/MountPointServiceTest.java +++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/test/MountPointServiceTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.md.sal.dom.broker.impl; +package org.opendaylight.mdsal.dom.broker.test; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/test/util/TestModel.java similarity index 97% rename from dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java rename to dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/test/util/TestModel.java index 09835ec5e3..3761c78705 100644 --- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java +++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/test/util/TestModel.java @@ -5,18 +5,17 @@ * 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 org.opendaylight.controller.md.sal.dom.store.impl; +package org.opendaylight.mdsal.dom.broker.test.util; +import java.io.InputStream; +import java.util.Collections; +import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; -import java.io.InputStream; -import java.util.Collections; -import java.util.Set; - public class TestModel { public static final QName TEST_QNAME = QName.create("urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test", "2014-03-13", -- 2.36.6