You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2017/06/20 19:31:42 UTC
cayenne git commit: modernizing connection pool test code
Repository: cayenne
Updated Branches:
refs/heads/master 64ef2a5a5 -> 05a79b5e7
modernizing connection pool test code
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/05a79b5e
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/05a79b5e
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/05a79b5e
Branch: refs/heads/master
Commit: 05a79b5e761f495052759a292a9948f782cbd166
Parents: 64ef2a5
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Tue Jun 20 15:23:45 2017 -0400
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Tue Jun 20 15:23:45 2017 -0400
----------------------------------------------------------------------
.../cayenne/datasource/PoolingDataSourceIT.java | 37 ++++++--------------
1 file changed, 10 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/05a79b5e/cayenne-server/src/test/java/org/apache/cayenne/datasource/PoolingDataSourceIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/datasource/PoolingDataSourceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/datasource/PoolingDataSourceIT.java
index d7d8bf1..f86d31d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/datasource/PoolingDataSourceIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/datasource/PoolingDataSourceIT.java
@@ -19,9 +19,9 @@
package org.apache.cayenne.datasource;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import org.apache.cayenne.unit.di.server.CayenneProjects;
+import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Connection;
import java.sql.ResultSet;
@@ -34,9 +34,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.cayenne.unit.di.server.CayenneProjects;
-import org.apache.cayenne.unit.di.server.UseServerRuntime;
-import org.junit.Test;
+import static org.junit.Assert.*;
@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT)
public class PoolingDataSourceIT extends BasePoolingDataSourceIT {
@@ -51,7 +49,7 @@ public class PoolingDataSourceIT extends BasePoolingDataSourceIT {
assertTrue(dataSource.getMaxConnections() > 0);
- List<Connection> connections = new ArrayList<Connection>();
+ List<Connection> connections = new ArrayList<>();
try {
for (int i = 0; i < dataSource.getMaxConnections(); i++) {
@@ -90,7 +88,7 @@ public class PoolingDataSourceIT extends BasePoolingDataSourceIT {
assertTrue(dataSource.getMaxConnections() > 0);
- List<Connection> connections = new ArrayList<Connection>();
+ List<Connection> connections = new ArrayList<>();
try {
for (int i = 0; i < dataSource.getMaxConnections(); i++) {
@@ -101,7 +99,7 @@ public class PoolingDataSourceIT extends BasePoolingDataSourceIT {
try {
dataSource.getConnection();
- fail("Opening more connections than the pool allows succeeeded");
+ fail("Opening more connections than the pool allows succeeded");
} catch (SQLException e) {
// expected, but check if we waited sufficiently
@@ -205,27 +203,12 @@ public class PoolingDataSourceIT extends BasePoolingDataSourceIT {
public void run() {
try {
- Connection c = dataSource.getConnection();
- try {
-
- Statement st = c.createStatement();
- try {
-
- ResultSet rs = st.executeQuery("SELECT ARTIST_ID FROM ARTIST");
-
- try {
+ try(Connection c = dataSource.getConnection()) {
+ try(Statement st = c.createStatement()) {
+ try(ResultSet rs = st.executeQuery("SELECT ARTIST_ID FROM ARTIST")) {
rs.next();
-
- } finally {
- rs.close();
}
-
- } finally {
- st.close();
}
-
- } finally {
- c.close();
}
// increment only after success