From: Gilles Thouenon <gilles.thouenon@orange.com>
Date: Tue, 20 Oct 2020 16:01:54 +0000 (+0200)
Subject: Make AbstractTest as static class
X-Git-Tag: 3.0.0~110
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=4ab08e4fda7f45c3fde791d0d7559b4083c9a6b0

Make AbstractTest as static class

Adapt AbstractTest to allow use of @BeforeClass for TAPI UT improvements

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I5f25e7ccf2d781f18822a6a7884030ed97abe9f3
---

diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/AbstractTest.java b/test-common/src/main/java/org/opendaylight/transportpce/test/AbstractTest.java
index 864533b99..983bae6a1 100644
--- a/test-common/src/main/java/org/opendaylight/transportpce/test/AbstractTest.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/test/AbstractTest.java
@@ -14,13 +14,9 @@ import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 
 public abstract class AbstractTest {
 
-    private final DataStoreContext dataStoreContextUtil;
+    private static DataStoreContext dataStoreContextUtil = new DataStoreContextImpl();
 
-    protected AbstractTest() {
-        dataStoreContextUtil = new DataStoreContextImpl();
-    }
-
-    public DataBroker getDataBroker() {
+    public static DataBroker getDataBroker() {
         return dataStoreContextUtil.getDataBroker();
     }
 
@@ -33,7 +29,7 @@ public abstract class AbstractTest {
         return dataStoreContextUtil.getDOMDataBroker();
     }
 
-    public DataStoreContext getDataStoreContextUtil() {
+    public static DataStoreContext getDataStoreContextUtil() {
         return dataStoreContextUtil;
     }