--- /dev/null
+/*
+ * 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.data.impl.schema.transform.dom.serializer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.util.Collections;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.stream.XMLOutputFactory;
+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.SimpleDateFormatUtil;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
+import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
+import org.opendaylight.yangtools.yang.data.impl.RetestUtils;
+import org.opendaylight.yangtools.yang.data.impl.schema.transform.dom.DomUtils;
+import org.opendaylight.yangtools.yang.data.impl.schema.transform.dom.parser.DomToNormalizedNodeParserFactory;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
+public class Bug5396 {
+ private static final XMLOutputFactory XML_FACTORY;
+ private static final DocumentBuilderFactory BUILDERFACTORY;
+
+ static {
+ XML_FACTORY = XMLOutputFactory.newFactory();
+ XML_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, false);
+
+ BUILDERFACTORY = DocumentBuilderFactory.newInstance();
+ BUILDERFACTORY.setNamespaceAware(true);
+ BUILDERFACTORY.setCoalescing(true);
+ BUILDERFACTORY.setIgnoringElementContentWhitespace(true);
+ BUILDERFACTORY.setIgnoringComments(true);
+ }
+
+ private QNameModule fooModuleQName;
+ private QName root;
+ private SchemaContext schemaContext;
+
+ @Before
+ public void Init() throws Exception {
+ fooModuleQName = QNameModule.create(new URI("foo"), SimpleDateFormatUtil.getRevisionFormat()
+ .parse("2016-03-22"));
+ root = QName.create(fooModuleQName, "root");
+ schemaContext = RetestUtils
+ .parseYangSources(new File(getClass().getResource("/bug5396/yang/foo.yang").toURI()));
+ }
+
+ @Test
+ public void test() throws Exception {
+ testInputXML("/bug5396/xml/foo.xml", "dp1o34");
+ testInputXML("/bug5396/xml/foo2.xml", "dp0s3f9");
+ testInputXML("/bug5396/xml/foo3.xml", "dp09P1p2s3");
+ testInputXML("/bug5396/xml/foo4.xml", "dp0p3p1");
+ testInputXML("/bug5396/xml/foo5.xml", "dp0s3");
+
+ try {
+ testInputXML("/bug5396/xml/invalid-foo.xml", null);
+ fail("Test should fail due to invalid input string");
+ } catch (IllegalArgumentException e) {
+ assertTrue(e
+ .getMessage()
+ .startsWith(
+ "Failed to parse element [my-leaf: null] as leaf AbsoluteSchemaPath{path=[(foo?revision=2016-03-22)root, (foo?revision=2016-03-22)my-leaf]"));
+ }
+ }
+
+ public void testInputXML(String xmlPath, String expectedValue) throws Exception {
+ final Document doc = loadDocument(xmlPath);
+
+ final ContainerNode output = DomToNormalizedNodeParserFactory
+ .getInstance(DomUtils.defaultValueCodecProvider(), schemaContext).getContainerNodeParser()
+ .parse(Collections.singletonList(doc.getDocumentElement()), schemaContext);
+
+ assertNotNull(output);
+
+ Optional<DataContainerChild<? extends PathArgument, ?>> child = output.getChild(new NodeIdentifier(root));
+ assertTrue(child.orNull() instanceof ContainerNode);
+ ContainerNode rootContainer = (ContainerNode) child.get();
+
+ Optional<DataContainerChild<? extends PathArgument, ?>> myLeaf = rootContainer.getChild(new NodeIdentifier(
+ QName.create(fooModuleQName, "my-leaf")));
+ assertTrue(myLeaf.orNull() instanceof LeafNode);
+
+ assertEquals(expectedValue, myLeaf.get().getValue());
+ }
+
+ private static Document loadDocument(final String xmlPath) throws IOException, SAXException {
+ final InputStream resourceAsStream = Bug5396.class.getResourceAsStream(xmlPath);
+
+ final Document currentConfigElement = readXmlToDocument(resourceAsStream);
+ Preconditions.checkNotNull(currentConfigElement);
+ return currentConfigElement;
+ }
+
+ private static Document readXmlToDocument(final InputStream xmlContent) throws IOException, SAXException {
+ final DocumentBuilder dBuilder;
+ try {
+ dBuilder = BUILDERFACTORY.newDocumentBuilder();
+ } catch (final ParserConfigurationException e) {
+ throw new RuntimeException("Failed to parse XML document", e);
+ }
+ final Document doc = dBuilder.parse(xmlContent);
+
+ doc.getDocumentElement().normalize();
+ return doc;
+ }
+}
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<foo xmlns="foo">
+ <root>
+ <my-leaf>dp1o34</my-leaf>
+ </root>
+</foo>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<foo xmlns="foo">
+ <root>
+ <my-leaf>dp0s3f9</my-leaf>
+ </root>
+</foo>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<foo xmlns="foo">
+ <root>
+ <my-leaf>dp09P1p2s3</my-leaf>
+ </root>
+</foo>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<foo xmlns="foo">
+ <root>
+ <my-leaf>dp0p3p1</my-leaf>
+ </root>
+</foo>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<foo xmlns="foo">
+ <root>
+ <my-leaf>dp0s3</my-leaf>
+ </root>
+</foo>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<foo xmlns="foo">
+ <root>
+ <my-leaf>dp09P1p2s1234</my-leaf>
+ </root>
+</foo>
\ No newline at end of file
--- /dev/null
+module foo {
+ yang-version 1;
+ namespace "foo";
+ prefix "foo";
+
+ revision "2016-03-22" {
+ description "test";
+ }
+
+ container root {
+ leaf my-leaf {
+ type my-type;
+ }
+ }
+
+ typedef my-type {
+ type union {
+ type string {
+ pattern "dp[0-9]+o[0-9]+";
+ }
+ type string {
+ pattern "dp[0-9]+s[0-9]+(f[0-9]+)?(d[0-9]+)?";
+ }
+ type string {
+ pattern "dp[0-9]+(P[0-9]+)?p[0-9]{1,3}s[0-9]{1,3}(f[0-9]+)?(d[0-9]+)?";
+ }
+ type string {
+ pattern "dp[0-9]+p[0-9]+p[0-9]+";
+ }
+ }
+ }
+}
StatementContextBase<?, ?, ?> potential = null;
StatementDefinition stmtDef = getDefinition().getPublicView();
- if (stmtDef != Rfc6020Mapping.AUGMENT && stmtDef != Rfc6020Mapping.DEVIATION) {
+ if (stmtDef != Rfc6020Mapping.AUGMENT && stmtDef != Rfc6020Mapping.DEVIATION
+ && stmtDef != Rfc6020Mapping.TYPE) {
potential = substatements.get(createIdentifier());
}
if (potential == null) {
--- /dev/null
+/*
+ * 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.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.FileNotFoundException;
+import java.net.URISyntaxException;
+import java.util.List;
+import org.junit.Test;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.SchemaNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
+import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil;
+import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
+import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
+
+public class Bug5396 {
+ @Test
+ public void test() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException {
+ SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5396");
+ assertNotNull(context);
+
+ QName root = QName.create("foo", "1970-01-01", "root");
+ QName myLeaf2 = QName.create("foo", "1970-01-01", "my-leaf2");
+
+ SchemaPath schemaPath = SchemaPath.create(true, root, myLeaf2);
+ SchemaNode findDataSchemaNode = SchemaContextUtil.findDataSchemaNode(context, schemaPath);
+ assertTrue(findDataSchemaNode instanceof LeafSchemaNode);
+
+ LeafSchemaNode leaf2 = (LeafSchemaNode) findDataSchemaNode;
+ TypeDefinition<?> type = leaf2.getType();
+ assertTrue(type instanceof UnionTypeDefinition);
+
+ UnionTypeDefinition union = (UnionTypeDefinition) type;
+ List<TypeDefinition<?>> types = union.getTypes();
+
+ assertEquals(4, types.size());
+
+ TypeDefinition<?> type0 = types.get(0);
+ TypeDefinition<?> type1 = types.get(1);
+ TypeDefinition<?> type2 = types.get(2);
+ TypeDefinition<?> type3 = types.get(3);
+
+ assertFalse(type0.equals(type1));
+ assertFalse(type0.equals(type2));
+ assertFalse(type0.equals(type3));
+
+ assertTrue(type0 instanceof StringTypeDefinition);
+ assertTrue(type1 instanceof StringTypeDefinition);
+ assertTrue(type2 instanceof StringTypeDefinition);
+ assertTrue(type3 instanceof StringTypeDefinition);
+
+ StringTypeDefinition stringType0 = (StringTypeDefinition) type0;
+ StringTypeDefinition stringType1 = (StringTypeDefinition) type1;
+ StringTypeDefinition stringType2 = (StringTypeDefinition) type2;
+ StringTypeDefinition stringType3 = (StringTypeDefinition) type3;
+
+ List<PatternConstraint> patternConstraints0 = stringType0.getPatternConstraints();
+ List<PatternConstraint> patternConstraints1 = stringType1.getPatternConstraints();
+ List<PatternConstraint> patternConstraints2 = stringType2.getPatternConstraints();
+ List<PatternConstraint> patternConstraints3 = stringType3.getPatternConstraints();
+
+ assertEquals(1, patternConstraints0.size());
+ assertEquals(1, patternConstraints1.size());
+ assertEquals(1, patternConstraints2.size());
+ assertEquals(1, patternConstraints3.size());
+
+ PatternConstraint patternConstraint0 = patternConstraints0.get(0);
+ PatternConstraint patternConstraint1 = patternConstraints1.get(0);
+ PatternConstraint patternConstraint2 = patternConstraints2.get(0);
+ PatternConstraint patternConstraint3 = patternConstraints3.get(0);
+
+ assertEquals("^dp[0-9]+o[0-9]+(d[0-9]+)?$", patternConstraint0.getRegularExpression());
+ assertEquals("^dp[0-9]+s[0-9]+(f[0-9]+)?(d[0-9]+)?$", patternConstraint1.getRegularExpression());
+ assertEquals("^dp[0-9]+(P[0-9]+)?p[0-9]{1,3}s[0-9]{1,3}(f[0-9]+)?(d[0-9]+)?$",
+ patternConstraint2.getRegularExpression());
+ assertEquals("^dp[0-9]+p[0-9]+p[0-9]+$", patternConstraint3.getRegularExpression());
+ }
+}
--- /dev/null
+module foo {
+ yang-version 1;
+ namespace "foo";
+ prefix "foo";
+
+ container root {
+ leaf my-leaf2 {
+ type my-type;
+ }
+ }
+
+ typedef my-type {
+ type union {
+ type string {
+ pattern "dp[0-9]+o[0-9]+(d[0-9]+)?";
+ }
+ type string {
+ pattern "dp[0-9]+s[0-9]+(f[0-9]+)?(d[0-9]+)?";
+ }
+ type string {
+ pattern "dp[0-9]+(P[0-9]+)?p[0-9]{1,3}s[0-9]{1,3}(f[0-9]+)?(d[0-9]+)?";
+ }
+ type string {
+ pattern "dp[0-9]+p[0-9]+p[0-9]+";
+ }
+ }
+ }
+}
Code Review / yangtools.git / commitdiff