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/02/25 10:58:25 UTC
svn commit: r1732271 - in
/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query:
QueryJcrTest1IT.java QueryJcrTest2IT.java QueryJcrTestIT.java
Author: mreutegg
Date: Thu Feb 25 09:58:24 2016
New Revision: 1732271
URL: http://svn.apache.org/viewvc?rev=1732271&view=rev
Log:
OAK-4061: QueryJcrTestIT times out on travis
Added:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest1IT.java
- copied, changed from r1728281, jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTestIT.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest2IT.java
- copied, changed from r1732270, jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTestIT.java
Removed:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTestIT.java
Copied: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest1IT.java (from r1728281, jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTestIT.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest1IT.java?p2=jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest1IT.java&p1=jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTestIT.java&r1=1728281&r2=1732271&rev=1732271&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTestIT.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest1IT.java Thu Feb 25 09:58:24 2016
@@ -16,41 +16,28 @@
*/
package org.apache.jackrabbit.oak.jcr.query;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.apache.jackrabbit.core.query.ChildAxisQueryTest;
-import org.apache.jackrabbit.core.query.DerefTest;
import org.apache.jackrabbit.core.query.ExcerptTest;
-import org.apache.jackrabbit.core.query.FnNameQueryTest;
import org.apache.jackrabbit.core.query.FulltextQueryTest;
import org.apache.jackrabbit.core.query.FulltextSQL2QueryTest;
import org.apache.jackrabbit.core.query.JoinTest;
import org.apache.jackrabbit.core.query.LimitAndOffsetTest;
import org.apache.jackrabbit.core.query.MixinTest;
import org.apache.jackrabbit.core.query.OrderByTest;
-import org.apache.jackrabbit.core.query.ParentNodeTest;
import org.apache.jackrabbit.core.query.PathQueryNodeTest;
import org.apache.jackrabbit.core.query.QueryResultTest;
import org.apache.jackrabbit.core.query.SQL2NodeLocalNameTest;
import org.apache.jackrabbit.core.query.SQL2OffsetLimitTest;
import org.apache.jackrabbit.core.query.SQL2OrderByTest;
import org.apache.jackrabbit.core.query.SQL2OuterJoinTest;
-import org.apache.jackrabbit.core.query.SQL2PathEscapingTest;
-import org.apache.jackrabbit.core.query.SQL2QueryResultTest;
import org.apache.jackrabbit.core.query.SQLTest;
-import org.apache.jackrabbit.core.query.SelectClauseTest;
-import org.apache.jackrabbit.core.query.ShareableNodeTest;
-import org.apache.jackrabbit.core.query.SimilarQueryTest;
-import org.apache.jackrabbit.core.query.SimpleQueryTest;
import org.apache.jackrabbit.core.query.SkipDeletedNodesTest;
-import org.apache.jackrabbit.core.query.UpperLowerCaseQueryTest;
-import org.apache.jackrabbit.core.query.VersionStoreQueryTest;
-import org.apache.jackrabbit.core.query.XPathAxisTest;
import org.apache.jackrabbit.test.ConcurrentTestSuite;
-public class QueryJcrTestIT extends TestCase {
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class QueryJcrTest1IT extends TestCase {
public static Test suite() {
TestSuite suite = new ConcurrentTestSuite(
@@ -70,19 +57,6 @@ public class QueryJcrTestIT extends Test
suite.addTestSuite(OrderByTest.class);
suite.addTestSuite(ExcerptTest.class);
suite.addTestSuite(QueryResultTest.class);
- suite.addTestSuite(ParentNodeTest.class);
- suite.addTestSuite(SimilarQueryTest.class);
- suite.addTestSuite(DerefTest.class);
- suite.addTestSuite(XPathAxisTest.class);
- suite.addTestSuite(SQL2QueryResultTest.class);
- suite.addTestSuite(SimpleQueryTest.class);
- suite.addTestSuite(FnNameQueryTest.class);
- suite.addTestSuite(UpperLowerCaseQueryTest.class);
- suite.addTestSuite(SQL2PathEscapingTest.class);
- suite.addTestSuite(ChildAxisQueryTest.class);
- suite.addTestSuite(SelectClauseTest.class);
- suite.addTestSuite(ShareableNodeTest.class);
- suite.addTestSuite(VersionStoreQueryTest.class);
return suite;
}
}
Copied: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest2IT.java (from r1732270, jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTestIT.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest2IT.java?p2=jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest2IT.java&p1=jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTestIT.java&r1=1732270&r2=1732271&rev=1732271&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTestIT.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest2IT.java Thu Feb 25 09:58:24 2016
@@ -22,54 +22,24 @@ import junit.framework.TestSuite;
import org.apache.jackrabbit.core.query.ChildAxisQueryTest;
import org.apache.jackrabbit.core.query.DerefTest;
-import org.apache.jackrabbit.core.query.ExcerptTest;
import org.apache.jackrabbit.core.query.FnNameQueryTest;
-import org.apache.jackrabbit.core.query.FulltextQueryTest;
-import org.apache.jackrabbit.core.query.FulltextSQL2QueryTest;
-import org.apache.jackrabbit.core.query.JoinTest;
-import org.apache.jackrabbit.core.query.LimitAndOffsetTest;
-import org.apache.jackrabbit.core.query.MixinTest;
-import org.apache.jackrabbit.core.query.OrderByTest;
import org.apache.jackrabbit.core.query.ParentNodeTest;
-import org.apache.jackrabbit.core.query.PathQueryNodeTest;
-import org.apache.jackrabbit.core.query.QueryResultTest;
-import org.apache.jackrabbit.core.query.SQL2NodeLocalNameTest;
-import org.apache.jackrabbit.core.query.SQL2OffsetLimitTest;
-import org.apache.jackrabbit.core.query.SQL2OrderByTest;
-import org.apache.jackrabbit.core.query.SQL2OuterJoinTest;
import org.apache.jackrabbit.core.query.SQL2PathEscapingTest;
import org.apache.jackrabbit.core.query.SQL2QueryResultTest;
-import org.apache.jackrabbit.core.query.SQLTest;
import org.apache.jackrabbit.core.query.SelectClauseTest;
import org.apache.jackrabbit.core.query.ShareableNodeTest;
import org.apache.jackrabbit.core.query.SimilarQueryTest;
import org.apache.jackrabbit.core.query.SimpleQueryTest;
-import org.apache.jackrabbit.core.query.SkipDeletedNodesTest;
import org.apache.jackrabbit.core.query.UpperLowerCaseQueryTest;
import org.apache.jackrabbit.core.query.VersionStoreQueryTest;
import org.apache.jackrabbit.core.query.XPathAxisTest;
import org.apache.jackrabbit.test.ConcurrentTestSuite;
-public class QueryJcrTestIT extends TestCase {
+public class QueryJcrTest2IT extends TestCase {
public static Test suite() {
TestSuite suite = new ConcurrentTestSuite(
"Jackrabbit query tests using a Lucene based index");
- suite.addTestSuite(FulltextQueryTest.class);
- suite.addTestSuite(SQLTest.class);
- suite.addTestSuite(JoinTest.class);
- suite.addTestSuite(SkipDeletedNodesTest.class);
- suite.addTestSuite(PathQueryNodeTest.class);
- suite.addTestSuite(FulltextSQL2QueryTest.class);
- suite.addTestSuite(SQL2NodeLocalNameTest.class);
- suite.addTestSuite(SQL2OrderByTest.class);
- suite.addTestSuite(MixinTest.class);
- suite.addTestSuite(SQL2OuterJoinTest.class);
- suite.addTestSuite(SQL2OffsetLimitTest.class);
- suite.addTestSuite(LimitAndOffsetTest.class);
- suite.addTestSuite(OrderByTest.class);
- suite.addTestSuite(ExcerptTest.class);
- suite.addTestSuite(QueryResultTest.class);
suite.addTestSuite(ParentNodeTest.class);
suite.addTestSuite(SimilarQueryTest.class);
suite.addTestSuite(DerefTest.class);