Bug 5085: Clean-up test and retest JUnit tests

[yangtools.git] / yang / yang-data-codec-gson / src / test / java / org / opendaylight / yangtools / yang / data / codec / gson / TestingNormalizedNodeStructuresCreator.java

diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestingNormalizedNodeStructuresCreator.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestingNormalizedNodeStructuresCreator.java
index 978b11005156243bb118dcb5cf88761b9d6f5aa6..db4814c9820364919af8ba334fe5d31d5cb14708 100644 (file)
--- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestingNormalizedNodeStructuresCreator.java
+++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestingNormalizedNodeStructuresCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -37,8 +37,9 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuil
 
 public class TestingNormalizedNodeStructuresCreator {
 
+    @SafeVarargs
     static NormalizedNode<?, ?> cont1Node(
-            DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?>... children) {
+            final DataContainerChild<? extends PathArgument, ?>... children) {
         DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> cont1 = Builders.containerBuilder();
         cont1.withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "cont1")));
 
@@ -68,12 +69,6 @@ public class TestingNormalizedNodeStructuresCreator {
         DataContainerNodeBuilder<NodeIdentifier, ChoiceNode> choc12Builder = Builders.choiceBuilder()
                 .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "choc12")));
 
-//        DataContainerNodeBuilder<AugmentationIdentifier, AugmentationNode> choc12Augmentation = Builders
-//                .augmentationBuilder();
-//        choc12Augmentation.withNodeIdentifier(new AugmentationIdentifier(Sets.newHashSet(QName.create(
-//                "ns:complex:json", "2014-08-11", "c12B"))));
-//        choc12Augmentation.withChild(lf17Node());
-
         choc12Builder.withChild(lf17Node());
         return choc12Builder.build();
     }
@@ -111,8 +106,9 @@ public class TestingNormalizedNodeStructuresCreator {
                 .withValue("lf15_11 value from augmentation").build();
     }
 
+    @SafeVarargs
     private static DataContainerChild<? extends PathArgument, ?> choc11Node(
-            DataContainerChild<? extends PathArgument, ?>... children) {
+            final DataContainerChild<? extends PathArgument, ?>... children) {
         DataContainerNodeBuilder<NodeIdentifier, ChoiceNode> choc11Builder = Builders.choiceBuilder()
                 .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "choc11")));
         choc11Builder.withValue(Lists.newArrayList(children));
@@ -212,7 +208,7 @@ public class TestingNormalizedNodeStructuresCreator {
         return YangInstanceIdentifier.create(
                 new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "cont1")),
                 new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "lflst11")),
-                new NodeWithValue(QName.create("ns:complex:json", "2014-08-11", "lflst11"),"foo")
+                new NodeWithValue<>(QName.create("ns:complex:json", "2014-08-11", "lflst11"),"foo")
         );
     }
 
@@ -222,12 +218,12 @@ public class TestingNormalizedNodeStructuresCreator {
         lflst11.withChild(Builders
                 .leafSetEntryBuilder()
                 .withNodeIdentifier(
-                        new NodeWithValue(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value1"))
+                        new NodeWithValue<>(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value1"))
                 .withValue("lflst11 value1").build());
         lflst11.withChild(Builders
                 .leafSetEntryBuilder()
                 .withNodeIdentifier(
-                        new NodeWithValue(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value2"))
+                        new NodeWithValue<>(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value2"))
                 .withValue("lflst11 value2").build());
         return lflst11.build();
     }
@@ -238,12 +234,12 @@ public class TestingNormalizedNodeStructuresCreator {
         lflst11.withChild(Builders
                 .leafSetEntryBuilder()
                 .withNodeIdentifier(
-                        new NodeWithValue(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value1\nanother line 1"))
+                        new NodeWithValue<>(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value1\nanother line 1"))
                 .withValue("lflst11 value1\nanother line 1").build());
         lflst11.withChild(Builders
                 .leafSetEntryBuilder()
                 .withNodeIdentifier(
-                        new NodeWithValue(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value2\r\nanother line 2"))
+                        new NodeWithValue<>(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value2\r\nanother line 2"))
                 .withValue("lflst11 value2\r\nanother line 2").build());
         return lflst11.build();
     }
@@ -280,11 +276,11 @@ public class TestingNormalizedNodeStructuresCreator {
      * @return
      */
     public static NormalizedNode<?, ?> caseNodeAugmentationInChoiceInContainer() {
-        return cont1Node(choc11Node(lf13Node(), lf15_11Node(), lf15_12Node(), lf15_21Node()));
+        return cont1Node(choc11Node(augmentC11AWithLf15_11AndLf15_12Node(), lf13Node(), augmentC11AWithLf15_21Node()));
     }
 
     public static NormalizedNode<?, ?> caseNodeExternalAugmentationInChoiceInContainer() {
-        return cont1Node(choc11Node(lf13Node(), lf15_11Node(), lf15_12Node(), lf15_11NodeExternal(), lf15_12NodeExternal()));
+        return cont1Node(choc11Node(lf13Node(), augmentC11AWithLf15_11AndLf15_12Node(), externalAugmentC11AWithLf15_11AndLf15_12Node()));
     }
 
     public static NormalizedNode<?, ?> choiceNodeAugmentationInContainer() {