Migrate mdsal-binding-test-model to JUnit 5

We have a few simple tests, let's migrate them.

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

diff --git a/binding/mdsal-binding-test-model/src/test/java/org/opendaylight/mdsal/binding/test/model/Mdsal661Test.java b/binding/mdsal-binding-test-model/src/test/java/org/opendaylight/mdsal/binding/test/model/Mdsal661Test.java
index 1ba4fcde58e8bdf79dea0c230dc49957585e9f4d..dc5e97d7e64468a08e0250b26c7a2fc0748ccc60 100644 (file)
--- a/binding/mdsal-binding-test-model/src/test/java/org/opendaylight/mdsal/binding/test/model/Mdsal661Test.java
+++ b/binding/mdsal-binding-test-model/src/test/java/org/opendaylight/mdsal/binding/test/model/Mdsal661Test.java
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.mdsal.binding.test.model;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.yang.gen.v1.mdsal661.norev.Foo;
 
 public class Mdsal661Test {

diff --git a/binding/mdsal-binding-test-model/src/test/java/org/opendaylight/mdsal/binding/test/model/TestBindingMap.java b/binding/mdsal-binding-test-model/src/test/java/org/opendaylight/mdsal/binding/test/model/TestBindingMap.java
index f0d32d06a2e44b8346d0673571da7e1b784b3c0b..4c5eab328919fc2f2a15114bc6ec0bb0a3a277c5 100644 (file)
--- a/binding/mdsal-binding-test-model/src/test/java/org/opendaylight/mdsal/binding/test/model/TestBindingMap.java
+++ b/binding/mdsal-binding-test-model/src/test/java/org/opendaylight/mdsal/binding/test/model/TestBindingMap.java
@@ -7,13 +7,13 @@
  */
 package org.opendaylight.mdsal.binding.test.model;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.yang.gen.v1.lal.norev.Foo;
 import org.opendaylight.yang.gen.v1.lal.norev.FooBuilder;
 import org.opendaylight.yang.gen.v1.lal.norev.foo.Bar;

diff --git a/binding/mdsal-binding-test-model/src/test/java/org/opendaylight/mdsal/binding/test/model/TestCopyBuilders.java b/binding/mdsal-binding-test-model/src/test/java/org/opendaylight/mdsal/binding/test/model/TestCopyBuilders.java
index 67fe76498010ba48586d27605e8c8e68099c6b12..6b08c8a4620071291b969370bb1e908cbfae33a3 100644 (file)
--- a/binding/mdsal-binding-test-model/src/test/java/org/opendaylight/mdsal/binding/test/model/TestCopyBuilders.java
+++ b/binding/mdsal-binding-test-model/src/test/java/org/opendaylight/mdsal/binding/test/model/TestCopyBuilders.java
@@ -7,21 +7,18 @@
  */
 package org.opendaylight.mdsal.binding.test.model;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeComplexUsesAugment;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeComplexUsesAugmentBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.put.top.input.choice.list.choice.in.choice.list.ComplexViaUses;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.put.top.input.choice.list.choice.in.choice.list.ComplexViaUsesBuilder;
 
 public class TestCopyBuilders {
-
     @Test
     public void testBuilderListCopy() {
-        final TreeComplexUsesAugment source = new TreeComplexUsesAugmentBuilder().build();
-        final ComplexViaUses viaUses = new ComplexViaUsesBuilder().build();
-        final TreeComplexUsesAugment copied = new TreeComplexUsesAugmentBuilder(viaUses).build();
+        final var source = new TreeComplexUsesAugmentBuilder().build();
+        final var viaUses = new ComplexViaUsesBuilder().build();
+        final var copied = new TreeComplexUsesAugmentBuilder(viaUses).build();
         assertEquals(source, copied);
     }
 }

diff --git a/binding/mdsal-binding-test-model/src/test/java/org/opendaylight/mdsal/binding/test/model/TestListSquashing.java b/binding/mdsal-binding-test-model/src/test/java/org/opendaylight/mdsal/binding/test/model/TestListSquashing.java
index 9b9a340055cc28ebcd73233c8e68a9ebf8779413..2f8261299bfaa1a77ec001b8855c3c090cfd666e 100644 (file)
--- a/binding/mdsal-binding-test-model/src/test/java/org/opendaylight/mdsal/binding/test/model/TestListSquashing.java
+++ b/binding/mdsal-binding-test-model/src/test/java/org/opendaylight/mdsal/binding/test/model/TestListSquashing.java
@@ -7,46 +7,40 @@
  */
 package org.opendaylight.mdsal.binding.test.model;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.mdsal442.keydef.norev.Def;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.yang.gen.v1.mdsal442.keydef.norev.DefBuilder;
-import org.opendaylight.yang.gen.v1.mdsal442.keydef.norev.grp.Lst;
 import org.opendaylight.yang.gen.v1.mdsal442.keydef.norev.grp.LstBuilder;
 import org.opendaylight.yang.gen.v1.mdsal442.keydef.norev.grp.LstKey;
-import org.opendaylight.yang.gen.v1.urn.test.opendaylight.mdsal298.rev180129.Container;
 import org.opendaylight.yang.gen.v1.urn.test.opendaylight.mdsal298.rev180129.ContainerBuilder;
-import org.opendaylight.yang.gen.v1.urn.test.opendaylight.mdsal298.rev180129.container.Keyed;
 import org.opendaylight.yang.gen.v1.urn.test.opendaylight.mdsal298.rev180129.container.KeyedBuilder;
 import org.opendaylight.yang.gen.v1.urn.test.opendaylight.mdsal298.rev180129.container.KeyedKey;
-import org.opendaylight.yang.gen.v1.urn.test.opendaylight.mdsal298.rev180129.container.Unkeyed;
 import org.opendaylight.yang.gen.v1.urn.test.opendaylight.mdsal298.rev180129.container.UnkeyedBuilder;
-import org.opendaylight.yang.gen.v1.urn.test.pattern.rev170101.Cont;
 import org.opendaylight.yang.gen.v1.urn.test.pattern.rev170101.ContBuilder;
 
 public class TestListSquashing {
     @Test
     public void testEmptyLeafList() {
-        final Cont obj = new ContBuilder().setTest3(Set.of()).build();
+        final var obj = new ContBuilder().setTest3(Set.of()).build();
         // Eventhough return type is Set, it should be retained
         assertEquals(Set.of(), obj.getTest3());
     }
 
     @Test
     public void testEmptyUserOrderedLeafList() {
-        final Cont obj = new ContBuilder().setTest4(List.of()).build();
+        final var obj = new ContBuilder().setTest4(List.of()).build();
         // Eventhough return type is List, it should be retained
         assertEquals(List.of(), obj.getTest4());
     }
 
     @Test
     public void testEmptyUserOrderedList() {
-        final Container cont = new ContainerBuilder()
+        final var cont = new ContainerBuilder()
                 .setKeyed(List.of())
                 .setUnkeyed(List.of())
                 .build();
@@ -57,9 +51,9 @@ public class TestListSquashing {
 
     @Test
     public void testUserOrderedList() {
-        final Keyed keyed = new KeyedBuilder().withKey(new KeyedKey("a")).build();
-        final Unkeyed unkeyed = new UnkeyedBuilder().build();
-        final Container cont = new ContainerBuilder()
+        final var keyed = new KeyedBuilder().withKey(new KeyedKey("a")).build();
+        final var unkeyed = new UnkeyedBuilder().build();
+        final var cont = new ContainerBuilder()
                 .setKeyed(List.of(keyed))
                 .setUnkeyed(List.of(unkeyed))
                 .build();
@@ -70,15 +64,15 @@ public class TestListSquashing {
 
     @Test
     public void testEmptySystemOrderedList() {
-        final Def cont = new DefBuilder().setLst(Map.of()).build();
+        final var def = new DefBuilder().setLst(Map.of()).build();
         // Empty Map should become null
-        assertNull(cont.getLst());
+        assertNull(def.getLst());
     }
 
     @Test
     public void testSystemOrderedList() {
-        final Lst lst = new LstBuilder().withKey(new LstKey("a")).build();
-        final Def cont = new DefBuilder().setLst(Map.of(lst.key(), lst)).build();
+        final var lst = new LstBuilder().withKey(new LstKey("a")).build();
+        final var cont = new DefBuilder().setLst(Map.of(lst.key(), lst)).build();
         // Non-empty Map should be retained
         assertEquals(Map.of(lst.key(), lst), cont.getLst());
     }