Update tests only - handle MySql specifics (boolean literal, lack of order by nulls last)

This commit is contained in:
Rob Bygrave
2016-10-15 00:55:09 +13:00
parent 7c9dda586e
commit 20634233ca
7 changed files with 120 additions and 67 deletions
@@ -1,5 +1,6 @@
package com.avaje.tests.model.onetoone.album;
import com.avaje.ebean.BaseTestCase;
import com.avaje.ebean.Ebean;
import com.avaje.ebean.EbeanServer;
import com.avaje.ebean.Transaction;
@@ -13,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
public class DeleteById_SoftDelete_Tests {
public class DeleteById_SoftDelete_Tests extends BaseTestCase {
@Test
public void ebean_deleteById_when_softDelete() {
@@ -27,7 +28,11 @@ public class DeleteById_SoftDelete_Tests {
List<String> sql = LoggedSqlCollector.stop();
assertThat(sql).hasSize(1);
assertThat(sql.get(0)).contains("update cover set deleted=true where id = ?");
if (isPlatformBooleanNative()) {
assertThat(sql.get(0)).contains("update cover set deleted=true where id = ?");
} else {
assertThat(sql.get(0)).contains("update cover set deleted=1 where id = ?");
}
cover.deletePermanent();
}
@@ -76,8 +81,11 @@ public class DeleteById_SoftDelete_Tests {
List<String> sql = LoggedSqlCollector.stop();
assertThat(sql).hasSize(1);
assertThat(sql.get(0)).contains("update cover set deleted=true where id = ?");
if (isPlatformBooleanNative()) {
assertThat(sql.get(0)).contains("update cover set deleted=true where id = ?");
} else {
assertThat(sql.get(0)).contains("update cover set deleted=1 where id = ?");
}
cover.deletePermanent();
}
@@ -109,7 +117,11 @@ public class DeleteById_SoftDelete_Tests {
List<String> sql = LoggedSqlCollector.stop();
assertThat(sql).hasSize(1);
assertThat(sql.get(0)).contains("update cover set deleted=true where id in (?,?)");
if (isPlatformBooleanNative()) {
assertThat(sql.get(0)).contains("update cover set deleted=true where id in (?,?)");
} else {
assertThat(sql.get(0)).contains("update cover set deleted=1 where id in (?,?)");
}
}
@Test
@@ -131,7 +143,11 @@ public class DeleteById_SoftDelete_Tests {
List<String> sql = LoggedSqlCollector.stop();
assertThat(sql).hasSize(1);
assertThat(sql.get(0)).contains("update cover set deleted=true where id in (?,?)");
if (isPlatformBooleanNative()) {
assertThat(sql.get(0)).contains("update cover set deleted=true where id in (?,?)");
} else {
assertThat(sql.get(0)).contains("update cover set deleted=1 where id in (?,?)");
}
}
@Test