github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: possible resource leaking in testcases (all created transactions are closed by followed try statement) (#1273)

Browse Source
This commit is contained in:
Roland Praml
2018-02-26 08:40:53 +13:00
committed by Rob Bygrave
parent 8e9843ab8a
commit e3425a8850
23 changed files with 278 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
+5 -6
View File
@@ -32,13 +32,12 @@ public class TestBatchInsertFlush extends BaseTestCase {
MetaInfoManager metaInfoManager = server.getMetaInfoManager();
metaInfoManager.collectTransactionStatistics(true);
Transaction transaction = server.beginTransaction()
.setPersistCascade(false)
.setBatchSize(10)
.setBatch(PersistBatch.ALL)
.setLabel("TestBatchInsertFlush.no_cascade");
Transaction transaction = server.beginTransaction();
try {
transaction.setPersistCascade(false)
.setBatchSize(10)
.setBatch(PersistBatch.ALL)
.setLabel("TestBatchInsertFlush.no_cascade");
LoggedSqlCollector.start();
src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
+4 -5
View File
@@ -128,12 +128,11 @@ public class TestBatchInsertSimple extends BaseTestCase {
masters.add(createMasterAndDetails(i, 7));
}
Transaction transaction = Ebean.beginTransaction()
.setBatch(PersistBatch.NONE)
.setBatchOnCascade(PersistBatch.ALL)
.setBatchSize(20);
Transaction transaction = Ebean.beginTransaction();
try {
transaction.setBatch(PersistBatch.NONE)
.setBatchOnCascade(PersistBatch.ALL)
.setBatchSize(20);
// escalate based on batchOnCascade value
Ebean.saveAll(masters);
src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java
+3 -3
View File
@@ -82,10 +82,10 @@ public class TestBatchOnCascadeExceptionHandling extends BaseTestCase {
protected void testBatchOnCascadeIsExceptionSafe(EbeanServer server, Runnable failingOperation) {
Transaction txn = server.beginTransaction();
assertThat(txn.getBatch()).isSameAs(PersistBatch.NONE);
assertThat(txn.getBatchOnCascade()).isSameAs(PersistBatch.ALL);
try {
assertThat(txn.getBatch()).isSameAs(PersistBatch.NONE);
assertThat(txn.getBatchOnCascade()).isSameAs(PersistBatch.ALL);
failingOperation.run();
Assertions.fail("PersistenceException expected");
} catch (PersistenceException e) {