X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=mdsal.git;a=blobdiff_plain;f=yanglib%2Fmdsal-yanglib-rfc8525%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fyanglib%2Frfc8525%2FAbstractYangLibraryTest.java;h=204cb95514f6134401d195768275fd572425c6b4;hp=3a0fff17c6aeed44aeb3fc45f1a0f25a9a272993;hb=e996a1b5aa1f8986deb917e0d1d77bd1dab0b82e;hpb=04d80cb158a6367189f23d8c72e2a4583507552c

diff --git a/yanglib/mdsal-yanglib-rfc8525/src/test/java/org/opendaylight/mdsal/yanglib/rfc8525/AbstractYangLibraryTest.java b/yanglib/mdsal-yanglib-rfc8525/src/test/java/org/opendaylight/mdsal/yanglib/rfc8525/AbstractYangLibraryTest.java
index 3a0fff17c6..204cb95514 100644
--- a/yanglib/mdsal-yanglib-rfc8525/src/test/java/org/opendaylight/mdsal/yanglib/rfc8525/AbstractYangLibraryTest.java
+++ b/yanglib/mdsal-yanglib-rfc8525/src/test/java/org/opendaylight/mdsal/yanglib/rfc8525/AbstractYangLibraryTest.java
@@ -8,8 +8,7 @@
 package org.opendaylight.mdsal.yanglib.rfc8525;
 
 import java.util.ServiceLoader;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeEach;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTree;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTreeFactory;
 import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeContext;
@@ -26,18 +25,12 @@ abstract class AbstractYangLibraryTest {
     private static final BindingCodecTreeFactory CODEC_FACTORY = ServiceLoader.load(BindingCodecTreeFactory.class)
         .findFirst().orElseThrow();
 
-    static BindingRuntimeContext runtimeContext;
-    static BindingCodecTree codecTree;
+    static final BindingRuntimeContext RUNTIME_CONTEXT = BindingRuntimeHelpers.createRuntimeContext();
+    static final BindingCodecTree CODEC_TREE = CODEC_FACTORY.create(RUNTIME_CONTEXT);
 
     YangLibrarySupport yangLib;
 
-    @BeforeClass
-    public static void beforeClass() {
-        runtimeContext = BindingRuntimeHelpers.createRuntimeContext();
-        codecTree = CODEC_FACTORY.create(runtimeContext);
-    }
-
-    @Before
+    @BeforeEach
     public void before() throws YangParserException {
         yangLib = new YangLibrarySupport(YANG_PARSER_FACTORY, BINDING_RUNTIME_GENERATOR, CODEC_FACTORY);
     }