Skip to content

Commit 25f6fb6

Browse files
committed
test only - Almost fix the model for test_manyNonRoot_RootHasNoMany
The test was using field access??? when that isn't valid unless we specifically turn on enhancement to support that. Using proper method access though stops the test from failing.
1 parent 852def8 commit 25f6fb6

File tree

5 files changed

+44
-30
lines changed

5 files changed

+44
-30
lines changed

ebean-test/src/test/java/org/tests/model/join/initfields/Order.java

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,27 @@ public class Order {
1515
int id;
1616

1717
@OneToMany
18-
public List<OrderItem> orderItems = new ArrayList<>();
18+
List<OrderItem> orderItems = new ArrayList<>();
1919

2020
@OneToMany
21-
public List<OrderDetail> orderDetails = new ArrayList<>();
21+
List<OrderDetail> orderDetails = new ArrayList<>();
2222

2323
@OneToMany
2424
public List<OrderInvoice> orderInvoices = List.of(); // Change this to new ArrayList<>() to make the test pass.
25+
26+
public int id() {
27+
return id;
28+
}
29+
30+
public List<OrderItem> orderItems() {
31+
return orderItems;
32+
}
33+
34+
public List<OrderDetail> orderDetails() {
35+
return orderDetails;
36+
}
37+
38+
public List<OrderInvoice> orderInvoices() {
39+
return orderInvoices;
40+
}
2541
}

ebean-test/src/test/java/org/tests/model/join/initfields/OrderDetail.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,10 @@ public class OrderDetail {
1212
int id;
1313

1414
@ManyToOne
15-
public Order order;
15+
Order order;
16+
17+
public OrderDetail(Order order) {
18+
this.order = order;
19+
}
20+
1621
}

ebean-test/src/test/java/org/tests/model/join/initfields/OrderInvoice.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,9 @@ public class OrderInvoice {
1212
int id;
1313

1414
@ManyToOne
15-
public Order order;
15+
Order order;
16+
17+
public OrderInvoice(Order order) {
18+
this.order = order;
19+
}
1620
}

ebean-test/src/test/java/org/tests/model/join/initfields/OrderItem.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,9 @@ public class OrderItem {
1212
int id;
1313

1414
@ManyToOne
15-
public Order order;
15+
Order order;
16+
17+
public OrderItem(Order order) {
18+
this.order = order;
19+
}
1620
}

ebean-test/src/test/java/org/tests/query/TestQueryMultiJoinFetchPath.java

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -75,29 +75,14 @@ public void test_manyNonRoot_RootHasNoMany() {
7575
Order o = new Order();
7676
DB.save(o);
7777

78-
OrderItem p1 = new OrderItem();
79-
p1.order = o;
80-
DB.save(p1);
78+
OrderItem p1 = new OrderItem(o);
79+
OrderItem p2 = new OrderItem(o);
80+
OrderDetail d1 = new OrderDetail(o);
81+
OrderDetail d2 = new OrderDetail(o);
82+
OrderInvoice i1 = new OrderInvoice(o);
83+
OrderInvoice i2 = new OrderInvoice(o);
8184

82-
OrderItem p2 = new OrderItem();
83-
p2.order = o;
84-
DB.save(p2);
85-
86-
OrderDetail d1 = new OrderDetail();
87-
d1.order = o;
88-
DB.save(d1);
89-
90-
OrderDetail d2 = new OrderDetail();
91-
d2.order = o;
92-
DB.save(d2);
93-
94-
OrderInvoice i1 = new OrderInvoice();
95-
i1.order = o;
96-
DB.save(i1);
97-
98-
OrderInvoice i2 = new OrderInvoice();
99-
i2.order = o;
100-
DB.save(i2);
85+
DB.saveAll(p1, p2, d1, d2, i1, i2);
10186

10287
// This first query behaves as expected: a main query and its secondary query.
10388
LoggedSql.start();
@@ -107,8 +92,8 @@ public void test_manyNonRoot_RootHasNoMany() {
10792
.where().gt("id", 0)
10893
.findList();
10994

110-
assertThat(list1.get(0).orderItems).hasSize(2);
111-
assertThat(list1.get(0).orderDetails).hasSize(2);
95+
assertThat(list1.get(0).orderItems()).hasSize(2);
96+
assertThat(list1.get(0).orderDetails()).hasSize(2);
11297

11398
List<String> sql1 = LoggedSql.collect();
11499
assertThat(sql1).hasSize(2);
@@ -121,7 +106,7 @@ public void test_manyNonRoot_RootHasNoMany() {
121106
.where().gt("id", 0)
122107
.findList();
123108

124-
assertThat(list2.get(0).orderItems).hasSize(2);
109+
assertThat(list2.get(0).orderItems()).hasSize(2);
125110
assertThat(list2.get(0).orderInvoices).hasSize(2);
126111

127112
List<String> sql2 = LoggedSql.stop();

0 commit comments

Comments
 (0)