From 858c55c97872fb497f1b5fcb2cd8a5246677a42d Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Fri, 19 Jul 2019 00:20:22 +1200 Subject: [PATCH] No effective change - format only test code --- .../org/tests/lazyforeignkeys/MainEntity.java | 8 +++--- .../lazyforeignkeys/MainEntityRelation.java | 11 ++++---- .../lazyforeignkeys/TestLazyForeignKeys.java | 28 +++++++++---------- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/test/java/org/tests/lazyforeignkeys/MainEntity.java b/src/test/java/org/tests/lazyforeignkeys/MainEntity.java index ec92722db..3fa760583 100644 --- a/src/test/java/org/tests/lazyforeignkeys/MainEntity.java +++ b/src/test/java/org/tests/lazyforeignkeys/MainEntity.java @@ -1,13 +1,13 @@ package org.tests.lazyforeignkeys; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - import io.ebean.annotation.Formula; import io.ebean.annotation.Platform; import io.ebean.annotation.SoftDelete; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + @Entity @Table(name = "main_entity") public class MainEntity { diff --git a/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java b/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java index 20c6ed4e9..6b4740512 100644 --- a/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java +++ b/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java @@ -1,14 +1,13 @@ package org.tests.lazyforeignkeys; -import java.util.UUID; +import io.ebean.annotation.DbForeignKey; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; - -import io.ebean.annotation.DbForeignKey; +import java.util.UUID; @Entity @@ -22,14 +21,14 @@ public class MainEntityRelation { @JoinColumn(name = "id1") @DbForeignKey(noConstraint = true) private MainEntity entity1; - + @ManyToOne @JoinColumn(name = "id2") @DbForeignKey(noConstraint = true) private MainEntity entity2; - + private String attr1; - + public MainEntity getEntity1() { return entity1; } diff --git a/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java b/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java index ccafc56f5..d8d19dd56 100644 --- a/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java +++ b/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java @@ -1,20 +1,21 @@ package org.tests.lazyforeignkeys; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; - -import java.util.List; - -import org.ebeantest.LoggedSqlCollector; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Ebean; import io.ebean.Query; import io.ebean.text.PathProperties; +import org.ebeantest.LoggedSqlCollector; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class TestLazyForeignKeys extends BaseTestCase { @@ -30,12 +31,12 @@ public class TestLazyForeignKeys extends BaseTestCase { e1.setId("ent1"); MainEntity e2 = new MainEntity(); e2.setId("ent2"); - + rel1.setEntity1(e1); rel1.setEntity2(e2); DB.save(rel1); } - + @After public void cleanup() { DB.find(MainEntity.class).delete(); @@ -62,7 +63,7 @@ public class TestLazyForeignKeys extends BaseTestCase { assertThat(loggedSql.get(1)).contains("select t0.id, t0.attr1, t0.attr2, t0.id is null from main_entity t0"); assertThat(loggedSql.get(2)).contains("select t0.id, t0.attr1, t0.attr2, t0.id is null from main_entity t0"); } - + @Test public void testFindListWithSelect() { PathProperties pathProp = new PathProperties(); @@ -74,7 +75,6 @@ public class TestLazyForeignKeys extends BaseTestCase { List list = query.findList(); assertEquals(1, list.size()); - System.out.println(query.getGeneratedSql()); assertThat(query.getGeneratedSql()).contains("t0.id, t0.attr1, t0.id1, t0.id2, t1.id, t2.id"); MainEntityRelation rel1 = list.get(0);