Bug 3670 (part 1/5): Use of new statement parser in yang-maven-plugin

[yangtools.git] / yang / yang-parser-impl / src / test / java / org / opendaylight / yangtools / yang / parser / util / SchemaContextUtilTest.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/SchemaContextUtilTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/SchemaContextUtilTest.java
index cc8950d244bd653aa46dec406916a67c4b8ad9b8..3b7bcb60fb1a476c92ecbaeee5f055f169ca8390 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/SchemaContextUtilTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/SchemaContextUtilTest.java
@@ -133,7 +133,7 @@ public class SchemaContextUtilTest {
         assertNotNull(foundNode);
         assertEquals(testNode, foundNode);
 
-        GroupingDefinition grouping = myModule.getGroupings().iterator().next();
+        GroupingDefinition grouping = getGroupingByName(myModule,"my-grouping");
         testNode = ((ContainerSchemaNode) grouping.getDataChildByName("my-container-in-grouping"))
                 .getDataChildByName("my-leaf-in-grouping");
 
@@ -235,7 +235,7 @@ public class SchemaContextUtilTest {
         assertNull(testNode);
         assertNull(foundNode);
 
-        GroupingDefinition grouping = myModule.getGroupings().iterator().next();
+        GroupingDefinition grouping = getGroupingByName(myModule,"my-grouping");
         testNode = ((ContainerSchemaNode) grouping.getDataChildByName("my-container-in-grouping"))
                 .getDataChildByName("no-leaf-in-grouping");
 
@@ -327,7 +327,7 @@ public class SchemaContextUtilTest {
         assertNotNull(foundNode);
         assertEquals(testNode, foundNode);
 
-        testNode = myModule.getGroupings().iterator().next();
+        testNode = getGroupingByName(myModule,"my-grouping");
 
         path = SchemaPath.create(true, QName.create(myModule.getQNameModule(), "my-grouping"));
         foundNode = SchemaContextUtil.findNodeInSchemaContext(context, path.getPathFromRoot());
@@ -459,7 +459,7 @@ public class SchemaContextUtilTest {
         Module module = context.findModuleByNamespaceAndRevision(new URI("uri:my-module"),
                 QName.parseRevision("2014-10-07"));
 
-        GroupingDefinition grouping = module.getGroupings().iterator().next();
+        GroupingDefinition grouping = getGroupingByName(module,"my-grouping");
         SchemaNode testNode = grouping.getDataChildByName("my-leaf-in-gouping2");
 
         RevisionAwareXPath xpath = new RevisionAwareXPathImpl("my:my-grouping/my:my-leaf-in-gouping2", true);