Bug 5085: Clean-up test and retest JUnit tests

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

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/Bug4623Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4623Test.java
similarity index 65%
rename from yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/Bug4623Test.java
rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4623Test.java
index 79f904e0c85d2e3d42c525467fdc83eae6401e03..8d4ba967263dc2f17f6d7f45bf2d885d43573906 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/Bug4623Test.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4623Test.java
@@ -1,19 +1,24 @@
-package org.opendaylight.yangtools.yang.parser.impl;
+/*
+ * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.opendaylight.yangtools.yang.stmt;
 
 import java.io.File;
-import java.math.BigInteger;
-import java.util.Arrays;
 import java.util.List;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
-import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser;
-import org.opendaylight.yangtools.yang.model.util.ExtendedType;
+import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
 
 public class Bug4623Test {
 
@@ -22,10 +27,9 @@ public class Bug4623Test {
         // given
         File extdef = new File(getClass().getResource("/bugs/bug4623/extension-def.yang").toURI());
         File stringWithExt = new File(getClass().getResource("/bugs/bug4623/string-with-ext.yang").toURI());
-        YangContextParser parser = new YangParserImpl();
 
         // when
-        SchemaContext schemaContext = parser.parseFiles(Arrays.asList(extdef, stringWithExt));
+        SchemaContext schemaContext = TestUtils.parseYangSources(extdef, stringWithExt);
 
         LeafSchemaNode leaf = (LeafSchemaNode) schemaContext
                 .findModuleByName("types", null)
@@ -33,19 +37,19 @@ public class Bug4623Test {
 
         // then
         Assert.assertNotNull(leaf);
-        Assert.assertNotNull(leaf.getType());
 
-        final List<UnknownSchemaNode> unknownSchemaNodes = leaf.getUnknownSchemaNodes();
-        Assert.assertNotNull(leaf.getUnknownSchemaNodes());
+        final TypeDefinition<?> type = leaf.getType();
+        Assert.assertNotNull(type);
+        final List<UnknownSchemaNode> unknownSchemaNodes = type.getUnknownSchemaNodes();
+        Assert.assertNotNull(unknownSchemaNodes);
         Assert.assertFalse(unknownSchemaNodes.size() == 0);
 
         final UnknownSchemaNode unknownSchemaNode = unknownSchemaNodes.get(0);
         Assert.assertEquals(unknownSchemaNode.getNodeParameter(), "unknown");
         Assert.assertEquals(unknownSchemaNode.getNodeType().getModule().getNamespace().toString(), "urn:simple.extension.typedefs");
 
-        final ExtendedType type = (ExtendedType) leaf.getType();
-        final List<LengthConstraint> lengthConstraints = type.getLengthConstraints();
-        final List<PatternConstraint> patternConstraints = type.getPatternConstraints();
+        final List<LengthConstraint> lengthConstraints = ((StringTypeDefinition) type).getLengthConstraints();
+        final List<PatternConstraint> patternConstraints = ((StringTypeDefinition) type).getPatternConstraints();
 
         Assert.assertNotNull(lengthConstraints);
         Assert.assertNotNull(patternConstraints);
@@ -53,23 +57,21 @@ public class Bug4623Test {
         Assert.assertFalse(patternConstraints.size() == 0);
 
         final LengthConstraint lengthConstraint = lengthConstraints.get(0);
-        Assert.assertEquals(lengthConstraint.getMin(), BigInteger.valueOf(2L));
-        Assert.assertEquals(lengthConstraint.getMax(), BigInteger.TEN);
+        Assert.assertEquals(lengthConstraint.getMin(), Integer.valueOf(2));
+        Assert.assertEquals(lengthConstraint.getMax(), Integer.valueOf(10));
 
         final PatternConstraint patternConstraint = patternConstraints.get(0);
         Assert.assertEquals(patternConstraint.getRegularExpression(), "^[0-9a-fA-F]$");
     }
 
-
     @Test
     public void testStringTypeWithUnknownSchemaNodeBetweenStringRestrictionStatements() throws Exception {
         // given
         File extdef = new File(getClass().getResource("/bugs/bug4623/extension-def.yang").toURI());
         File stringWithExt = new File(getClass().getResource("/bugs/bug4623/string-with-ext.yang").toURI());
-        YangContextParser parser = new YangParserImpl();
 
         // when
-        SchemaContext schemaContext = parser.parseFiles(Arrays.asList(extdef, stringWithExt));
+        SchemaContext schemaContext = TestUtils.parseYangSources(extdef, stringWithExt);
 
         LeafSchemaNode leaf = (LeafSchemaNode) schemaContext
                 .findModuleByName("types", null)
@@ -77,19 +79,19 @@ public class Bug4623Test {
 
         // then
         Assert.assertNotNull(leaf);
-        Assert.assertNotNull(leaf.getType());
 
-        final List<UnknownSchemaNode> unknownSchemaNodes = leaf.getUnknownSchemaNodes();
-        Assert.assertNotNull(leaf.getUnknownSchemaNodes());
+        final TypeDefinition<?> type = leaf.getType();
+        Assert.assertNotNull(type);
+        final List<UnknownSchemaNode> unknownSchemaNodes = type.getUnknownSchemaNodes();
+        Assert.assertNotNull(unknownSchemaNodes);
         Assert.assertFalse(unknownSchemaNodes.size() == 0);
 
         final UnknownSchemaNode unknownSchemaNode = unknownSchemaNodes.get(0);
         Assert.assertEquals(unknownSchemaNode.getNodeParameter(), "unknown");
         Assert.assertEquals(unknownSchemaNode.getNodeType().getModule().getNamespace().toString(), "urn:simple.extension.typedefs");
 
-        final ExtendedType type = (ExtendedType) leaf.getType();
-        final List<LengthConstraint> lengthConstraints = type.getLengthConstraints();
-        final List<PatternConstraint> patternConstraints = type.getPatternConstraints();
+        final List<LengthConstraint> lengthConstraints = ((StringTypeDefinition) type).getLengthConstraints();
+        final List<PatternConstraint> patternConstraints = ((StringTypeDefinition) type).getPatternConstraints();
 
         Assert.assertNotNull(lengthConstraints);
         Assert.assertNotNull(patternConstraints);
@@ -97,8 +99,8 @@ public class Bug4623Test {
         Assert.assertFalse(patternConstraints.size() == 0);
 
         final LengthConstraint lengthConstraint = lengthConstraints.get(0);
-        Assert.assertEquals(lengthConstraint.getMin(), BigInteger.valueOf(2L));
-        Assert.assertEquals(lengthConstraint.getMax(), BigInteger.TEN);
+        Assert.assertEquals(lengthConstraint.getMin(), Integer.valueOf(2));
+        Assert.assertEquals(lengthConstraint.getMax(), Integer.valueOf(10));
 
         final PatternConstraint patternConstraint = patternConstraints.get(0);
         Assert.assertEquals(patternConstraint.getRegularExpression(), "^[0-9a-fA-F]$");
@@ -109,10 +111,9 @@ public class Bug4623Test {
         // given
         File extdef = new File(getClass().getResource("/bugs/bug4623/extension-def.yang").toURI());
         File stringWithExt = new File(getClass().getResource("/bugs/bug4623/string-with-ext.yang").toURI());
-        YangContextParser parser = new YangParserImpl();
 
         // when
-        SchemaContext schemaContext = parser.parseFiles(Arrays.asList(extdef, stringWithExt));
+        SchemaContext schemaContext = TestUtils.parseYangSources(extdef, stringWithExt);
 
         LeafSchemaNode leaf = (LeafSchemaNode) schemaContext
                 .findModuleByName("types", null)
@@ -120,19 +121,19 @@ public class Bug4623Test {
 
         // then
         Assert.assertNotNull(leaf);
-        Assert.assertNotNull(leaf.getType());
 
-        final List<UnknownSchemaNode> unknownSchemaNodes = leaf.getUnknownSchemaNodes();
-        Assert.assertNotNull(leaf.getUnknownSchemaNodes());
+        final TypeDefinition<?> type = leaf.getType();
+        Assert.assertNotNull(type);
+        final List<UnknownSchemaNode> unknownSchemaNodes = type.getUnknownSchemaNodes();
+        Assert.assertNotNull(unknownSchemaNodes);
         Assert.assertFalse(unknownSchemaNodes.size() == 0);
 
         final UnknownSchemaNode unknownSchemaNode = unknownSchemaNodes.get(0);
         Assert.assertEquals(unknownSchemaNode.getNodeParameter(), "unknown");
         Assert.assertEquals(unknownSchemaNode.getNodeType().getModule().getNamespace().toString(), "urn:simple.extension.typedefs");
 
-        final ExtendedType type = (ExtendedType) leaf.getType();
-        final List<LengthConstraint> lengthConstraints = type.getLengthConstraints();
-        final List<PatternConstraint> patternConstraints = type.getPatternConstraints();
+        final List<LengthConstraint> lengthConstraints = ((StringTypeDefinition) type).getLengthConstraints();
+        final List<PatternConstraint> patternConstraints = ((StringTypeDefinition) type).getPatternConstraints();
 
         Assert.assertNotNull(lengthConstraints);
         Assert.assertNotNull(patternConstraints);
@@ -140,8 +141,8 @@ public class Bug4623Test {
         Assert.assertFalse(patternConstraints.size() == 0);
 
         final LengthConstraint lengthConstraint = lengthConstraints.get(0);
-        Assert.assertEquals(lengthConstraint.getMin(), BigInteger.valueOf(2L));
-        Assert.assertEquals(lengthConstraint.getMax(), BigInteger.TEN);
+        Assert.assertEquals(lengthConstraint.getMin(), Integer.valueOf(2));
+        Assert.assertEquals(lengthConstraint.getMax(), Integer.valueOf(10));
 
         final PatternConstraint patternConstraint = patternConstraints.get(0);
         Assert.assertEquals(patternConstraint.getRegularExpression(), "^[0-9a-fA-F]$");