From fe2c2e5331a31d8ab76b9af89679dee3dd841eb6 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Mon, 15 Feb 2016 23:46:28 +1300 Subject: [PATCH] #566 - Refactor internals - SpiExpression, add prepareExpression() to merge queryAutoTuneHash() and queryPlanHash() - sameByPlan() & sameByBind() --- .../ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java b/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java index f6cd5df9b..ae1af12d8 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java @@ -407,7 +407,7 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest { OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, SpiQuery.Type.BEAN, null, 0, 0, false, null, null, null, null, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, false, null, null); OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, SpiQuery.Type.BEAN, null, 0, 0, false, null, null, null, null, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, false, null, null); - assertSame(key1, key2); + assertDifferent(key1, key2); } @Test @@ -417,7 +417,7 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest { OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, SpiQuery.Type.BEAN, null, 0, 0, false, null, null, null, null, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, false, null, null); OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, SpiQuery.Type.BEAN, null, 0, 0, false, null, null, null, null, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, false, null, null); - assertSame(key1, key2); + assertDifferent(key1, key2); } private void assertDifferent(OrmQueryPlanKey key1, OrmQueryPlanKey key2) {