BUG-1472: deprecated CompositeNode and friends

[yangtools.git] / yang / yang-data-impl / src / test / java / org / opendaylight / yangtools / yang / data / impl / NodeUtilsTest.java

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java
index 285cdb0b30705e3128c76fe282a91586b62fbad7..6afd46f2dd6c3e7ae7b3f12d8fd1e0a85c245088 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java
@@ -10,9 +10,10 @@ package org.opendaylight.yangtools.yang.data.impl;
 import java.io.IOException;
 import java.net.URI;
 import java.util.Date;
+import java.util.Deque;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Stack;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -31,6 +32,7 @@ import org.w3c.dom.Document;
  * @author michal.rehak
  *
  */
+@Deprecated
 public class NodeUtilsTest {
 
     private static final Logger LOG = LoggerFactory
@@ -48,7 +50,7 @@ public class NodeUtilsTest {
     @Before
     public void setUp() throws Exception {
         ns = "urn:ietf:params:xml:ns:netconf:base:1.0";
-        qName = new QName(
+        qName = QName.create(
                 new URI(ns),
                 new Date(42), "yang-data-impl-mutableTest");
         network = NodeHelper.buildTestConfigTree(qName);
@@ -61,8 +63,8 @@ public class NodeUtilsTest {
     @Test
     public void testBuildPath() throws Exception {
         SimpleNode<?> needle = network.getCompositesByName("topologies").iterator().next()
-            .getCompositesByName("topology").iterator().next()
-            .getSimpleNodesByName("topology-id").iterator().next();
+                .getCompositesByName("topology").iterator().next()
+                .getSimpleNodesByName("topology-id").iterator().next();
         String breadCrumbs = NodeUtils.buildPath(needle);
 
         Assert.assertEquals("network.topologies.topology.topology-id", breadCrumbs);
@@ -109,7 +111,7 @@ public class NodeUtilsTest {
     @Test
     public void testBuildNodeMap() {
         CompositeNode topology = network.getCompositesByName("topologies").iterator().next()
-            .getCompositesByName("topology").iterator().next();
+                .getCompositesByName("topology").iterator().next();
 
         Map<QName, List<Node<?>>> nodeMap = NodeUtils.buildNodeMap(topology.getValue());
         Assert.assertEquals(3, nodeMap.size());
@@ -132,20 +134,20 @@ public class NodeUtilsTest {
      */
     @Test
     public void testLoadConfigByGroovy() throws IOException, Exception {
-       CompositeNode treeRoot = NodeHelper.loadConfigByGroovy("./config02.groovy");
-       Document shadowTree = NodeUtils.buildShadowDomTree(treeRoot);
-       try {
+        CompositeNode treeRoot = NodeHelper.loadConfigByGroovy("./config02.groovy");
+        Document shadowTree = NodeUtils.buildShadowDomTree(treeRoot);
+        try {
             checkFamilyBinding(treeRoot);
         } catch (Exception e) {
             LOG.error(e.getMessage());
             throw e;
         }
 
-       NodeHelper.compareXmlTree(shadowTree, "./config02g-shadow.xml", getClass());
+        NodeHelper.compareXmlTree(shadowTree, "./config02g-shadow.xml", getClass());
     }
 
     private static void checkFamilyBinding(final CompositeNode treeRoot) throws Exception {
-        Stack<CompositeNode> jobQueue = new Stack<>();
+        Deque<CompositeNode> jobQueue = new LinkedList<>();
         jobQueue.push(treeRoot);
 
         while (!jobQueue.isEmpty()) {