Add proper StatementPolicy for 'augment'

[yangtools.git] / yang / yang-parser-rfc7950 / src / test / java / org / opendaylight / yangtools / yang / stmt / OrderingTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/OrderingTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/OrderingTest.java
index de7cbb4abac4c9e5a31e304855b2d952367fd03b..75d763a232e44b590f44ea0359f7d110176fe5fe 100644 (file)
--- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/OrderingTest.java
+++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/OrderingTest.java
@@ -14,7 +14,6 @@ import static org.junit.Assert.assertNotNull;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Collection;
-import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
@@ -45,10 +44,9 @@ public class OrderingTest {
 
     @Test
     public void testOrderingTypedef() throws Exception {
-        final Set<TypeDefinition<?>> typedefs = bar.getTypeDefinitions();
+        final Collection<? extends TypeDefinition<?>> typedefs = bar.getTypeDefinitions();
         final String[] expectedOrder = { "int32-ext1", "int32-ext2", "string-ext1", "string-ext2", "string-ext3",
-            "string-ext4", "invalid-string-pattern", "multiple-pattern-string", "my-decimal-type", "my-union",
-            "my-union-ext", "nested-union2"
+            "string-ext4", "multiple-pattern-string", "my-decimal-type", "my-union", "my-union-ext", "nested-union2"
         };
         final String[] actualOrder = new String[typedefs.size()];
 
@@ -85,9 +83,8 @@ public class OrderingTest {
 
     @Test
     public void testOrderingNestedChildNodes1() throws Exception {
-        final Collection<DataSchemaNode> childNodes = foo.getChildNodes();
-        final String[] expectedOrder = { "int32-leaf", "string-leaf", "invalid-pattern-string-leaf",
-            "invalid-direct-string-pattern-def-leaf", "multiple-pattern-string-leaf",
+        final Collection<? extends DataSchemaNode> childNodes = foo.getChildNodes();
+        final String[] expectedOrder = { "int32-leaf", "string-leaf", "multiple-pattern-string-leaf",
             "multiple-pattern-direct-string-def-leaf", "length-leaf", "decimal-leaf", "decimal-leaf2", "ext",
             "union-leaf", "custom-union-leaf", "transfer", "datas", "mycont", "data", "how", "address", "port",
             "addresses", "peer", "id", "foo-id", "sub-ext", "sub-transfer", "sub-datas"
@@ -104,11 +101,11 @@ public class OrderingTest {
 
     @Test
     public void testOrderingNestedChildNodes2() throws Exception {
-        final Set<GroupingDefinition> groupings = baz.getGroupings();
+        final Collection<? extends GroupingDefinition> groupings = baz.getGroupings();
         assertEquals(1, groupings.size());
         final GroupingDefinition target = groupings.iterator().next();
 
-        final Collection<DataSchemaNode> childNodes = target.getChildNodes();
+        final Collection<? extends DataSchemaNode> childNodes = target.getChildNodes();
         final String[] expectedOrder = { "data", "how", "address", "port", "addresses" };
         final String[] actualOrder = new String[childNodes.size()];
 
@@ -122,11 +119,10 @@ public class OrderingTest {
 
     @Test
     public void testOrderingNestedChildNodes3() throws Exception {
-        final Module baz = TestUtils.loadModuleResources(getClass(), "/ordering/foo.yang")
-                .getModules().iterator().next();
-        final ContainerSchemaNode x = (ContainerSchemaNode) baz
-                .getDataChildByName(QName.create(baz.getQNameModule(), "x"));
-        final Collection<DataSchemaNode> childNodes = x.getChildNodes();
+        final Module justFoo = StmtTestUtils.parseYangSource("/ordering/foo.yang").getModules().iterator().next();
+        final ContainerSchemaNode x = (ContainerSchemaNode) justFoo
+                .getDataChildByName(QName.create(justFoo.getQNameModule(), "x"));
+        final Collection<? extends DataSchemaNode> childNodes = x.getChildNodes();
 
         final String[] expectedOrder = { "x15", "x10", "x5", "x1", "a5", "a1", "x2", "b5", "b1", "x3", "ax15", "ax5" };
         final String[] actualOrder = new String[childNodes.size()];