From da059142de9d7b541e00b163086e06395b017c61 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 26 Aug 2019 12:35:10 +0200 Subject: [PATCH] Reuse schemacontext in ListenerAdapterTest SchemaContext is an invariant here, make sure we reuse it across tests. Change-Id: Ieed76b452cfaf5bd6a6174badc4eace29650a230 Signed-off-by: Robert Varga --- .../listeners/ListenerAdapterTest.java | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapterTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapterTest.java index 34116da78c..54d4fe2be1 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapterTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapterTest.java @@ -20,7 +20,9 @@ import java.nio.file.Paths; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.json.JSONObject; +import org.junit.AfterClass; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; import org.opendaylight.mdsal.binding.api.DataBroker; @@ -56,25 +58,36 @@ public class ListenerAdapterTest extends AbstractConcurrentDataBrokerTest { private static final String JSON_NOTIF_UPDATE = "/listener-adapter-test/notif-update.json"; private static final String JSON_NOTIF_DEL = "/listener-adapter-test/notif-del.json"; - private static YangInstanceIdentifier PATCH_CONT_YIID = + private static final YangInstanceIdentifier PATCH_CONT_YIID = YangInstanceIdentifier.create(new YangInstanceIdentifier.NodeIdentifier(PatchCont.QNAME)); + private static SchemaContext SCHEMA_CONTEXT; + private DataBroker dataBroker; private DOMDataBroker domDataBroker; private TransactionChainHandler transactionChainHandler; private SchemaContextHandler schemaContextHandler; + @BeforeClass + public static void beforeClass() { + SCHEMA_CONTEXT = YangParserTestUtils.parseYangResource( + "/instanceidentifier/yang/instance-identifier-patch-module.yang"); + } + + @AfterClass + public static void afterClass() { + SCHEMA_CONTEXT = null; + } + @Before public void setUp() throws Exception { dataBroker = getDataBroker(); domDataBroker = getDomBroker(); - SchemaContext sc = YangParserTestUtils.parseYangResource( - "/instanceidentifier/yang/instance-identifier-patch-module.yang"); transactionChainHandler = new TransactionChainHandler(domDataBroker); schemaContextHandler = SchemaContextHandler.newInstance(transactionChainHandler, Mockito.mock(DOMSchemaService.class)); - schemaContextHandler.onGlobalContextUpdated(sc); + schemaContextHandler.onGlobalContextUpdated(SCHEMA_CONTEXT); } class ListenerAdapterTester extends ListenerAdapter { -- 2.36.6