Code Review / yangtools.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Add ImmutableNode.newXYXBuilder() methods
[yangtools.git] / data / yang-data-tree-ri / src / test / java / org / opendaylight / yangtools / yang / data / tree / leafref / DataTreeCandidateValidatorTest3.java
diff --git a/data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/leafref/DataTreeCandidateValidatorTest3.java b/data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/leafref/DataTreeCandidateValidatorTest3.java
index bff26f5f7814a3ff1ec6b28c37a90822c2a7cb18..843e85afb62753cad44f41681788fc2dfd450d0b 100644 (file)
--- a/data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/leafref/DataTreeCandidateValidatorTest3.java
+++ b/data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/leafref/DataTreeCandidateValidatorTest3.java
@@ -7,26 +7,22 @@
  */
 package org.opendaylight.yangtools.yang.data.tree.leafref;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.Map;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
-import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
-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;
 import org.opendaylight.yangtools.yang.data.tree.api.DataTree;
-import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidate;
 import org.opendaylight.yangtools.yang.data.tree.api.DataTreeConfiguration;
-import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification;
 import org.opendaylight.yangtools.yang.data.tree.api.DataValidationFailedException;
 import org.opendaylight.yangtools.yang.data.tree.impl.di.InMemoryDataTreeFactory;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
