X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fmodification%2FAbstractModificationTest.java;h=f2527b13abb013b475f8eeb2286ec809a9debc18;hp=84f3b92f1ba6dba08ae7a29992fe7d9e39b4e33c;hb=69d944b7b97e0e2c6a062ecb1227b7b30474cc18;hpb=961b5b9260565194a863a25bd697f171ec2405af

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 84f3b92f1b..f2527b13ab 100644
--- 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,41 +5,56 @@
  * 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;
 
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
+import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
-import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction;
+import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort;
+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.ContainerNode;
 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.EffectiveModelContext;
 
 public abstract class AbstractModificationTest {
+    private static EffectiveModelContext TEST_SCHEMA_CONTEXT;
+
+    static final @NonNull ContainerNode TEST_CONTAINER = ImmutableNodes.containerNode(TestModel.TEST_QNAME);
+
+    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());
+        store.onModelContextUpdated(TEST_SCHEMA_CONTEXT);
+    }
+
+    protected void commitTransaction(final DOMStoreWriteTransaction transaction) {
+        DOMStoreThreePhaseCommitCohort cohort = transaction.ready();
+        cohort.preCommit();
+        cohort.commit();
+    }
 
-  protected InMemoryDOMDataStore store;
-
-  @Before
-  public void setUp(){
-    store = new InMemoryDOMDataStore("test", MoreExecutors.sameThreadExecutor(),
-            MoreExecutors.sameThreadExecutor());
-    store.onGlobalContextUpdated(TestModel.createTestContext());
-  }
-
-  protected void commitTransaction(DOMStoreWriteTransaction transaction){
-    DOMStoreThreePhaseCommitCohort cohort = transaction.ready();
-    cohort.preCommit();
-    cohort.commit();
-  }
-
-  protected Optional<NormalizedNode<?,?>> readData(YangInstanceIdentifier path) throws Exception{
-    DOMStoreReadTransaction transaction = store.newReadOnlyTransaction();
-    ListenableFuture<Optional<NormalizedNode<?, ?>>> future = transaction.read(path);
-    return future.get();
-  }
+    protected Optional<NormalizedNode> readData(final YangInstanceIdentifier path) throws Exception {
+        try (var transaction = store.newReadOnlyTransaction()) {
+            return transaction.read(path).get();
+        }
+    }
 }