Added constructors to builder classes based on implemented interfaces from uses nodes.
[yangtools.git] / yang / yang-parser-impl / src / test / java / org / opendaylight / yangtools / yang / parser / impl / UsesAugmentTest.java
index 921b7070b79fcffbfb5ff0ed30dc81e559b38417..9b69af60e69e9bdf6c01182dcd46457cbb6c5f38 100644 (file)
@@ -12,8 +12,8 @@ import static org.junit.Assert.*;
 import java.io.FileNotFoundException;
 import java.net.URI;
 import java.text.ParseException;
-import java.util.ArrayList;
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
@@ -28,25 +28,38 @@ import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.NotificationDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.util.BaseTypes;
+import org.opendaylight.yangtools.yang.model.util.BooleanType;
+import org.opendaylight.yangtools.yang.model.util.ExtendedType;
+import org.opendaylight.yangtools.yang.model.util.Uint32;
+import org.opendaylight.yangtools.yang.model.util.Uint8;
+import org.opendaylight.yangtools.yang.model.util.UnionType;
+
+import com.google.common.collect.Lists;
 
 public class UsesAugmentTest {
-    private final URI ns = URI.create("urn:opendaylight:params:xml:ns:yang:uses-grouping");
-    private Date rev;
-    private final String prefix = "ug";
+    private static final URI UG_NS = URI.create("urn:opendaylight:params:xml:ns:yang:uses-grouping");
+    private static final URI GD_NS = URI.create("urn:opendaylight:params:xml:ns:yang:grouping-definitions");
+    private Date UG_REV;
+    private Date GD_REV;
+    private static final String UG_PREF = "ug";
+    private static final String GD_PREF = "gd";
 
     private Set<Module> modules;
 
     @Before
     public void init() throws FileNotFoundException, ParseException {
-        rev = TestUtils.simpleDateFormat.parse("2013-07-30");
+        UG_REV = TestUtils.simpleDateFormat.parse("2013-07-30");
+        GD_REV = TestUtils.simpleDateFormat.parse("2013-09-04");
     }
 
-
     /**
      * Structure of testing model:
      *
      * notification pcreq
      * |-- leaf version (U)
+     * |-- leaf type (U)
      * |-- list requests
      * |-- |-- container rp
      * |-- |-- |-- leaf priority (U)
@@ -59,7 +72,8 @@ public class UsesAugmentTest {
      * |-- |-- path-key-expansion
      * |-- |-- |-- container path-key
      * |-- |-- |-- |-- list path-keys (U)
-     * |-- |-- |-- |-- |-- leaf version (U, A)
+     * |-- |-- |-- |-- |-- leaf version (U)
+     * |-- |-- |-- |-- |-- leaf type (U)
      * |-- |-- |-- |-- |-- leaf processing-rule (U)
      * |-- |-- |-- |-- |-- leaf ignore (U)
      * |-- |-- container segment-computation
@@ -92,245 +106,540 @@ public class UsesAugmentTest {
      * |-- |-- leaf processing-rule (U)
      * |-- |-- leaf ignore (U)
      *
-     * U = added by uses
-     * A = added by augment
+     * U = added by uses A = added by augment
      */
     @Test
     public void testAugmentInUses() throws Exception {
         modules = TestUtils.loadModules(getClass().getResource("/grouping-test").getPath());
         Module testModule = TestUtils.findModule(modules, "uses-grouping");
 
+        LinkedList<QName> path = new LinkedList<>();
+
         // * notification pcreq
         Set<NotificationDefinition> notifications = testModule.getNotifications();
         assertEquals(1, notifications.size());
         NotificationDefinition pcreq = notifications.iterator().next();
         assertNotNull(pcreq);
-        assertEquals(createPath("pcreq"), pcreq.getPath());
+        QName expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "pcreq");
+        path.offer(expectedQName);
+        SchemaPath expectedPath = new SchemaPath(path, true);
+        assertEquals(expectedPath, pcreq.getPath());
         Set<DataSchemaNode> childNodes = pcreq.getChildNodes();
-        assertEquals(3, childNodes.size());
-        // * |-- leaf version (U)
-        LeafSchemaNode version = (LeafSchemaNode)pcreq.getDataChildByName("version");
+        assertEquals(4, childNodes.size());
+        // * |-- leaf version
+        LeafSchemaNode version = (LeafSchemaNode) pcreq.getDataChildByName("version");
         assertNotNull(version);
-        assertEquals(createPath("pcreq", "version"), version.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "version");
+        path.offer(expectedQName);
+        expectedPath = new SchemaPath(path, true);
+        assertEquals(expectedPath, version.getPath());
+        expectedQName = new QName(GD_NS, GD_REV, GD_PREF, "protocol-version");
+        path.offer(expectedQName);
+        expectedPath = new SchemaPath(Lists.newArrayList(expectedQName), true);
+        assertEquals(expectedPath, version.getType().getPath());
+        assertEquals(Uint8.getInstance(), version.getType().getBaseType());
         assertTrue(version.isAddedByUses());
+        // * |-- leaf type
+        LeafSchemaNode type = (LeafSchemaNode) pcreq.getDataChildByName("type");
+        assertNotNull(type);
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "type");
+        assertTrue(type.isAddedByUses());
+        path.pollLast();
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath = new SchemaPath(path, true);
+        assertEquals(expectedPath, type.getPath());
+        expectedQName = new QName(GD_NS, GD_REV, GD_PREF, "int-ext");
+        path.offer(expectedQName);
+        expectedPath = new SchemaPath(Lists.newArrayList(expectedQName), true);
+        assertEquals(expectedPath, type.getType().getPath());
+        UnionType union = (UnionType)type.getType().getBaseType();
+        assertEquals(BaseTypes.schemaPath(BaseTypes.constructQName("union")), union.getPath());
+        assertEquals(2, union.getTypes().size());
         // * |-- list requests
