mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-19 23:02:24 +00:00
#2361 - Tidy tests only, move to LoggedSql (ebean-test)
This commit is contained in:
1 parent
e5dceda4b9
commit
1696caadd4
163 files changed
+1024
-1179
No files matched your search
@@ -5,7 +5,7 @@ import io.ebean.DB;
|
||||
import io.ebean.DB;
|
||||
import io.ebean.FutureIds;
|
||||
import io.ebean.Query;
|
||||
import io.ebeantest.LoggedSql;
|
||||
import io.ebean.test.LoggedSql;
|
||||
|
||||
import org.tests.model.basic.Order;
|
||||
import org.tests.model.basic.OrderDetail;
|
||||
|
||||
@@ -8,7 +8,7 @@ import io.ebean.Query;
|
||||
import io.ebean.Transaction;
|
||||
import io.ebean.annotation.ForPlatform;
|
||||
import io.ebean.annotation.Platform;
|
||||
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.EBasic;
|
||||
@@ -54,7 +54,7 @@ public class TestQueryForUpdate extends BaseTestCase {
|
||||
|
||||
try (Transaction transaction = DB.beginTransaction()) {
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
EBasic basic0 = DB.find(EBasic.class, basic.getId());
|
||||
assertThat(basic0).isNotNull();
|
||||
@@ -67,7 +67,7 @@ public class TestQueryForUpdate extends BaseTestCase {
|
||||
assertThat(basic1).isNotNull();
|
||||
assertThat(basic1).isSameAs(basic0);
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
assertThat(sql).hasSize(2);
|
||||
if (isH2() || isPostgres()) {
|
||||
assertSql(sql.get(0)).contains("from e_basic t0 where t0.id =");
|
||||
|
||||
@@ -7,7 +7,7 @@ import io.ebean.annotation.ForPlatform;
|
||||
import io.ebean.annotation.Platform;
|
||||
import io.ebean.config.dbplatform.DbEncrypt;
|
||||
import io.ebeaninternal.api.SpiEbeanServer;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.model.basic.EBasicEncrypt;
|
||||
import org.tests.model.basic.EBasicEncryptRelate;
|
||||
@@ -25,12 +25,12 @@ public class TestEncrypt extends BaseTestCase {
|
||||
@ForPlatform({Platform.H2, Platform.SQLSERVER}) // only run this on H2 - PGCrypto not happy on CI server
|
||||
public void testQueryBind() {
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
DB.find(EBasicEncrypt.class)
|
||||
.where().startsWith("description", "Rob")
|
||||
.findList();
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
assertThat(loggedSql).hasSize(1);
|
||||
assertThat(loggedSql.get(0)).contains("; --bind(****,Rob%)");
|
||||
}
|
||||
@@ -39,7 +39,7 @@ public class TestEncrypt extends BaseTestCase {
|
||||
@ForPlatform({Platform.H2, Platform.SQLSERVER}) // only run this on H2 - PGCrypto not happy on CI server
|
||||
public void testQueryJoin() {
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
DB.find(EBasicEncryptRelate.class)
|
||||
.where().eq("other.description", "foo")
|
||||
@@ -49,7 +49,7 @@ public class TestEncrypt extends BaseTestCase {
|
||||
.where().eq("other.description", "foo")
|
||||
.findCount();
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
assertThat(loggedSql).hasSize(2);
|
||||
assertThat(loggedSql.get(0)).contains("left join e_basicenc t1 on t1.id = t0.other_id");
|
||||
assertThat(loggedSql.get(1)).contains("left join e_basicenc t1 on t1.id = t0.other_id");
|
||||
|
||||
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
|
||||
import io.ebean.DB;
|
||||
import io.ebean.Query;
|
||||
import io.ebean.QueryType;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.model.basic.ResetBasicData;
|
||||
import org.tests.model.basic.TOne;
|
||||
@@ -35,21 +35,21 @@ public class TestQueryAdapter extends BaseTestCase {
|
||||
Query<TOne> notUsedQuery = DB.find(TOne.class);
|
||||
assertThat(notUsedQuery.getQueryType()).isEqualTo(QueryType.FIND);
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
DB.update(TOne.class)
|
||||
.set("name", "mod")
|
||||
.where().idEq(o.getId())
|
||||
.update();
|
||||
|
||||
List<String> sql = LoggedSqlCollector.current();
|
||||
List<String> sql = LoggedSql.collect();
|
||||
assertSql(sql.get(0)).contains(" 2=2");
|
||||
|
||||
DB.find(TOne.class)
|
||||
.where().idEq(o.getId())
|
||||
.delete();
|
||||
|
||||
sql = LoggedSqlCollector.stop();
|
||||
sql = LoggedSql.stop();
|
||||
assertSql(sql.get(0)).contains(" 3=3");
|
||||
|
||||
}
|
||||
|
||||
@@ -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