github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#2361 - Tidy tests only, move to LoggedSql (ebean-test)

Browse Source
This commit is contained in:
Rob Bygrave
2021-09-09 11:25:04 +12:00
parent e5dceda4b9
commit 1696caadd4
163 changed files with 1024 additions and 1179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-test/src/test/java/org/tests/cache/TestBeanCache.java
Vendored
+10 -10
View File
@@ -5,7 +5,7 @@ import io.ebean.DB;
import io.ebean.Transaction;
import io.ebean.cache.ServerCache;
import io.ebean.cache.ServerCacheStatistics;
import org.ebeantest.LoggedSqlCollector;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,16 +40,16 @@ public class TestBeanCache extends BaseTestCase {
assertNotNull(bean0);
// expect to hit the cache, no SQL
LoggedSqlCollector.start();
LoggedSql.start();
OCachedBean bean1 = DB.find(OCachedBean.class, bean.getId());
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertNotNull(bean1);
assertThat(sql).isEmpty();
// expect to hit the cache, no SQL
LoggedSqlCollector.start();
LoggedSql.start();
OCachedBean bean2 = DB.find(OCachedBean.class).setReadOnly(true).setId(String.valueOf(bean.getId())).findOne();
sql = LoggedSqlCollector.stop();
sql = LoggedSql.stop();
assertNotNull(bean2);
assertThat(sql).isEmpty();
}
@@ -92,7 +92,7 @@ public class TestBeanCache extends BaseTestCase {
beanCache.clear();
beanCache.statistics(true);
LoggedSqlCollector.start();
LoggedSql.start();
log.info("All misses (0 of 3) ...");
List<OCachedBean> list = DB.find(OCachedBean.class)
@@ -102,7 +102,7 @@ public class TestBeanCache extends BaseTestCase {
assertThat(list).hasSize(3);
assertBeanCacheHitMiss(0, 3);
List<String> sql = LoggedSqlCollector.current();
List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(1);
if (isH2()) {
assertSql(sql.get(0)).contains("from o_cached_bean t0 where t0.id in (?,?,?,?,?)");
@@ -116,7 +116,7 @@ public class TestBeanCache extends BaseTestCase {
assertBeanCacheHitMiss(3, 0);
assertThat(list).hasSize(3);
sql = LoggedSqlCollector.current();
sql = LoggedSql.collect();
assertThat(sql).hasSize(0); // no misses
// remove a bean so that we get a "partial" hit (2 out of 3 in cache)
@@ -130,7 +130,7 @@ public class TestBeanCache extends BaseTestCase {
assertBeanCacheHitMiss(2, 1);
assertThat(list).hasSize(3);
sql = LoggedSqlCollector.current();
sql = LoggedSql.collect();
assertThat(sql).hasSize(1);
if (isH2()) {
// fetch the miss from DB
@@ -149,7 +149,7 @@ public class TestBeanCache extends BaseTestCase {
assertBeanCacheHitMiss(1, 2);
assertThat(list).hasSize(3);
sql = LoggedSqlCollector.stop();
sql = LoggedSql.stop();
assertThat(sql).hasSize(1);
if (isH2()) {
// fetch the misses from DB
ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package org.tests.cache;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebeantest.LoggedSql;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Contact;
import org.tests.model.basic.Customer;
ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java
Vendored
+9 -9
View File
@@ -2,7 +2,7 @@ package org.tests.cache;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.OCachedBean;
@@ -29,9 +29,9 @@ public class TestBeanCacheWithDeleteQuery extends BaseTestCase {
assertNotNull(bean0);
// expect to hit the cache, no SQL
LoggedSqlCollector.start();
LoggedSql.start();
OCachedBean bean1 = DB.find(OCachedBean.class, bean.getId());
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertNotNull(bean1);
assertThat(sql).isEmpty();
@@ -41,9 +41,9 @@ public class TestBeanCacheWithDeleteQuery extends BaseTestCase {
assertEquals(deleted, 1);
// expect not to hit the cache, expect SQL
LoggedSqlCollector.start();
LoggedSql.start();
OCachedBean bean2 = DB.find(OCachedBean.class).setReadOnly(true).setId(String.valueOf(bean.getId())).findOne();
sql = LoggedSqlCollector.stop();
sql = LoggedSql.stop();
assertNull(bean2);
assertThat(sql).isNotEmpty();
}
@@ -59,9 +59,9 @@ public class TestBeanCacheWithDeleteQuery extends BaseTestCase {
assertNotNull(bean0);
// expect to hit the cache, no SQL
LoggedSqlCollector.start();
LoggedSql.start();
OCachedBean bean1 = DB.find(OCachedBean.class, bean.getId());
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertNotNull(bean1);
assertThat(sql).isEmpty();
@@ -71,9 +71,9 @@ public class TestBeanCacheWithDeleteQuery extends BaseTestCase {
assertEquals(updated, 1);
// expect not to hit the cache, expect SQL
LoggedSqlCollector.start();
LoggedSql.start();
OCachedBean bean2 = DB.find(OCachedBean.class).setReadOnly(true).setId(String.valueOf(bean.getId())).findOne();
sql = LoggedSqlCollector.stop();
sql = LoggedSql.stop();
assertNotNull(bean2);
assertThat(sql).isNotEmpty();
assertEquals("updatedName", bean2.getName());
ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java
Vendored
+12 -12
View File
@@ -5,7 +5,7 @@ import io.ebean.DB;
import io.ebean.FetchGroup;
import io.ebean.cache.ServerCache;
import io.ebean.cache.ServerCacheStatistics;
import org.ebeantest.LoggedSqlCollector;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer;
import org.tests.model.basic.Order;
@@ -26,13 +26,13 @@ public class TestBeanFetchJoinCache extends BaseTestCase {
loadCustomerBeanCache();
customerBeanCache.statistics(true);
LoggedSqlCollector.start();
LoggedSql.start();
List<Order> orders = DB.find(Order.class)
.fetchCache("customer", "status, name")
.findList();
final List<String> sql0 = LoggedSqlCollector.current();
final List<String> sql0 = LoggedSql.collect();
assertThat(sql0).hasSize(1);
final ServerCacheStatistics statistics = customerBeanCache.statistics(true);
@@ -46,7 +46,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase {
assertThat(customer.getStatus()).isNotNull();
}
assertThat(LoggedSqlCollector.stop()).isEmpty();
assertThat(LoggedSql.stop()).isEmpty();
}
private void loadCustomerBeanCache() {
@@ -66,13 +66,13 @@ public class TestBeanFetchJoinCache extends BaseTestCase {
customerBeanCache.statistics(true);
LoggedSqlCollector.start();
LoggedSql.start();
List<Order> orders = DB.find(Order.class)
.fetchCache("customer")
.findList();
final List<String> sql0 = LoggedSqlCollector.current();
final List<String> sql0 = LoggedSql.collect();
assertThat(sql0).hasSize(2);
assertThat(sql0.get(0)).contains(" from o_order ");
assertThat(sql0.get(1)).contains(" from o_customer t0 where t0.id ");
@@ -86,7 +86,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase {
assertThat(customer.getStatus()).isNotNull();
}
assertThat(LoggedSqlCollector.stop()).isEmpty();
assertThat(LoggedSql.stop()).isEmpty();
}
@Test
@@ -100,7 +100,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase {
customerBeanCache.statistics(true);
LoggedSqlCollector.start();
LoggedSql.start();
List<Order> orders = DB.find(Order.class)
.fetchCache("customer")
@@ -109,7 +109,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase {
for (Order order : orders) {
assertThat(order.getCustomer().getName()).isNotNull();
}
final List<String> sql0 = LoggedSqlCollector.current();
final List<String> sql0 = LoggedSql.collect();
assertThat(sql0).hasSize(1);
final ServerCacheStatistics statistics = customerBeanCache.statistics(true);
@@ -124,7 +124,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase {
}
// assert we hit the DB the second time around
final List<String> sql1 = LoggedSqlCollector.stop();
final List<String> sql1 = LoggedSql.stop();
assertThat(sql1).hasSize(1);
assertThat(sql1.get(0)).contains(" from o_customer t0 ");
@@ -162,7 +162,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase {
initDataClearCache();
customerBeanCache.statistics(true);
LoggedSqlCollector.start();
LoggedSql.start();
List<Order> orders = DB.find(Order.class)
.select(fgCachePartial)
@@ -173,7 +173,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase {
final ServerCacheStatistics statistics1 = customerBeanCache.statistics(true);
assertThat(statistics1.getMissCount()).isEqualTo(2);
final List<String> sql = LoggedSqlCollector.stop();
final List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains(" from o_order ");
assertSql(sql.get(1)).contains(" from o_customer ");
ebean-test/src/test/java/org/tests/cache/TestQueryCache.java
Vendored
+17 -17
View File
@@ -6,7 +6,7 @@ import io.ebean.DB;
import io.ebean.ExpressionList;
import io.ebean.bean.BeanCollection;
import io.ebean.cache.ServerCache;
import org.ebeantest.LoggedSqlCollector;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer;
import org.tests.model.basic.ResetBasicData;
@@ -104,7 +104,7 @@ public class TestQueryCache extends BaseTestCase {
new EColAB("04", "count").save();
new EColAB("05", "count").save();
LoggedSqlCollector.start();
LoggedSql.start();
int count0 = DB.find(EColAB.class)
.setUseQueryCache(CacheMode.ON)
@@ -118,20 +118,20 @@ public class TestQueryCache extends BaseTestCase {
.eq("columnB", "count")
.findCount();
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(count0).isEqualTo(count1);
assertThat(sql).hasSize(1);
// and now, ensure that we hit the database
LoggedSqlCollector.start();
LoggedSql.start();
int count2 = DB.find(EColAB.class)
.setUseQueryCache(CacheMode.OFF)
.where()
.eq("columnB", "count")
.findCount();
assertThat(count2).isEqualTo(count1);
sql = LoggedSqlCollector.stop();
sql = LoggedSql.stop();
assertThat(sql).hasSize(1);
}
@@ -139,7 +139,7 @@ public class TestQueryCache extends BaseTestCase {
public void findCountDifferentQueries() {
LoggedSqlCollector.start();
LoggedSql.start();
int count0 = DB.find(EColAB.class)
.setUseQueryCache(CacheMode.ON)
@@ -153,7 +153,7 @@ public class TestQueryCache extends BaseTestCase {
.eq("columnB", "def")
.findCount();
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(count0).isEqualTo(count1);
assertThat(sql).hasSize(2); // different queries
@@ -164,7 +164,7 @@ public class TestQueryCache extends BaseTestCase {
public void findCountFirstOnThenRecache() {
LoggedSqlCollector.start();
LoggedSql.start();
int count0 = DB.find(EColAB.class)
.setUseQueryCache(CacheMode.ON)
@@ -178,7 +178,7 @@ public class TestQueryCache extends BaseTestCase {
.eq("columnB", "uvw")
.findCount();
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(count0).isEqualTo(count1);
assertThat(sql).hasSize(2); // try recache as second query - it must fetch it
@@ -190,7 +190,7 @@ public class TestQueryCache extends BaseTestCase {
public void findCountFirstRecacheThenOn() {
LoggedSqlCollector.start();
LoggedSql.start();
int count0 = DB.find(EColAB.class)
.setUseQueryCache(CacheMode.PUT)
@@ -204,7 +204,7 @@ public class TestQueryCache extends BaseTestCase {
.eq("columnB", "xyz")
.findCount();
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(count0).isEqualTo(count1);
assertThat(sql).hasSize(1); // try recache as first query - second "ON" query must fetch it.
@@ -263,7 +263,7 @@ public class TestQueryCache extends BaseTestCase {
new EColAB("04", "someId").save();
new EColAB("05", "someId").save();
LoggedSqlCollector.start();
LoggedSql.start();
List<Integer> colA_first = DB.find(EColAB.class)
.setUseQueryCache(CacheMode.ON)
@@ -277,20 +277,20 @@ public class TestQueryCache extends BaseTestCase {
.eq("columnB", "someId")
.findIds();
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(colA_first).isSameAs(colA_second);
assertThat(colA_first).hasSize(3);
assertThat(sql).hasSize(1);
// and now, ensure that we hit the database
LoggedSqlCollector.start();
LoggedSql.start();
colA_second = DB.find(EColAB.class)
.setUseQueryCache(CacheMode.PUT)
.where()
.eq("columnB", "someId")
.findIds();
sql = LoggedSqlCollector.stop();
sql = LoggedSql.stop();
assertThat(sql).hasSize(1);
}
@@ -311,7 +311,7 @@ public class TestQueryCache extends BaseTestCase {
}
void differentFindCount(Consumer<ExpressionList<EColAB>> q0, Consumer<ExpressionList<EColAB>> q1) {
LoggedSqlCollector.start();
LoggedSql.start();
ExpressionList<EColAB> el0 = DB.find(EColAB.class).setUseQueryCache(CacheMode.ON).where();
q0.accept(el0);
@@ -321,7 +321,7 @@ public class TestQueryCache extends BaseTestCase {
q1.accept(el1);
el1.findCount();
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2); // different queries
}
ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java
Vendored
+4 -4
View File
@@ -4,7 +4,7 @@ import io.ebean.DB;
import io.ebean.cache.ServerCache;
import io.ebean.cache.ServerCacheRegion;
import io.ebean.cache.ServerCacheStatistics;
import org.ebeantest.LoggedSqlCollector;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,7 +49,7 @@ public class PersonCacheTests {
addTestData();
LoggedSqlCollector.start();
LoggedSql.start();
DB.find(PersonCacheInfo.class)
.select("personId") // do not fetch name
@@ -70,7 +70,7 @@ public class PersonCacheTests {
assertThat(email.getPersonInfo().getName()).isNotNull();
}
List<String> sql = LoggedSqlCollector.current();
List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(3);
assertThat(beanCacheInfo.statistics(true).getHitCount()).isEqualTo(3);
@@ -91,7 +91,7 @@ public class PersonCacheTests {
assertThat(email.getPersonInfo().getName()).isNotNull();
}
sql = LoggedSqlCollector.stop();
sql = LoggedSql.stop();
assertThat(sql).hasSize(1);
assertThat(beanCacheInfo.statistics(true).getHitCount()).isEqualTo(3);