-        ListSchemaNode requests = (ListSchemaNode)pcreq.getDataChildByName("requests");
+        ListSchemaNode requests = (ListSchemaNode) pcreq.getDataChildByName("requests");
         assertNotNull(requests);
-        assertEquals(createPath("pcreq", "requests"), requests.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "requests");
+        assertEquals(expectedQName, requests.getQName());
+        path.pollLast();
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath = new SchemaPath(path, true);
+        assertEquals(expectedPath, requests.getPath());
         assertFalse(requests.isAddedByUses());
         childNodes = requests.getChildNodes();
         assertEquals(3, childNodes.size());
         // * |-- |-- container rp
-        ContainerSchemaNode rp = (ContainerSchemaNode)requests.getDataChildByName("rp");
+        ContainerSchemaNode rp = (ContainerSchemaNode) requests.getDataChildByName("rp");
         assertNotNull(rp);
-        assertEquals(createPath("pcreq", "requests", "rp"), rp.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "rp");
+        path.offer(expectedQName);
+        expectedPath = new SchemaPath(path, true);
+        assertEquals(expectedPath, rp.getPath());
         assertFalse(rp.isAddedByUses());
         childNodes = rp.getChildNodes();
         assertEquals(4, childNodes.size());
-        // * |-- |-- |-- leaf priority (U)
-        LeafSchemaNode priority = (LeafSchemaNode)rp.getDataChildByName("priority");
+        // * |-- |-- |-- leaf processing-rule
+        LeafSchemaNode processingRule = (LeafSchemaNode) rp.getDataChildByName("processing-rule");
+        assertNotNull(processingRule);
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "processing-rule");
+        assertEquals(expectedQName, processingRule.getQName());
+        path.offer(expectedQName);
+        expectedPath = new SchemaPath(path, true);
+        assertEquals(expectedPath, processingRule.getPath());
+        assertEquals(BooleanType.getInstance(), processingRule.getType());
+        assertTrue(processingRule.isAddedByUses());
+        // * |-- |-- |-- leaf ignore
+        LeafSchemaNode ignore = (LeafSchemaNode) rp.getDataChildByName("ignore");
+        assertNotNull(ignore);
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "ignore");
+        assertEquals(expectedQName, ignore.getQName());
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath = new SchemaPath(path, true);
+        assertEquals(expectedPath, ignore.getPath());
+        assertEquals(BooleanType.getInstance(), ignore.getType());
+        assertTrue(ignore.isAddedByUses());
+        // * |-- |-- |-- leaf priority
+        LeafSchemaNode priority = (LeafSchemaNode) rp.getDataChildByName("priority");
         assertNotNull(priority);
-        assertEquals(createPath("pcreq", "requests", "rp", "priority"), priority.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "priority");
+        assertEquals(expectedQName, priority.getQName());
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath = new SchemaPath(path, true);
+        assertEquals(expectedPath, priority.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "uint8");
+        path.offer(expectedQName);
+        expectedPath = new SchemaPath(path, true);
+        // TODO
+        //assertEquals(expectedPath, priority.getType().getPath());
+        assertEquals(Uint8.getInstance(), priority.getType().getBaseType());
         assertTrue(priority.isAddedByUses());
