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/rawsql/TestRawSqlOrmQuery.java
+10 -10
View File
@@ -216,12 +216,12 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
query.findList();
if (isSqlServer()) {
assertThat(query.getGeneratedSql()).contains("top 100 ");
assertThat(query.getGeneratedSql()).contains("order by o.ship_date desc");
assertSql(query).contains("top 100 ");
assertSql(query).contains("order by o.ship_date desc");
} else if (isOracle()) {
assertThat(query.getGeneratedSql()).contains("a where rownum <= 100 )");
assertSql(query).contains("a where rownum <= 100 )");
} else {
assertThat(query.getGeneratedSql()).contains("order by o.ship_date desc limit 100");
assertSql(query).contains("order by o.ship_date desc limit 100");
}
// check also select count(*)
@@ -251,12 +251,12 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
query.findList();
if (isSqlServer()) {
assertThat(query.getGeneratedSql()).contains("top 100 ");
assertThat(query.getGeneratedSql()).contains("order by o.ship_date desc, o.id");
assertSql(query).contains("top 100 ");
assertSql(query).contains("order by o.ship_date desc, o.id");
} else if (isOracle()) {
assertThat(query.getGeneratedSql()).contains("a where rownum <= 100 )");
assertSql(query).contains("a where rownum <= 100 )");
} else {
assertThat(query.getGeneratedSql()).contains("order by o.ship_date desc, o.id limit 100");
assertSql(query).contains("order by o.ship_date desc, o.id limit 100");
}
// check also select count(*)
@@ -295,7 +295,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
query.order("coalesce(shipDate, now()) desc");
query.findList();
assertThat(query.getGeneratedSql()).contains("order by coalesce(o.ship_date, now()) desc limit 100");
assertSql(query).contains("order by coalesce(o.ship_date, now()) desc limit 100");
}
}
@@ -328,7 +328,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
query.order("coalesce(shipDate, now()) desc");
query.findList();
assertThat(query.getGeneratedSql()).contains("order by coalesce(o.ship_date, now()) desc, o.id limit 100");
assertSql(query).contains("order by coalesce(o.ship_date, now()) desc, o.id limit 100");
}
}
src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java
+1 -1
View File
@@ -180,7 +180,7 @@ public class TestNativeSqlBasic extends BaseTestCase {
sql = LoggedSqlCollector.stop();
assertThat(sql).hasSize(1);
assertThat(sql.get(0)).contains(" from o_customer t0 where ");
assertSql(sql.get(0)).contains(" from o_customer t0 where ");
}
@Test