Migrate concepts to Jupiter API

These are simple tests, use JUnit5 for them.

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

diff --git a/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/AbstractIllegalArgumentCodecTest.java b/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/AbstractIllegalArgumentCodecTest.java
index b645e3051c44fa6ce747ed3940c527bd0a07b537..ae85a213018f5944debb97aa7898958656994bd5 100644 (file)
--- a/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/AbstractIllegalArgumentCodecTest.java
+++ b/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/AbstractIllegalArgumentCodecTest.java
@@ -7,9 +7,9 @@
  */
 package org.opendaylight.yangtools.concepts;
 
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 @Deprecated(since = "8.0.0", forRemoval = true)
 public class AbstractIllegalArgumentCodecTest {

diff --git a/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/CheckedValueTest.java b/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/CheckedValueTest.java
index 237b9334f3a3284a02a08450e0a4799c5aa876ae..9ebaee5ef5afc61b3abc4e1c6672312089b961e1 100644 (file)
--- a/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/CheckedValueTest.java
+++ b/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/CheckedValueTest.java
@@ -7,11 +7,11 @@
  */
 package org.opendaylight.yangtools.concepts;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
@@ -22,7 +22,7 @@ import static org.mockito.Mockito.verifyNoInteractions;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CheckedValueTest {
     @Test

diff --git a/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/SemVerTest.java b/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/SemVerTest.java
index 56e45e4d0b1fdcd7b2ec00e9de84af539f14a588..8d446260974c925c34e8deb554cf5da45fec3546 100644 (file)
--- a/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/SemVerTest.java
+++ b/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/SemVerTest.java
@@ -5,18 +5,16 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.yangtools.concepts;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SemVerTest {
-
     @Test
     public void testSemVer() {
         final SemVer semVer = SemVer.create(5);

diff --git a/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/WritableObjectsTest.java b/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/WritableObjectsTest.java
index f019219cc514b8226fed87356397e470fcec727e..f74b040a5888b8f27c8d8971d4e69c68afdfb51c 100644 (file)
--- a/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/WritableObjectsTest.java
+++ b/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/WritableObjectsTest.java
@@ -7,12 +7,12 @@
  */
 package org.opendaylight.yangtools.concepts;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
 import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class WritableObjectsTest {