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

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

Revision: 2858
          http://openutils.svn.sourceforge.net/openutils/?rev=2858&view=rev
Author:   fgiust
Date:     2010-08-20 17:07:00 +0000 (Fri, 20 Aug 2010)

Log Message:
-----------
CRIT-17 AdvancedResult.getPage() returns 1 for page 2

Modified Paths:
--------------
    trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java
    trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/AdvancedCriteriaSearchTest.java

Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java	2010-08-19 09:30:47 UTC (rev 2857)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java	2010-08-20 17:07:00 UTC (rev 2858)
@@ -83,7 +83,7 @@
             }
 
             int pageNumberStartingFromOne = 1;
-            if (maxResults > 0 && offset > maxResults)
+            if (maxResults > 0 && offset > maxResults - 1)
             {
                 pageNumberStartingFromOne = (offset / maxResults) + 1;
             }

Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/AdvancedCriteriaSearchTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/AdvancedCriteriaSearchTest.java	2010-08-19 09:30:47 UTC (rev 2857)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/AdvancedCriteriaSearchTest.java	2010-08-20 17:07:00 UTC (rev 2858)
@@ -146,6 +146,28 @@
     }
 
     @Test
+    public void testSearchPageNumber1() throws Exception
+    {
+        AdvancedResult advResult = search("francia", 1, 1);
+        Assert.assertEquals(advResult.getPage(), 1);
+    }
+
+    // see CRIT-17
+    @Test
+    public void testSearchPageNumber2() throws Exception
+    {
+        AdvancedResult advResult = search("francia", 2, 1);
+        Assert.assertEquals(advResult.getPage(), 2);
+    }
+
+    @Test
+    public void testSearchPageNumber3() throws Exception
+    {
+        AdvancedResult advResult = search("francia", 3, 1);
+        Assert.assertEquals(advResult.getPage(), 3);
+    }
+
+    @Test
     public void testEscapeQuotesForEqRestriction() throws Exception
     {
         String title = "Tallart, Camille d'Hostun, cónte di-";


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