Migrate ImmutableNodes users

[yangtools.git] / codec / yang-data-codec-binfmt / src / test / java / org / opendaylight / yangtools / yang / data / codec / binfmt / MapEntrySerializationTest.java

diff --git a/codec/yang-data-codec-binfmt/src/test/java/org/opendaylight/yangtools/yang/data/codec/binfmt/MapEntrySerializationTest.java b/codec/yang-data-codec-binfmt/src/test/java/org/opendaylight/yangtools/yang/data/codec/binfmt/MapEntrySerializationTest.java
index c62194bb9ed93c170b4ec2daf45ce0cbff80cb21..01bf2f65901c3a0a53e81e89f4158e019aa91ac9 100644 (file)
--- a/codec/yang-data-codec-binfmt/src/test/java/org/opendaylight/yangtools/yang/data/codec/binfmt/MapEntrySerializationTest.java
+++ b/codec/yang-data-codec-binfmt/src/test/java/org/opendaylight/yangtools/yang/data/codec/binfmt/MapEntrySerializationTest.java
@@ -8,61 +8,61 @@
 package org.opendaylight.yangtools.yang.data.codec.binfmt;
 
 import com.google.common.collect.Maps;
-import java.util.Collections;
-import java.util.Map;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.List;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
-import org.opendaylight.yangtools.yang.data.api.schema.builder.DataContainerNodeBuilder;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
-import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
+import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes;
 
-@RunWith(Parameterized.class)
-public class MapEntrySerializationTest extends AbstractSerializationTest {
-    @Parameters(name = "{0}")
-    public static Iterable<Object[]> data() {
-        return Collections.singletonList(
-            new Object[] { NormalizedNodeStreamVersion.MAGNESIUM, 96, 110, 125, 3_927 });
+class MapEntrySerializationTest extends AbstractSerializationTest {
+    @ParameterizedTest
+    @MethodSource
+    void testEmptyIdentifier(final NormalizedNodeStreamVersion version, final int size) {
+        assertEquals(version, createEntry(0), size);
     }
 
-    @Parameter(1)
-    public int emptySize;
-    @Parameter(2)
-    public int oneSize;
-    @Parameter(3)
-    public int twoSize;
-    @Parameter(4)
-    public int size256;
+    static List<Arguments> testEmptyIdentifier() {
+        return List.of(Arguments.of(NormalizedNodeStreamVersion.POTASSIUM, 96));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void testOneIdentifier(final NormalizedNodeStreamVersion version, final int size) {
+        assertEquals(version, createEntry(1), size);
+    }
+
+    static List<Arguments> testOneIdentifier() {
+        return List.of(Arguments.of(NormalizedNodeStreamVersion.POTASSIUM, 110));
+    }
 
-    @Test
-    public void testEmptyIdentifier() {
-        assertEquals(createEntry(0), emptySize);
+    @ParameterizedTest
+    @MethodSource
+    void testTwoIdentifiers(final NormalizedNodeStreamVersion version, final int size) {
+        assertEquals(version, createEntry(2), size);
     }
 
-    @Test
-    public void testOneIdentifier() {
-        assertEquals(createEntry(1), oneSize);
+    static List<Arguments> testTwoIdentifiers() {
+        return List.of(Arguments.of(NormalizedNodeStreamVersion.POTASSIUM, 125));
     }
 
-    @Test
-    public void testTwoIdentifiers() {
-        assertEquals(createEntry(2), twoSize);
+    @ParameterizedTest
+    @MethodSource
+    void test256(final NormalizedNodeStreamVersion version, final int size) {
+        assertEquals(version, createEntry(256), size);
     }
 
-    @Test
-    public void test256() {
-        assertEquals(createEntry(256), size256);
+    static List<Arguments> test256() {
+        return List.of(Arguments.of(NormalizedNodeStreamVersion.POTASSIUM, 3_927));
     }
 
     private static MapEntryNode createEntry(final int size) {
-        final DataContainerNodeBuilder<NodeIdentifierWithPredicates, MapEntryNode> builder = Builders.mapEntryBuilder();
-        final Map<QName, Object> predicates = Maps.newHashMapWithExpectedSize(size);
-        for (QName qname : generateQNames(size)) {
+        final var builder = Builders.mapEntryBuilder();
+        final var predicates = Maps.<QName, Object>newHashMapWithExpectedSize(size);
+        for (var qname : generateQNames(size)) {
             builder.withChild(ImmutableNodes.leafNode(qname, "a"));
             predicates.put(qname, "a");
         }