@@ -67,11 +63,11 @@ public class DataTreeCandidateValidatorTest3 {
     private static final Logger LOG = LoggerFactory.getLogger(DataTreeCandidateValidatorTest3.class);
     private static final String NEW_LINE = System.getProperty("line.separator");
 
-    @BeforeClass
-    public static void init() throws DataValidationFailedException {
+    @BeforeAll
+    static void init() throws DataValidationFailedException {
         context = YangParserTestUtils.parseYangResourceDirectory("/leafref-validation");
 
-        for (final Module module : context.getModules()) {
+        for (final var module : context.getModules()) {
             if (module.getName().equals("leafref-validation3")) {
                 mainModule = module;
             }
@@ -104,20 +100,20 @@ public class DataTreeCandidateValidatorTest3 {
 
         inMemoryDataTree = new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_OPERATIONAL, context);
 
-        final DataTreeModification initialDataTreeModification = inMemoryDataTree.takeSnapshot().newModification();
+        final var initialDataTreeModification = inMemoryDataTree.takeSnapshot().newModification();
 
-        initialDataTreeModification.write(YangInstanceIdentifier.of(chips), Builders.containerBuilder()
+        initialDataTreeModification.write(YangInstanceIdentifier.of(chips), ImmutableNodes.newContainerBuilder()
             .withNodeIdentifier(new NodeIdentifier(chips))
-            .addChild(Builders.mapBuilder()
+            .addChild(ImmutableNodes.newSystemMapBuilder()
                 .withNodeIdentifier(new NodeIdentifier(chip))
                 .addChild(createChipsListEntry("dev_type_1", "desc1"))
                 .addChild(createChipsListEntry("dev_type_2", "desc2"))
                 .build())
             .build());
 
-        initialDataTreeModification.write(YangInstanceIdentifier.of(deviceTypeStr), Builders.containerBuilder()
+        initialDataTreeModification.write(YangInstanceIdentifier.of(deviceTypeStr), ImmutableNodes.newContainerBuilder()
             .withNodeIdentifier(new NodeIdentifier(deviceTypeStr))
-            .addChild(Builders.mapBuilder()
+            .addChild(ImmutableNodes.newSystemMapBuilder()
                 .withNodeIdentifier(new NodeIdentifier(deviceType))
                 .addChild(createDevTypeListEntry("dev_type1_1", "dev_type2_1", "dev_type3_1", "typedesc1"))
                 .addChild(createDevTypeListEntry("dev_type1_2", "dev_type2_2", "dev_type3_2", "typedesc2"))
@@ -126,15 +122,15 @@ public class DataTreeCandidateValidatorTest3 {
             .build());
 
         initialDataTreeModification.ready();
-        final DataTreeCandidate writeChipsCandidate = inMemoryDataTree.prepare(initialDataTreeModification);
+        final var writeChipsCandidate = inMemoryDataTree.prepare(initialDataTreeModification);
 
         inMemoryDataTree.commit(writeChipsCandidate);
 
         LOG.debug("{}", inMemoryDataTree);
     }
 
-    @AfterClass
-    public static void cleanup() {
+    @AfterAll
+    static void cleanup() {
         inMemoryDataTree = null;
         rootLeafRefContext = null;
         mainModule = null;
@@ -142,16 +138,16 @@ public class DataTreeCandidateValidatorTest3 {
     }
 
     @Test
-    public void dataTreeCanditateValidationTest2() throws DataValidationFailedException {
+    void dataTreeCanditateValidationTest2() throws DataValidationFailedException {
         writeDevices();
         mergeDevices();
     }
 
     private static void writeDevices() throws DataValidationFailedException {
-        final DataTreeModification writeModification = inMemoryDataTree.takeSnapshot().newModification();
-        writeModification.write(YangInstanceIdentifier.of(devices), Builders.containerBuilder()
+        final var writeModification = inMemoryDataTree.takeSnapshot().newModification();
+        writeModification.write(YangInstanceIdentifier.of(devices), ImmutableNodes.newContainerBuilder()
             .withNodeIdentifier(new NodeIdentifier(devices))
-            .addChild(Builders.mapBuilder()
+            .addChild(ImmutableNodes.newSystemMapBuilder()
                 .withNodeIdentifier(new NodeIdentifier(device))
                 .addChild(createDeviceListEntry("dev_type1_1", "dev_type2_1", "dev_type3_1", "typedesc1", 123456,
                     "192.168.0.1"))
@@ -164,14 +160,14 @@ public class DataTreeCandidateValidatorTest3 {
             .build());
 
         writeModification.ready();
-        final DataTreeCandidate writeDevicesCandidate = inMemoryDataTree.prepare(writeModification);
+        final var writeDevicesCandidate = inMemoryDataTree.prepare(writeModification);
 
         LOG.debug("*************************");
         LOG.debug("Before writeDevices: ");
         LOG.debug("*************************");
         LOG.debug("{}", inMemoryDataTree);
 
-        final LeafRefDataValidationFailedException ex = assertThrows(LeafRefDataValidationFailedException.class,
+        final var ex = assertThrows(LeafRefDataValidationFailedException.class,
             () -> LeafRefValidation.validate(writeDevicesCandidate, rootLeafRefContext));
         assertEquals(6, ex.getValidationsErrorsCount());
 
@@ -184,9 +180,9 @@ public class DataTreeCandidateValidatorTest3 {
     }
 
     private static void mergeDevices() throws DataValidationFailedException {
-        final ContainerNode devicesContainer = Builders.containerBuilder()
+        final var devicesContainer = ImmutableNodes.newContainerBuilder()
             .withNodeIdentifier(new NodeIdentifier(devices))
-            .addChild(Builders.mapBuilder()
+            .addChild(ImmutableNodes.newSystemMapBuilder()
                 .withNodeIdentifier(new NodeIdentifier(device))
                 .addChild(createDeviceListEntry("dev_type1_3", "dev_type2_3", "dev_type3_3", "typedesc3", 123459,
                     "192.168.0.1"))
@@ -198,20 +194,20 @@ public class DataTreeCandidateValidatorTest3 {
                 .build())
             .build();
 
-        final YangInstanceIdentifier devicesPath = YangInstanceIdentifier.of(devices);
-        final DataTreeModification mergeModification = inMemoryDataTree.takeSnapshot().newModification();
+        final var devicesPath = YangInstanceIdentifier.of(devices);
+        final var mergeModification = inMemoryDataTree.takeSnapshot().newModification();
         mergeModification.write(devicesPath, devicesContainer);
         mergeModification.merge(devicesPath, devicesContainer);
 
         mergeModification.ready();
-        final DataTreeCandidate mergeDevicesCandidate = inMemoryDataTree.prepare(mergeModification);
+        final var mergeDevicesCandidate = inMemoryDataTree.prepare(mergeModification);
 
         LOG.debug("*************************");
         LOG.debug("Before mergeDevices: ");
         LOG.debug("*************************");
         LOG.debug("{}", inMemoryDataTree);
 
-        final LeafRefDataValidationFailedException ex = assertThrows(LeafRefDataValidationFailedException.class,
+        final var ex = assertThrows(LeafRefDataValidationFailedException.class,
             () -> LeafRefValidation.validate(mergeDevicesCandidate, rootLeafRefContext));
         // :TODO verify errors count gz
         assertEquals(6, ex.getValidationsErrorsCount());
@@ -226,7 +222,7 @@ public class DataTreeCandidateValidatorTest3 {
 
     private static MapEntryNode createDevTypeListEntry(final String type1Val, final String type2Val,
             final String type3Val, final String descVal) {
-        return Builders.mapEntryBuilder()
+        return ImmutableNodes.newMapEntryBuilder()
             .withNodeIdentifier(NodeIdentifierWithPredicates.of(deviceType,
                 Map.of(type1, type1Val, type2, type2Val, type3, type3Val)))
             .addChild(ImmutableNodes.leafNode(type1, type1Val))
@@ -237,7 +233,7 @@ public class DataTreeCandidateValidatorTest3 {
     }
 
     private static MapEntryNode createChipsListEntry(final String devTypeVal, final String chipDescVal) {
-        return Builders.mapEntryBuilder()
+        return ImmutableNodes.newMapEntryBuilder()
             .withNodeIdentifier(NodeIdentifierWithPredicates.of(chip, devType, devTypeVal))
             .addChild(ImmutableNodes.leafNode(devType, devTypeVal))
             .addChild(ImmutableNodes.leafNode(chipDesc, chipDescVal))
@@ -246,7 +242,7 @@ public class DataTreeCandidateValidatorTest3 {
 
     private static MapEntryNode createDeviceListEntry(final String type1TextVal, final String type2TextVal,
             final String type3TextVal, final String descVal, final int snVal, final String defaultIpVal) {
-        return Builders.mapEntryBuilder()
+        return ImmutableNodes.newMapEntryBuilder()
             .withNodeIdentifier(NodeIdentifierWithPredicates.of(device, Map.of(typeText1, type1TextVal, sn, snVal)))
             .addChild(ImmutableNodes.leafNode(typeText1, type1TextVal))
             .addChild(ImmutableNodes.leafNode(typeText2, type2TextVal))
OpenDaylight YANG Tools