Migrate yang-model-spi to JUnit5

This is mostly a rewrite-driven migration.

Change-Id: Icb01d01d7cd3daa37fbdfff8b5cd932eb75e4c58
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/model/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/ModuleDependencySortTest.java b/model/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/ModuleDependencySortTest.java
index fec1802a43f27d995a1647831011af2922702c43..45445349973f15cc2ee67b8635236cd86bea3436 100644 (file)
--- a/model/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/ModuleDependencySortTest.java
+++ b/model/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/ModuleDependencySortTest.java
@@ -7,17 +7,17 @@
  */
 package org.opendaylight.yangtools.yang.model.spi;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.doReturn;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified;
 import org.opendaylight.yangtools.yang.common.XMLNamespace;
@@ -26,31 +26,39 @@ import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.ModuleImport;
 import org.opendaylight.yangtools.yang.model.api.Submodule;
 
-@RunWith(MockitoJUnitRunner.class)
-public class ModuleDependencySortTest {
-    public static final QNameModule FOO_MODULE = QNameModule.create(XMLNamespace.of("foo"));
-    public static final QNameModule BAR_MODULE = QNameModule.create(XMLNamespace.of("bar"));
+@ExtendWith(MockitoExtension.class)
+class ModuleDependencySortTest {
+    static final QNameModule FOO_MODULE = QNameModule.create(XMLNamespace.of("foo"));
+    static final QNameModule BAR_MODULE = QNameModule.create(XMLNamespace.of("bar"));
 
     @Mock
-    public Module fooNoRev;
+    Module fooNoRev;
 
     @Mock
-    public ModuleImport fooNoRevImport;
+    ModuleImport fooNoRevImport;
 
     @Mock
-    public Module bar;
+    Module bar;
 
     @Mock
-    public Submodule barSubmodule;
+    Submodule barSubmodule;
 
-    @Before
-    public void before() {
+    @BeforeEach
+    void before() {
         doReturn("foo").when(fooNoRev).getName();
         doReturn(FOO_MODULE.getNamespace()).when(fooNoRev).getNamespace();
         doReturn(FOO_MODULE.getRevision()).when(fooNoRev).getRevision();
         doReturn(Set.of()).when(fooNoRev).getImports();
         doReturn(Set.of()).when(fooNoRev).getSubmodules();
+    }
+
+    @Test
+    void testSimpleModules() {
+        assertSortedTo(List.of(fooNoRev), fooNoRev);
+    }
 
+    @Test
+    void testSubmodules() {
         doReturn(Unqualified.of("foo")).when(fooNoRevImport).getModuleName();
         doReturn(Optional.empty()).when(fooNoRevImport).getRevision();
 
@@ -62,15 +70,7 @@ public class ModuleDependencySortTest {
         doReturn(Set.of(barSubmodule)).when(bar).getSubmodules();
 
         doReturn(Set.of(fooNoRevImport)).when(barSubmodule).getImports();
-    }
-
-    @Test
-    public void testSimpleModules() {
-        assertSortedTo(List.of(fooNoRev), fooNoRev);
-    }
 
-    @Test
-    public void testSubmodules() {
         assertSortedTo(List.of(fooNoRev, bar), bar, fooNoRev);
         assertSortedTo(List.of(fooNoRev, bar), fooNoRev, bar);
     }

diff --git a/model/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/YT1414Test.java b/model/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/YT1414Test.java
index ed479382876ab850eddfa8d7b395e678432a37ec..90b420510c7a217ca555795e535007b3aeef9d98 100644 (file)
--- a/model/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/YT1414Test.java
+++ b/model/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/YT1414Test.java
@@ -9,32 +9,32 @@ package org.opendaylight.yangtools.yang.model.spi;
 
 import static org.hamcrest.CoreMatchers.startsWith;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 
 import com.google.common.collect.ImmutableList;
 import java.util.Optional;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.stmt.ContainerEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.ListEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.ModuleEffectiveStatement;
 
-@RunWith(MockitoJUnitRunner.StrictStubs.class)
-public class YT1414Test {
+@ExtendWith(MockitoExtension.class)
+class YT1414Test {
     @Mock
-    public EffectiveModelContext modelContext;
+    EffectiveModelContext modelContext;
     @Mock
-    public ContainerEffectiveStatement container;
+    ContainerEffectiveStatement container;
 
     @Test
-    public void testUnsafeOf() {
+    void testUnsafeOf() {
         final var path = ImmutableList.of(container);
         final var inference = DefaultSchemaTreeInference.unsafeOf(modelContext, path);
         assertSame(modelContext, inference.getEffectiveModelContext());
@@ -42,7 +42,7 @@ public class YT1414Test {
     }
 
     @Test
-    public void testVerifiedOf() {
+    void testVerifiedOf() {
         final var qname = QName.create("foo", "foo");
         doReturn(qname).when(container).argument();
 
@@ -58,7 +58,7 @@ public class YT1414Test {
     }
 
     @Test
-    public void testVerifiedOfNegative() {
+    void testVerifiedOfNegative() {
         final var qname = QName.create("foo", "foo");
         doReturn(qname).when(container).argument();