From 86faa947af5832f77ca5ea595236d9e35b78c447 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Tue, 12 Jul 2016 16:22:18 +1200
Subject: [PATCH] No effective change - tidy tests

---
 .../com/avaje/tests/query/TestIContains.java     | 16 ++++++++--------
 .../tests/rawsql/TestRawSqlPositionedParams.java | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/test/java/com/avaje/tests/query/TestIContains.java b/src/test/java/com/avaje/tests/query/TestIContains.java
index c3c14c2c4..372b932dc 100644
--- a/src/test/java/com/avaje/tests/query/TestIContains.java
+++ b/src/test/java/com/avaje/tests/query/TestIContains.java
@@ -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();
diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlPositionedParams.java b/src/test/java/com/avaje/tests/rawsql/TestRawSqlPositionedParams.java
index bb65bc0d9..6ec2b6c75 100644
--- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlPositionedParams.java
+++ b/src/test/java/com/avaje/tests/rawsql/TestRawSqlPositionedParams.java
@@ -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);
   }
 }