X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=model%2Fyang-model-util%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fmodel%2Futil%2FYT1297Test.java;h=f7cdfe88e82ca1923580ce3051d2e9e3b17952ed;hb=b399395448bc45d411bd121331ce1510a2b92de1;hp=685ae83535983e7225aea5eb2db50b7e1c0503a1;hpb=3df631a51ee1177e7642b853097be461b02c08df;p=yangtools.git

diff --git a/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1297Test.java b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1297Test.java
index 685ae83535..f7cdfe88e8 100644
--- a/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1297Test.java
+++ b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1297Test.java
@@ -7,49 +7,51 @@
  */
 package org.opendaylight.yangtools.yang.model.util;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
-import org.opendaylight.yangtools.yang.common.Revision;
-import org.opendaylight.yangtools.yang.common.XMLNamespace;
+import org.opendaylight.yangtools.yang.common.YangDataName;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
-public class YT1297Test {
+class YT1297Test {
     private static final QNameModule RESTCONF =
-        QNameModule.create(XMLNamespace.of("urn:ietf:params:xml:ns:yang:ietf-restconf"), Revision.of("2017-01-26"));
+        QNameModule.of("urn:ietf:params:xml:ns:yang:ietf-restconf", "2017-01-26");
     private static final QNameModule BAD_MODULE =
-        QNameModule.create(XMLNamespace.of("urn:ietf:params:xml:ns:yang:ietf-restconf"), Revision.of("2018-01-26"));
+        QNameModule.of("urn:ietf:params:xml:ns:yang:ietf-restconf", "2018-01-26");
 
     private static EffectiveModelContext context;
 
     private final SchemaInferenceStack stack = SchemaInferenceStack.of(context);
 
-    @BeforeClass
-    public static void beforeClass() {
+    @BeforeAll
+    static void beforeClass() {
         context = YangParserTestUtils.parseYangResource("/ietf-restconf.yang");
     }
 
     @Test
-    public void testEnterYangData() {
-        assertNotNull(stack.enterYangData(RESTCONF, "yang-api"));
+    void testEnterYangData() {
+        assertNotNull(stack.enterYangData(new YangDataName(RESTCONF, "yang-api")));
         assertNotNull(stack.enterDataTree(QName.create(RESTCONF, "restconf")));
     }
 
     @Test
-    public void testEnterYangDataNegative() {
-        Exception ex = assertThrows(IllegalArgumentException.class, () -> stack.enterYangData(RESTCONF, "bad-name"));
+    void testEnterYangDataNegative() {
+        Exception ex = assertThrows(IllegalArgumentException.class,
+            () -> stack.enterYangData(new YangDataName(RESTCONF, "bad-name")));
         assertEquals("yang-data bad-name not present in " + RESTCONF, ex.getMessage());
-        ex = assertThrows(IllegalArgumentException.class, () -> stack.enterYangData(BAD_MODULE, "whatever"));
+        ex = assertThrows(IllegalArgumentException.class,
+            () -> stack.enterYangData(new YangDataName(BAD_MODULE, "whatever")));
         assertEquals("Module for " + BAD_MODULE + " not found", ex.getMessage());
 
         assertNotNull(stack.enterGrouping(QName.create(RESTCONF, "errors")));
-        ex = assertThrows(IllegalStateException.class, () -> stack.enterYangData(RESTCONF, "yang-api"));
+        ex = assertThrows(IllegalStateException.class,
+            () -> stack.enterYangData(new YangDataName(RESTCONF, "yang-api")));
         assertEquals("Cannot lookup yang-data in a non-empty stack", ex.getMessage());
     }
 }