-        // * |-- |-- |-- container box (U)
-        ContainerSchemaNode box = (ContainerSchemaNode)rp.getDataChildByName("box");
+        // * |-- |-- |-- container box
+        ContainerSchemaNode box = (ContainerSchemaNode) rp.getDataChildByName("box");
         assertNotNull(box);
-        assertEquals(createPath("pcreq", "requests", "rp", "box"), box.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "box");
+        assertEquals(expectedQName, box.getQName());
+        path.pollLast();
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath = new SchemaPath(path, true);
+        assertEquals(expectedPath, box.getPath());
         assertTrue(box.isAddedByUses());
-        // * |-- |-- |-- |-- container order (A)
-        ContainerSchemaNode order = (ContainerSchemaNode)box.getDataChildByName("order");
+        // * |-- |-- |-- |-- container order
+        ContainerSchemaNode order = (ContainerSchemaNode) box.getDataChildByName("order");
         assertNotNull(order);
-        assertEquals(createPath("pcreq", "requests", "rp", "box", "order"), order.getPath());
-        assertFalse(order.isAddedByUses());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "order");
+        assertEquals(expectedQName, order.getQName());
+        path.offer(expectedQName);
+        expectedPath = new SchemaPath(path, true);
+        assertEquals(expectedPath, order.getPath());
+        assertTrue(order.isAddedByUses());
         assertTrue(order.isAugmenting());
         assertEquals(2, order.getChildNodes().size());
-        // * |-- |-- |-- |-- |-- leaf processing-rule (U)
-        LeafSchemaNode delete = (LeafSchemaNode)order.getDataChildByName("delete");
+        // * |-- |-- |-- |-- |-- leaf delete
+        LeafSchemaNode delete = (LeafSchemaNode) order.getDataChildByName("delete");
         assertNotNull(delete);
-        assertEquals(createPath("pcreq", "requests", "rp", "box", "order", "delete"), delete.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "delete");
+        assertEquals(expectedQName, delete.getQName());
+        path.offer(expectedQName);
+        expectedPath = new SchemaPath(path, true);
+        assertEquals(expectedPath, delete.getPath());
+        assertEquals(Uint32.getInstance(), delete.getType());
         assertTrue(delete.isAddedByUses());
-        // * |-- |-- |-- |-- |-- leaf ignore (U)
-        LeafSchemaNode setup = (LeafSchemaNode)order.getDataChildByName("setup");
+        // * |-- |-- |-- |-- |-- leaf setup
+        LeafSchemaNode setup = (LeafSchemaNode) order.getDataChildByName("setup");
         assertNotNull(setup);
-        assertEquals(createPath("pcreq", "requests", "rp", "box", "order", "setup"), setup.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "setup");
+        assertEquals(expectedQName, setup.getQName());
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath = new SchemaPath(path, true);
+        assertEquals(expectedPath, setup.getPath());
+        assertEquals(Uint32.getInstance(), setup.getType());
         assertTrue(setup.isAddedByUses());
-        // * |-- |-- |-- leaf processing-rule (U)
-        LeafSchemaNode processingRule = (LeafSchemaNode)rp.getDataChildByName("processing-rule");
-        assertNotNull(processingRule);
-        assertEquals(createPath("pcreq", "requests", "rp", "processing-rule"), processingRule.getPath());
-        assertTrue(processingRule.isAddedByUses());
-        // * |-- |-- |-- leaf ignore (U)
-        LeafSchemaNode ignore = (LeafSchemaNode)rp.getDataChildByName("ignore");
-        assertNotNull(ignore);
-        assertEquals(createPath("pcreq", "requests", "rp", "ignore"), ignore.getPath());
-        assertTrue(ignore.isAddedByUses());
         // * |-- |-- path-key-expansion
-        ContainerSchemaNode pke = (ContainerSchemaNode)requests.getDataChildByName("path-key-expansion");
+        ContainerSchemaNode pke = (ContainerSchemaNode) requests.getDataChildByName("path-key-expansion");
         assertNotNull(pke);
-        assertEquals(createPath("pcreq", "requests", "path-key-expansion"), pke.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "path-key-expansion");
+        assertEquals(expectedQName, pke.getQName());
+        path.pollLast();
+        path.pollLast();
+        path.pollLast();
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath = new SchemaPath(path, true);
+        assertEquals(expectedPath, pke.getPath());
         assertFalse(pke.isAddedByUses());
         // * |-- |-- |-- path-key
-        ContainerSchemaNode pathKey = (ContainerSchemaNode)pke.getDataChildByName("path-key");
+        ContainerSchemaNode pathKey = (ContainerSchemaNode) pke.getDataChildByName("path-key");
         assertNotNull(pathKey);
