From 8670aff288c7f590d28380eaaa6f4c8c4ad0547d Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 8 Aug 2018 16:26:48 +0200 Subject: [PATCH] Speed up AbstractTransactionProxyTest Sharing SchemaContext here shaves off about 2 seconds from test run time. Change-Id: Ic32bbd2e57aa5a56910377422fd3ab34a3120d89 Signed-off-by: Robert Varga --- .../cluster/datastore/AbstractTransactionProxyTest.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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 strategyMap = ImmutableMap.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(); -- 2.36.6