Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9B35ED189 for ; Wed, 5 Dec 2012 11:11:40 +0000 (UTC) Received: (qmail 58592 invoked by uid 500); 5 Dec 2012 11:11:40 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 58506 invoked by uid 500); 5 Dec 2012 11:11:37 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 58465 invoked by uid 99); 5 Dec 2012 11:11:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Dec 2012 11:11:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Dec 2012 11:11:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A7EC92388A4A; Wed, 5 Dec 2012 11:10:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1417356 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/PropertyStateValue.java oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest.java Date: Wed, 05 Dec 2012 11:10:39 -0000 To: oak-commits@jackrabbit.apache.org From: thomasm@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121205111039.A7EC92388A4A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: thomasm Date: Wed Dec 5 11:10:38 2012 New Revision: 1417356 URL: http://svn.apache.org/viewvc?rev=1417356&view=rev Log: OAK-466 OrderByTest.testChildAxisMixedTypes failing Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/PropertyStateValue.java jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTest.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/PropertyStateValue.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/PropertyStateValue.java?rev=1417356&r1=1417355&r2=1417356&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/PropertyStateValue.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/PropertyStateValue.java Wed Dec 5 11:10:38 2012 @@ -42,33 +42,40 @@ public class PropertyStateValue implemen this.ps = ps; } + @Override public boolean isArray() { return ps.isArray(); } + @Override @Nonnull public Type getType() { return ps.getType(); } + @Override @Nonnull public T getValue(Type type) { return ps.getValue(type); } + @Override @Nonnull public T getValue(Type type, int index) { return ps.getValue(type, index); } + @Override public long size() { return ps.size(); } + @Override public long size(int index) { return ps.size(index); } + @Override public int count() { return ps.count(); } @@ -81,7 +88,7 @@ public class PropertyStateValue implemen @Override public int compareTo(PropertyValue p2) { if (getType().tag() != p2.getType().tag()) { - return Integer.signum(getType().tag() - p2.getType().tag()); + return Integer.signum(p2.getType().tag() - getType().tag()); } switch (getType().tag()) { case PropertyType.BINARY: 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=1417356&r1=1417355&r2=1417356&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 Wed Dec 5 11:10:38 2012 @@ -25,6 +25,7 @@ import org.apache.jackrabbit.core.query. 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.PathQueryNodeTest; import org.apache.jackrabbit.core.query.SQL2NodeLocalNameTest; import org.apache.jackrabbit.core.query.SQL2OffsetLimitTest; @@ -50,11 +51,11 @@ public class QueryJcrTest extends TestCa suite.addTestSuite(SQL2OuterJoinTest.class); suite.addTestSuite(SQL2OffsetLimitTest.class); suite.addTestSuite(LimitAndOffsetTest.class); + suite.addTestSuite(OrderByTest.class); // FAILURES // // suite.addTestSuite(QueryResultTest.class); // OAK-484 - // suite.addTestSuite(OrderByTest.class); // OAK-466 // suite.addTestSuite(ParentNodeTest.class); // OAK-309 // suite.addTestSuite(ExcerptTest.class); // OAK-318 // suite.addTestSuite(SimilarQueryTest.class); // OAK-319