[Openutils-svn] SF.net SVN: openutils:[2437] trunk/openutils-mgnlcriteria/src

[<die...@us...>]

Revision: 2437
          http://openutils.svn.sourceforge.net/openutils/?rev=2437&view=rev
Author:   diego_schivo
Date:     2010-05-13 07:46:59 +0000 (Thu, 13 May 2010)

Log Message:
-----------
CRIT-11 CriteriaTest

Modified Paths:
--------------
    trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java
    trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResultItem.java

Added Paths:
-----------
    trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java

Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java	2010-05-13 07:17:14 UTC (rev 2436)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java	2010-05-13 07:46:59 UTC (rev 2437)
@@ -31,6 +31,7 @@
 
 
 /**
+ * Wraps the RowIterator returned by an AdvancedResult instance, adapting each Row to AdvancedResultItem.
  * @author fgiust
  * @version $Id$
  */

Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResultItem.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResultItem.java	2010-05-13 07:17:14 UTC (rev 2436)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResultItem.java	2010-05-13 07:46:59 UTC (rev 2437)
@@ -23,6 +23,7 @@
 
 
 /**
+ * An extension of Content exposing additional informations obtained from a Row item of a QueryResult.
  * @author fgiust
  * @version $Id$
  */

Added: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java	                        (rev 0)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java	2010-05-13 07:46:59 UTC (rev 2437)
@@ -0,0 +1,49 @@
+package net.sourceforge.openutils.mgnlcriteria.jcr.query;
+
+import info.magnolia.cms.beans.config.ContentRepository;
+
+import java.util.Calendar;
+
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Order;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+
+import org.apache.commons.lang.StringUtils;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+/**
+ * @author dschivo
+ * @version $Id$
+ */
+public class CriteriaTest
+{
+
+    @Test
+    public void testToXpathExpression() throws Exception
+    {
+        Calendar begin = Calendar.getInstance();
+        begin.set(2004, Calendar.JANUARY, 1);
+        Calendar end = Calendar.getInstance();
+        end.set(2008, Calendar.DECEMBER, 1);
+
+        Criteria criteria = JCRCriteriaFactory
+            .createCriteria()
+            .setWorkspace(ContentRepository.WEBSITE)
+            .setBasePath("/dogs")
+            .add(Restrictions.contains("@name", "Nana"))
+            .add(Restrictions.gt("@weight", Float.valueOf(10)))
+            .add(Restrictions.between("@birthDate", begin, end))
+            .addOrder(Order.desc("@name"));
+
+        String expectedStmt = "//dogs//*"
+            + "[((jcr:contains(@name, 'Nana')) and (@weight>10.0)"
+            + " and (@birthDate >=xs:dateTime('2004-01-01T00:00:00.000+00:00')"
+            + " and @birthDate <=xs:dateTime('2008-12-01T23:59:59.000+00:00')))]"
+            + " order by @name descending";
+        String actualStmt = criteria.toXpathExpression();
+
+        Assert.assertEquals(StringUtils.remove(expectedStmt, ' '), StringUtils.remove(actualStmt, ' '));
+    }
+
+}


Property changes on: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native


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