Author: tv Date: Mon Aug 27 09:39:49 2018 New Revision: 1839287 URL: http://svn.apache.org/viewvc?rev=1839287&view=rev Log: As LargeSelect now returns much faster, the assumption, we could check initial values before data is available proves to be wrong.
Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java?rev=1839287&r1=1839286&r2=1839287&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java Mon Aug 27 09:39:49 2018 @@ -73,7 +73,7 @@ public class LargeSelectTest extends Bas { // Delete the test data org.apache.torque.criteria.Criteria criteria - = new org.apache.torque.criteria.Criteria(); + = new org.apache.torque.criteria.Criteria(); criteria.where(AuthorPeer.NAME, LARGE_SELECT_AUTHOR); AuthorPeer.doDelete(criteria); criteria = null; @@ -99,7 +99,7 @@ public class LargeSelectTest extends Bas criteria.setLimit(1); try { - new LargeSelect<Author>(criteria, TEST_PAGE_SIZE, + new LargeSelect<>(criteria, TEST_PAGE_SIZE, AuthorPeer.getAuthorPeerImpl()); } catch (IllegalArgumentException success) @@ -116,7 +116,7 @@ public class LargeSelectTest extends Bas criteria.setOffset(1); try { - new LargeSelect<Author>(criteria, TEST_PAGE_SIZE, + new LargeSelect<>(criteria, TEST_PAGE_SIZE, AuthorPeer.getAuthorPeerImpl()); } catch (IllegalArgumentException success) @@ -132,7 +132,7 @@ public class LargeSelectTest extends Bas { try { - new LargeSelect<Author>(criteria, 0, + new LargeSelect<>(criteria, 0, AuthorPeer.getAuthorPeerImpl()); } catch (IllegalArgumentException success) @@ -148,7 +148,7 @@ public class LargeSelectTest extends Bas { try { - new LargeSelect<Author>(criteria, TEST_PAGE_SIZE, 0, + new LargeSelect<>(criteria, TEST_PAGE_SIZE, 0, AuthorPeer.getAuthorPeerImpl()); } catch (IllegalArgumentException success) @@ -162,7 +162,7 @@ public class LargeSelectTest extends Bas */ public void testSetterMethods() { - LargeSelect<Author> ls = new LargeSelect<Author>( + LargeSelect<Author> ls = new LargeSelect<>( criteria, TEST_PAGE_SIZE, AuthorPeer.getAuthorPeerImpl()); @@ -187,7 +187,7 @@ public class LargeSelectTest extends Bas */ public void testLargeSelect() throws TorqueException { - LargeSelect<Author> ls = new LargeSelect<Author>( + LargeSelect<Author> ls = new LargeSelect<>( criteria, TEST_PAGE_SIZE, AuthorPeer.getAuthorPeerImpl()); @@ -305,7 +305,7 @@ public class LargeSelectTest extends Bas { // Alter criteria to retrieve only one row criteria.where(AuthorPeer.AUTHOR_ID, firstAuthorId); - LargeSelect<Author> ls = new LargeSelect<Author>( + LargeSelect<Author> ls = new LargeSelect<>( criteria, TEST_PAGE_SIZE, AuthorPeer.getAuthorPeerImpl()); @@ -333,7 +333,7 @@ public class LargeSelectTest extends Bas */ public void testInvalidateResult() throws Exception { - LargeSelect<Author> ls = new LargeSelect<Author>( + LargeSelect<Author> ls = new LargeSelect<>( criteria, TEST_PAGE_SIZE, AuthorPeer.getAuthorPeerImpl()); @@ -341,19 +341,6 @@ public class LargeSelectTest extends Bas assertEquals("Page size", TEST_PAGE_SIZE, ls.getPageSize()); assertTrue("Paginated", ls.getPaginated()); - // Page 0 - assertEquals("Current page number", 0, ls.getCurrentPageNumber()); - assertFalse("Previous results available", ls.getPreviousResultsAvailable()); - assertTrue("Next results available", ls.getNextResultsAvailable()); - assertEquals("Current page size", 0, ls.getCurrentPageSize()); - assertEquals("First record for page", 0, ls.getFirstRecordNoForPage()); - assertEquals("Last record for page", 0, ls.getLastRecordNoForPage()); - assertFalse("Totals finalised", ls.getTotalsFinalized()); - assertEquals("Total pages", 0, ls.getTotalPages()); - assertEquals("Total records", 0, ls.getTotalRecords()); - assertEquals("Page progress text", "0 of > 0", ls.getPageProgressText()); - assertEquals("Record progress text", "0 - 0 of > 0", ls.getRecordProgressText()); - List<Author> results = ls.getNextResults(); // Page 1 assertEquals("results.size()", TEST_PAGE_SIZE, results.size()); @@ -403,59 +390,59 @@ public class LargeSelectTest extends Bas assertEquals("Record progress text", "1 - 9 of > 45", ls.getRecordProgressText()); } -// /** -// * A basic serialization test. Cannot continue implementation until -// * serialization of Criteria has been implemented correctly. -// * -// * @throws TorqueException -// */ -// public void testSerialization() throws TorqueException -// { -// // TODO Serialization needs to be reviewed for LargeSelect -// // userDataSet should be marked transient and all access should be wrapped for detect and handle null _or_ readObject should rerun the query. -// -// System.out.println("criteria (before LS created) = " + criteria); -// LargeSelect ls = new LargeSelect(criteria, TEST_PAGE_SIZE, -// "org.apache.torque.test.AuthorPeer"); -// -// assertEquals("Page size", TEST_PAGE_SIZE, ls.getPageSize()); -// assertTrue("Paginated", ls.getPaginated()); -// -// List results = ls.getNextResults(); -// // Page 1 -// assertEquals("results.size()", TEST_PAGE_SIZE, results.size()); -// assertEquals("Current page number", 1, ls.getCurrentPageNumber()); -// assertFalse("Previous results available", ls.getPreviousResultsAvailable()); -// assertTrue("Next results available", ls.getNextResultsAvailable()); -// assertEquals("Current page size", TEST_PAGE_SIZE, ls.getCurrentPageSize()); -// assertEquals("First record for page", 1, ls.getFirstRecordNoForPage()); -// assertEquals("Last record for page", 9, ls.getLastRecordNoForPage()); -// assertFalse("Totals finalised", ls.getTotalsFinalized()); -// assertEquals("Total pages", 5, ls.getTotalPages()); -// assertEquals("Total records", 45, ls.getTotalRecords()); -// assertEquals("Page progress text", "1 of > 5", ls.getPageProgressText()); -// assertEquals("Record progress text", "1 - 9 of > 45", ls.getRecordProgressText()); -// -// LargeSelect lsCopy = (LargeSelect) SerializationUtils.clone(ls); -// -// assertEquals("Page size", TEST_PAGE_SIZE, lsCopy.getPageSize()); -// assertTrue("Paginated", lsCopy.getPaginated()); -// -// // Page 1 -// results = lsCopy.getCurrentPageResults(); -// assertEquals("results.size()", TEST_PAGE_SIZE, results.size()); -// assertEquals("Current page number", 1, lsCopy.getCurrentPageNumber()); -// assertFalse("Previous results available", lsCopy.getPreviousResultsAvailable()); -// assertTrue("Next results available", lsCopy.getNextResultsAvailable()); -// assertEquals("Current page size", TEST_PAGE_SIZE, lsCopy.getCurrentPageSize()); -// assertEquals("First record for page", 1, lsCopy.getFirstRecordNoForPage()); -// assertEquals("Last record for page", 9, lsCopy.getLastRecordNoForPage()); -// assertFalse("Totals finalised", lsCopy.getTotalsFinalized()); -// assertEquals("Total pages", 5, lsCopy.getTotalPages()); -// assertEquals("Total records", 45, lsCopy.getTotalRecords()); -// assertEquals("Page progress text", "1 of > 5", lsCopy.getPageProgressText()); -// assertEquals("Record progress text", "1 - 9 of > 45", lsCopy.getRecordProgressText()); -// } + // /** + // * A basic serialization test. Cannot continue implementation until + // * serialization of Criteria has been implemented correctly. + // * + // * @throws TorqueException + // */ + // public void testSerialization() throws TorqueException + // { + // // TODO Serialization needs to be reviewed for LargeSelect + // // userDataSet should be marked transient and all access should be wrapped for detect and handle null _or_ readObject should rerun the query. + // + // System.out.println("criteria (before LS created) = " + criteria); + // LargeSelect ls = new LargeSelect(criteria, TEST_PAGE_SIZE, + // "org.apache.torque.test.AuthorPeer"); + // + // assertEquals("Page size", TEST_PAGE_SIZE, ls.getPageSize()); + // assertTrue("Paginated", ls.getPaginated()); + // + // List results = ls.getNextResults(); + // // Page 1 + // assertEquals("results.size()", TEST_PAGE_SIZE, results.size()); + // assertEquals("Current page number", 1, ls.getCurrentPageNumber()); + // assertFalse("Previous results available", ls.getPreviousResultsAvailable()); + // assertTrue("Next results available", ls.getNextResultsAvailable()); + // assertEquals("Current page size", TEST_PAGE_SIZE, ls.getCurrentPageSize()); + // assertEquals("First record for page", 1, ls.getFirstRecordNoForPage()); + // assertEquals("Last record for page", 9, ls.getLastRecordNoForPage()); + // assertFalse("Totals finalised", ls.getTotalsFinalized()); + // assertEquals("Total pages", 5, ls.getTotalPages()); + // assertEquals("Total records", 45, ls.getTotalRecords()); + // assertEquals("Page progress text", "1 of > 5", ls.getPageProgressText()); + // assertEquals("Record progress text", "1 - 9 of > 45", ls.getRecordProgressText()); + // + // LargeSelect lsCopy = (LargeSelect) SerializationUtils.clone(ls); + // + // assertEquals("Page size", TEST_PAGE_SIZE, lsCopy.getPageSize()); + // assertTrue("Paginated", lsCopy.getPaginated()); + // + // // Page 1 + // results = lsCopy.getCurrentPageResults(); + // assertEquals("results.size()", TEST_PAGE_SIZE, results.size()); + // assertEquals("Current page number", 1, lsCopy.getCurrentPageNumber()); + // assertFalse("Previous results available", lsCopy.getPreviousResultsAvailable()); + // assertTrue("Next results available", lsCopy.getNextResultsAvailable()); + // assertEquals("Current page size", TEST_PAGE_SIZE, lsCopy.getCurrentPageSize()); + // assertEquals("First record for page", 1, lsCopy.getFirstRecordNoForPage()); + // assertEquals("Last record for page", 9, lsCopy.getLastRecordNoForPage()); + // assertFalse("Totals finalised", lsCopy.getTotalsFinalized()); + // assertEquals("Total pages", 5, lsCopy.getTotalPages()); + // assertEquals("Total records", 45, lsCopy.getTotalRecords()); + // assertEquals("Page progress text", "1 of > 5", lsCopy.getPageProgressText()); + // assertEquals("Record progress text", "1 - 9 of > 45", lsCopy.getRecordProgressText()); + // } // todo Add a test for getPaginated() - was previously returning false when 6 results and pageSize 5 --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org