Bug 3876: Introduce support for XPath / XQuery queries on YANG Data

- unit test coverage increase 60%
- fixed broken xpath with predicates

Change-Id: I853772a28370cdf5901ec8b01ca3ad1d105bb854
Signed-off-by: Filip Gregor <filip.gregor@pantheon.sk>

diff --git a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/NormalizedNodeNavigator.java b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/NormalizedNodeNavigator.java
index 922c46cc90678bf2a1c380242058718d0a7238a4..1fc2bdba68f9ec8d99ffe523bf624e7f40e31ae6 100644 (file)
--- a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/NormalizedNodeNavigator.java
+++ b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/NormalizedNodeNavigator.java
@@ -125,7 +125,7 @@ final class NormalizedNodeNavigator extends DefaultNavigator implements NamedAcc
 
     @Override
     public boolean isElement(final Object object) {
-        return object instanceof NormalizedNode;
+        return object instanceof NormalizedNodeContext;
     }
 
     @Override
@@ -145,7 +145,7 @@ final class NormalizedNodeNavigator extends DefaultNavigator implements NamedAcc
 
     @Override
     public boolean isText(final Object object) {
-        return false;
+        return object instanceof String;
     }
 
     @Override
@@ -197,7 +197,7 @@ final class NormalizedNodeNavigator extends DefaultNavigator implements NamedAcc
 
     @Override
     public String getTextStringValue(final Object text) {
-        throw new UnsupportedOperationException();
+        return text.toString();
     }
 
     @Override

diff --git a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenTest.java b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenTest.java
index 6fea9fcda05d5aaca38e14e65944e39dbd9b40df..93557596f6bca4fcdbdcb27ae561e3e2c7e8a4ae 100644 (file)
--- a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenTest.java
+++ b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenTest.java
@@ -11,6 +11,7 @@ package org.opendaylight.yangtools.yang.data.jaxen;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+
 import com.google.common.base.Converter;
 import com.google.common.base.Optional;
 import com.google.common.base.VerifyException;
