From cc637d56e1d9933d56f452fb50f9882c00e5e576 Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Wed, 25 Nov 2020 21:11:16 +1300 Subject: [PATCH] Tidy tests only TestInsertSqlLogging and TestSqlUpdateExceptions --- .../tests/rawsql/TestInsertSqlLogging.java | 24 +++++++++---------- .../tests/update/TestSqlUpdateExceptions.java | 16 ++++++------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java b/ebean-core/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java index 1fd17c8b8..b8fdba507 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java @@ -1,7 +1,7 @@ package org.tests.rawsql; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; import io.ebeaninternal.api.SpiTransaction; @@ -17,12 +17,12 @@ public class TestInsertSqlLogging extends BaseTestCase { @Test public void test() { - Ebean.find(AuditLog.class).where().ge("id", 10000).delete(); + DB.find(AuditLog.class).where().ge("id", 10000).delete(); String sql = "insert into audit_log (id, description, modified_description) values (?,?,?)"; - SqlUpdate insert = Ebean.createSqlUpdate(sql); + SqlUpdate insert = DB.sqlUpdate(sql); - try (Transaction txn = Ebean.beginTransaction()) { + try (Transaction txn = DB.beginTransaction()) { txn.setBatchMode(true); txn.setBatchSize(2); @@ -48,12 +48,12 @@ public class TestInsertSqlLogging extends BaseTestCase { @Test public void addBatch_executeBatch() { - Ebean.find(AuditLog.class).where().ge("id", 10000).delete(); + DB.find(AuditLog.class).where().ge("id", 10000).delete(); String sql = "insert into audit_log (id, description, modified_description) values (?,?,?)"; - SqlUpdate insert = Ebean.createSqlUpdate(sql); + SqlUpdate insert = DB.sqlUpdate(sql); - try (Transaction txn = Ebean.beginTransaction()) { + try (Transaction txn = DB.beginTransaction()) { insert.setParameter(10000); insert.setParameter("hello"); @@ -80,12 +80,12 @@ public class TestInsertSqlLogging extends BaseTestCase { @Test public void addBatch_namedParams() { - Ebean.find(AuditLog.class).where().ge("id", 10000).delete(); + DB.find(AuditLog.class).where().ge("id", 10000).delete(); String sql = "insert into audit_log (id, description, modified_description) values (:id, :desc, :modDesc)"; - SqlUpdate insert = Ebean.createSqlUpdate(sql); + SqlUpdate insert = DB.sqlUpdate(sql); - try (Transaction txn = Ebean.beginTransaction()) { + try (Transaction txn = DB.beginTransaction()) { insert.setParameter("id", 20000); insert.setParameter("desc", "hello"); @@ -112,10 +112,10 @@ public class TestInsertSqlLogging extends BaseTestCase { @Test public void test_trim_leadingSpaces_eventFound() { - Transaction transaction = Ebean.beginTransaction(); + Transaction transaction = DB.beginTransaction(); try { String upd = " update audit_log set description='junk' where id = 10001"; - SqlUpdate update = Ebean.createSqlUpdate(upd); + SqlUpdate update = DB.sqlUpdate(upd); update.execute(); transaction.commit(); diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateExceptions.java b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateExceptions.java index 8632a9778..8253f7c87 100644 --- a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateExceptions.java +++ b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateExceptions.java @@ -3,7 +3,6 @@ package org.tests.update; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.DuplicateKeyException; -import io.ebean.Ebean; import io.ebean.SqlUpdate; import io.ebean.Transaction; import org.junit.Test; @@ -38,7 +37,7 @@ public class TestSqlUpdateExceptions extends BaseTestCase { UUID id = UUID.randomUUID(); - SqlUpdate sqlUpdate = Ebean.createSqlUpdate(sql); + SqlUpdate sqlUpdate = DB.sqlUpdate(sql); sqlUpdate.setParameter(1, id); sqlUpdate.setParameter(2, "hi"); sqlUpdate.setParameter(3, 1); @@ -53,10 +52,9 @@ public class TestSqlUpdateExceptions extends BaseTestCase { @Test(expected = DuplicateKeyException.class) public void duplicateKey_executeNow() { - UUID id = UUID.randomUUID(); - SqlUpdate sqlUpdate = Ebean.createSqlUpdate(sql); + SqlUpdate sqlUpdate = DB.sqlUpdate(sql); sqlUpdate.setParameter(1, id); sqlUpdate.setParameter(2, "hi"); sqlUpdate.setParameter(3, 1); @@ -73,9 +71,9 @@ public class TestSqlUpdateExceptions extends BaseTestCase { UUID id = UUID.randomUUID(); - try (Transaction transaction = Ebean.beginTransaction()) { + try (Transaction transaction = DB.beginTransaction()) { - SqlUpdate sqlUpdate = Ebean.createSqlUpdate(sql); + SqlUpdate sqlUpdate = DB.sqlUpdate(sql); sqlUpdate.setParameter(1, id); sqlUpdate.setParameter(2, "hi in batch"); sqlUpdate.setParameter(3, 1); @@ -95,9 +93,9 @@ public class TestSqlUpdateExceptions extends BaseTestCase { UUID id = UUID.randomUUID(); - try (Transaction transaction = Ebean.beginTransaction()) { + try (Transaction transaction = DB.beginTransaction()) { - SqlUpdate sqlUpdate = Ebean.createSqlUpdate(sql); + SqlUpdate sqlUpdate = DB.sqlUpdate(sql); sqlUpdate.setParameter(1, id); sqlUpdate.setParameter(2, "hi in batch"); sqlUpdate.setParameter(3, 1); @@ -107,8 +105,8 @@ public class TestSqlUpdateExceptions extends BaseTestCase { sqlUpdate.setParameter(2, "fail in batch"); sqlUpdate.setParameter(3, 1); sqlUpdate.addBatch(); - int[] ints = sqlUpdate.executeBatch(); + sqlUpdate.executeBatch(); transaction.commit(); } }