Fixed bugs in parsing enumeration, augment, identity.

[controller.git] / opendaylight / sal / yang-prototype / code-generator / yang-model-parser-impl / src / test / java / org / opendaylight / controller / yang / model / parser / impl / YangModelParserTest.java

diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/java/org/opendaylight/controller/yang/model/parser/impl/YangModelParserTest.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/java/org/opendaylight/controller/yang/model/parser/impl/YangModelParserTest.java
index 81ca4879dfa361ab346fe839b3bd6cb1d8f3b0fb..736efe7efe9eb709ef73995c255ebc338728b71d 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/java/org/opendaylight/controller/yang/model/parser/impl/YangModelParserTest.java
+++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/java/org/opendaylight/controller/yang/model/parser/impl/YangModelParserTest.java
@@ -170,7 +170,7 @@ public class YangModelParserTest {
         // test AugmentationTarget args
         Set<AugmentationSchema> availableAugmentations = ifEntry
                 .getAvailableAugmentations();
-        assertEquals(1, availableAugmentations.size());
+        assertEquals(2, availableAugmentations.size());
         AugmentationSchema augment = availableAugmentations.iterator().next();
         ContainerSchemaNode augmentHolder = (ContainerSchemaNode) augment
                 .getDataChildByName("augment-holder");
@@ -183,16 +183,16 @@ public class YangModelParserTest {
         assertFalse(ifEntry.isUserOrdered());
         // test DataNodeContainer args
         assertEquals(0, ifEntry.getTypeDefinitions().size());
-        assertEquals(3, ifEntry.getChildNodes().size());
+        assertEquals(4, ifEntry.getChildNodes().size());
         assertEquals(0, ifEntry.getGroupings().size());
         assertEquals(0, ifEntry.getUses().size());
 
         LeafSchemaNode ifIndex = (LeafSchemaNode) ifEntry
                 .getDataChildByName("ifIndex");
-        assertEquals(new Uint32(), ifIndex.getType());
+        assertTrue(ifIndex.getType() instanceof Uint32);
         LeafSchemaNode ifMtu = (LeafSchemaNode) ifEntry
                 .getDataChildByName("ifMtu");
-        assertEquals(new Int32(), ifMtu.getType());
+        assertTrue(ifMtu.getType() instanceof Int32);
     }
 
     @Test
@@ -225,14 +225,14 @@ public class YangModelParserTest {
 
         Set<AugmentationSchema> ifEntryAugments = ifEntry
                 .getAvailableAugmentations();
-        assertEquals(1, ifEntryAugments.size());
+        assertEquals(2, ifEntryAugments.size());
 
         // testfile3
         Module module3 = TestUtils.findModule(modules, "types3");
 
         Set<AugmentationSchema> module3Augmentations = module3
                 .getAugmentations();
-        assertEquals(1, module3Augmentations.size());
+        assertEquals(2, module3Augmentations.size());
         AugmentationSchema augment3 = module3Augmentations.iterator().next();
         ContainerSchemaNode augmentedContainerDefinition = (ContainerSchemaNode) augment3
                 .getDataChildByName("augment-holder");
@@ -256,7 +256,7 @@ public class YangModelParserTest {
                 .getDataChildByName("ifEntry");
         Set<AugmentationSchema> augmentations = ifEntry
                 .getAvailableAugmentations();
-        assertEquals(1, augmentations.size());
+        assertEquals(2, augmentations.size());
 
         AugmentationSchema augment = augmentations.iterator().next();