jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mreut...@apache.org
Subject svn commit: r794190 - in /jackrabbit/trunk/jackrabbit-core/src/test: java/org/apache/jackrabbit/core/query/OrderByTest.java repository/workspaces/default/indexing-configuration.xml repository/workspaces/default/workspace.xml
Date Wed, 15 Jul 2009 08:42:41 GMT
Author: mreutegg
Date: Wed Jul 15 08:42:41 2009
New Revision: 794190

URL: http://svn.apache.org/viewvc?rev=794190&view=rev
Log:
JCR-2210: Move tests that require indexing configuration

Removed:
    jackrabbit/trunk/jackrabbit-core/src/test/repository/workspaces/default/indexing-configuration.xml
Modified:
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/OrderByTest.java
    jackrabbit/trunk/jackrabbit-core/src/test/repository/workspaces/default/workspace.xml

Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/OrderByTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/OrderByTest.java?rev=794190&r1=794189&r2=794190&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/OrderByTest.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/OrderByTest.java
Wed Jul 15 08:42:41 2009
@@ -33,7 +33,7 @@
 /**
  * Tests queries with order by.
  */
-public class OrderByTest extends AbstractQueryTest {
+public class OrderByTest extends AbstractIndexingTest {
 
     public void testOrderByScore() throws RepositoryException {
         Node n1 = testRootNode.addNode("node1");
@@ -51,12 +51,12 @@
 
         String sql = "SELECT value FROM nt:unstructured WHERE " +
                 "jcr:path LIKE '" + testRoot + "/%' ORDER BY jcr:score, value";
-        Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
+        Query q = session.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
         QueryResult result = q.execute();
         checkResult(result, 3);
 
         String xpath = "/" + testRoot + "/*[@jcr:primaryType='nt:unstructured'] order by
jcr:score(), @value";
-        q = superuser.getWorkspace().getQueryManager().createQuery(xpath, Query.XPATH);
+        q = session.getWorkspace().getQueryManager().createQuery(xpath, Query.XPATH);
         result = q.execute();
         checkResult(result, 3);
     }
@@ -148,31 +148,31 @@
     //------------------------------< helper >----------------------------------
 
     private Value getValue(String value) throws RepositoryException {
-        return superuser.getValueFactory().createValue(value);
+        return session.getValueFactory().createValue(value);
     }
 
     private Value getValue(long value) throws RepositoryException {
-        return superuser.getValueFactory().createValue(value);
+        return session.getValueFactory().createValue(value);
     }
 
     private Value getValue(double value) throws RepositoryException {
-        return superuser.getValueFactory().createValue(value);
+        return session.getValueFactory().createValue(value);
     }
 
     private Value getValue(boolean value) throws RepositoryException {
-        return superuser.getValueFactory().createValue(value);
+        return session.getValueFactory().createValue(value);
     }
 
     private Value getValue(Calendar value) throws RepositoryException {
-        return superuser.getValueFactory().createValue(value);
+        return session.getValueFactory().createValue(value);
     }
 
     private Value getNameValue(String value) throws RepositoryException {
-        return superuser.getValueFactory().createValue(value, PropertyType.NAME);
+        return session.getValueFactory().createValue(value, PropertyType.NAME);
     }
 
     private Value getPathValue(String value) throws RepositoryException {
-        return superuser.getValueFactory().createValue(value, PropertyType.PATH);
+        return session.getValueFactory().createValue(value, PropertyType.PATH);
     }
 
     /**
@@ -185,8 +185,8 @@
     private void checkChildAxis(Value[] values) throws RepositoryException {
         // child/prop is part of the test indexing configuration,
         // this will use SimpleScoreDocComparator internally
-        checkChildAxis(values, "child", "prop");
-        cleanUpTestRoot(superuser);
+        checkChildAxis(values, "child", "property");
+        cleanUpTestRoot(session);
         // c/p is not in the indexing configuration,
         // this will use RelPathScoreDocComparator internally
         checkChildAxis(values, "c", "p");

Modified: jackrabbit/trunk/jackrabbit-core/src/test/repository/workspaces/default/workspace.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/repository/workspaces/default/workspace.xml?rev=794190&r1=794189&r2=794190&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/repository/workspaces/default/workspace.xml
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/repository/workspaces/default/workspace.xml
Wed Jul 15 08:42:41 2009
@@ -41,7 +41,6 @@
     <param name="synonymProviderConfigPath" value="../synonyms.properties"/>
     <param name="supportHighlighting" value="true"/>
     <param name="excerptProviderClass" value="org.apache.jackrabbit.core.query.lucene.WeightedHTMLExcerpt"/>
-    <param name="indexingConfiguration" value="${wsp.home}/indexing-configuration.xml"/>
   </SearchIndex>
 </Workspace>
 



Mime
View raw message