-        assertEquals(createPath("pcreq", "requests", "path-key-expansion", "path-key"), pathKey.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "path-key");
+        assertEquals(expectedQName, pathKey.getQName());
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, pathKey.getPath());
         assertFalse(pathKey.isAddedByUses());
         assertEquals(3, pathKey.getChildNodes().size());
-        // * |-- |-- |-- |-- list path-keys (U)
-        ListSchemaNode pathKeys = (ListSchemaNode)pathKey.getDataChildByName("path-keys");
+        // * |-- |-- |-- |-- leaf processing-rule
+        processingRule = (LeafSchemaNode) pathKey.getDataChildByName("processing-rule");
+        assertNotNull(processingRule);
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "processing-rule");
+        assertEquals(expectedQName, processingRule.getQName());
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, processingRule.getPath());
+        assertEquals(BooleanType.getInstance(), processingRule.getType());
+        assertTrue(processingRule.isAddedByUses());
+        // * |-- |-- |-- |-- leaf ignore
+        ignore = (LeafSchemaNode) pathKey.getDataChildByName("ignore");
+        assertNotNull(ignore);
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "ignore");
+        assertEquals(expectedQName, ignore.getQName());
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, ignore.getPath());
+        assertEquals(BooleanType.getInstance(), ignore.getType());
+        assertTrue(ignore.isAddedByUses());
+        // * |-- |-- |-- |-- list path-keys
+        ListSchemaNode pathKeys = (ListSchemaNode) pathKey.getDataChildByName("path-keys");
         assertNotNull(pathKeys);
-        assertEquals(createPath("pcreq", "requests", "path-key-expansion", "path-key", "path-keys"), pathKeys.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "path-keys");
+        assertEquals(expectedQName, pathKeys.getQName());
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, pathKeys.getPath());
         assertTrue(pathKeys.isAddedByUses());
         childNodes = pathKeys.getChildNodes();
-        assertEquals(1, childNodes.size());
-        // * |-- |-- |-- |-- |-- leaf version (U)
-        version = (LeafSchemaNode)pathKeys.getDataChildByName("version");
+        assertEquals(2, childNodes.size());
+        // * |-- |-- |-- |-- |-- leaf version
+        version = (LeafSchemaNode) pathKeys.getDataChildByName("version");
         assertNotNull(version);
-        assertEquals(createPath("pcreq", "requests", "path-key-expansion", "path-key", "path-keys", "version"), version.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "version");
+        assertEquals(expectedQName, version.getQName());
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, version.getPath());
+        assertTrue(version.getType() instanceof ExtendedType);
+        assertEquals(Uint8.getInstance(), version.getType().getBaseType());
         assertTrue(version.isAddedByUses());
-        assertFalse(version.isAugmenting());
-        // * |-- |-- |-- |-- |-- leaf processing-rule (U)
-        processingRule = (LeafSchemaNode)pathKey.getDataChildByName("processing-rule");
-        assertNotNull(processingRule);
-        assertEquals(createPath("pcreq", "requests", "path-key-expansion", "path-key", "processing-rule"), processingRule.getPath());
-        assertTrue(processingRule.isAddedByUses());
-        // * |-- |-- |-- |-- |-- leaf ignore (U)
-        ignore = (LeafSchemaNode)pathKey.getDataChildByName("ignore");
-        assertNotNull(ignore);
-        assertEquals(createPath("pcreq", "requests", "path-key-expansion", "path-key", "ignore"), ignore.getPath());
-        assertTrue(ignore.isAddedByUses());
+        assertTrue(version.isAugmenting());
+        // * |-- |-- |-- |-- |-- leaf type
+        type = (LeafSchemaNode) pathKeys.getDataChildByName("type");
+        assertNotNull(type);
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "type");
+        assertEquals(expectedQName, type.getQName());
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, type.getPath());
+        assertTrue(type.getType() instanceof ExtendedType);
+        assertTrue(type.isAddedByUses());
+        assertTrue(type.isAugmenting());
         // * |-- |-- container segment-computation
-        ContainerSchemaNode sc = (ContainerSchemaNode)requests.getDataChildByName("segment-computation");
+        ContainerSchemaNode sc = (ContainerSchemaNode) requests.getDataChildByName("segment-computation");
         assertNotNull(sc);
-        assertEquals(createPath("pcreq", "requests", "segment-computation"), sc.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "segment-computation");
+        assertEquals(expectedQName, sc.getQName());
+        path.pollLast();
+        path.pollLast();
+        path.pollLast();
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, sc.getPath());
         assertFalse(sc.isAddedByUses());
         // * |-- |-- |-- container p2p
