BUG-1119: optimize length and range checks in generated sources.

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

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java
index f7ed184300a639069854b8cde0e3edac25b2aa86..8c4e130cbc9e54657036c25219192d1ef67c5f9a 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java
@@ -12,9 +12,11 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
+import com.google.common.collect.Lists;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
+import java.math.BigInteger;
 import java.net.URI;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -23,7 +25,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.junit.Ignore;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
@@ -45,11 +46,9 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.UsesNode;
 import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
-import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser;
+import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser;
 import org.opendaylight.yangtools.yang.model.util.ExtendedType;
 
-import com.google.common.collect.Lists;
-
 public class YangParserWithContextTest {
     private final DateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
     private final YangParserImpl parser = new YangParserImpl();
@@ -87,8 +86,8 @@ public class YangParserWithContextTest {
         List<RangeConstraint> ranges = dscpExt.getRangeConstraints();
         assertEquals(1, ranges.size());
         RangeConstraint range = ranges.get(0);
-        assertEquals(0L, range.getMin());
-        assertEquals(63L, range.getMax());
+        assertEquals(BigInteger.ZERO, range.getMin());
+        assertEquals(BigInteger.valueOf(63), range.getMax());
     }
 
     @Test
@@ -277,8 +276,8 @@ public class YangParserWithContextTest {
         SchemaContext context;
         File yangFile = new File(getClass().getResource("/types/custom-types-test@2012-4-4.yang").toURI());
         File dependenciesDir = new File(getClass().getResource("/ietf").toURI());
-        YangModelParser parser = new YangParserImpl();
-        context = parser.resolveSchemaContext(parser.parseYangModels(yangFile, dependenciesDir));
+        YangContextParser parser = new YangParserImpl();
+        context = parser.parseFile(yangFile, dependenciesDir);
 
         Module module;
         try (InputStream stream = new FileInputStream(new File(getClass().getResource("/context-test/test3.yang")
@@ -310,8 +309,8 @@ public class YangParserWithContextTest {
         SchemaContext context;
         File yangFile = new File(getClass().getResource("/types/custom-types-test@2012-4-4.yang").toURI());
         File dependenciesDir = new File(getClass().getResource("/ietf").toURI());
-        YangModelParser parser = new YangParserImpl();
-        context = parser.resolveSchemaContext(parser.parseYangModels(yangFile, dependenciesDir));
+        YangContextParser parser = new YangParserImpl();
+        context = parser.parseFile(yangFile, dependenciesDir);
 
         Module module;
         try (InputStream stream = new FileInputStream(new File(getClass().getResource("/context-test/test3.yang")