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
@@ -7,7 +7,7 @@ import io.ebean.Transaction;
|
||||
import io.ebean.annotation.Transactional;
|
||||
import io.ebean.config.dbplatform.IdType;
|
||||
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.model.m2m.MnyB;
|
||||
import org.tests.model.m2m.MnyTopic;
|
||||
@@ -45,7 +45,7 @@ public class TestBatchModelFlush extends BaseTestCase {
|
||||
@Test
|
||||
public void multipleTopLevel_expect_singleFlush() {
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
// 2 unrelated "top level" beans being persisted
|
||||
MnyB m0 = new MnyB("BatchMultipleTop_0");
|
||||
@@ -70,7 +70,7 @@ public class TestBatchModelFlush extends BaseTestCase {
|
||||
transaction.commit();
|
||||
}
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
|
||||
// DEBUG io.ebean.SUM - txn[1001] BatchControl flush [MnyB:100 i:2, Role:101 i:2, MnyTopic:102 i:2]
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ import io.ebean.Database;
|
||||
import io.ebean.Transaction;
|
||||
import io.ebean.annotation.IgnorePlatform;
|
||||
import io.ebean.annotation.Platform;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -27,7 +27,7 @@ public class TestBatchPersistCascade extends BaseTestCase {
|
||||
|
||||
Database ebeanServer = DB.getDefault();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
Transaction txn = ebeanServer.beginTransaction();
|
||||
try {
|
||||
@@ -48,7 +48,7 @@ public class TestBatchPersistCascade extends BaseTestCase {
|
||||
txn.end();
|
||||
}
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
assertTrue(loggedSql.size() > 2);
|
||||
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ import io.ebean.DB;
|
||||
import io.ebean.Transaction;
|
||||
import org.tests.model.m2m.MnyB;
|
||||
import org.tests.model.m2m.MnyC;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -40,11 +40,11 @@ public class TestBeanStateReset extends BaseTestCase {
|
||||
DB.beanState(b).resetForInsert();
|
||||
b.getCs().clear();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
b.setName("mod");
|
||||
b.save();
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
assertSql(sql.get(0)).contains("insert into mny_b (id, name, version, when_created, when_modified, a_id) values (");
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
|
||||
import io.ebean.CacheMode;
|
||||
import io.ebean.DB;
|
||||
import io.ebean.Transaction;
|
||||
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;
|
||||
@@ -39,10 +39,10 @@ public class TestTransactionSkipCache extends BaseTestCase {
|
||||
try {
|
||||
transaction.setSkipCache(true);
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
findUseQueryCache();
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
assertThat(sql).as("We didn't use the L2 query cache").hasSize(1);
|
||||
|
||||
} finally {
|
||||
|
||||
Reference in new issue
Block a user