-        ContainerSchemaNode p2p = (ContainerSchemaNode)sc.getDataChildByName("p2p");
+        ContainerSchemaNode p2p = (ContainerSchemaNode) sc.getDataChildByName("p2p");
         assertNotNull(p2p);
-        assertEquals(createPath("pcreq", "requests", "segment-computation", "p2p"), p2p.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "p2p");
+        assertEquals(expectedQName, p2p.getQName());
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, p2p.getPath());
         assertFalse(p2p.isAddedByUses());
         // * |-- |-- |-- |-- container endpoints
-        ContainerSchemaNode endpoints = (ContainerSchemaNode)p2p.getDataChildByName("endpoints");
+        ContainerSchemaNode endpoints = (ContainerSchemaNode) p2p.getDataChildByName("endpoints");
         assertNotNull(endpoints);
-        assertEquals(createPath("pcreq", "requests", "segment-computation", "p2p", "endpoints"), endpoints.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "endpoints");
+        assertEquals(expectedQName, endpoints.getQName());
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, endpoints.getPath());
         assertFalse(endpoints.isAddedByUses());
-        // * |-- |-- |-- |-- |-- leaf processing-rule (U)
-        processingRule = (LeafSchemaNode)endpoints.getDataChildByName("processing-rule");
+        // * |-- |-- |-- |-- |-- leaf processing-rule
+        processingRule = (LeafSchemaNode) endpoints.getDataChildByName("processing-rule");
         assertNotNull(processingRule);
-        assertEquals(createPath("pcreq", "requests", "segment-computation", "p2p", "endpoints", "processing-rule"), processingRule.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "processing-rule");
+        assertEquals(expectedQName, processingRule.getQName());
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, processingRule.getPath());
+        assertEquals(BooleanType.getInstance(), processingRule.getType());
         assertTrue(processingRule.isAddedByUses());
-        // * |-- |-- |-- |-- |-- leaf ignore (U)
-        ignore = (LeafSchemaNode)endpoints.getDataChildByName("ignore");
+        // * |-- |-- |-- |-- |-- leaf ignore
+        ignore = (LeafSchemaNode) endpoints.getDataChildByName("ignore");
         assertNotNull(ignore);
-        assertEquals(createPath("pcreq", "requests", "segment-computation", "p2p", "endpoints", "ignore"), ignore.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "ignore");
+        assertEquals(expectedQName, ignore.getQName());
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, ignore.getPath());
+        assertEquals(BooleanType.getInstance(), ignore.getType());
         assertTrue(ignore.isAddedByUses());
         // * |-- |-- |-- |-- |-- container box
-        box = (ContainerSchemaNode)endpoints.getDataChildByName("box");
+        box = (ContainerSchemaNode) endpoints.getDataChildByName("box");
         assertNotNull(box);
-        assertEquals(createPath("pcreq", "requests", "segment-computation", "p2p", "endpoints", "box"), box.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "box");
+        assertEquals(expectedQName, box.getQName());
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, box.getPath());
         assertTrue(box.isAddedByUses());
-        // * |-- |-- |-- |-- |-- choice address-family (U)
-        ChoiceNode af = (ChoiceNode)endpoints.getDataChildByName("address-family");
+        // * |-- |-- |-- |-- |-- choice address-family
+        ChoiceNode af = (ChoiceNode) endpoints.getDataChildByName("address-family");
         assertNotNull(af);
-        assertEquals(createPath("pcreq", "requests", "segment-computation", "p2p", "endpoints", "address-family"), af.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "address-family");
+        assertEquals(expectedQName, af.getQName());
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, af.getPath());
         assertTrue(af.isAddedByUses());
         // * |-- |-- |-- |-- container reported-route
-        ContainerSchemaNode reportedRoute = (ContainerSchemaNode)p2p.getDataChildByName("reported-route");
+        ContainerSchemaNode reportedRoute = (ContainerSchemaNode) p2p.getDataChildByName("reported-route");
         assertNotNull(reportedRoute);
-        assertEquals(createPath("pcreq", "requests", "segment-computation", "p2p", "reported-route"), reportedRoute.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "reported-route");
+        assertEquals(expectedQName, reportedRoute.getQName());
+        path.pollLast();
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, reportedRoute.getPath());
         assertFalse(reportedRoute.isAddedByUses());
