import static org.junit.Assert.assertTrue;
import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource;
+import com.google.common.collect.Range;
+import com.google.common.collect.RangeSet;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Date;
import java.util.Iterator;
import java.util.List;
+import java.util.Optional;
import java.util.Set;
+import java.util.SortedMap;
import org.junit.Before;
import org.junit.Test;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.common.QNameModule;
+import org.opendaylight.yangtools.yang.common.Revision;
import org.opendaylight.yangtools.yang.common.YangConstants;
import org.opendaylight.yangtools.yang.common.YangVersion;
-import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
+import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode;
import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode;
import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
import org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition;
import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition;
-import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline;
public class YangParserTest {
- private static final QNameModule FOO = QNameModule.create(
- URI.create("urn:opendaylight.foo"), QName.parseRevision("2013-02-27"));
- private static final QNameModule BAR = QNameModule.create(
- URI.create("urn:opendaylight.bar"), QName.parseRevision("2013-07-03"));
- private static final QNameModule BAZ = QNameModule.create(
- URI.create("urn:opendaylight.baz"), QName.parseRevision("2013-02-27"));
+ private static final QNameModule FOO = QNameModule.create(URI.create("urn:opendaylight.foo"),
+ Revision.of("2013-02-27"));
+ private static final QNameModule BAR = QNameModule.create(URI.create("urn:opendaylight.bar"),
+ Revision.of("2013-07-03"));
+ private static final QNameModule BAZ = QNameModule.create(URI.create("urn:opendaylight.baz"),
+ Revision.of("2013-02-27"));
private SchemaContext context;
private Module foo;
@Test
public void testHeaders() throws ParseException {
assertEquals("foo", foo.getName());
- assertEquals(YangVersion.VERSION_1.toString(), foo.getYangVersion());
+ assertEquals(YangVersion.VERSION_1, foo.getYangVersion());
assertEquals(FOO.getNamespace(), foo.getNamespace());
assertEquals("foo", foo.getPrefix());
assertEquals("baz", import3.getModuleName());
assertEquals(BAZ.getRevision(), import3.getRevision());
- assertEquals("opendaylight", foo.getOrganization());
- assertEquals("http://www.opendaylight.org/", foo.getContact());
- final Date expectedRevision = TestUtils.createDate("2013-02-27");
- assertEquals(expectedRevision, foo.getRevision());
- assertNull(foo.getReference());
+ assertEquals(Optional.of("opendaylight"), foo.getOrganization());
+ assertEquals(Optional.of("http://www.opendaylight.org/"), foo.getContact());
+ assertEquals(Revision.ofNullable("2013-02-27"), foo.getRevision());
+ assertFalse(foo.getReference().isPresent());
}
@Test
final SchemaPath expectedPath = TestUtils.createPath(true, BAR, "interfaces", "ifEntry");
assertEquals(expectedPath, ifEntry.getPath());
- assertNull(ifEntry.getDescription());
- assertNull(ifEntry.getReference());
+ assertFalse(ifEntry.getDescription().isPresent());
+ assertFalse(ifEntry.getReference().isPresent());
assertEquals(Status.CURRENT, ifEntry.getStatus());
assertEquals(0, ifEntry.getUnknownSchemaNodes().size());
// test DataSchemaNode args
assertEquals(1, (int) constraints.getMinElements());
assertEquals(11, (int) constraints.getMaxElements());
// test AugmentationTarget args
- final Set<AugmentationSchema> availableAugmentations = ifEntry.getAvailableAugmentations();
+ final Set<AugmentationSchemaNode> availableAugmentations = ifEntry.getAvailableAugmentations();
assertEquals(2, availableAugmentations.size());
// test ListSchemaNode args
final List<QName> expectedKey = new ArrayList<>();
assertEquals(0, ifEntry.getGroupings().size());
assertEquals(0, ifEntry.getUses().size());
- final LeafSchemaNode ifIndex = (LeafSchemaNode) ifEntry.getDataChildByName(QName.create(bar.getQNameModule(), "ifIndex"));
+ final LeafSchemaNode ifIndex = (LeafSchemaNode) ifEntry.getDataChildByName(QName.create(bar.getQNameModule(),
+ "ifIndex"));
assertEquals(ifEntry.getKeyDefinition().get(0), ifIndex.getQName());
assertTrue(ifIndex.getType() instanceof UnsignedIntegerTypeDefinition);
- assertEquals("minutes", ifIndex.getUnits());
- final LeafSchemaNode ifMtu = (LeafSchemaNode) ifEntry.getDataChildByName(QName.create(bar.getQNameModule(), "ifMtu"));
+ assertEquals(Optional.of("minutes"), ifIndex.getType().getUnits());
+ final LeafSchemaNode ifMtu = (LeafSchemaNode) ifEntry.getDataChildByName(QName.create(bar.getQNameModule(),
+ "ifMtu"));
assertEquals(BaseTypes.int32Type(), ifMtu.getType());
}
@Test
public void testTypedefRangesResolving() throws ParseException {
- final LeafSchemaNode int32Leaf = (LeafSchemaNode) foo.getDataChildByName(QName.create(foo.getQNameModule(), "int32-leaf"));
+ final LeafSchemaNode int32Leaf = (LeafSchemaNode) foo.getDataChildByName(QName.create(foo.getQNameModule(),
+ "int32-leaf"));
final IntegerTypeDefinition leafType = (IntegerTypeDefinition) int32Leaf.getType();
assertEquals(QName.create(FOO, "int32-ext2"), leafType.getQName());
- assertEquals("mile", leafType.getUnits());
- assertEquals("11", leafType.getDefaultValue());
+ assertEquals(Optional.of("mile"), leafType.getUnits());
+ assertEquals(Optional.of("11"), leafType.getDefaultValue());
- final List<RangeConstraint> ranges = leafType.getRangeConstraints();
+ final RangeSet<? extends Number> rangeset = leafType.getRangeConstraint().get().getAllowedRanges();
+ final Set<? extends Range<? extends Number>> ranges = rangeset.asRanges();
assertEquals(1, ranges.size());
- final RangeConstraint range = ranges.get(0);
- assertEquals(12, range.getMin().intValue());
- assertEquals(20, range.getMax().intValue());
-
- final IntegerTypeDefinition baseType = leafType.getBaseType();
- assertEquals(QName.create(BAR, "int32-ext2"), baseType.getQName());
- assertEquals("mile", baseType.getUnits());
- assertEquals("11", baseType.getDefaultValue());
-
- final List<RangeConstraint> baseTypeRanges = baseType.getRangeConstraints();
- assertEquals(2, baseTypeRanges.size());
- final RangeConstraint baseTypeRange1 = baseTypeRanges.get(0);
- assertEquals(3, baseTypeRange1.getMin().intValue());
- assertEquals(9, baseTypeRange1.getMax().intValue());
- final RangeConstraint baseTypeRange2 = baseTypeRanges.get(1);
- assertEquals(11, baseTypeRange2.getMin().intValue());
- assertEquals(20, baseTypeRange2.getMax().intValue());
-
- final IntegerTypeDefinition base = baseType.getBaseType();
- final QName baseQName = base.getQName();
+
+ final Range<? extends Number> range = ranges.iterator().next();
+ assertEquals(12, range.lowerEndpoint().intValue());
+ assertEquals(20, range.upperEndpoint().intValue());
+
+ final IntegerTypeDefinition firstBaseType = leafType.getBaseType();
+ assertEquals(QName.create(BAR, "int32-ext2"), firstBaseType.getQName());
+ assertEquals(Optional.of("mile"), firstBaseType.getUnits());
+ assertEquals(Optional.of("11"), firstBaseType.getDefaultValue());
+
+ final RangeSet<? extends Number> firstRangeset = firstBaseType.getRangeConstraint().get().getAllowedRanges();
+ final Set<? extends Range<? extends Number>> baseRanges = firstRangeset.asRanges();
+ assertEquals(2, baseRanges.size());
+
+ final Iterator<? extends Range<? extends Number>> it = baseRanges.iterator();
+ final Range<? extends Number> baseTypeRange1 = it.next();
+ assertEquals(3, baseTypeRange1.lowerEndpoint().intValue());
+ assertEquals(9, baseTypeRange1.upperEndpoint().intValue());
+ final Range<? extends Number> baseTypeRange2 = it.next();
+ assertEquals(11, baseTypeRange2.lowerEndpoint().intValue());
+ assertEquals(20, baseTypeRange2.upperEndpoint().intValue());
+
+ final IntegerTypeDefinition secondBaseType = firstBaseType.getBaseType();
+ final QName baseQName = secondBaseType.getQName();
assertEquals("int32-ext1", baseQName.getLocalName());
assertEquals(BAR, baseQName.getModule());
- assertNull(base.getUnits());
- assertNull(base.getDefaultValue());
+ assertEquals(Optional.empty(), secondBaseType.getUnits());
+ assertEquals(Optional.empty(), secondBaseType.getDefaultValue());
- final List<RangeConstraint> baseRanges = base.getRangeConstraints();
- assertEquals(1, baseRanges.size());
- final RangeConstraint baseRange = baseRanges.get(0);
- assertEquals(2, baseRange.getMin().intValue());
- assertEquals(20, baseRange.getMax().intValue());
+ final Set<? extends Range<? extends Number>> secondRanges = secondBaseType.getRangeConstraint().get()
+ .getAllowedRanges().asRanges();
+ assertEquals(1, secondRanges.size());
+ final Range<? extends Number> secondRange = secondRanges.iterator().next();
+ assertEquals(2, secondRange.lowerEndpoint().intValue());
+ assertEquals(20, secondRange.upperEndpoint().intValue());
- assertEquals(BaseTypes.int32Type(), base.getBaseType());
+ assertEquals(BaseTypes.int32Type(), secondBaseType.getBaseType());
}
@Test
public void testTypedefPatternsResolving() {
- final LeafSchemaNode stringleaf = (LeafSchemaNode) foo.getDataChildByName(QName.create(foo.getQNameModule(), "string-leaf"));
+ final LeafSchemaNode stringleaf = (LeafSchemaNode) foo.getDataChildByName(QName.create(foo.getQNameModule(),
+ "string-leaf"));
assertTrue(stringleaf.getType() instanceof StringTypeDefinition);
final StringTypeDefinition type = (StringTypeDefinition) stringleaf.getType();
final QName typeQName = type.getQName();
assertEquals("string-ext4", typeQName.getLocalName());
assertEquals(BAR, typeQName.getModule());
- assertNull(type.getUnits());
- assertNull(type.getDefaultValue());
+ assertEquals(Optional.empty(), type.getUnits());
+ assertEquals(Optional.empty(), type.getDefaultValue());
List<PatternConstraint> patterns = type.getPatternConstraints();
assertEquals(1, patterns.size());
PatternConstraint pattern = patterns.iterator().next();
- assertEquals("^[e-z]*$", pattern.getRegularExpression());
- assertEquals(1, type.getLengthConstraints().size());
+ assertEquals("^[e-z]*$", pattern.getJavaPatternString());
+ assertEquals(1, type.getLengthConstraint().get().getAllowedRanges().asRanges().size());
final StringTypeDefinition baseType1 = type.getBaseType();
final QName baseType1QName = baseType1.getQName();
assertEquals("string-ext3", baseType1QName.getLocalName());
assertEquals(BAR, baseType1QName.getModule());
- assertNull(baseType1.getUnits());
- assertNull(baseType1.getDefaultValue());
+ assertEquals(Optional.empty(), baseType1.getUnits());
+ assertEquals(Optional.empty(), baseType1.getDefaultValue());
patterns = baseType1.getPatternConstraints();
assertEquals(1, patterns.size());
pattern = patterns.iterator().next();
- assertEquals("^[b-u]*$", pattern.getRegularExpression());
- assertEquals(1, baseType1.getLengthConstraints().size());
+ assertEquals("^[b-u]*$", pattern.getJavaPatternString());
+ assertEquals(1, baseType1.getLengthConstraint().get().getAllowedRanges().asRanges().size());
final StringTypeDefinition baseType2 = baseType1.getBaseType();
final QName baseType2QName = baseType2.getQName();
assertEquals("string-ext2", baseType2QName.getLocalName());
assertEquals(BAR, baseType2QName.getModule());
- assertNull(baseType2.getUnits());
- assertNull(baseType2.getDefaultValue());
+ assertEquals(Optional.empty(), baseType2.getUnits());
+ assertEquals(Optional.empty(), baseType2.getDefaultValue());
assertTrue(baseType2.getPatternConstraints().isEmpty());
- final List<LengthConstraint> baseType2Lengths = baseType2.getLengthConstraints();
- assertEquals(1, baseType2Lengths.size());
- LengthConstraint length = baseType2Lengths.get(0);
- assertEquals(6, length.getMin().intValue());
- assertEquals(10, length.getMax().intValue());
+ final RangeSet<Integer> baseType2Lengths = baseType2.getLengthConstraint().get().getAllowedRanges();
+ assertEquals(1, baseType2Lengths.asRanges().size());
+ Range<Integer> length = baseType2Lengths.span();
+ assertEquals(6, length.lowerEndpoint().intValue());
+ assertEquals(10, length.upperEndpoint().intValue());
final StringTypeDefinition baseType3 = baseType2.getBaseType();
assertEquals(QName.create(BAR, "string-ext1"), baseType3.getQName());
- assertNull(baseType3.getUnits());
- assertNull(baseType3.getDefaultValue());
+ assertEquals(Optional.empty(), baseType3.getUnits());
+ assertEquals(Optional.empty(), baseType3.getDefaultValue());
patterns = baseType3.getPatternConstraints();
assertEquals(1, patterns.size());
pattern = patterns.iterator().next();
- assertEquals("^[a-k]*$", pattern.getRegularExpression());
- final List<LengthConstraint> baseType3Lengths = baseType3.getLengthConstraints();
- assertEquals(1, baseType3Lengths.size());
- length = baseType3Lengths.get(0);
- assertEquals(5, length.getMin().intValue());
- assertEquals(11, length.getMax().intValue());
+ assertEquals("^[a-k]*$", pattern.getJavaPatternString());
+ final RangeSet<Integer> baseType3Lengths = baseType3.getLengthConstraint().get().getAllowedRanges();
+ assertEquals(1, baseType3Lengths.asRanges().size());
+ length = baseType3Lengths.span();
+ assertEquals(5, length.lowerEndpoint().intValue());
+ assertEquals(11, length.upperEndpoint().intValue());
assertEquals(BaseTypes.stringType(), baseType3.getBaseType());
}
.getDataChildByName(QName.create(foo.getQNameModule(), "invalid-pattern-string-leaf"));
StringTypeDefinition type = (StringTypeDefinition) invalidPatternStringLeaf.getType();
assertEquals(QName.create(BAR, "invalid-string-pattern"), type.getQName());
- assertNull(type.getUnits());
- assertNull(type.getDefaultValue());
+ assertEquals(Optional.empty(), type.getUnits());
+ assertEquals(Optional.empty(), type.getDefaultValue());
List<PatternConstraint> patterns = type.getPatternConstraints();
assertTrue(patterns.isEmpty());
type = (StringTypeDefinition) invalidDirectStringPatternDefLeaf.getType();
assertEquals(QName.create(YangConstants.RFC6020_YANG_MODULE, "string"), type.getQName());
- assertNull(type.getUnits());
- assertNull(type.getDefaultValue());
+ assertEquals(Optional.empty(), type.getUnits());
+ assertEquals(Optional.empty(), type.getDefaultValue());
patterns = type.getPatternConstraints();
assertTrue(patterns.isEmpty());
.getDataChildByName(QName.create(foo.getQNameModule(), "multiple-pattern-string-leaf"));
type = (StringTypeDefinition) multiplePatternStringLeaf.getType();
assertEquals(QName.create(BAR, "multiple-pattern-string"), type.getQName());
- assertNull(type.getUnits());
- assertNull(type.getDefaultValue());
+ assertEquals(Optional.empty(), type.getUnits());
+ assertEquals(Optional.empty(), type.getDefaultValue());
patterns = type.getPatternConstraints();
assertTrue(!patterns.isEmpty());
assertEquals(1, patterns.size());
final PatternConstraint pattern = patterns.iterator().next();
- assertEquals("^[e-z]*$", pattern.getRegularExpression());
- assertEquals(1, type.getLengthConstraints().size());
+ assertEquals("^[e-z]*$", pattern.getJavaPatternString());
+ assertEquals(1, type.getLengthConstraint().get().getAllowedRanges().asRanges().size());
final LeafSchemaNode multiplePatternDirectStringDefLeaf = (LeafSchemaNode) foo
.getDataChildByName(QName.create(foo.getQNameModule(), "multiple-pattern-direct-string-def-leaf"));
type = (StringTypeDefinition) multiplePatternDirectStringDefLeaf.getType();
assertEquals(QName.create(FOO, "string"), type.getQName());
- assertNull(type.getUnits());
- assertNull(type.getDefaultValue());
+ assertEquals(Optional.empty(), type.getUnits());
+ assertEquals(Optional.empty(), type.getDefaultValue());
patterns = type.getPatternConstraints();
assertTrue(!patterns.isEmpty());
assertEquals(2, patterns.size());
boolean isEZPattern = false;
boolean isADPattern = false;
for (final PatternConstraint patternConstraint : patterns) {
- if (patternConstraint.getRegularExpression().equals("^[e-z]*$")) {
+ if (patternConstraint.getJavaPatternString().equals("^[e-z]*$")) {
isEZPattern = true;
- } else if (patternConstraint.getRegularExpression().equals("^[a-d]*$")) {
+ } else if (patternConstraint.getJavaPatternString().equals("^[a-d]*$")) {
isADPattern = true;
}
}
@Test
public void testTypedefLengthsResolving() {
- final LeafSchemaNode lengthLeaf = (LeafSchemaNode) foo.getDataChildByName(QName.create(foo.getQNameModule(), "length-leaf"));
+ final LeafSchemaNode lengthLeaf = (LeafSchemaNode) foo.getDataChildByName(QName.create(foo.getQNameModule(),
+ "length-leaf"));
final StringTypeDefinition type = (StringTypeDefinition) lengthLeaf.getType();
assertEquals(QName.create(FOO, "string-ext2"), type.getQName());
- assertNull(type.getUnits());
- assertNull(type.getDefaultValue());
+ assertEquals(Optional.empty(), type.getUnits());
+ assertEquals(Optional.empty(), type.getDefaultValue());
assertTrue(type.getPatternConstraints().isEmpty());
- final List<LengthConstraint> typeLengths = type.getLengthConstraints();
- assertEquals(1, typeLengths.size());
- LengthConstraint length = typeLengths.get(0);
- assertEquals(7, length.getMin().intValue());
- assertEquals(10, length.getMax().intValue());
+ final RangeSet<Integer> typeLengths = type.getLengthConstraint().get().getAllowedRanges();
+ assertEquals(1, typeLengths.asRanges().size());
+ Range<Integer> length = typeLengths.span();
+ assertEquals(7, length.lowerEndpoint().intValue());
+ assertEquals(10, length.upperEndpoint().intValue());
final StringTypeDefinition baseType1 = type.getBaseType();
assertEquals(QName.create(BAR, "string-ext2"), baseType1.getQName());
- assertNull(baseType1.getUnits());
- assertNull(baseType1.getDefaultValue());
+ assertEquals(Optional.empty(), baseType1.getUnits());
+ assertEquals(Optional.empty(), baseType1.getDefaultValue());
assertTrue(baseType1.getPatternConstraints().isEmpty());
- final List<LengthConstraint> baseType2Lengths = baseType1.getLengthConstraints();
- assertEquals(1, baseType2Lengths.size());
- length = baseType2Lengths.get(0);
- assertEquals(6, length.getMin().intValue());
- assertEquals(10, length.getMax().intValue());
+ final RangeSet<Integer> baseType2Lengths = baseType1.getLengthConstraint().get().getAllowedRanges();
+ assertEquals(1, baseType2Lengths.asRanges().size());
+ length = baseType2Lengths.span();
+ assertEquals(6, length.lowerEndpoint().intValue());
+ assertEquals(10, length.upperEndpoint().intValue());
final StringTypeDefinition baseType2 = baseType1.getBaseType();
assertEquals(QName.create(BAR, "string-ext1"), baseType2.getQName());
- assertNull(baseType2.getUnits());
- assertNull(baseType2.getDefaultValue());
+ assertEquals(Optional.empty(), baseType2.getUnits());
+ assertEquals(Optional.empty(), baseType2.getDefaultValue());
final List<PatternConstraint> patterns = baseType2.getPatternConstraints();
assertEquals(1, patterns.size());
final PatternConstraint pattern = patterns.iterator().next();
- assertEquals("^[a-k]*$", pattern.getRegularExpression());
- final List<LengthConstraint> baseType3Lengths = baseType2.getLengthConstraints();
- assertEquals(1, baseType3Lengths.size());
- length = baseType3Lengths.get(0);
- assertEquals(5, length.getMin().intValue());
- assertEquals(11, length.getMax().intValue());
+ assertEquals("^[a-k]*$", pattern.getJavaPatternString());
+ final RangeSet<Integer> baseType3Lengths = baseType2.getLengthConstraint().get().getAllowedRanges();
+ assertEquals(1, baseType3Lengths.asRanges().size());
+ length = baseType3Lengths.span();
+ assertEquals(5, length.lowerEndpoint().intValue());
+ assertEquals(11, length.upperEndpoint().intValue());
assertEquals(BaseTypes.stringType(), baseType2.getBaseType());
}
@Test
public void testTypedefDecimal1() {
- final LeafSchemaNode testleaf = (LeafSchemaNode) foo.getDataChildByName(QName.create(foo.getQNameModule(), "decimal-leaf"));
+ final LeafSchemaNode testleaf = (LeafSchemaNode) foo.getDataChildByName(QName.create(foo.getQNameModule(),
+ "decimal-leaf"));
assertTrue(testleaf.getType() instanceof DecimalTypeDefinition);
final DecimalTypeDefinition type = (DecimalTypeDefinition) testleaf.getType();
assertEquals(QName.create(BAR, "my-decimal-type"), type.getQName());
- assertNull(type.getUnits());
- assertNull(type.getDefaultValue());
+ assertEquals(Optional.empty(), type.getUnits());
+ assertEquals(Optional.empty(), type.getDefaultValue());
assertEquals(6, type.getFractionDigits().intValue());
- assertEquals(1, type.getRangeConstraints().size());
+ assertEquals(1, type.getRangeConstraint().get().getAllowedRanges().asRanges().size());
final DecimalTypeDefinition typeBase = type.getBaseType();
assertEquals(QName.create(BAR, "decimal64"), typeBase.getQName());
- assertNull(typeBase.getUnits());
- assertNull(typeBase.getDefaultValue());
+ assertEquals(Optional.empty(), typeBase.getUnits());
+ assertEquals(Optional.empty(), typeBase.getDefaultValue());
assertEquals(6, typeBase.getFractionDigits().intValue());
- assertEquals(1, typeBase.getRangeConstraints().size());
+ assertEquals(1, typeBase.getRangeConstraint().get().getAllowedRanges().asRanges().size());
assertNull(typeBase.getBaseType());
}
@Test
public void testTypedefDecimal2() {
- final LeafSchemaNode testleaf = (LeafSchemaNode) foo.getDataChildByName(QName.create(foo.getQNameModule(), "decimal-leaf2"));
+ final LeafSchemaNode testleaf = (LeafSchemaNode) foo.getDataChildByName(QName.create(foo.getQNameModule(),
+ "decimal-leaf2"));
assertTrue(testleaf.getType() instanceof DecimalTypeDefinition);
final DecimalTypeDefinition type = (DecimalTypeDefinition) testleaf.getType();
assertEquals(QName.create(BAR, "my-decimal-type"), type.getQName());
- assertNull(type.getUnits());
- assertNull(type.getDefaultValue());
+ assertEquals(Optional.empty(), type.getUnits());
+ assertEquals(Optional.empty(), type.getDefaultValue());
assertEquals(6, type.getFractionDigits().intValue());
- assertEquals(1, type.getRangeConstraints().size());
+ assertEquals(1, type.getRangeConstraint().get().getAllowedRanges().asRanges().size());
final DecimalTypeDefinition baseTypeDecimal = type.getBaseType();
assertEquals(6, baseTypeDecimal.getFractionDigits().intValue());
@Test
public void testTypedefUnion() {
- final LeafSchemaNode unionleaf = (LeafSchemaNode) foo.getDataChildByName(QName.create(foo.getQNameModule(), "union-leaf"));
+ final LeafSchemaNode unionleaf = (LeafSchemaNode) foo.getDataChildByName(QName.create(foo.getQNameModule(),
+ "union-leaf"));
assertTrue(unionleaf.getType() instanceof UnionTypeDefinition);
final UnionTypeDefinition type = (UnionTypeDefinition) unionleaf.getType();
assertEquals(QName.create(BAR, "my-union-ext"), type.getQName());
- assertNull(type.getUnits());
- assertNull(type.getDefaultValue());
+ assertEquals(Optional.empty(), type.getUnits());
+ assertEquals(Optional.empty(), type.getDefaultValue());
final UnionTypeDefinition baseType = type.getBaseType();
assertEquals(QName.create(BAR, "my-union"), baseType.getQName());
- assertNull(baseType.getUnits());
- assertNull(baseType.getDefaultValue());
+ assertEquals(Optional.empty(), baseType.getUnits());
+ assertEquals(Optional.empty(), baseType.getDefaultValue());
final UnionTypeDefinition unionType = baseType.getBaseType();
final List<TypeDefinition<?>> unionTypes = unionType.getTypes();
final IntegerTypeDefinition unionType1 = (IntegerTypeDefinition) unionTypes.get(0);
assertEquals(QName.create(BAR, "my-union"), baseType.getQName());
- assertNull(unionType1.getUnits());
- assertNull(unionType1.getDefaultValue());
-
- final List<RangeConstraint> ranges = unionType1.getRangeConstraints();
- assertEquals(1, ranges.size());
- final RangeConstraint range = ranges.get(0);
- assertEquals(1, range.getMin().intValue());
- assertEquals(100, range.getMax().intValue());
+ assertEquals(Optional.empty(), unionType1.getUnits());
+ assertEquals(Optional.empty(), unionType1.getDefaultValue());
+
+ final RangeConstraint<?> ranges = unionType1.getRangeConstraint().get();
+ assertEquals(1, ranges.getAllowedRanges().asRanges().size());
+ final Range<?> range = ranges.getAllowedRanges().span();
+ assertEquals((short)1, range.lowerEndpoint());
+ assertEquals((short)100, range.upperEndpoint());
assertEquals(BaseTypes.int16Type(), unionType1.getBaseType());
assertEquals(BaseTypes.int32Type(), unionTypes.get(1));
@Test
public void testNestedUnionResolving() {
- final LeafSchemaNode testleaf = (LeafSchemaNode) foo.getDataChildByName(QName.create(foo.getQNameModule(), "custom-union-leaf"));
+ final LeafSchemaNode testleaf = (LeafSchemaNode) foo.getDataChildByName(QName.create(foo.getQNameModule(),
+ "custom-union-leaf"));
assertTrue(testleaf.getType() instanceof UnionTypeDefinition);
final UnionTypeDefinition type = (UnionTypeDefinition) testleaf.getType();
assertEquals(QName.create(BAZ, "union1"), type.getQName());
- assertNull(type.getUnits());
- assertNull(type.getDefaultValue());
+ assertEquals(Optional.empty(), type.getUnits());
+ assertEquals(Optional.empty(), type.getDefaultValue());
final UnionTypeDefinition typeBase = type.getBaseType();
assertEquals(QName.create(BAZ, "union2"), typeBase.getQName());
- assertNull(typeBase.getUnits());
- assertNull(typeBase.getDefaultValue());
+ assertEquals(Optional.empty(), typeBase.getUnits());
+ assertEquals(Optional.empty(), typeBase.getDefaultValue());
final UnionTypeDefinition union = typeBase.getBaseType();
final List<TypeDefinition<?>> unionTypes = union.getTypes();
final UnionTypeDefinition unionType1 = (UnionTypeDefinition) unionTypes.get(1);
assertEquals(QName.create(BAR, "nested-union2"), unionType1.getQName());
- assertNull(unionType1.getUnits());
- assertNull(unionType1.getDefaultValue());
+ assertEquals(Optional.empty(), unionType1.getUnits());
+ assertEquals(Optional.empty(), unionType1.getDefaultValue());
final UnionTypeDefinition nestedUnion = unionType1.getBaseType();
final List<TypeDefinition<?>> nestedUnion2Types = nestedUnion.getTypes();
final UnionTypeDefinition myUnionExt = (UnionTypeDefinition) nestedUnion2Types.get(0);
assertEquals(QName.create(BAR, "my-union-ext"), myUnionExt.getQName());
- assertNull(myUnionExt.getUnits());
- assertNull(myUnionExt.getDefaultValue());
+ assertEquals(Optional.empty(), myUnionExt.getUnits());
+ assertEquals(Optional.empty(), myUnionExt.getDefaultValue());
final UnionTypeDefinition myUnion = myUnionExt.getBaseType();
assertEquals(QName.create(BAR, "my-union"), myUnion.getQName());
- assertNull(myUnion.getUnits());
- assertNull(myUnion.getDefaultValue());
+ assertEquals(Optional.empty(), myUnion.getUnits());
+ assertEquals(Optional.empty(), myUnion.getDefaultValue());
final UnionTypeDefinition myUnionBase = myUnion.getBaseType();
final List<TypeDefinition<?>> myUnionBaseTypes = myUnionBase.getTypes();
final IntegerTypeDefinition int16Ext = (IntegerTypeDefinition) myUnionBaseTypes.get(0);
assertEquals(QName.create(BAR, "int16"), int16Ext.getQName());
- assertNull(int16Ext.getUnits());
- assertNull(int16Ext.getDefaultValue());
- final List<RangeConstraint> ranges = int16Ext.getRangeConstraints();
+ assertEquals(Optional.empty(), int16Ext.getUnits());
+ assertEquals(Optional.empty(), int16Ext.getDefaultValue());
+ final Set<? extends Range<? extends Number>> ranges = int16Ext.getRangeConstraint().get().getAllowedRanges()
+ .asRanges();
assertEquals(1, ranges.size());
- final RangeConstraint range = ranges.get(0);
- assertEquals(1, range.getMin().intValue());
- assertEquals(100, range.getMax().intValue());
+ final Range<? extends Number> range = ranges.iterator().next();
+ assertEquals(1, range.lowerEndpoint().intValue());
+ assertEquals(100, range.upperEndpoint().intValue());
assertEquals(BaseTypes.int16Type(), int16Ext.getBaseType());
}
@Test
public void testChoice() {
- final ContainerSchemaNode transfer = (ContainerSchemaNode) foo.getDataChildByName(QName.create(foo.getQNameModule(), "transfer"));
- final ChoiceSchemaNode how = (ChoiceSchemaNode) transfer.getDataChildByName(QName.create(foo.getQNameModule(), "how"));
- final Set<ChoiceCaseNode> cases = how.getCases();
+ final ContainerSchemaNode transfer = (ContainerSchemaNode) foo.getDataChildByName(
+ QName.create(foo.getQNameModule(), "transfer"));
+ final ChoiceSchemaNode how = (ChoiceSchemaNode) transfer.getDataChildByName(
+ QName.create(foo.getQNameModule(), "how"));
+ final SortedMap<QName, ChoiceCaseNode> cases = how.getCases();
assertEquals(5, cases.size());
ChoiceCaseNode input = null;
ChoiceCaseNode output = null;
- for (final ChoiceCaseNode caseNode : cases) {
+ for (final ChoiceCaseNode caseNode : cases.values()) {
if ("input".equals(caseNode.getQName().getLocalName())) {
input = caseNode;
} else if ("output".equals(caseNode.getQName().getLocalName())) {
final Set<Deviation> deviations = foo.getDeviations();
assertEquals(1, deviations.size());
final Deviation dev = deviations.iterator().next();
- assertEquals("system/user ref", dev.getReference());
+ assertEquals(Optional.of("system/user ref"), dev.getReference());
final SchemaPath expectedPath = SchemaPath.create(true,
QName.create(BAR, "interfaces"),
@Test
public void testUnknownNode() {
- final ContainerSchemaNode network = (ContainerSchemaNode) baz.getDataChildByName(QName.create(baz.getQNameModule(), "network"));
+ final ContainerSchemaNode network = (ContainerSchemaNode) baz.getDataChildByName(
+ QName.create(baz.getQNameModule(), "network"));
final List<UnknownSchemaNode> unknownNodes = network.getUnknownSchemaNodes();
assertEquals(1, unknownNodes.size());
final UnknownSchemaNode unknownNode = unknownNodes.get(0);
assertEquals(1, extensions.size());
final ExtensionDefinition extension = extensions.get(0);
assertEquals("name", extension.getArgument());
- assertEquals("Takes as argument a name string. Makes the code generator use the given name in the #define.",
+ assertEquals(
+ Optional.of("Takes as argument a name string. Makes the code generator use the given name in the #define."),
extension.getDescription());
assertTrue(extension.isYinElement());
}
assertEquals(QName.create(BAZ, "event"), notification.getQName());
final SchemaPath expectedPath = SchemaPath.create(true, QName.create(BAZ, "event"));
assertEquals(expectedPath, notification.getPath());
- assertNull(notification.getDescription());
- assertNull(notification.getReference());
+ assertFalse(notification.getDescription().isPresent());
+ assertFalse(notification.getReference().isPresent());
assertEquals(Status.CURRENT, notification.getStatus());
assertEquals(0, notification.getUnknownSchemaNodes().size());
// test DataNodeContainer args
assertEquals(0, notification.getGroupings().size());
assertEquals(0, notification.getUses().size());
- final LeafSchemaNode eventClass = (LeafSchemaNode) notification.getDataChildByName(QName.create(baz.getQNameModule(), "event-class"));
+ final LeafSchemaNode eventClass = (LeafSchemaNode) notification.getDataChildByName(
+ QName.create(baz.getQNameModule(), "event-class"));
assertTrue(eventClass.getType() instanceof StringTypeDefinition);
- final LeafSchemaNode severity = (LeafSchemaNode) notification.getDataChildByName(QName.create(baz.getQNameModule(), "severity"));
+ final LeafSchemaNode severity = (LeafSchemaNode) notification.getDataChildByName(
+ QName.create(baz.getQNameModule(), "severity"));
assertTrue(severity.getType() instanceof StringTypeDefinition);
}
assertEquals(1, rpcs.size());
final RpcDefinition rpc = rpcs.iterator().next();
- assertEquals("Retrieve all or part of a specified configuration.", rpc.getDescription());
- assertEquals("RFC 6241, Section 7.1", rpc.getReference());
+ assertEquals(Optional.of("Retrieve all or part of a specified configuration."), rpc.getDescription());
+ assertEquals(Optional.of("RFC 6241, Section 7.1"), rpc.getReference());
}
@Test
private static void checkOrder(final Collection<Module> modules) {
final Iterator<Module> it = modules.iterator();
- Module m = it.next();
- assertEquals("m2", m.getName());
- m = it.next();
- assertEquals("m4", m.getName());
- m = it.next();
- assertEquals("m6", m.getName());
- m = it.next();
- assertEquals("m8", m.getName());
- m = it.next();
- assertEquals("m7", m.getName());
- m = it.next();
- assertEquals("m5", m.getName());
- m = it.next();
- assertEquals("m3", m.getName());
- m = it.next();
- assertEquals("m1", m.getName());
+ Module module = it.next();
+ assertEquals("m2", module.getName());
+ module = it.next();
+ assertEquals("m4", module.getName());
+ module = it.next();
+ assertEquals("m6", module.getName());
+ module = it.next();
+ assertEquals("m8", module.getName());
+ module = it.next();
+ assertEquals("m7", module.getName());
+ module = it.next();
+ assertEquals("m5", module.getName());
+ module = it.next();
+ assertEquals("m3", module.getName());
+ module = it.next();
+ assertEquals("m1", module.getName());
}
private static void assertSetEquals(final Set<Module> s1, final Set<Module> s2) {
}
@Test
- public void unknownStatementsInStatementsTest() throws ReactorException {
+ public void unknownStatementsInStatementsTest() {
final StatementStreamSource yangFile1 = sourceForResource(
"/yang-grammar-test/stmtsep-in-statements.yang");
// TODO: change test or create new module in order to respect new statement parser validations
try {
final SchemaContext result = reactor.buildEffective();
- } catch (final Exception e) {
+ } catch (final ReactorException e) {
assertEquals(SomeModifiersUnresolvedException.class, e.getClass());
assertTrue(e.getCause() instanceof SourceException);
assertTrue(e.getCause().getMessage().startsWith("aaa is not a YANG statement or use of extension"));
Code Review / yangtools.git / blobdiff