Migrate yang-model-api to JUnit5

This is a rather trivial migration.

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

diff --git a/model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatementTest.java b/model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatementTest.java
index 747cc1a4d49b4922f6222f182df1266ca40a5691..5bb6c414974aa8557f50e6980108215da331942d 100644 (file)
--- a/model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatementTest.java
+++ b/model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatementTest.java
@@ -7,32 +7,31 @@
  */
 package org.opendaylight.yangtools.yang.model.api.meta;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.doReturn;
 
 import com.google.common.collect.ImmutableList;
 import java.util.Optional;
-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.Mock.Strictness;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.StrictStubs.class)
-public class DeclaredStatementTest {
+@ExtendWith(MockitoExtension.class)
+class DeclaredStatementTest {
+    @Mock(strictness = Strictness.LENIENT)
+    DeclaredStatement1 stmt;
     @Mock
-    public DeclaredStatement1 stmt;
+    DeclaredStatement1 stmt1;
     @Mock
-    public DeclaredStatement1 stmt1;
-    @Mock
-    public DeclaredStatement2 stmt2;
+    DeclaredStatement2 stmt2;
 
-    @Before
-    public void before() {
-        doReturn("one").when(stmt1).argument();
-        doReturn("two").when(stmt2).argument();
+    @BeforeEach
+    void before() {
         doReturn(ImmutableList.of(stmt1, stmt2)).when(stmt).declaredSubstatements();
         doCallRealMethod().when(stmt).declaredSubstatements(any());
         doCallRealMethod().when(stmt).findFirstDeclaredSubstatement(any());
@@ -41,7 +40,7 @@ public class DeclaredStatementTest {
     }
 
     @Test
-    public void testDeclaredSubstatements() {
+    void testDeclaredSubstatements() {
         assertEquals(ImmutableList.of(stmt1), ImmutableList.copyOf(stmt.declaredSubstatements(
             DeclaredStatement1.class)));
         assertEquals(ImmutableList.of(stmt2), ImmutableList.copyOf(stmt.declaredSubstatements(
@@ -49,13 +48,15 @@ public class DeclaredStatementTest {
     }
 
     @Test
-    public void testFindFirstDeclaredSubstatement() {
+    void testFindFirstDeclaredSubstatement() {
         assertEquals(Optional.of(stmt1), stmt.findFirstDeclaredSubstatement(DeclaredStatement1.class));
         assertEquals(Optional.of(stmt2), stmt.findFirstDeclaredSubstatement(DeclaredStatement2.class));
     }
 
     @Test
-    public void testFindFirstDeclaredSubstatementArgument() {
+    void testFindFirstDeclaredSubstatementArgument() {
+        doReturn("one").when(stmt1).argument();
+        doReturn("two").when(stmt2).argument();
         assertEquals(Optional.of("one"), stmt.findFirstDeclaredSubstatementArgument(DeclaredStatement1.class));
         assertEquals(Optional.of("two"), stmt.findFirstDeclaredSubstatementArgument(DeclaredStatement2.class));
     }

diff --git a/model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatementTest.java b/model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatementTest.java
index 054da31a302eff927112c2463caf1d44b8d4d9fe..bb5f822f9b74ca47b5f832061be1ec6a985ff97f 100644 (file)
--- a/model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatementTest.java
+++ b/model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatementTest.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.yangtools.yang.model.api.meta;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.doReturn;
@@ -16,27 +16,26 @@ import com.google.common.collect.ImmutableList;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
-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.Mock.Strictness;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.StrictStubs.class)
-public class EffectiveStatementTest {
+@ExtendWith(MockitoExtension.class)
+class EffectiveStatementTest {
+    @Mock(strictness = Strictness.LENIENT)
+    EffectiveStatement1 stmt;
     @Mock
-    public EffectiveStatement1 stmt;
+    EffectiveStatement1 stmt1;
     @Mock
-    public EffectiveStatement1 stmt1;
+    Effectivestatement2 stmt2;
     @Mock
-    public Effectivestatement2 stmt2;
-    @Mock
-    public Map<?, ?> mockNamespace;
+    Map<?, ?> mockNamespace;
 
-    @Before
-    public void before() {
-        doReturn("one").when(stmt1).argument();
-        doReturn("two").when(stmt2).argument();
+    @BeforeEach
+    void before() {
         doReturn(ImmutableList.of(stmt1, stmt2)).when(stmt).effectiveSubstatements();
         doCallRealMethod().when(stmt).findFirstEffectiveSubstatement(any());
         doCallRealMethod().when(stmt).findFirstEffectiveSubstatementArgument(any());
@@ -44,19 +43,21 @@ public class EffectiveStatementTest {
     }
 
     @Test
-    public void testFindFirstDeclaredSubstatement() {
+    void testFindFirstDeclaredSubstatement() {
         assertEquals(Optional.of(stmt1), stmt.findFirstEffectiveSubstatement(EffectiveStatement1.class));
         assertEquals(Optional.of(stmt2), stmt.findFirstEffectiveSubstatement(Effectivestatement2.class));
     }
 
     @Test
-    public void testFindFirstDeclaredSubstatementArgument() {
+    void testFindFirstDeclaredSubstatementArgument() {
+        doReturn("one").when(stmt1).argument();
+        doReturn("two").when(stmt2).argument();
         assertEquals(Optional.of("one"), stmt.findFirstEffectiveSubstatementArgument(EffectiveStatement1.class));
         assertEquals(Optional.of("two"), stmt.findFirstEffectiveSubstatementArgument(Effectivestatement2.class));
     }
 
     @Test
-    public void testStreamEffectiveSubstatements() {
+    void testStreamEffectiveSubstatements() {
         assertEquals(ImmutableList.of(stmt1), stmt.streamEffectiveSubstatements(EffectiveStatement1.class)
             .collect(Collectors.toList()));
         assertEquals(ImmutableList.of(stmt2), stmt.streamEffectiveSubstatements(Effectivestatement2.class)

diff --git a/model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementAwareDeclaredStatementTest.java b/model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementAwareDeclaredStatementTest.java
index b9a4ee7df3cef1e8ff8188bd236a0e9d2a36a216..b46e6dec66f1a0667bcec67097e80b4429d59ba8 100644 (file)
--- a/model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementAwareDeclaredStatementTest.java
+++ b/model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementAwareDeclaredStatementTest.java
@@ -7,37 +7,37 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.doReturn;
 
 import com.google.common.collect.ImmutableList;
-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.model.api.meta.DeclaredStatement1;
 
-@RunWith(MockitoJUnitRunner.StrictStubs.class)
-public class ActionStatementAwareDeclaredStatementTest {
+@ExtendWith(MockitoExtension.class)
+class ActionStatementAwareDeclaredStatementTest {
     @Mock
-    public ActionStatementAwareDeclaredStatement<?> stmt;
+    ActionStatementAwareDeclaredStatement<?> stmt;
     @Mock
-    public DeclaredStatement1 stmt1;
+    DeclaredStatement1 stmt1;
     @Mock
-    public ActionStatement stmt2;
+    ActionStatement stmt2;
 
-    @Before
-    public void before() {
+    @BeforeEach
+    void before() {
         doReturn(ImmutableList.of(stmt1, stmt2)).when(stmt).declaredSubstatements();
         doCallRealMethod().when(stmt).declaredSubstatements(any());
         doCallRealMethod().when(stmt).getActions();
     }
 
     @Test
-    public void testGetActions() {
+    void testGetActions() {
         assertEquals(ImmutableList.of(stmt2), ImmutableList.copyOf(stmt.getActions()));
     }
 }