mirror of
https://github.com/ebean-orm/ebean.git
synced 2024-04-21 10:51:47 +00:00
#2361 - Tidy tests only, move to LoggedSql (ebean-test)
This commit is contained in:
@@ -5,7 +5,7 @@ import io.ebean.DB;
|
||||
import io.ebean.Database;
|
||||
import io.ebean.Query;
|
||||
import org.tests.model.basic.EBasicClobFetchEager;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.List;
|
||||
@@ -35,13 +35,13 @@ public class TestBasicClobFetchEager extends BaseTestCase {
|
||||
assertThat(sql).contains(expectedSql);
|
||||
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
// Same as previous query - clob included by default based on annotation
|
||||
DB.find(EBasicClobFetchEager.class, entity.getId());
|
||||
|
||||
// Assert query same as previous ...
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
assertEquals(1, loggedSql.size());
|
||||
assertThat(trimSql(loggedSql.get(0), 6)).contains(expectedSql);
|
||||
|
||||
@@ -66,13 +66,13 @@ public class TestBasicClobFetchEager extends BaseTestCase {
|
||||
|
||||
assertEquals("initialClobValue", entity.getDescription());
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
// Refresh query includes all properties
|
||||
server.refresh(entity);
|
||||
|
||||
// Assert all properties fetched in refresh
|
||||
loggedSql = LoggedSqlCollector.stop();
|
||||
loggedSql = LoggedSql.stop();
|
||||
assertEquals(1, loggedSql.size());
|
||||
assertThat(trimSql(loggedSql.get(0), 6)).contains(expectedSql);
|
||||
assertEquals("modified", entity.getDescription());
|
||||
|
||||
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
|
||||
import io.ebean.DB;
|
||||
import io.ebean.Query;
|
||||
import org.tests.model.basic.EBasicClobNoVer;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.List;
|
||||
@@ -53,13 +53,13 @@ public class TestBasicClobNoVer extends BaseTestCase {
|
||||
|
||||
assertThat(entity.getDescription()).isEqualTo("initialClobValue");
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
// Refresh query includes all properties
|
||||
DB.refresh(entity);
|
||||
|
||||
// Assert all properties fetched in refresh
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
assertThat(loggedSql).hasSize(1);
|
||||
assertThat(trimSql(loggedSql.get(0), 2)).contains(sqlWithClob);
|
||||
assertThat(entity.getDescription()).isEqualTo("modified");
|
||||
|
||||
Reference in New Issue
Block a user