github/ebean
4
0 Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-11-13 06:42:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ebean-orm/ebean

Browse Source
This commit is contained in:
rbygrave committed 2021-08-30 22:43:06 +12:00
2 parents c5dca69482 371a50176e
commit 6e10d641b2
2 files changed
+1 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
-2
View File
@@ -81,7 +81,6 @@ public class TestAggregateFormula extends BaseTestCase {
for (Contact contact : contacts) { for (Contact contact : contacts) {
Customer customer = contact.getCustomer(); Customer customer = contact.getCustomer();
assertNotNull(customer.getName()); assertNotNull(customer.getName());
assertNotNull(customer.getStatus());
} }
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSqlCollector.stop();
@@ -112,7 +111,6 @@ public class TestAggregateFormula extends BaseTestCase {
for (Contact contact : contacts) { for (Contact contact : contacts) {
Customer customer = contact.getCustomer(); Customer customer = contact.getCustomer();
assertNotNull(customer.getName()); assertNotNull(customer.getName());
assertNotNull(customer.getStatus());
final Address billingAddress = customer.getBillingAddress(); final Address billingAddress = customer.getBillingAddress();
if (billingAddress != null) { if (billingAddress != null) {
assertNotNull(billingAddress.getCountry()); assertNotNull(billingAddress.getCountry());
ebean-redis/src/test/java/org/integration/ClusterTest.java
+1
View File
@@ -40,6 +40,7 @@ public class ClusterTest {
foo.save(); foo.save();
DB.getServerCacheManager().clearAll(); DB.getServerCacheManager().clearAll();
DB.getDefault().getMetaInfoManager().resetAllMetrics();
other.getMetaInfoManager().resetAllMetrics(); other.getMetaInfoManager().resetAllMetrics();
Person fooA = DB.find(Person.class, foo.getId()); Person fooA = DB.find(Person.class, foo.getId());