From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 8 Aug 2018 14:26:48 +0000 (+0200)
Subject: Speed up AbstractTransactionProxyTest
X-Git-Tag: release/neon~107
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=refs%2Fchanges%2F49%2F74949%2F3

Speed up AbstractTransactionProxyTest

Sharing SchemaContext here shaves off about 2 seconds from
test run time.

Change-Id: Ic32bbd2e57aa5a56910377422fd3ab34a3120d89
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionProxyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionProxyTest.java
index 2dd62ab72d..41881575ac 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionProxyTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionProxyTest.java
@@ -96,6 +96,7 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest {
     protected final Logger log = LoggerFactory.getLogger(getClass());
 
     private static ActorSystem system;
+    private static SchemaContext SCHEMA_CONTEXT;
 
     private final Configuration configuration = new MockConfiguration() {
         Map<String, ShardStrategy> strategyMap = ImmutableMap.<String, ShardStrategy>builder().put(
@@ -143,8 +144,6 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest {
 
     protected TransactionContextFactory mockComponentFactory;
 
-    private SchemaContext schemaContext;
-
     @Mock
     private ClusterWrapper mockClusterWrapper;
 
@@ -162,26 +161,26 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest {
                         "akka.testkit.CallingThreadDispatcherConfigurator").build())
                 .withFallback(ConfigFactory.load());
         system = ActorSystem.create("test", config);
+        SCHEMA_CONTEXT = TestModel.createTestContext();
     }
 
     @AfterClass
     public static void tearDownClass() {
         TestKit.shutdownActorSystem(system);
         system = null;
+        SCHEMA_CONTEXT = null;
     }
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        schemaContext = TestModel.createTestContext();
-
         doReturn(getSystem()).when(mockActorContext).getActorSystem();
         doReturn(getSystem().dispatchers().defaultGlobalDispatcher()).when(mockActorContext).getClientDispatcher();
         doReturn(MemberName.forName(memberName)).when(mockActorContext).getCurrentMemberName();
         doReturn(new ShardStrategyFactory(configuration,
                 LogicalDatastoreType.CONFIGURATION)).when(mockActorContext).getShardStrategyFactory();
-        doReturn(schemaContext).when(mockActorContext).getSchemaContext();
+        doReturn(SCHEMA_CONTEXT).when(mockActorContext).getSchemaContext();
         doReturn(new Timeout(operationTimeoutInSeconds, TimeUnit.SECONDS)).when(mockActorContext).getOperationTimeout();
         doReturn(mockClusterWrapper).when(mockActorContext).getClusterWrapper();
         doReturn(mockClusterWrapper).when(mockActorContext).getClusterWrapper();