@@ -68,7 +69,8 @@ public class JaxenTest {
         xpathSchemaContext = new JaxenSchemaContextFactory().createContext(schemaContext);
         assertNotNull(xpathSchemaContext);
 
-        xpathExpression = xpathSchemaContext.compileExpression(createSchemaPath(), createPrefixes(), createXPath());
+        xpathExpression = xpathSchemaContext.compileExpression(createSchemaPath(), createPrefixes(), createXPath
+                (false));
         assertNotNull(xpathExpression);
 
         xpathDocument = xpathSchemaContext.createDocument(createNormalizedNodes());
@@ -78,7 +80,7 @@ public class JaxenTest {
         assertEquals("root", rootNodeName);
 
         Optional<? extends XPathResult<?>> resultExpressionEvaluate = xpathExpression
-                .evaluate(xpathDocument, createYangInstanceIdentifier());
+                .evaluate(xpathDocument, createYangInstanceIdentifier(false));
         assertNotNull(resultExpressionEvaluate);
         assertTrue(resultExpressionEvaluate.isPresent());
         XPathResult<?> xPathResult = resultExpressionEvaluate.get();
@@ -87,7 +89,6 @@ public class JaxenTest {
         assertEquals("three", value);
 
         convertNctx = new ConverterNamespaceContext(createPrefixes());
-
         navigator = new NormalizedNodeNavigator(convertNctx, (JaxenDocument) xpathDocument);
         assertNotNull(navigator);
     }
@@ -115,48 +116,24 @@ public class JaxenTest {
 
     @Test
     public void testJaxenXpath() throws XPathExpressionException {
-        assertNotNull(xpathExpression.evaluate(xpathDocument, createYangInstanceIdentifier()));
+        assertNotNull(xpathExpression.evaluate(xpathDocument, createYangInstanceIdentifier(false)));
     }
 
+    @Test
     public void testXpathWithPredicates() throws XPathExpressionException {
-        final Map<QName, Object> keys1 = new HashMap<>();
-        keys1.put(leafAQName, "bar");
-
-        final YangInstanceIdentifier.NodeIdentifierWithPredicates mapEntryPath1 = new YangInstanceIdentifier
-                .NodeIdentifierWithPredicates(listAQName , keys1);
-
-        final Map<QName, Object> keys2 = new HashMap<>();
-        keys2.put(leafBQName, "two");
-
-        final YangInstanceIdentifier.NodeIdentifierWithPredicates mapEntryPath2 = new YangInstanceIdentifier
-                .NodeIdentifierWithPredicates(listBQName , keys2);
-
-        YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.of(listAQName).node(mapEntryPath1)
-                .node(listBQName).node(mapEntryPath2).node(leafBQName);
-
-        String xPath = "/list-a[leaf-a='bar']/list-b[leaf-b='two']/leaf-b";
-
         XPathExpression xpathExpressionWithPredicates = xpathSchemaContext.compileExpression(createSchemaPath(),
-                createPrefixes(), xPath);
+                createPrefixes(), createXPath(true));
 
         Optional<? extends XPathResult<?>> resultExpressionEvaluate = xpathExpressionWithPredicates
-                .evaluate(xpathDocument, yangInstanceIdentifier);
-        assertNotNull(resultExpressionEvaluate);
-    }
-
-    @Test(expected = UnsupportedOperationException.class)
-    public void testUnsupportedOperationException() {
-        assertNotNull(navigator.getCommentStringValue("Test"));
+                .evaluate(xpathDocument, createYangInstanceIdentifier(true));
+        assertTrue(resultExpressionEvaluate.isPresent());
+        XPathResult<?> xPathResult = resultExpressionEvaluate.get();
+        Object value = ((XPathNodesetResult) xPathResult).getValue().iterator().next().getValue();
+        assertEquals("two", value);
     }
 
     @Test(expected = VerifyException.class)
     public void testIsMethodsInNodeNavigator() {
-        assertNotNull(navigator.isAttribute("test"));
-        assertNotNull(navigator.isComment("test"));
-        assertNotNull(navigator.isElement("test"));
-        assertNotNull(navigator.isNamespace("test"));
-        assertNotNull(navigator.isText("test"));
-        assertNotNull(navigator.isProcessingInstruction("test"));
         assertNotNull(navigator.isDocument("test"));
     }
 
@@ -175,13 +152,36 @@ public class JaxenTest {
 
     /**
      * @return container-a -> container-b -> leaf-d
+     *         list-a -> list-b -> leaf-b
      */
-    private YangInstanceIdentifier createYangInstanceIdentifier() {
-        return YangInstanceIdentifier.of(containerAQName).node(containerBQName).node(leafDQName);
+    private YangInstanceIdentifier createYangInstanceIdentifier(Boolean withPredicates) {
+        YangInstanceIdentifier testYangInstanceIdentifier = YangInstanceIdentifier.of(containerAQName).node
+                (containerBQName).node(leafDQName);
+        if (withPredicates) {
+            final Map<QName, Object> keys1 = new HashMap<>();
+            keys1.put(leafAQName, "bar");
+
+            final YangInstanceIdentifier.NodeIdentifierWithPredicates mapEntryPath1 = new YangInstanceIdentifier
+                    .NodeIdentifierWithPredicates(listAQName , keys1);
+
+            final Map<QName, Object> keys2 = new HashMap<>();
+            keys2.put(leafBQName, "two");
+
+            final YangInstanceIdentifier.NodeIdentifierWithPredicates mapEntryPath2 = new YangInstanceIdentifier
+                    .NodeIdentifierWithPredicates(listBQName , keys2);
+
+            testYangInstanceIdentifier = YangInstanceIdentifier.of(listAQName).node(mapEntryPath1)
+                    .node(listBQName).node(mapEntryPath2).node(leafBQName);
+        }
+        return testYangInstanceIdentifier;
     }
 
-    private static String createXPath() {
-        return "/container-a/container-b/leaf-d";
+    private static String createXPath(boolean withPredicates) {
+        String xPath = "/container-a/container-b/leaf-d";
+        if (withPredicates) {
+            xPath = "/list-a[leaf-a='bar']/list-b[leaf-b='two']/leaf-b";
+        }
+        return xPath;
     }
 
     private Converter<String, QNameModule> createPrefixes() {
@@ -192,10 +192,9 @@ public class JaxenTest {
     }
 
     /**
-     * rootQName -> listAQName -> leafAQName
-     * @return
+     * @return rootQName -> listAQName -> leafAQName
      */
-    private SchemaPath createSchemaPath() {
+    private  SchemaPath createSchemaPath() {
         return SchemaPath.create(true, rootQName, listAQName, leafAQName);
     }
 

diff --git a/yang/yang-data-jaxen/src/test/resources/test/documentTest/test2.yang b/yang/yang-data-jaxen/src/test/resources/test/documentTest/test2.yang
index 0eb8467dd4d6585e3cffb3c42b52603afe2332b4..c8cd38233608414f0e198aedce67034030d5691b 100644 (file)
--- a/yang/yang-data-jaxen/src/test/resources/test/documentTest/test2.yang
+++ b/yang/yang-data-jaxen/src/test/resources/test/documentTest/test2.yang
@@ -46,12 +46,12 @@ module test2 {
                 }
             }
         }
-    }
 
-    container container-a {
-        container container-b {
-            leaf leaf-d {
-                type string;
+        container container-a {
+            container container-b {
+                leaf leaf-d {
+                    type string;
+                }
             }
         }
     }