Return-Path: X-Original-To: apmail-cayenne-commits-archive@www.apache.org Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B14661014C for ; Wed, 27 Nov 2013 18:30:06 +0000 (UTC) Received: (qmail 5209 invoked by uid 500); 27 Nov 2013 18:29:49 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 5097 invoked by uid 500); 27 Nov 2013 18:29:36 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 5039 invoked by uid 99); 27 Nov 2013 18:29:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Nov 2013 18:29:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Nov 2013 18:29:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E5B2B2388A5B; Wed, 27 Nov 2013 18:29:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1546153 - in /cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server: ServerCaseDataSourceFactory.java ServerCaseDataSourceInfoProvider.java Date: Wed, 27 Nov 2013 18:29:01 -0000 To: commits@cayenne.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131127182901.E5B2B2388A5B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: aadamchik Date: Wed Nov 27 18:29:01 2013 New Revision: 1546153 URL: http://svn.apache.org/r1546153 Log: fixing H2 unit test failures the fix would ensure we keep at least 2 open connections during the tests, so that when an (intentional) exception happens in DB operation, closing the connection doesn't kill the in-memory db Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceFactory.java cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceInfoProvider.java Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceFactory.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceFactory.java?rev=1546153&r1=1546152&r2=1546153&view=diff ============================================================================== --- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceFactory.java (original) +++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceFactory.java Wed Nov 27 18:29:01 2013 @@ -77,10 +77,10 @@ public class ServerCaseDataSourceFactory dataSourceInfo.getDataSourceUrl()); return new PoolManager( poolDS, - 1, - 1, + dataSourceInfo.getMinConnections(), + dataSourceInfo.getMaxConnections(), dataSourceInfo.getUserName(), - dataSourceInfo.getPassword()) { + dataSourceInfo.getPassword(), PoolManager.MAX_QUEUE_WAIT_DEFAULT) { @Override public void shutdown() throws SQLException { Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceInfoProvider.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceInfoProvider.java?rev=1546153&r1=1546152&r2=1546153&view=diff ============================================================================== --- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceInfoProvider.java (original) +++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceInfoProvider.java Wed Nov 27 18:29:01 2013 @@ -76,6 +76,8 @@ public class ServerCaseDataSourceInfoPro h2.setPassword(""); h2.setDataSourceUrl("jdbc:h2:mem:aname;MVCC=TRUE"); h2.setJdbcDriver("org.h2.Driver"); + h2.setMinConnections(2); + h2.setMaxConnections(2); inMemoryDataSources.put("h2", h2); DataSourceInfo derby = new DataSourceInfo();