From 08788622aa44df7ded9e1d6d91ff51ee67e60eff Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 8 Aug 2018 16:30:43 +0200 Subject: [PATCH 1/1] Speed up AbstractModificationTest Sharing SchemaContext here shaves off about 2 seconds from test run time. Change-Id: I5e7fa63dd061ee6e1a16831aeae59f61deaccb5f Signed-off-by: Robert Varga --- .../modification/AbstractModificationTest.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) 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 9daa3429fd..e3bca7e16b 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 @@ -11,7 +11,9 @@ package org.opendaylight.controller.cluster.datastore.modification; 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.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; @@ -19,15 +21,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.yangtools.yang.model.api.SchemaContext; public abstract class AbstractModificationTest { + private static SchemaContext TEST_SCHEMA_CONTEXT; 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.onGlobalContextUpdated(TestModel.createTestContext()); + store.onGlobalContextUpdated(TEST_SCHEMA_CONTEXT); } protected void commitTransaction(final DOMStoreWriteTransaction transaction) { -- 2.36.6