From 3207ae1f08e14e7f0accaebc555274b46af57a3d Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Wed, 9 Jan 2019 19:05:16 +1300 Subject: [PATCH] No effective change - tidy test --- src/test/java/org/tests/query/TestQueryAlias.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/tests/query/TestQueryAlias.java b/src/test/java/org/tests/query/TestQueryAlias.java index fba7cba1f..de378586c 100644 --- a/src/test/java/org/tests/query/TestQueryAlias.java +++ b/src/test/java/org/tests/query/TestQueryAlias.java @@ -3,10 +3,11 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; +import org.junit.Test; import org.tests.model.basic.CKeyParent; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; + +import static org.assertj.core.api.Assertions.assertThat; public class TestQueryAlias extends BaseTestCase { @@ -32,8 +33,8 @@ public class TestQueryAlias extends BaseTestCase { // select myt0.one_key c0, myt0.two_key c1, myt0.name c2, myt0.version c3, myt0.assoc_id c4 from ckey_parent myt0 // where (myt0.one_key) in (select st0.one_key from ckey_parent st0) - Assert.assertTrue(sql.contains("ckey_parent myt0")); - Assert.assertTrue(sql.contains("(myt0.one_key) in (select st0.one_key from ckey_parent st0)")); + assertThat(sql).contains("ckey_parent myt0"); + assertThat(sql).contains("(myt0.one_key) in (select st0.one_key from ckey_parent st0)"); } @Test @@ -58,8 +59,8 @@ public class TestQueryAlias extends BaseTestCase { // select myt0.one_key c0, myt0.two_key c1, myt0.name c2, myt0.version c3, myt0.assoc_id c4 from ckey_parent myt0 // where (myt0.one_key) in (select st0.one_key from ckey_parent st0) - Assert.assertTrue(sql.contains("ckey_parent myt0")); - Assert.assertTrue(sql.contains("(myt0.one_key) not in (select st0.one_key from ckey_parent st0)")); + assertThat(sql).contains("ckey_parent myt0"); + assertThat(sql).contains("(myt0.one_key) not in (select st0.one_key from ckey_parent st0)"); } }