From c766756efe8e228ba39413ad2fab868a70082b18 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 20 Apr 2022 10:02:11 +1200 Subject: [PATCH] Improve test TestHistoryOneToOne --- .../java/org/tests/model/history/HistoryOneToOne.java | 11 ++++------- .../org/tests/model/history/HistorylessOneToOne.java | 8 +++++--- .../org/tests/model/history/TestHistoryOneToOne.java | 10 +++++++--- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ebean-test/src/test/java/org/tests/model/history/HistoryOneToOne.java b/ebean-test/src/test/java/org/tests/model/history/HistoryOneToOne.java index 3abebab1a..aabe3d197 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HistoryOneToOne.java +++ b/ebean-test/src/test/java/org/tests/model/history/HistoryOneToOne.java @@ -10,7 +10,7 @@ import org.tests.model.draftable.BaseDomain; @Entity public class HistoryOneToOne extends BaseDomain { - String name; + final String name; @OneToOne(cascade = CascadeType.REFRESH) HistorylessOneToOne historylessOneToOne; @@ -19,14 +19,11 @@ public class HistoryOneToOne extends BaseDomain { this.name = name; } - public HistoryOneToOne() { - } - - public HistorylessOneToOne getHistorylessOneToOne() { + public HistorylessOneToOne less() { return historylessOneToOne; } - public void setHistorylessOneToOne(final HistorylessOneToOne historylessOneToOne) { - this.historylessOneToOne = historylessOneToOne; + public String getName() { + return name; } } diff --git a/ebean-test/src/test/java/org/tests/model/history/HistorylessOneToOne.java b/ebean-test/src/test/java/org/tests/model/history/HistorylessOneToOne.java index b35326f79..f9053cb32 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HistorylessOneToOne.java +++ b/ebean-test/src/test/java/org/tests/model/history/HistorylessOneToOne.java @@ -9,7 +9,7 @@ import javax.persistence.OneToOne; @Entity public class HistorylessOneToOne extends BaseDomain { - private String name; + private final String name; /** * This @OneToOne(mappedBy=...) side should really be FetchType.LAZY @@ -17,8 +17,6 @@ public class HistorylessOneToOne extends BaseDomain { @OneToOne(mappedBy = "historylessOneToOne", cascade = CascadeType.ALL, orphanRemoval = true)//, fetch = FetchType.LAZY) HistoryOneToOne historyOneToOne; - public HistorylessOneToOne() {} - public HistorylessOneToOne(final String name) { this.name = name; } @@ -30,4 +28,8 @@ public class HistorylessOneToOne extends BaseDomain { public void setHistoryOneToOne(final HistoryOneToOne historyOneToOne) { this.historyOneToOne = historyOneToOne; } + + public String getName() { + return name; + } } diff --git a/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToOne.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToOne.java index ec452bbe2..cf629f9ac 100644 --- a/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToOne.java +++ b/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToOne.java @@ -18,7 +18,7 @@ class TestHistoryOneToOne extends BaseTestCase { @IgnorePlatform({Platform.ORACLE, Platform.COCKROACH}) @Test void test() throws InterruptedException { - HistorylessOneToOne historylessOneToOne = new HistorylessOneToOne(); + HistorylessOneToOne historylessOneToOne = new HistorylessOneToOne("less"); historylessOneToOne.setHistoryOneToOne(new HistoryOneToOne("one")); DB.save(historylessOneToOne); Thread.sleep(20); @@ -56,7 +56,9 @@ class TestHistoryOneToOne extends BaseTestCase { assertThat(lessFetched.getId()).isEqualTo(expectedLessId); HistoryOneToOne history1 = lessFetched.getHistoryOneToOne(); assertThat(history1.getId()).isEqualTo(expectedHistoryId); - assertThat(history1.getHistorylessOneToOne().getId()).isEqualTo(expectedLessId); + assertThat(history1.less().getId()).isEqualTo(expectedLessId); + assertThat(history1.less().getName()).isEqualTo("less"); + assertThat(history1.getName()).isEqualTo("one"); } @@ -81,6 +83,8 @@ class TestHistoryOneToOne extends BaseTestCase { private void expected_viaHistory(HistoryOneToOne oneFetched) { assert oneFetched != null; assertThat(oneFetched.getId()).isEqualTo(expectedHistoryId); - assertThat(oneFetched.getHistorylessOneToOne().getId()).isEqualTo(expectedLessId); + assertThat(oneFetched.less().getId()).isEqualTo(expectedLessId); + assertThat(oneFetched.less().getName()).isEqualTo("less"); + assertThat(oneFetched.getName()).isEqualTo("one"); } }