#566 - Refactor internals - SpiExpression, add prepareExpression() to merge queryAutoTuneHash() and queryPlanHash() - sameByPlan() & sameByBind()

src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpressionTest.java

@@ -1,13 +1,11 @@
 package com.avaje.ebeaninternal.server.expression;
 
 import com.avaje.ebean.BaseTestCase;
-import com.avaje.ebean.Ebean;
 import com.avaje.ebean.LikeType;
 import com.avaje.ebean.Query;
 import com.avaje.ebean.bean.EntityBean;
 import com.avaje.ebean.event.BeanQueryRequest;
 import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
-import com.avaje.ebeaninternal.api.SpiEbeanServer;
 import com.avaje.ebeaninternal.api.SpiQuery;
 import com.avaje.ebeaninternal.server.core.OrmQueryRequest;
 import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
@@ -22,42 +20,68 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class DefaultExampleExpressionTest extends BaseTestCase {
 
 
-  @Test
-  public void test() {
-
-    SpiEbeanServer server = (SpiEbeanServer)Ebean.getDefaultServer();
-    BeanDescriptor<Customer> desc = server.getBeanDescriptor(Customer.class);
-
-    SpiQuery<Customer> query = (SpiQuery<Customer>)server.find(Customer.class);
-
+  Customer customer() {
     Address address = new Address();
     address.setCity("billingAddress.city");
 
     Customer customer = new Customer();
     customer.setName("name");
     customer.setBillingAddress(address);
+    return customer;
+  }
 
+  DefaultExampleExpression exp() {
+    Customer customer = customer();
+    return new DefaultExampleExpression((EntityBean)customer, false, LikeType.EQUAL_TO);
+  }
 
-    DefaultExampleExpression expr = new DefaultExampleExpression((EntityBean)customer, false, LikeType.EQUAL_TO);
+  DefaultExampleExpression expExtra() {
+    Customer customer = customer();
+    customer.setSmallnote("smallNote");
+    return new DefaultExampleExpression((EntityBean)customer, false, LikeType.EQUAL_TO);
+  }
 
+  DefaultExampleExpression expDiffName() {
+    Customer customer = customer();
+    customer.setName("otherName");
+    return new DefaultExampleExpression((EntityBean)customer, false, LikeType.EQUAL_TO);
+  }
 
-    BeanQueryRequest<?> request = create(query, desc);
+  BeanDescriptor<Customer> customerBeanDescriptor() {
+    return getBeanDescriptor(Customer.class);
+  }
+
+  DefaultExampleExpression prepare(DefaultExampleExpression expr) {
+
+    SpiQuery<Customer> query = (SpiQuery<Customer>)spiEbeanServer().find(Customer.class);
+    BeanQueryRequest<?> request = create(query, customerBeanDescriptor());
     expr.prepareExpression(request);
 
+    return expr;
+  }
+
+  @Test
+  public void test() {
+
+    DefaultExampleExpression expr = exp();
+
+    prepare(expr);
+
     HashQueryPlanBuilder builder = new HashQueryPlanBuilder();
     expr.queryPlanHash(builder);
 
-    TDSpiExpressionRequest req = new TDSpiExpressionRequest(desc);
+    TDSpiExpressionRequest req = new TDSpiExpressionRequest(customerBeanDescriptor());
     expr.addBindValues(req);
 
     assertThat(req.bindValues).contains("name", "billingAddress.city");
 
-    address.setCity("Auckland");
+    Customer customer = customer();
     customer.setName("Rob");
+    customer.getBillingAddress().setCity("Auckland");
 
     ResetBasicData.reset();
 
-    Query<Customer> query1 = server.find(Customer.class)
+    Query<Customer> query1 = server().find(Customer.class)
         .where().exampleLike(customer)
         .query();
 
@@ -72,4 +96,28 @@ public class DefaultExampleExpressionTest extends BaseTestCase {
     return new OrmQueryRequest<T>(null, null, query, desc, null);
   }
 
+  @Test
+  public void isSameByPlan_whenSame() {
+
+    assertThat(prepare(exp()).isSameByPlan(prepare(exp()))).isTrue();
+  }
+
+  @Test
+  public void isSameByPlan_when_diffBindValue_stillSame() {
+
+    assertThat(prepare(exp()).isSameByPlan(prepare(expDiffName()))).isTrue();
+  }
+
+  @Test
+  public void isSameByPlan_when_extraExpression_then_different() {
+
+    assertThat(prepare(exp()).isSameByPlan(prepare(expExtra()))).isFalse();
+  }
+
+  @Test
+  public void isSameByPlan_when_lessExpression_then_different() {
+
+    assertThat(prepare(expExtra()).isSameByPlan(prepare(exp()))).isFalse();
+  }
+
 }