From 17fed0ebd80b21337c7df17e4dbb628b7a92bbdd Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 1 Feb 2022 15:18:06 +1300 Subject: [PATCH] Tidy test only - TestNestedBeginRequiresNew --- .../TestNestedBeginRequiresNew.java | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java index b7c7fd3e0..ca6b62bc7 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java @@ -4,54 +4,42 @@ import io.ebean.*; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.tests.model.basic.Address; import org.tests.model.basic.Country; -import org.tests.model.basic.Customer; import org.tests.model.basic.Product; -public class TestNestedBeginRequiresNew extends BaseTestCase { +class TestNestedBeginRequiresNew extends BaseTestCase { Logger logger = LoggerFactory.getLogger(TestNestedBeginRequiresNew.class); Database server = DB.getDefault(); @Test - public void test() { - + void test() { someOuterMethod(); } private void someOuterMethod() { - Transaction txn = server.beginTransaction(TxScope.requiresNew()); try { - - server.find(Country.class).findCount(); - - someInnerMethod(); - server.find(Product.class).findCount(); - + someInnerMethod(); + server.find(Address.class).findCount(); txn.commit(); - } finally { txn.end(); } - } private void someInnerMethod() { - logger.debug("someInnerMethod() ..."); Transaction txn = server.beginTransaction(TxScope.requiresNew()); try { - - server.find(Customer.class).findCount(); + server.find(Country.class).findCount(); txn.commit(); - } finally { txn.end(); } logger.debug("someInnerMethod() ... done"); - } }