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

Refactor tests using assertSql() helper method

Browse Source 
This helper method trims column alias from the sql (for Oracle)
This commit is contained in:
rob bygrave
2020-02-20 15:08:43 +13:00
parent 78b9066345
commit de42655bbd
123 changed files with 767 additions and 743 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/org/tests/merge/TestMergeBasic.java
+6 -6
View File
@@ -50,13 +50,13 @@ public class TestMergeBasic extends BaseTestCase {
List<String> sql = LoggedSqlCollector.stop();
// fetch the Ids ... used to identity inserts, updates and deletes
assertThat(sql.get(0)).contains("select t0.id, t1.id from uuone t0 left join uutwo t1 on t1.master_id = t0.id where t0.id = ?");
assertSql(sql.get(0)).contains("select t0.id, t1.id from uuone t0 left join uutwo t1 on t1.master_id = t0.id where t0.id = ?");
// deletes of Ids that are no longer in the graph
assertThat(sql.get(1)).contains("delete from uutwo where id=?");
assertSql(sql.get(1)).contains("delete from uutwo where id=?");
// cascade persist ... master
assertThat(sql.get(2)).contains("update uuone set name=?, description=?, version=? where id=? and version=?");
assertSql(sql.get(2)).contains("update uuone set name=?, description=?, version=? where id=? and version=?");
// persist children ...
if (isPersistBatchOnCascade()) {
@@ -98,13 +98,13 @@ public class TestMergeBasic extends BaseTestCase {
List<String> sql = LoggedSqlCollector.stop();
// fetch the Ids ... used to identity inserts, updates and deletes
assertThat(sql.get(0)).contains("select t0.id, t1.id from uuone t0 left join uutwo t1 on t1.master_id = t0.id where t0.id = ?");
assertSql(sql.get(0)).contains("select t0.id, t1.id from uuone t0 left join uutwo t1 on t1.master_id = t0.id where t0.id = ?");
// deletes of Ids that are no longer in the graph
assertThat(sql.get(1)).contains("delete from uutwo where id=?");
assertSql(sql.get(1)).contains("delete from uutwo where id=?");
// cascade persist ... master
assertThat(sql.get(2)).contains("update uuone set name=?, description=?, version=? where id=? and version=?");
assertSql(sql.get(2)).contains("update uuone set name=?, description=?, version=? where id=? and version=?");
// persist children ...
if (isPersistBatchOnCascade()) {