X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fsal%2Fyang-prototype%2Fcode-generator%2Fyang-model-parser-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fyang%2Fmodel%2Fparser%2Fimpl%2FYangModelParserTest.java;fp=opendaylight%2Fsal%2Fyang-prototype%2Fcode-generator%2Fyang-model-parser-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fyang%2Fmodel%2Fparser%2Fimpl%2FYangModelParserTest.java;h=e02d8321696983aff6457b8b1822931e70985c1d;hb=e2ef18c530a0bb668d7806c419fea95edd5aae53;hp=9881080bfa496c57094a40cd83cd9af1db17b4da;hpb=78718ca2980d6289703f239abb6b7928ea08c8e4;p=controller.git

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 9881080bfa..e02d832169 100644
--- 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
@@ -21,9 +21,10 @@ import org.opendaylight.controller.yang.model.api.LeafSchemaNode;
 import org.opendaylight.controller.yang.model.api.ListSchemaNode;
 import org.opendaylight.controller.yang.model.api.Module;
 import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.IntegerTypeDefinition;
+import org.opendaylight.controller.yang.model.api.type.LengthConstraint;
 import org.opendaylight.controller.yang.model.api.type.PatternConstraint;
 import org.opendaylight.controller.yang.model.api.type.RangeConstraint;
+import org.opendaylight.controller.yang.model.api.type.StringTypeDefinition;
 import org.opendaylight.controller.yang.model.parser.api.YangModelParser;
 import org.opendaylight.controller.yang.model.util.Decimal64;
 import org.opendaylight.controller.yang.model.util.Int32;
@@ -99,9 +100,9 @@ public class YangModelParserTest {
         assertTrue(testleaf.getType().getBaseType() instanceof Int32);
         Int32 baseTypeCast = (Int32)baseType;
         List<RangeConstraint> ranges = baseTypeCast.getRangeStatements();
-        assertEquals(2, ranges.size());
+        assertEquals(1, ranges.size());
         RangeConstraint range = ranges.get(0);
-        assertEquals(2L, range.getMin());
+        assertEquals(11L, range.getMin());
         assertEquals(20L, range.getMax());
     }
 
@@ -150,22 +151,15 @@ public class YangModelParserTest {
         }
         assertNotNull(m1);
 
-        LeafSchemaNode testleaf = (LeafSchemaNode)m1.getDataChildByName("test-int-leaf");
+        LeafSchemaNode testleaf = (LeafSchemaNode)m1.getDataChildByName("leaf-with-length");
         TypeDefinition<?> baseType = testleaf.getType().getBaseType();
-        assertTrue(testleaf.getType().getBaseType() instanceof IntegerTypeDefinition);
-        Int32 baseTypeCast = (Int32)baseType;
-
-        Long[][] expectedRanges = new Long[3][2];
-        expectedRanges[0] = new Long[]{10L, 20L};
-        expectedRanges[1] = new Long[]{12L, 18L};
-        expectedRanges[2] = new Long[]{14L, 16L};
+        assertTrue(testleaf.getType().getBaseType() instanceof StringTypeDefinition);
+        StringType baseTypeCast = (StringType)baseType;
 
-        List<RangeConstraint> actualRanges = baseTypeCast.getRangeStatements();
-        assertEquals(3, actualRanges.size());
-        for(int i = 0; i < actualRanges.size(); i++) {
-            assertEquals(expectedRanges[i][0], actualRanges.get(i).getMin());
-            assertEquals(expectedRanges[i][1], actualRanges.get(i).getMax());
-        }
+        List<LengthConstraint> actualLengths = baseTypeCast.getLengthStatements();
+        assertEquals(1, actualLengths.size());
+        assertEquals(7L, actualLengths.get(0).getMin());
+        assertEquals(10L, actualLengths.get(0).getMax());
     }
 
     @Test
@@ -186,9 +180,9 @@ public class YangModelParserTest {
         assertTrue(testleaf.getType().getBaseType() instanceof Int32);
         Int32 baseTypeCast = (Int32)baseType;
         List<RangeConstraint> ranges = baseTypeCast.getRangeStatements();
-        assertEquals(2, ranges.size());
+        assertEquals(1, ranges.size());
         RangeConstraint range = ranges.get(0);
-        assertEquals(2L, range.getMin());
+        assertEquals(11L, range.getMin());
         assertEquals(20L, range.getMax());
     }