mirror of
https://github.com/ebean-orm/ebean.git
synced 2024-04-21 10:51:47 +00:00
No effective change - tidy tests
This commit is contained in:
@@ -1,16 +1,16 @@
|
||||
package com.avaje.tests.query;
|
||||
|
||||
|
||||
import com.avaje.ebean.RawSql;
|
||||
import com.avaje.ebean.RawSqlBuilder;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
import com.avaje.ebean.BaseTestCase;
|
||||
import com.avaje.ebean.Ebean;
|
||||
import com.avaje.ebean.Query;
|
||||
import com.avaje.ebean.RawSql;
|
||||
import com.avaje.ebean.RawSqlBuilder;
|
||||
import com.avaje.tests.model.basic.Customer;
|
||||
import com.avaje.tests.model.basic.ResetBasicData;
|
||||
import org.junit.Test;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
public class TestIContains extends BaseTestCase {
|
||||
|
||||
@@ -25,15 +25,15 @@ public class TestIContains extends BaseTestCase {
|
||||
query.findList();
|
||||
String generatedSql = query.getGeneratedSql();
|
||||
|
||||
Assert.assertTrue(generatedSql.contains("lower(t0.name)"));
|
||||
assertThat(generatedSql).contains("lower(t0.name)");
|
||||
|
||||
// not case insensitive
|
||||
// case sensitive
|
||||
query = Ebean.find(Customer.class).where().contains("name", "Rob").query();
|
||||
|
||||
query.findList();
|
||||
generatedSql = query.getGeneratedSql();
|
||||
|
||||
Assert.assertTrue(generatedSql.contains(" t0.name "));
|
||||
assertThat(generatedSql).contains(" t0.name ");
|
||||
|
||||
Ebean.find(Customer.class).where().icontains("name", "Rob").findList();
|
||||
Ebean.find(Customer.class).where().icontains("name", "Rob").findList();
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
package com.avaje.tests.rawsql;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
import com.avaje.ebean.BaseTestCase;
|
||||
import com.avaje.ebean.Ebean;
|
||||
import com.avaje.ebean.Query;
|
||||
@@ -12,6 +7,11 @@ import com.avaje.ebean.RawSql;
|
||||
import com.avaje.ebean.RawSqlBuilder;
|
||||
import com.avaje.tests.model.basic.Customer;
|
||||
import com.avaje.tests.model.basic.ResetBasicData;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
|
||||
public class TestRawSqlPositionedParams extends BaseTestCase {
|
||||
|
||||
@@ -22,7 +22,7 @@ public class TestRawSqlPositionedParams extends BaseTestCase {
|
||||
|
||||
RawSql rawSql = RawSqlBuilder
|
||||
.parse("select r.id, r.name from o_customer r where r.id >= ? and r.name like ?")
|
||||
.columnMapping("r.id", "id").columnMapping("r.name", "name").create();
|
||||
.create();
|
||||
|
||||
Query<Customer> query = Ebean.find(Customer.class);
|
||||
query.setRawSql(rawSql);
|
||||
@@ -32,7 +32,7 @@ public class TestRawSqlPositionedParams extends BaseTestCase {
|
||||
|
||||
List<Customer> list = query.findList();
|
||||
|
||||
Assert.assertNotNull(list);
|
||||
assertNotNull(list);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -52,6 +52,6 @@ public class TestRawSqlPositionedParams extends BaseTestCase {
|
||||
|
||||
List<Customer> list = query.findList();
|
||||
|
||||
Assert.assertNotNull(list);
|
||||
assertNotNull(list);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user