Author: alexparvulescu Date: Fri Jun 14 14:29:51 2013 New Revision: 1493086
URL: http://svn.apache.org/r1493086 Log: OAK-237 Run Jackrabbit query tests Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest.java Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1493086&r1=1493085&r2=1493086&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/pom.xml (original) +++ jackrabbit/oak/trunk/oak-jcr/pom.xml Fri Jun 14 14:29:51 2013 @@ -216,12 +216,6 @@ org.apache.jackrabbit.test.api.query.ElementTest#testElementTestNameTestSomeNTWithSNS <!-- OAK-203 --> org.apache.jackrabbit.test.api.query.SaveTest#testItemExistsException <!-- OAK-203 --> org.apache.jackrabbit.test.api.query.SaveTest#testLockException - org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoin <!-- OAK-474 --> - org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoinNtBase <!-- OAK-474 --> - org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoinFilterPrimaryType <!-- OAK-474 --> - org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoinSNS <!-- OAK-474 --> - org.apache.jackrabbit.test.api.query.qom.DescendantNodeJoinConditionTest#testInnerJoin <!-- OAK-852 --> - org.apache.jackrabbit.test.api.query.qom.DescendantNodeJoinConditionTest#testLeftOuterJoin <!-- OAK-852 --> org.apache.jackrabbit.test.api.observation.NodeMovedTest#testMoveNode org.apache.jackrabbit.test.api.observation.NodeMovedTest#testMoveTree org.apache.jackrabbit.test.api.observation.NodeMovedTest#testMoveWithRemove @@ -305,6 +299,41 @@ org.apache.jackrabbit.core.query.ExcerptTest#testPunctuationStartsFragment <!-- OAK-318 --> org.apache.jackrabbit.core.query.ExcerptTest#testPunctuationStartsFragmentEndsWithDots <!-- OAK-318 --> org.apache.jackrabbit.core.query.ExcerptTest#testPreferPhrase <!-- OAK-318 --> + + <!-- Jackrabbit query tests (OAK-237) --> + org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoin <!-- OAK-474 --> + org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoinNtBase <!-- OAK-474 --> + org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoinFilterPrimaryType <!-- OAK-474 --> + org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoinSNS <!-- OAK-474 --> + org.apache.jackrabbit.test.api.query.qom.DescendantNodeJoinConditionTest#testInnerJoin <!-- OAK-852 --> + org.apache.jackrabbit.test.api.query.qom.DescendantNodeJoinConditionTest#testLeftOuterJoin <!-- OAK-852 --> + org.apache.jackrabbit.core.query.QueryResultTest#testSkip <!-- OAK-484 --> + org.apache.jackrabbit.core.query.SimilarQueryTest#testSimilar <!-- OAK-319 --> + org.apache.jackrabbit.core.query.DerefTest#testDeref <!-- OAK-321 --> + org.apache.jackrabbit.core.query.DerefTest#testDerefInPredicate <!-- OAK-321 --> + org.apache.jackrabbit.core.query.DerefTest#testRewrite <!-- OAK-321 --> + org.apache.jackrabbit.core.query.DerefTest#testDerefToVersionNode <!-- OAK-321 --> + org.apache.jackrabbit.core.query.DerefTest#testMultipleDeref <!-- OAK-321 --> + org.apache.jackrabbit.core.query.XPathAxisTest#testIndex0Descendant <!-- OAK-322 --> + org.apache.jackrabbit.core.query.XPathAxisTest#testIndex1Descendant <!-- OAK-322 --> + org.apache.jackrabbit.core.query.XPathAxisTest#testIndex2Descendant <!-- OAK-322 --> + org.apache.jackrabbit.core.query.XPathAxisTest#testIndex3Descendant <!-- OAK-322 --> + org.apache.jackrabbit.core.query.SQL2QueryResultTest#testSQL2SelectColums <!-- OAK-874 --> + org.apache.jackrabbit.core.query.SimpleQueryTest#testGeneralComparison <!-- OAK-327 --> + org.apache.jackrabbit.core.query.FnNameQueryTest#testLikeWithPrefix <!-- OAK-328 --> + org.apache.jackrabbit.core.query.UpperLowerCaseQueryTest#testInvalidQuery <!-- OAK-329 --> + org.apache.jackrabbit.core.query.SQL2PathEscapingTest#testGetChildrenNoEscaping <!-- OAK-481 --> + org.apache.jackrabbit.core.query.SQL2PathEscapingTest#testGetChildrenEscapedFull <!-- OAK-481 --> + org.apache.jackrabbit.core.query.SQL2PathEscapingTest#testGetChildrenEscapedNode <!-- OAK-481 --> + org.apache.jackrabbit.core.query.ChildAxisQueryTest#testRelationQuery <!-- OAK-203 --> + org.apache.jackrabbit.core.query.ChildAxisQueryTest#testRelationQueryDeep <!-- OAK-203 --> + org.apache.jackrabbit.core.query.ChildAxisQueryTest#testMultiRelation <!-- OAK-203 --> + org.apache.jackrabbit.core.query.ChildAxisQueryTest#testLike <!-- OAK-203 --> + org.apache.jackrabbit.core.query.ChildAxisQueryTest#testContains <!-- OAK-203 --> + org.apache.jackrabbit.core.query.ChildAxisQueryTest#testStarNameTest <!-- OAK-203 --> + org.apache.jackrabbit.core.query.SelectClauseTest#testSameNameSiblingSQL <!-- OAK-203 --> + org.apache.jackrabbit.core.query.ShareableNodeTest#testName <!-- OAK-118 --> + org.apache.jackrabbit.core.query.ShareableNodeTest#testPathConstraint <!-- OAK-118 --> </known.issues> </properties> Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest.java?rev=1493086&r1=1493085&r2=1493086&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest.java Fri Jun 14 14:29:51 2013 @@ -20,20 +20,36 @@ 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.LimitedAccessQueryTest; 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.SkipDeniedNodesTest; +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 QueryJcrTest extends TestCase { @@ -54,33 +70,20 @@ public class QueryJcrTest extends TestCa suite.addTestSuite(LimitAndOffsetTest.class); suite.addTestSuite(OrderByTest.class); suite.addTestSuite(ExcerptTest.class); - - // FAILURES - // - // suite.addTestSuite(QueryResultTest.class); // OAK-484 - // suite.addTestSuite(ParentNodeTest.class); // OAK-309 - // suite.addTestSuite(SimilarQueryTest.class); // OAK-319 - // suite.addTestSuite(DerefTest.class); // OAK-321 - // suite.addTestSuite(XPathAxisTest.class); // OAK-322 - // suite.addTestSuite(SQL2QueryResultTest.class); // OAK-323 - // suite.addTestSuite(SimpleQueryTest.class); // OAK-327 - // suite.addTestSuite(FnNameQueryTest.class); // OAK-328 - // suite.addTestSuite(UpperLowerCaseQueryTest.class); // OAK-329 - // suite.addTestSuite(SQL2PathEscapingTest.class); // OAK-481 - - // NOT IMPLEMENTED - // - // suite.addTestSuite(ChildAxisQueryTest.class); // sns - // suite.addTestSuite(SelectClauseTest.class); // sns - // suite.addTestSuite(ShareableNodeTest.class); // ws#clone - // suite.addTestSuite(VersionStoreQueryTest.class); // versioning - - // TOO JR SPECIFIC - // - // suite.addTestSuite(LimitedAccessQueryTest.class); // acls - // suite.addTestSuite(SkipDeniedNodesTest.class); // acls - + 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); // sns + suite.addTestSuite(SelectClauseTest.class); // sns + suite.addTestSuite(ShareableNodeTest.class); // ws#clone + suite.addTestSuite(VersionStoreQueryTest.class); // versioning return suite; } - }
