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

Update tests - for asserts trim column alias from generated SQL if necessary (to support generating without column alias)

Browse Source
This commit is contained in:
Rob Bygrave
2016-10-14 20:23:36 +13:00
parent 91d3279061
commit 9f98b5333d
33 changed files with 170 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/avaje/tests/basic/lob/TestBasicClobFetchEager.java
+9 -7
View File
@@ -12,6 +12,8 @@ import com.avaje.ebean.EbeanServer;
import com.avaje.ebean.Query;
import com.avaje.tests.model.basic.EBasicClobFetchEager;
import static org.assertj.core.api.Assertions.assertThat;
public class TestBasicClobFetchEager extends BaseTestCase {
@Test
@@ -24,14 +26,14 @@ public class TestBasicClobFetchEager extends BaseTestCase {
server.save(entity);
String expectedSql = "select t0.id c0, t0.name c1, t0.title c2, t0.description c3, t0.last_update c4 from ebasic_clob_fetch_eager t0 where t0.id = ?";
String expectedSql = "select t0.id, t0.name, t0.title, t0.description, t0.last_update from ebasic_clob_fetch_eager t0 where t0.id = ?";
// Clob included in fetch as FetchType.EAGER set by annotation
Query<EBasicClobFetchEager> defaultQuery = Ebean.find(EBasicClobFetchEager.class).setId(entity.getId());
defaultQuery.findUnique();
String sql = defaultQuery.getGeneratedSql();
String sql = trimSql(defaultQuery.getGeneratedSql(), 6);
Assert.assertTrue("Clob is eager fetched", sql.contains(expectedSql));
assertThat(sql).contains(expectedSql);
LoggedSqlCollector.start();
@@ -42,7 +44,7 @@ public class TestBasicClobFetchEager extends BaseTestCase {
// Assert query same as previous ...
List<String> loggedSql = LoggedSqlCollector.stop();
Assert.assertEquals(1, loggedSql.size());
Assert.assertTrue(loggedSql.get(0).contains(expectedSql));
assertThat(trimSql(loggedSql.get(0), 6)).contains(expectedSql);
@@ -50,9 +52,9 @@ public class TestBasicClobFetchEager extends BaseTestCase {
Query<EBasicClobFetchEager> explicitQuery = Ebean.find(EBasicClobFetchEager.class).setId(entity.getId()).select("*");
explicitQuery.findUnique();
sql = explicitQuery.getGeneratedSql();
sql = sqlOf(explicitQuery, 6);
Assert.assertTrue("Explicitly include Clob", sql.contains(expectedSql));
assertThat(sql).contains(expectedSql);
// Update description to test refresh
@@ -74,7 +76,7 @@ public class TestBasicClobFetchEager extends BaseTestCase {
// Assert all properties fetched in refresh
loggedSql = LoggedSqlCollector.stop();
Assert.assertEquals(1, loggedSql.size());
Assert.assertTrue("Refresh includes all", loggedSql.get(0).contains(expectedSql));
assertThat(trimSql(loggedSql.get(0), 6)).contains(expectedSql);
Assert.assertEquals("modified", entity.getDescription());
}
src/test/java/com/avaje/tests/basic/lob/TestBasicClobNoVer.java
+7 -5
View File
@@ -12,6 +12,8 @@ import com.avaje.ebean.EbeanServer;
import com.avaje.ebean.Query;
import com.avaje.tests.model.basic.EBasicClobNoVer;
import static org.assertj.core.api.Assertions.assertThat;
public class TestBasicClobNoVer extends BaseTestCase {
@Test
@@ -24,14 +26,14 @@ public class TestBasicClobNoVer extends BaseTestCase {
server.save(entity);
String sqlNoClob = "select t0.id c0, t0.name c1 from ebasic_clob_no_ver t0 where t0.id = ?";
String sqlWithClob = "select t0.id c0, t0.name c1, t0.description c2 from ebasic_clob_no_ver t0 where t0.id = ?";
String sqlNoClob = "select t0.id, t0.name from ebasic_clob_no_ver t0 where t0.id = ?";
String sqlWithClob = "select t0.id, t0.name, t0.description from ebasic_clob_no_ver t0 where t0.id = ?";
// Clob by default is Fetch Lazy
Query<EBasicClobNoVer> defaultQuery = Ebean.find(EBasicClobNoVer.class).setId(entity.getId());
defaultQuery.findUnique();
String sql = defaultQuery.getGeneratedSql();
String sql = sqlOf(defaultQuery, 2);
Assert.assertTrue("Clob is fetch lazy by default", sql.contains(sqlNoClob));
@@ -40,7 +42,7 @@ public class TestBasicClobNoVer extends BaseTestCase {
Query<EBasicClobNoVer> explicitQuery = Ebean.find(EBasicClobNoVer.class).setId(entity.getId()).select("*");
explicitQuery.findUnique();
sql = explicitQuery.getGeneratedSql();
sql = sqlOf(explicitQuery, 2);
Assert.assertTrue("Explicitly include Clob", sql.contains(sqlWithClob));
@@ -64,7 +66,7 @@ public class TestBasicClobNoVer extends BaseTestCase {
// Assert all properties fetched in refresh
List<String> loggedSql = LoggedSqlCollector.stop();
Assert.assertEquals(1, loggedSql.size());
Assert.assertTrue("Refresh includes all", loggedSql.get(0).contains(sqlWithClob));
assertThat(trimSql(loggedSql.get(0), 2)).contains(sqlWithClob);
Assert.assertEquals("modified", entity.getDescription());
}