-        // * |-- |-- |-- |-- |-- container bandwidth
-        ContainerSchemaNode bandwidth = (ContainerSchemaNode)reportedRoute.getDataChildByName("bandwidth");
-        assertNotNull(bandwidth);
-        assertEquals(createPath("pcreq", "requests", "segment-computation", "p2p", "reported-route", "bandwidth"), bandwidth.getPath());
-        assertFalse(bandwidth.isAddedByUses());
-        // * |-- |-- |-- |-- |-- list subobjects
-        ListSchemaNode subobjects = (ListSchemaNode)reportedRoute.getDataChildByName("subobjects");
-        assertNotNull(subobjects);
-        assertEquals(createPath("pcreq", "requests", "segment-computation", "p2p", "reported-route", "subobjects"), subobjects.getPath());
-        assertTrue(subobjects.isAddedByUses());
-        // * |-- |-- |-- |-- |-- leaf processing-rule (U)
-        processingRule = (LeafSchemaNode)reportedRoute.getDataChildByName("processing-rule");
+        // * |-- |-- |-- |-- |-- leaf processing-rule
+        processingRule = (LeafSchemaNode) reportedRoute.getDataChildByName("processing-rule");
         assertNotNull(processingRule);
-        assertEquals(createPath("pcreq", "requests", "segment-computation", "p2p", "reported-route", "processing-rule"), processingRule.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "processing-rule");
+        assertEquals(expectedQName, processingRule.getQName());
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, processingRule.getPath());
+        assertEquals(BooleanType.getInstance(), processingRule.getType());
         assertTrue(processingRule.isAddedByUses());
-        // * |-- |-- |-- |-- |-- leaf ignore (U)
-        ignore = (LeafSchemaNode)reportedRoute.getDataChildByName("ignore");
+        // * |-- |-- |-- |-- |-- leaf ignore
+        ignore = (LeafSchemaNode) reportedRoute.getDataChildByName("ignore");
         assertNotNull(ignore);
-        assertEquals(createPath("pcreq", "requests", "segment-computation", "p2p", "reported-route", "ignore"), ignore.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "ignore");
+        assertEquals(expectedQName, ignore.getQName());
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, ignore.getPath());
+        assertEquals(BooleanType.getInstance(), ignore.getType());
         assertTrue(ignore.isAddedByUses());
-        // * |-- |-- |-- |-- container bandwidth (U)
-        bandwidth = (ContainerSchemaNode)p2p.getDataChildByName("bandwidth");
+        // * |-- |-- |-- |-- |-- list subobjects
+        ListSchemaNode subobjects = (ListSchemaNode) reportedRoute.getDataChildByName("subobjects");
+        assertNotNull(subobjects);
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "subobjects");
+        assertEquals(expectedQName, subobjects.getQName());
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, subobjects.getPath());
+        assertTrue(subobjects.isAddedByUses());
+        // * |-- |-- |-- |-- |-- container bandwidth
+        ContainerSchemaNode bandwidth = (ContainerSchemaNode) reportedRoute.getDataChildByName("bandwidth");
+        assertNotNull(bandwidth);
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "bandwidth");
+        assertEquals(expectedQName, bandwidth.getQName());
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, bandwidth.getPath());
+        assertFalse(bandwidth.isAddedByUses());
+        // * |-- |-- |-- |-- container bandwidth
+        bandwidth = (ContainerSchemaNode) p2p.getDataChildByName("bandwidth");
         assertNotNull(bandwidth);
-        assertEquals(createPath("pcreq", "requests", "segment-computation", "p2p", "bandwidth"), bandwidth.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "bandwidth");
+        assertEquals(expectedQName, bandwidth.getQName());
+        path.pollLast();
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, bandwidth.getPath());
         assertTrue(bandwidth.isAddedByUses());
-        // * |-- |-- |-- |-- |-- container bandwidth (U)
-        ContainerSchemaNode bandwidthInner = (ContainerSchemaNode)bandwidth.getDataChildByName("bandwidth");
-        assertNotNull(bandwidthInner);
-        assertEquals(createPath("pcreq", "requests", "segment-computation", "p2p", "bandwidth", "bandwidth"), bandwidthInner.getPath());
-        assertTrue(bandwidthInner.isAddedByUses());
-        // * |-- |-- |-- |-- |-- leaf processing-rule (U)
-        processingRule = (LeafSchemaNode)bandwidth.getDataChildByName("processing-rule");
+        // * |-- |-- |-- |-- |-- leaf processing-rule
+        processingRule = (LeafSchemaNode) bandwidth.getDataChildByName("processing-rule");
         assertNotNull(processingRule);
