[Openutils-svn] SF.net SVN: openutils:[2914] trunk/openutils-mgnlcriteria/src/test/java/net /sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest. java

[<fg...@us...>]

Revision: 2914
          http://openutils.svn.sourceforge.net/openutils/?rev=2914&view=rev
Author:   fgiust
Date:     2010-08-28 08:14:49 +0000 (Sat, 28 Aug 2010)

Log Message:
-----------
CRIT-19 fix test for jackrabbit 2.x (totalSize is, according to specifications, not required and evaluated by jackrabbit only where is an "order by" clause) 

Modified Paths:
--------------
    trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java

Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java	2010-08-28 07:55:31 UTC (rev 2913)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java	2010-08-28 08:14:49 UTC (rev 2914)
@@ -32,6 +32,7 @@
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRQueryException;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Order;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
 import net.sourceforge.openutils.mgnlcriteria.tests.RepositoryTestNgTestcase;
 
@@ -139,7 +140,7 @@
         Criteria criteria = criteria(textEnteredByUser, true);
         Assert.assertEquals(
             StringUtils.remove(criteria.toXpathExpression(), ' '),
-            "//*[((@jcr:primaryType='mgnl:content')and(jcr:contains(@title,'test\\?')))]");
+            "//*[((@jcr:primaryType='mgnl:content')and(jcr:contains(@title,'test\\?')))]orderby@jcr:scoredescending");
         AdvancedResult advResult = null;
         try
         {
@@ -163,7 +164,7 @@
         Criteria criteria = criteria(textEnteredByUser, true);
         Assert.assertEquals(
             StringUtils.remove(criteria.toXpathExpression(), ' '),
-            "//*[((@jcr:primaryType='mgnl:content')and(jcr:contains(@title,'te\\?st')))]");
+            "//*[((@jcr:primaryType='mgnl:content')and(jcr:contains(@title,'te\\?st')))]orderby@jcr:scoredescending");
         AdvancedResult advResult = null;
         try
         {
@@ -187,7 +188,7 @@
         Criteria criteria = criteria(textEnteredByUser, true);
         Assert.assertEquals(
             StringUtils.remove(criteria.toXpathExpression(), ' '),
-            "//*[((@jcr:primaryType='mgnl:content')and(jcr:contains(@title,'\\\"Milano\\\"')))]");
+                "//*[((@jcr:primaryType='mgnl:content')and(jcr:contains(@title,'\\\"Milano\\\"')))]orderby@jcr:scoredescending");
         AdvancedResult advResult = null;
         try
         {
@@ -210,6 +211,7 @@
         criteria.setBasePath(StringUtils.EMPTY);
         criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
         criteria.add(Restrictions.contains("@title", titleSearch, escape));
+        criteria.addOrder(Order.desc("@jcr:score"));
         return criteria;
     }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.