From 7e0ac5a73a080a0c0578a00b992aedda16de5df9 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 26 Jan 2022 21:47:00 +1300 Subject: [PATCH] Fix issues with tests - tidy ResetBasicData --- .../TestBatchSaveWithGetBeanId.java | 8 +- .../org/tests/model/basic/ResetBasicData.java | 142 +++++------------- 2 files changed, 42 insertions(+), 108 deletions(-) diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java index 029bac16f..7495f8560 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java @@ -6,6 +6,7 @@ import io.ebean.Database; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -14,6 +15,11 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestBatchSaveWithGetBeanId extends BaseTestCase { + @BeforeAll + static void before() { + ResetBasicData.reset(); + } + /** * Making this transaction with batchSize means that the insert * below does not occur immediately ... and the getBeanId() @@ -23,8 +29,6 @@ public class TestBatchSaveWithGetBeanId extends BaseTestCase { @Test @IgnorePlatform(Platform.HANA) // HANA doesn't support insert batching public void test() { - ResetBasicData.reset(); - Database server = DB.getDefault(); Customer model = new Customer(); model.setName("foo"); diff --git a/ebean-test/src/test/java/org/tests/model/basic/ResetBasicData.java b/ebean-test/src/test/java/org/tests/model/basic/ResetBasicData.java index 80260a350..819bc406c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ResetBasicData.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ResetBasicData.java @@ -58,100 +58,55 @@ public class ResetBasicData { } - public void deleteAll() { - DB.execute(() -> { + private void insertCountries() { + Country c = new Country(); + c.setCode("NZ"); + c.setName("New Zealand"); + server.save(c); - // orm update use bean name and bean properties - server.sqlUpdate("delete from o_cached_bean_child").execute(); - server.sqlUpdate("delete from o_cached_bean_country").execute(); - server.sqlUpdate("delete from o_cached_bean").execute(); - - server.createUpdate(OrderShipment.class, "delete from orderShipment").execute(); - - server.createUpdate(OrderDetail.class, "delete from orderDetail").execute(); - - server.createUpdate(Order.class, "delete from order").execute(); - - server.createUpdate(Contact.class, "delete from contact").execute(); - - server.createUpdate(Customer.class, "delete from Customer").execute(); - - server.createUpdate(Address.class, "delete from address").execute(); - - // sql update uses table and column names - server.sqlUpdate("delete from o_country").execute(); - server.sqlUpdate("delete from o_product").execute(); - - }); + Country au = new Country(); + au.setCode("AU"); + au.setName("Australia"); + server.save(au); } - public void insertCountries() { + private void insertProducts() { + Product p = new Product(); + p.setName("Chair"); + p.setSku("C001"); + server.save(p); - if (server.find(Country.class).findCount() > 0) { - return; - } + p = new Product(); + p.setName("Desk"); + p.setSku("DSK1"); + server.save(p); - server.execute(() -> { - Country c = new Country(); - c.setCode("NZ"); - c.setName("New Zealand"); - server.save(c); + p = new Product(); + p.setName("Computer"); + p.setSku("C002"); + server.save(p); - Country au = new Country(); - au.setCode("AU"); - au.setName("Australia"); - server.save(au); - }); + p = new Product(); + p.setName("Printer"); + p.setSku("C003"); + server.save(p); } + private void insertTestCustAndOrders() { + Customer cust1 = insertCustomer("Rob"); + Customer cust2 = insertCustomerNoAddress(); + insertCustomerFiona(); + insertCustomerNoContacts("NocCust"); - public void insertProducts() { - - if (server.find(Product.class).findCount() > 0) { - return; - } - server.execute(() -> { - Product p = new Product(); - p.setName("Chair"); - p.setSku("C001"); - server.save(p); - - p = new Product(); - p.setName("Desk"); - p.setSku("DSK1"); - server.save(p); - - p = new Product(); - p.setName("Computer"); - p.setSku("C002"); - server.save(p); - - p = new Product(); - p.setName("Printer"); - p.setSku("C003"); - server.save(p); - }); - } - - public void insertTestCustAndOrders() { - - DB.execute(() -> { - Customer cust1 = insertCustomer("Rob"); - Customer cust2 = insertCustomerNoAddress(); - insertCustomerFiona(); - insertCustomerNoContacts("NocCust"); - - createOrder1(cust1); - createOrder2(cust2); - createOrder3(cust1); - createOrder4(cust1); - createOrder5(cust2); - }); + createOrder1(cust1); + createOrder2(cust2); + createOrder3(cust1); + createOrder4(cust1); + createOrder5(cust2); } public static Customer createCustAndOrder(String custName) { - ResetBasicData me = new ResetBasicData(); Customer cust1 = insertCustomer(custName); me.createOrder1(cust1); @@ -159,7 +114,6 @@ public class ResetBasicData { } public static Order createOrderCustAndOrder(String custName) { - ResetBasicData me = new ResetBasicData(); Customer cust1 = insertCustomer(custName); return me.createOrder1(cust1); @@ -168,10 +122,8 @@ public class ResetBasicData { private static int contactEmailNum = 1; private Customer insertCustomerFiona() { - Customer c = createCustomer("Fiona", "12 Apple St", "West Coast Rd", 1, "2009-08-31"); c.setStatus(Customer.Status.ACTIVE); - c.addContact(createContact("Fiona", "Black")); c.addContact(createContact("Tracy", "Red")); @@ -187,22 +139,18 @@ public class ResetBasicData { } private Customer insertCustomerNoContacts(String name) { - Customer c = createCustomer("Roger", "15 Kumera Way", "Bos town", 1, "2010-04-10"); c.setName(name); c.setStatus(Customer.Status.ACTIVE); - DB.save(c); return c; } private Customer insertCustomerNoAddress() { - Customer c = new Customer(); c.setName("Cust NoAddress"); c.setStatus(Customer.Status.NEW); c.addContact(createContact("Jack", "Black")); - DB.save(c); return c; } @@ -218,7 +166,6 @@ public class ResetBasicData { } public static Customer createCustomer(String name, String shippingStreet, String billingStreet, int contactSuffix, String annDate) { - Customer c = new Customer(); c.setName(name); c.setStatus(Customer.Status.NEW); @@ -253,17 +200,14 @@ public class ResetBasicData { c.setBillingAddress(billingAddr); } - return c; } private Order createOrder1(Customer customer) { - Product product1 = DB.reference(Product.class, 1); Product product2 = DB.reference(Product.class, 2); Product product3 = DB.reference(Product.class, 3); - Order order = new Order(); order.setCustomer(customer); order.setOrderDate(Date.valueOf("2018-07-01")); @@ -273,16 +217,12 @@ public class ResetBasicData { details.add(new OrderDetail(product2, 3, 1.10)); details.add(new OrderDetail(product3, 1, 2.00)); order.setDetails(details); - - order.addShipment(new OrderShipment()); - DB.save(order); return order; } private void createOrder2(Customer customer) { - Product product1 = DB.reference(Product.class, 1); Order order = new Order(); @@ -293,14 +233,11 @@ public class ResetBasicData { List details = new ArrayList<>(); details.add(new OrderDetail(product1, 4, 10.50)); order.setDetails(details); - order.addShipment(new OrderShipment()); - DB.save(order); } private void createOrder3(Customer customer) { - Product product1 = DB.reference(Product.class, 1); Product product3 = DB.reference(Product.class, 3); @@ -314,30 +251,23 @@ public class ResetBasicData { details.add(new OrderDetail(product3, 40, 2.10)); details.add(new OrderDetail(product1, 5, 10.00)); order.setDetails(details); - order.addShipment(new OrderShipment()); - DB.save(order); } private void createOrder4(Customer customer) { - Order order = new Order(); order.setCustomer(customer); order.setOrderDate(Date.valueOf("2018-07-04")); - order.addShipment(new OrderShipment()); - DB.save(order); } private void createOrder5(Customer customer) { - Order order = new Order(); order.setCustomer(customer); order.setOrderDate(Date.valueOf("2018-06-28")); order.addShipment(new OrderShipment()); - DB.save(order); } }