Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump odlparent/yangtools/mdsal
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
modification
/
AbstractModificationTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/AbstractModificationTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/AbstractModificationTest.java
index ac06dc2b32e9c7b7a77c90a6025aa6e4f1340c6a..5d7d842298e419fe13d94198b9b751d080944b69 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/AbstractModificationTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/AbstractModificationTest.java
@@
-5,13
+5,14
@@
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
* 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.cluster.datastore.modification;
package org.opendaylight.controller.cluster.datastore.modification;
-import com.google.common.base.Optional;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;
+import java.util.Optional;
+import org.junit.AfterClass;
import org.junit.Before;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadTransaction;
import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort;
import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadTransaction;
import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort;
@@
-19,15
+20,27
@@
import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction;
import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStore;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStore;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
public abstract class AbstractModificationTest {
public abstract class AbstractModificationTest {
+ private static EffectiveModelContext TEST_SCHEMA_CONTEXT;
protected InMemoryDOMDataStore store;
protected InMemoryDOMDataStore store;
+ @BeforeClass
+ public static void beforeClass() {
+ TEST_SCHEMA_CONTEXT = TestModel.createTestContext();
+ }
+
+ @AfterClass
+ public static void afterClass() {
+ TEST_SCHEMA_CONTEXT = null;
+ }
+
@Before
public void setUp() {
store = new InMemoryDOMDataStore("test", MoreExecutors.newDirectExecutorService());
@Before
public void setUp() {
store = new InMemoryDOMDataStore("test", MoreExecutors.newDirectExecutorService());
- store.on
GlobalContextUpdated(TestModel.createTestContext()
);
+ store.on
ModelContextUpdated(TEST_SCHEMA_CONTEXT
);
}
protected void commitTransaction(final DOMStoreWriteTransaction transaction) {
}
protected void commitTransaction(final DOMStoreWriteTransaction transaction) {