#921 - Refactor internals - Change internal use of "findRowCount" to "findCount"

This commit is contained in:
Rob Bygrave
2016-12-13 19:51:11 +13:00
parent f429811f79
commit cf37fda3f4
17 changed files with 36 additions and 41 deletions
@@ -226,7 +226,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
}
@Override
public <T> int findRowCountWithCopy(Query<T> query, Transaction t) {
public <T> int findCountWithCopy(Query<T> query, Transaction t) {
return 0;
}
@@ -20,7 +20,6 @@ public class TestQuery extends BaseTestCase {
// .orderBy("orderDate");
int rc = query.findList().size();
// int rc = query.findRowCount();
Assert.assertTrue(rc > 0);
// String generatedSql = query.getGeneratedSql();
// Assert.assertFalse(generatedSql.contains("order by"));
@@ -66,7 +66,7 @@ public class TestSoftDeleteBasic extends BaseTestCase {
}
@Test
public void testDeleteById_and_findRowCount() {
public void testDeleteById_and_findCount() {
EBasicSoftDelete bean = new EBasicSoftDelete();
bean.setName("two");
@@ -77,7 +77,7 @@ public class TestSoftDeleteBasic extends BaseTestCase {
Ebean.delete(EBasicSoftDelete.class, bean.getId());
// -- test .findRowCount()
// -- test .findCount()
LoggedSqlCollector.start();
int rowCountAfter = Ebean.find(EBasicSoftDelete.class).findCount();
@@ -88,7 +88,7 @@ public class TestSoftDeleteBasic extends BaseTestCase {
assertThat(rowCountAfter).isEqualTo(rowCountBefore - 1);
// -- test includeSoftDeletes().findRowCount()
// -- test includeSoftDeletes().findCount()
LoggedSqlCollector.start();
int rowCountFull = Ebean.find(EBasicSoftDelete.class).setIncludeSoftDeletes().findCount();