jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thom...@apache.org
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 GMT
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> T getValue(Type<T> type) {
         return ps.getValue(type);
     }
 
+    @Override
     @Nonnull
     public <T> T getValue(Type<T> 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



Mime
View raw message