-        assertEquals(createPath("pcreq", "requests", "segment-computation", "p2p", "bandwidth", "processing-rule"), processingRule.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "processing-rule");
+        assertEquals(expectedQName, processingRule.getQName());
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, processingRule.getPath());
+        assertEquals(BooleanType.getInstance(), processingRule.getType());
         assertTrue(processingRule.isAddedByUses());
-        // * |-- |-- |-- |-- |-- leaf ignore (U)
-        ignore = (LeafSchemaNode)bandwidth.getDataChildByName("ignore");
+        // * |-- |-- |-- |-- |-- leaf ignore
+        ignore = (LeafSchemaNode) bandwidth.getDataChildByName("ignore");
         assertNotNull(ignore);
-        assertEquals(createPath("pcreq", "requests", "segment-computation", "p2p", "bandwidth", "ignore"), ignore.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "ignore");
+        assertEquals(expectedQName, ignore.getQName());
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, ignore.getPath());
+        assertEquals(BooleanType.getInstance(), ignore.getType());
         assertTrue(ignore.isAddedByUses());
+        // * |-- |-- |-- |-- |-- container bandwidth
+        ContainerSchemaNode bandwidthInner = (ContainerSchemaNode) bandwidth.getDataChildByName("bandwidth");
+        assertNotNull(bandwidthInner);
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "bandwidth");
+        assertEquals(expectedQName, bandwidth.getQName());
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, bandwidthInner.getPath());
+        assertTrue(bandwidthInner.isAddedByUses());
         // * |-- list svec
-        ListSchemaNode svec = (ListSchemaNode)pcreq.getDataChildByName("svec");
+        ListSchemaNode svec = (ListSchemaNode) pcreq.getDataChildByName("svec");
         assertNotNull(svec);
-        assertEquals(createPath("pcreq", "svec"), svec.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "svec");
+        assertEquals(expectedQName, svec.getQName());
+        path.pollLast();
+        path.pollLast();
+        path.pollLast();
+        path.pollLast();
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, svec.getPath());
         assertFalse(svec.isAddedByUses());
+        // * |-- |-- leaf link-diverse
+        LeafSchemaNode linkDiverse = (LeafSchemaNode) svec.getDataChildByName("link-diverse");
+        assertNotNull(linkDiverse);
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "link-diverse");
+        assertEquals(expectedQName, linkDiverse.getQName());
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, linkDiverse.getPath());
+        assertEquals(BooleanType.getInstance(), linkDiverse.getType());
+        assertTrue(linkDiverse.isAddedByUses());
+        // * |-- |-- leaf processing-rule
+        processingRule = (LeafSchemaNode) svec.getDataChildByName("processing-rule");
+        assertNotNull(processingRule);
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "processing-rule");
+        assertEquals(expectedQName, processingRule.getQName());
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, processingRule.getPath());
+        assertEquals(BooleanType.getInstance(), processingRule.getType());
+        assertTrue(processingRule.isAddedByUses());
+        // * |-- |-- leaf ignore
+        ignore = (LeafSchemaNode) svec.getDataChildByName("ignore");
+        assertNotNull(ignore);
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "ignore");
+        assertEquals(expectedQName, ignore.getQName());
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, ignore.getPath());
+        assertEquals(BooleanType.getInstance(), ignore.getType());
+        assertTrue(ignore.isAddedByUses());
         // * |-- |-- list metric
-        ListSchemaNode metric = (ListSchemaNode)svec.getDataChildByName("metric");
+        ListSchemaNode metric = (ListSchemaNode) svec.getDataChildByName("metric");
         assertNotNull(metric);
-        assertEquals(createPath("pcreq", "svec", "metric"), metric.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "metric");
+        assertEquals(expectedQName, metric.getQName());
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, metric.getPath());
         assertFalse(metric.isAddedByUses());
-        // * |-- |-- |-- leaf metric-type (U)
-        LeafSchemaNode metricType = (LeafSchemaNode)metric.getDataChildByName("metric-type");
+        // * |-- |-- |-- leaf metric-type
+        LeafSchemaNode metricType = (LeafSchemaNode) metric.getDataChildByName("metric-type");
         assertNotNull(metricType);
-        assertEquals(createPath("pcreq", "svec", "metric", "metric-type"), metricType.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "metric-type");
+        assertEquals(expectedQName, metricType.getQName());
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, metricType.getPath());
+        assertEquals(Uint8.getInstance(), metricType.getType());
         assertTrue(metricType.isAddedByUses());
-        // * |-- |-- |-- box (U)
-        box = (ContainerSchemaNode)metric.getDataChildByName("box");
+        // * |-- |-- |-- box
+        box = (ContainerSchemaNode) metric.getDataChildByName("box");
         assertNotNull(box);
