From e51f7f11f15e3441f1c491cc8f071a52cd5a28ce Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sun, 30 Apr 2017 22:56:07 +1200
Subject: [PATCH] Fix tests for #1016

---
 .../server/expression/NoopExpressionTest.java     | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java
index 32f8d58bc..0767e4cf5 100644
--- a/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java
@@ -3,8 +3,9 @@ package io.ebeaninternal.server.expression;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
-import org.tests.model.basic.Customer;
 import org.junit.Test;
+import org.tests.model.basic.Customer;
+import org.tests.model.onetoone.album.Cover;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -25,6 +26,16 @@ public class NoopExpressionTest extends BaseTestCase {
     assertThat(generatedSql).contains("select t0.id from o_customer t0 where 1=1");
   }
 
+  @Test
+  public void test_withSoftDeleteBean() {
+
+    Query<Cover> query = Ebean.find(Cover.class)
+      .where().add(NoopExpression.INSTANCE)
+      .query();
+
+    query.findCount();
+  }
+
   @Test
   public void test_withPreAndPost() {
 
@@ -38,7 +49,7 @@ public class NoopExpressionTest extends BaseTestCase {
     query.findList();
     String generatedSql = sqlOf(query);
 
-    assertThat(generatedSql).contains("select t0.id from o_customer t0 where t0.name is null  and 1=1 and t0.status is not null");
+    assertThat(generatedSql).contains("select t0.id from o_customer t0 where t0.name is null  and 1=1  and t0.status is not null");
   }
 
   @Test