Yang parser refactoring.

[yangtools.git] / code-generator / binding-generator-impl / src / test / java / org / opendaylight / yangtools / sal / binding / generator / impl / RefineTest.java

diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/RefineTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/RefineTest.java
index 92185784c9bdd2ccdff2cbe68c966f78b9268215..2f067a2d9eca56a97b6feb357749ffe46b41a779 100644 (file)
--- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/RefineTest.java
+++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/RefineTest.java
@@ -12,10 +12,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
+import java.io.*;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URI;
@@ -30,7 +27,6 @@ import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.impl.*;
 import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
-import org.opendaylight.yangtools.yang.parser.util.GroupingUtils;
 import org.opendaylight.yangtools.yang.parser.util.RefineHolder;
 import org.opendaylight.yangtools.yang.parser.util.RefineUtils;
 
@@ -48,7 +44,7 @@ public class RefineTest {
     }
 
     private void findUnknownNode(DataSchemaNodeBuilder childNode, String unknownNodeValue, String unknownNodeName) {
-        List<UnknownSchemaNodeBuilder> unknownSchemaNodesBuilder = childNode.getUnknownNodeBuilders();
+        List<UnknownSchemaNodeBuilder> unknownSchemaNodesBuilder = childNode.getUnknownNodes();
         boolean refinedUnknownNodeLflstFound = false;
 
         for (UnknownSchemaNodeBuilder unknownSchemaNodeBuilders : unknownSchemaNodesBuilder) {
@@ -83,8 +79,9 @@ public class RefineTest {
         for (UsesNodeBuilder usesNodeBuilder : usesNodeBuilders) {
             if (usesNodeBuilder.getGroupingPathAsString().equals("grp")) {
                 refineHolders = usesNodeBuilder.getRefines();
-                GroupingUtils.updateUsesParent(usesNodeBuilder);
-                dataSchemaNodeBuilders = usesNodeBuilder.getParent().getChildNodeBuilders();
+                // FIXME
+                //GroupingUtils.updateUsesParent(usesNodeBuilder);
+                dataSchemaNodeBuilders = usesNodeBuilder.getParent().getChildNodes();
                 break;
             }
         }
@@ -148,7 +145,7 @@ public class RefineTest {
         DataSchemaNodeBuilder builderData = new AnyXmlBuilder("module", 4, qname, createSchemaPath(qname));
 
         assertNotNull("Refine holder data wasn't initialized.", refHolderData);
-        RefineUtils.refineAnyxml((AnyXmlBuilder) builderData, refHolderData, 3);
+        RefineUtils.refineAnyxml((AnyXmlBuilder) builderData, refHolderData);
 
         // data node
         ConstraintsBuilder conDefData = builderData.getConstraints();
@@ -166,10 +163,11 @@ public class RefineTest {
         RefineHolder refHolderChc2 = getRefineHolder("chc2", refineHolders);
 
         QName qname = createQname();
-        DataSchemaNodeBuilder builderChc2 = new ChoiceBuilder("module", 4, qname);
+        List<QName> path = Lists.newArrayList(qname);
+        DataSchemaNodeBuilder builderChc2 = new ChoiceBuilder("module", 4, qname, new SchemaPath(path, true));
         assertNotNull("Refine holder chc2 wasn't initialized.", refHolderChc2);
 
-        RefineUtils.refineChoice((ChoiceBuilder) builderChc2, refHolderChc2, 3);
+        RefineUtils.refineChoice((ChoiceBuilder) builderChc2, refHolderChc2);
 
         // chc2 node
         ConstraintsBuilder conDefChc2 = builderChc2.getConstraints();
@@ -181,11 +179,12 @@ public class RefineTest {
         RefineHolder refHolderChc = getRefineHolder("chc", refineHolders);
 
         QName qname = createQname();
-        DataSchemaNodeBuilder builderChc = new ChoiceBuilder("module", 4, qname);
+        List<QName> path = Lists.newArrayList(qname);
+        DataSchemaNodeBuilder builderChc = new ChoiceBuilder("module", 4, qname, new SchemaPath(path, true));
 
         assertNotNull("Refine holder chc wasn't initialized.", refHolderChc);
         assertNotNull("Data schema node builder chc wasn't initialized.", builderChc);
-        RefineUtils.refineChoice((ChoiceBuilder) builderChc, refHolderChc, 2);
+        RefineUtils.refineChoice((ChoiceBuilder) builderChc, refHolderChc);
 
         ChoiceBuilder choiceBuilder = null;
         if (builderChc instanceof ChoiceBuilder) {
@@ -207,7 +206,7 @@ public class RefineTest {
 
         assertNotNull("Refine holder " + nodeName + " wasn't initialized.", refHolderLflst);
         assertNotNull("Data schema node builder " + nodeName + " wasn't initialized.", builderLflst);
-        RefineUtils.refineLeafList((LeafListSchemaNodeBuilder) builderLflst, refHolderLflst, 1);
+        RefineUtils.refineLeafList((LeafListSchemaNodeBuilder) builderLflst, refHolderLflst);
         // lflst node
 
         ConstraintsBuilder conDefLflst = builderLflst.getConstraints();