Author: ssmaeklu
Date: 2007-08-21 22:50:04 +0200 (Tue, 21 Aug 2007)
New Revision: 5652
Removed:
trunk/core-api/src/test/java/no/sesat/search/util/test/PagingDisplayHelperUnitTest.java
trunk/result-spi/src/main/java/no/sesat/search/result/PagingDisplayHelper.java
Modified:
trunk/core-api/src/test/resources/testng.xml
trunk/data-model-api/src/main/java/no/sesat/search/datamodel/search/SearchDataObject.java
trunk/result-handler-control-spi/src/main/java/no/sesat/search/result/handler/DataModelResultHandler.java
Log:
PagingDisplayHelper retired. SEARCH-3159
Deleted:
trunk/core-api/src/test/java/no/sesat/search/util/test/PagingDisplayHelperUnitTest.java
===================================================================
---
trunk/core-api/src/test/java/no/sesat/search/util/test/PagingDisplayHelperUnitTest.java
2007-08-21 13:54:03 UTC (rev 5651)
+++
trunk/core-api/src/test/java/no/sesat/search/util/test/PagingDisplayHelperUnitTest.java
2007-08-21 20:50:04 UTC (rev 5652)
@@ -1,183 +0,0 @@
-/*
- * Copyright (2005-2007) Schibsted Søk AS
- * This file is part of SESAT.
- * You can use, redistribute, and/or modify it, under the terms of the SESAT
License.
- * You should have received a copy of the SESAT License along with this
program.
- * If not, see https://dev.sesat.no/confluence/display/SESAT/SESAT+License
- *
- */
-package no.sesat.search.util.test;
-
-import no.sesat.search.result.PagingDisplayHelper;
-import no.sesat.search.site.SiteTestCase;
-import no.sesat.search.result.PagingDisplayHelper;
-import junit.framework.TestResult;
-import org.apache.log4j.Logger;
-import static org.testng.AssertJUnit.*;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.AfterTest;
-
-
-/** Test a PagingDisplayHelper.
- *
- * @author <a href="mailto:[EMAIL PROTECTED]">Magnus Eklund</a>
- * @version <tt>$Revision$</tt>
- */
-public final class PagingDisplayHelperUnitTest extends SiteTestCase {
-
- // Constants -----------------------------------------------------
-
- private static final Logger LOG =
Logger.getLogger(PagingDisplayHelperUnitTest.class);
-
- // Attributes ----------------------------------------------------
-
- private PagingDisplayHelper pager;
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- public PagingDisplayHelperUnitTest(final String testName) {
- super(testName);
- }
-
- // Public --------------------------------------------------------
-
- public void testPageSets() {
-
- LOG.info("testPageSets");
- pager.setNumberOfResults(100);
-
- assertEquals(1, pager.getFirstVisiblePage());
- assertEquals(10, pager.getLastVisiblePage());
-
- pager.setCurrentOffset(9);
- assertEquals(1, pager.getFirstVisiblePage());
- assertEquals(10, pager.getLastVisiblePage());
-
- pager.setNumberOfResults(200);
- pager.setCurrentOffset(0);
-
- assertEquals(20, pager.getNumberOfPages());
-
- pager.setCurrentOffset(pager.getOffsetOfNextPage());
- pager.setCurrentOffset(pager.getOffsetOfNextPage());
- pager.setCurrentOffset(pager.getOffsetOfNextPage());
- pager.setCurrentOffset(pager.getOffsetOfNextPage());
- pager.setCurrentOffset(pager.getOffsetOfNextPage());
- pager.setCurrentOffset(pager.getOffsetOfNextPage());
- pager.setCurrentOffset(pager.getOffsetOfNextPage());
- pager.setCurrentOffset(pager.getOffsetOfNextPage());
- pager.setCurrentOffset(pager.getOffsetOfNextPage());
- pager.setCurrentOffset(pager.getOffsetOfNextPage());
-
- assertEquals(6, pager.getFirstVisiblePage());
- assertEquals(15, pager.getLastVisiblePage());
-
- pager.setNumberOfResults(93);
- pager.setCurrentOffset(0);
-
- assertEquals(10, pager.getOffsetOfNextPage());
- assertEquals(10, pager.getOffsetOfPage(2));
-
- assertEquals(10, pager.getNumberOfPages());
- assertEquals(10, pager.getLastVisiblePage());
- }
-
- public void testPaging() {
-
- LOG.info("testPaging");
- pager.setNumberOfResults(100);
-
- // Default offset is 0
- assertEquals(1, pager.getCurrentPage());
- assertEquals(1, pager.getFirstHitOnPage());
- assertEquals(10, pager.getLastHitOnPage());
- assertEquals(10, pager.getNumberOfPages());
- assertEquals(10, pager.getOffsetOfNextPage());
- assertTrue(pager.isFirstPage());
-
- pager.setCurrentOffset(1);
-
- assertEquals(2, pager.getFirstHitOnPage());
- assertEquals(11, pager.getLastHitOnPage());
- assertEquals(10, pager.getNumberOfPages());
- assertEquals(11, pager.getOffsetOfNextPage());
-
- pager.setCurrentOffset(9);
-
- assertEquals(10, pager.getFirstHitOnPage());
- assertEquals(19, pager.getLastHitOnPage());
- assertEquals(10, pager.getNumberOfPages());
- assertEquals(19, pager.getOffsetOfNextPage());
-
- pager.setCurrentOffset(0);
-
- assertEquals(10, pager.getOffsetOfNextPage());
-
- pager.setCurrentOffset(pager.getOffsetOfNextPage());
-
- assertEquals(2, pager.getCurrentPage());
- assertEquals(11, pager.getFirstHitOnPage());
- assertEquals(20, pager.getLastHitOnPage());
-
- pager.setCurrentOffset(99);
- assertTrue(pager.isLastPage());
- assertFalse(pager.isFirstPage());
- assertEquals(10, pager.getCurrentPage());
-
- pager.setCurrentOffset(pager.getOffsetOfPreviousPage());
- assertFalse(pager.isLastPage());
-
- pager.setNumberOfResults(200);
- pager.setCurrentOffset(0);
-
- assertEquals(20, pager.getNumberOfPages());
- }
-
- public void testDifferentPageSize() {
-
- LOG.info("testDifferentPageSize");
- pager = new PagingDisplayHelper(12, 10);
- pager.setNumberOfResults(2000);
- pager.setCurrentOffset(120);
-
- assertEquals(6, pager.getFirstVisiblePage());
-
- pager.setCurrentOffset(0);
- assertEquals(1, pager.getFirstVisiblePage());
-
- pager.setCurrentOffset(108);
- assertEquals(5, pager.getFirstVisiblePage());
-
- pager.setCurrentOffset(30);
- assertEquals(1, pager.getFirstVisiblePage());
-
- pager.setCurrentOffset(240);
- assertEquals(16, pager.getFirstVisiblePage());
- }
-
-
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
-
- @BeforeTest
- protected void setUp() throws Exception {
- super.setUp();
-
- pager = new PagingDisplayHelper(10, 10);
- }
-
- @AfterTest
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-}
Modified: trunk/core-api/src/test/resources/testng.xml
===================================================================
--- trunk/core-api/src/test/resources/testng.xml 2007-08-21 13:54:03 UTC
(rev 5651)
+++ trunk/core-api/src/test/resources/testng.xml 2007-08-21 20:50:04 UTC
(rev 5652)
@@ -3,10 +3,6 @@
<suite name="Search Engine Unit Tests" verbose="10" parallel="false">
<test name="UnitTests" junit="true">
- <classes>
- <class
name="no.sesat.search.util.test.PagingDisplayHelperUnitTest"/>
- </classes>
-
</test>
</suite>
Modified:
trunk/data-model-api/src/main/java/no/sesat/search/datamodel/search/SearchDataObject.java
===================================================================
---
trunk/data-model-api/src/main/java/no/sesat/search/datamodel/search/SearchDataObject.java
2007-08-21 13:54:03 UTC (rev 5651)
+++
trunk/data-model-api/src/main/java/no/sesat/search/datamodel/search/SearchDataObject.java
2007-08-21 20:50:04 UTC (rev 5652)
@@ -12,7 +12,6 @@
import no.sesat.search.datamodel.generic.DataObject;
import no.sesat.search.datamodel.query.QueryDataObject;
import no.sesat.search.mode.config.SearchConfiguration;
-import no.sesat.search.result.PagingDisplayHelper;
import no.sesat.search.result.ResultItem;
import no.sesat.search.result.ResultList;
Modified:
trunk/result-handler-control-spi/src/main/java/no/sesat/search/result/handler/DataModelResultHandler.java
===================================================================
---
trunk/result-handler-control-spi/src/main/java/no/sesat/search/result/handler/DataModelResultHandler.java
2007-08-21 13:54:03 UTC (rev 5651)
+++
trunk/result-handler-control-spi/src/main/java/no/sesat/search/result/handler/DataModelResultHandler.java
2007-08-21 20:50:04 UTC (rev 5652)
@@ -21,7 +21,6 @@
import no.sesat.search.datamodel.query.QueryDataObject;
import no.sesat.search.datamodel.search.SearchDataObject;
import no.sesat.search.mode.config.SearchConfiguration;
-import no.sesat.search.result.PagingDisplayHelper;
import no.sesat.search.view.config.SearchTab;
import no.sesat.search.site.Site;
import no.sesat.search.site.SiteContext;
@@ -82,20 +81,6 @@
throw new IllegalStateException(skfie.getMessage(), skfie);
}
-// will be replaced with SEARCH-3159 - Replace PagingDisplayHelper
-// // Paging helper
-// PagingDisplayHelper pager = null;
-// if (config.isPaging()) {
-// pager = new PagingDisplayHelper(
-// cxt.getSearchResult().getHitCount(),
-// tab.getPageSize(),
-// tab.getPagingSize());
-// final Object v = null != parameters.get("offset") ?
parameters.get("offset") : "0";
-// pager.setCurrentOffset(Integer.parseInt( v instanceof String[]
&& ((String[])v).length ==1
-// ? ((String[]) v)[0]
-// : (String) v));
-// }
-
// friendly command-specific search string
final String friendly = null != cxt.getDisplayQuery() &&
cxt.getDisplayQuery().length() > 0
? cxt.getDisplayQuery()
Deleted:
trunk/result-spi/src/main/java/no/sesat/search/result/PagingDisplayHelper.java
===================================================================
---
trunk/result-spi/src/main/java/no/sesat/search/result/PagingDisplayHelper.java
2007-08-21 13:54:03 UTC (rev 5651)
+++
trunk/result-spi/src/main/java/no/sesat/search/result/PagingDisplayHelper.java
2007-08-21 20:50:04 UTC (rev 5652)
@@ -1,217 +0,0 @@
-/*
- * Copyright (2005-2007) Schibsted Søk AS
- * This file is part of SESAT.
- * You can use, redistribute, and/or modify it, under the terms of the SESAT
License.
- * You should have received a copy of the SESAT License along with this
program.
- * If not, see https://dev.sesat.no/confluence/display/SESAT/SESAT+License
- *
- */
-package no.sesat.search.result;
-
-import java.io.Serializable;
-
-/**
- * @deprecated replaced by SEARCH-3159 - Replace PagingDisplayHelper
- *
- * @author <a href="mailto:[EMAIL PROTECTED]">Magnus Eklund</a>
- * @version <tt>$Id$</tt>
- */
-public final class PagingDisplayHelper implements Serializable {
-
- private int pageSize = 10;
- private int maxPages = 10;
-
- private int numberOfResults;
-
- private int currentOffset = 0;
-
- /**
- *
- * @param numberOfResults
- */
- public PagingDisplayHelper(final int numberOfResults) {
- this.numberOfResults = numberOfResults;
- }
-
- /**
- *
- * @param numberOfResults
- * @param pageSize
- * @param maxPages
- */
- public PagingDisplayHelper(final int numberOfResults, final int pageSize,
final int maxPages) {
- this.numberOfResults = numberOfResults;
- this.pageSize = pageSize;
- this.maxPages = maxPages;
- }
-
- /**
- *
- * @param pageSize
- * @param maxPages
- */
- public PagingDisplayHelper(final int pageSize, final int maxPages) {
- this.pageSize = pageSize;
- this.maxPages = maxPages;
- }
-
- /**
- *
- * @return
- */
- public int getCurrentPage() {
- return currentOffset / pageSize + 1;
- }
-
- /**
- *
- * @return
- */
- public int getNumberOfPages() {
- return (numberOfResults + pageSize - 1) / pageSize;
- }
-
- /**
- *
- * @return
- */
- public int getPageSize() {
- return pageSize;
- }
-
- /**
- *
- * @param pageSize
- */
- public final void setPageSize(final int pageSize) {
- this.pageSize = pageSize;
- }
-
- /**
- *
- * @return
- */
- public boolean isFirstPage() {
- return getCurrentPage() == 1;
- }
-
- /**
- *
- * @return
- */
- public boolean isLastPage() {
- return getCurrentPage() == getNumberOfPages();
- }
-
- /**
- *
- * @param offset
- */
- public void setCurrentOffset(final int offset) {
- currentOffset = offset;
- }
-
- /**
- *
- * @return
- */
- public int getOffsetOfNextPage() {
- return getFirstHitOnPage() + pageSize - 1;
- }
-
- /**
- *
- * @return
- */
- public int getOffsetOfPreviousPage() {
- return (getCurrentPage() - 2) * pageSize;
- }
-
- /**
- *
- * @param page
- * @return
- */
- public int getOffsetOfPage(final int page) {
- return (page - 1) * (pageSize);
- }
-
- /**
- *
- * @return
- */
- public int getFirstVisiblePage() {
-
- int firstPage = 0;
- int n = (getCurrentOffset()/pageSize);
- if (n > 5)
- if ( ( getNumberOfPages() - getCurrentPage() ) < 5) {
- firstPage = getNumberOfPages() - 9;
- if (firstPage <= 0)
- firstPage = 1;
- } else
- firstPage = (n - 5 + 1);
- else
- firstPage = 1;
-
- return firstPage;
- }
-
- /**
- *
- * @return
- */
- public int getLastVisiblePage() {
- int pageSet = getFirstVisiblePage() + maxPages - 1;
-
- return getNumberOfPages() < pageSet ? getNumberOfPages() : pageSet;
- }
-
- /**
- *
- * @return
- */
- public int getMaxPages() {
- return maxPages;
- }
-
- /**
- *
- * @return
- */
- public int getFirstHitOnPage() {
- return (getCurrentPage() - 1) * pageSize + currentOffset % pageSize +
1;
- }
-
- /**
- *
- * @return
- */
- public int getLastHitOnPage() {
- return Math.min(numberOfResults, getFirstHitOnPage() + pageSize - 1);
- }
-
- /**
- *
- * @param numberOfResults
- */
- public void setNumberOfResults(final int numberOfResults) {
- this.numberOfResults = numberOfResults;
- }
-
- /**
- *
- * @return
- */
- public int getNumberOfResults() {
- return numberOfResults;
- }
-
- /**
- *
- * @return
- */
- public int getCurrentOffset() {
- return currentOffset;
- }
-}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
