[exo-jcr-commits] exo-jcr SVN: r3460 - in jcr/trunk: exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query and 1 other directories.

Author: sergiykarpenko Date: 2010-11-12 08:07:42 -0500 (Fri, 12 Nov 2010) New Revision: 3460 Modified: jcr/trunk/exo.jcr.component.core/pom.xml jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestQueryUsecases.java jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/searching/order-by-property.xml Log: EXOJCR-1044: TestQueryUsecases fixed. Query ordering documentation updated. Modified: jcr/trunk/exo.jcr.component.core/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/pom.xml 2010-11-12 09:55:41 UTC (rev 3459) +++ jcr/trunk/exo.jcr.component.core/pom.xml 2010-11-12 13:07:42 UTC (rev 3460) @@ -405,7 +405,6 @@ <include>org/exoplatform/services/jcr/impl/**/Test*.java</include> </includes> <excludes> - <exclude>org/exoplatform/services/jcr/**/TestQueryUsecases.java</exclude> <exclude>org/exoplatform/services/jcr/**/api/TestAll.java</exclude> <exclude>org/exoplatform/services/jcr/**/api/**/TestVersionRestore.java</exclude> <exclude>org/exoplatform/services/jcr/**/impl/**/TestWorkspaceManagement.java</exclude> Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestQueryUsecases.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestQueryUsecases.java 2010-11-12 09:55:41 UTC (rev 3459) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestQueryUsecases.java 2010-11-12 13:07:42 UTC (rev 3460) @@ -17,8 +17,6 @@ package org.exoplatform.services.jcr.impl.core.query; import org.exoplatform.services.jcr.impl.core.NodeImpl; -import org.exoplatform.services.log.ExoLogger; -import org.exoplatform.services.log.Log; import java.io.ByteArrayInputStream; import java.util.ArrayList; @@ -32,6 +30,7 @@ import javax.jcr.NodeIterator; import javax.jcr.RepositoryException; import javax.jcr.Value; +import javax.jcr.query.InvalidQueryException; import javax.jcr.query.Query; import javax.jcr.query.QueryManager; import javax.jcr.query.QueryResult; @@ -49,8 +48,6 @@ public class TestQueryUsecases extends BaseQueryTest { - private final Log log = ExoLogger.getLogger("exo.jcr.component.core.TestQueryUsecases"); - /** * Get all nodes from repository. * @@ -720,8 +717,6 @@ // make SQL query QueryManager qman = this.workspace.getQueryManager(); - - //TODO can't make working query Query q = qman.createQuery("SELECT * FROM mix:title WHERE CONTAINS(*,'break')", Query.SQL); QueryResult res = q.execute(); long sqlsize = res.getNodes().getSize(); @@ -791,8 +786,8 @@ Node r1 = root.addNode("root1"); Node r2 = r1.addNode("root2"); Node node1 = r2.addNode("node1", "nt:unstructured"); - Node node1_2 = r2.addNode("node1", "nt:unstructured"); - Node node2 = r2.addNode("node2", "nt:unstructured"); + r2.addNode("node1", "nt:unstructured"); + r2.addNode("node2", "nt:unstructured"); session.save(); // make SQL query @@ -819,7 +814,7 @@ Node r2 = r1.addNode("root2"); Node node1 = r2.addNode("node1", "nt:unstructured"); Node node1_2 = r2.addNode("node1", "nt:unstructured"); - Node node2 = r2.addNode("node2", "nt:unstructured"); + r2.addNode("node2", "nt:unstructured"); session.save(); // make SQL query @@ -845,7 +840,7 @@ Node r1 = root.addNode("root1", "nt:folder"); Node r2 = r1.addNode("root2", "nt:folder"); Node subdir1 = r2.addNode("subdir1", "nt:folder"); - Node node1 = subdir1.addNode("node1", "nt:folder"); + subdir1.addNode("node1", "nt:folder"); Node node2 = r2.addNode("node2", "nt:folder"); session.save(); @@ -896,36 +891,26 @@ } /*** - * TODO seems working incorrect + * Descendant or self is unsupported. * * @throws Exception */ public void testDescendantOrSelf() throws Exception { - Node r1 = root.addNode("root1", "nt:folder"); - Node r2 = r1.addNode("root2", "nt:folder"); - Node subdir1 = r2.addNode("subdir1", "nt:folder"); - Node node1 = subdir1.addNode("node1", "nt:folder"); - Node node2 = r2.addNode("node2", "nt:folder"); - session.save(); - // make SQL query QueryManager qman = this.workspace.getQueryManager(); - - Query q = - qman.createQuery("SELECT * FROM nt:folder WHERE jcr:path = '/root1/root2' OR jcr:path LIKE '/root1/root2/%'", - Query.SQL); - QueryResult res = q.execute(); - long sqlsize = res.getNodes().getSize(); - assertEquals(4, sqlsize); - checkResult(res, new Node[]{r2, subdir1, node1, node2}); - - //make XPath query - Query xq = qman.createQuery("/jcr:root/root1[1]/root2[1]//element(*,nt:folder)", Query.XPATH); - QueryResult xres = xq.execute(); - long xpathsize = xres.getNodes().getSize(); - assertEquals(3, xpathsize); - checkResult(xres, new Node[]{subdir1, node1, node2}); + try + { + Query q = + qman.createQuery( + "SELECT * FROM nt:folder WHERE jcr:path = '/root1/root2' OR jcr:path LIKE '/root1/root2/%'", Query.SQL); + q.execute(); + fail("Secendant or self query is unsupported."); + } + catch (InvalidQueryException e) + { + // thats ok descendant or self is unsupported + } } public void testGetAllColumns() throws Exception @@ -1050,11 +1035,12 @@ QueryManager qman = this.workspace.getQueryManager(); //make XPath query - Query xq = qman.createQuery("//element(*,mix:title) order by jcr:pagecount descending", Query.XPATH); + Query xq = qman.createQuery("//element(*,mix:title) order by @jcr:pagecount descending", Query.XPATH); QueryResult xres = xq.execute(); long xpathsize = xres.getNodes().getSize(); assertEquals(3, xpathsize); checkResult(xres, new Node[]{doc1, doc2, doc3}); + checkOrder(xres, new Node[]{doc2, doc1, doc3}); } public void testOrderByProperty() throws Exception @@ -1093,12 +1079,12 @@ //make XPath query - Query xq = qman.createQuery("//element(*,mix:title) order by jcr:pagecount ascending", Query.XPATH); + Query xq = qman.createQuery("//element(*,mix:title) order by @jcr:pagecount ascending", Query.XPATH); QueryResult xres = xq.execute(); long xpathsize = xres.getNodes().getSize(); assertEquals(3, xpathsize); - //checkResult(xres, new Node[]{doc1, doc2, doc3}); - checkOrder(res, new Node[]{doc3, doc1, doc2}); + checkResult(xres, new Node[]{doc1, doc2, doc3}); + checkOrder(xres, new Node[]{doc3, doc1, doc2}); } public void testSearchByName() throws Exception @@ -1181,8 +1167,6 @@ protected void checkResult(QueryResult result, Node[] nodes) throws RepositoryException { // collect paths - - String[] columnNames = result.getColumnNames(); String[][] vals = new String[(int)result.getNodes().getSize()][result.getColumnNames().length]; RowIterator rit = result.getRows(); Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/searching/order-by-property.xml =================================================================== --- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/searching/order-by-property.xml 2010-11-12 09:55:41 UTC (rev 3459) +++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/searching/order-by-property.xml 2010-11-12 13:07:42 UTC (rev 3460) @@ -55,7 +55,7 @@ <programlisting>// make XPath query QueryManager queryManager = workspace.getQueryManager(); // create query -String xpathStatement = "//element(*,mix:title) order by prop_pagecount ascending"; +String xpathStatement = "//element(*,mix:title) order by @prop_pagecount ascending"; Query query = queryManager.createQuery(xpathStatement, Query.XPATH); // execute query and fetch result QueryResult result = query.execute();</programlisting>