-        assertEquals(createPath("pcreq", "svec", "metric", "box"), box.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "box");
+        assertEquals(expectedQName, box.getQName());
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, box.getPath());
         assertTrue(box.isAddedByUses());
-        // * |-- |-- |-- leaf processing-rule (U)
-        processingRule = (LeafSchemaNode)metric.getDataChildByName("processing-rule");
+        // * |-- |-- |-- leaf processing-rule
+        processingRule = (LeafSchemaNode) metric.getDataChildByName("processing-rule");
         assertNotNull(processingRule);
-        assertEquals(createPath("pcreq", "svec", "metric", "processing-rule"), processingRule.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "processing-rule");
+        assertEquals(expectedQName, processingRule.getQName());
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, processingRule.getPath());
+        assertEquals(BooleanType.getInstance(), processingRule.getType());
         assertTrue(processingRule.isAddedByUses());
-        // * |-- |-- |-- leaf ignore (U)
-        ignore = (LeafSchemaNode)metric.getDataChildByName("ignore");
+        // * |-- |-- |-- leaf ignore
+        ignore = (LeafSchemaNode) metric.getDataChildByName("ignore");
         assertNotNull(ignore);
-        assertEquals(createPath("pcreq", "svec", "metric", "ignore"), ignore.getPath());
-        assertTrue(ignore.isAddedByUses());
-        // * |-- |-- leaf link-diverse (U)
-        LeafSchemaNode linkDiverse = (LeafSchemaNode)svec.getDataChildByName("link-diverse");
-        assertNotNull(linkDiverse);
-        assertEquals(createPath("pcreq", "svec", "link-diverse"), linkDiverse.getPath());
-        assertTrue(linkDiverse.isAddedByUses());
-        // * |-- |-- leaf processing-rule (U)
-        processingRule = (LeafSchemaNode)svec.getDataChildByName("processing-rule");
-        assertNotNull(processingRule);
-        assertEquals(createPath("pcreq", "svec", "processing-rule"), processingRule.getPath());
-        assertTrue(processingRule.isAddedByUses());
-        // * |-- |-- leaf ignore (U)
-        ignore = (LeafSchemaNode)svec.getDataChildByName("ignore");
-        assertNotNull(ignore);
-        assertEquals(createPath("pcreq", "svec", "ignore"), ignore.getPath());
+        expectedQName = new QName(UG_NS, UG_REV, UG_PREF, "ignore");
+        assertEquals(expectedQName, ignore.getQName());
+        path.pollLast();
+        path.offer(expectedQName);
+        expectedPath= new SchemaPath(path, true);
+        assertEquals(expectedPath, ignore.getPath());
+        assertEquals(BooleanType.getInstance(), ignore.getType());
         assertTrue(ignore.isAddedByUses());
     }
 
-    private SchemaPath createPath(String... names) {
-        List<QName> path = new ArrayList<>();
-        for(String name : names) {
-            path.add(new QName(ns, rev, prefix, name));
+    @Test
+    public void testTypedefs() throws FileNotFoundException {
+        modules = TestUtils.loadModules(getClass().getResource("/grouping-test").getPath());
+        Module testModule = TestUtils.findModule(modules, "grouping-definitions");
+        Set<TypeDefinition<?>> types = testModule.getTypeDefinitions();
+
+        TypeDefinition<?> intExt = null;
+        for(TypeDefinition<?> td : types) {
+            if("int-ext".equals(td.getQName().getLocalName())) {
+                intExt = td;
+            }
         }
-        return new SchemaPath(path, true);
+        assertNotNull(intExt);
+
+        List<QName> path = Lists.newArrayList(new QName(GD_NS, GD_REV, GD_PREF, "int-ext"));
+        SchemaPath expectedPath = new SchemaPath(path, true);
+        assertEquals(expectedPath, intExt.getPath());
+
+        UnionType union = (UnionType)intExt.getBaseType();
+
+        TypeDefinition<?> uint8 = null;
+        TypeDefinition<?> pv = null;
+        for(TypeDefinition<?> td : union.getTypes()) {
+            if("uint8".equals(td.getQName().getLocalName())) {
+                uint8 = td;
+            } else if("protocol-version".equals(td.getQName().getLocalName())) {
+                pv = td;
+            }
+        }
+        assertNotNull(uint8);
+        assertNotNull(pv);
+
+        QName q1 = BaseTypes.constructQName("union");
+        expectedPath = new SchemaPath(Lists.newArrayList(q1), true);
+        assertEquals(expectedPath, union.getPath());
     }
 
 }