You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2016/10/25 07:50:01 UTC
svn commit: r1766481 -
/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java
Author: mreutegg
Date: Tue Oct 25 07:50:01 2016
New Revision: 1766481
URL: http://svn.apache.org/viewvc?rev=1766481&view=rev
Log:
OAK-4993: Report plan when QueryTest.nodeType() fails
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java?rev=1766481&r1=1766480&r2=1766481&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java Tue Oct 25 07:50:01 2016
@@ -827,19 +827,23 @@ public class QueryTest extends AbstractR
public void nodeType() throws Exception {
Session session = createAdminSession();
String xpath = "/jcr:root//element(*,rep:User)[xyz/@jcr:primaryType]";
- assertTrue(getPlan(session, xpath).startsWith("[rep:User] as [a] /* nodeType"));
+ assertPlan(getPlan(session, xpath), "[rep:User] as [a] /* nodeType");
session.getNode("/oak:index/nodetype").setProperty("declaringNodeTypes",
new String[]{"oak:Unstructured"}, PropertyType.NAME);
session.save();
- assertTrue(getPlan(session, xpath).startsWith("[rep:User] as [a] /* traverse "));
+ assertPlan(getPlan(session, xpath), "[rep:User] as [a] /* traverse ");
xpath = "/jcr:root//element(*,oak:Unstructured)[xyz/@jcr:primaryType]";
- assertTrue(getPlan(session, xpath).startsWith("[oak:Unstructured] as [a] /* nodeType "));
+ assertPlan(getPlan(session, xpath), "[oak:Unstructured] as [a] /* nodeType ");
session.logout();
}
+
+ private static void assertPlan(String plan, String planPrefix) {
+ assertTrue("Unexpected plan: " + plan, plan.startsWith(planPrefix));
+ }
private static String getPlan(Session session, String xpath) throws RepositoryException {
QueryManager qm = session.getWorkspace().getQueryManager();