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 2011/05/22 16:55:37 UTC
svn commit: r1125978 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne:
conn/PoolManagerTest.java unit/di/server/ServerCaseModule.java
Author: aadamchik
Date: Sun May 22 14:55:36 2011
New Revision: 1125978
URL: http://svn.apache.org/viewvc?rev=1125978&view=rev
Log:
CAY-1565 CayenneCase unit tests conversion(5)
patches by Dzmitry Kazimirchyk PoolManagerTest + injecting DataSourceInfo
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/PoolManagerTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/PoolManagerTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/PoolManagerTest.java?rev=1125978&r1=1125977&r2=1125978&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/PoolManagerTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/PoolManagerTest.java Sun May 22 14:55:36 2011
@@ -21,15 +21,22 @@ package org.apache.cayenne.conn;
import java.sql.Connection;
-import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.di.Inject;
+import org.apache.cayenne.unit.di.server.ServerCase;
+import org.apache.cayenne.unit.di.server.UseServerRuntime;
-public class PoolManagerTest extends CayenneCase {
+@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
+public class PoolManagerTest extends ServerCase {
+
+ @Inject
+ private DataSourceInfo dataSourceInfo;
public void testDataSourceUrl() throws Exception {
- String driverName = getConnectionInfo().getJdbcDriver();
- String url = getConnectionInfo().getDataSourceUrl();
+ String driverName = dataSourceInfo.getJdbcDriver();
+ String url = dataSourceInfo.getDataSourceUrl();
PoolManager pm = new PoolManager(driverName, url, 0, 3, "", "") {
+
@Override
protected void startMaintenanceThread() {
}
@@ -40,6 +47,7 @@ public class PoolManagerTest extends Cay
public void testPassword() throws Exception {
PoolManager pm = new PoolManager(null, 0, 3, "", "b") {
+
@Override
protected void startMaintenanceThread() {
}
@@ -49,6 +57,7 @@ public class PoolManagerTest extends Cay
public void testUserName() throws Exception {
PoolManager pm = new PoolManager(null, 0, 3, "a", "") {
+
@Override
protected void startMaintenanceThread() {
}
@@ -58,6 +67,7 @@ public class PoolManagerTest extends Cay
public void testMinConnections() throws Exception {
PoolManager pm = new PoolManager(null, 0, 3, "", "") {
+
@Override
protected void startMaintenanceThread() {
}
@@ -67,6 +77,7 @@ public class PoolManagerTest extends Cay
public void testMaxConnections() throws Exception {
PoolManager pm = new PoolManager(null, 0, 3, "", "") {
+
@Override
protected void startMaintenanceThread() {
}
@@ -75,15 +86,10 @@ public class PoolManagerTest extends Cay
}
public void testPooling() throws Exception {
- DataSourceInfo dsi = getConnectionInfo();
- PoolManager pm =
- new PoolManager(
- dsi.getJdbcDriver(),
- dsi.getDataSourceUrl(),
- 2,
- 3,
- dsi.getUserName(),
- dsi.getPassword());
+
+ PoolManager pm = new PoolManager(dataSourceInfo.getJdbcDriver(), dataSourceInfo
+ .getDataSourceUrl(), 2, 3, dataSourceInfo.getUserName(), dataSourceInfo
+ .getPassword());
try {
assertEquals(0, pm.getCurrentlyInUse());
@@ -106,9 +112,7 @@ public class PoolManagerTest extends Cay
assertEquals(2, pm.getCurrentlyUnused());
}
finally {
- // get rid of local pool
- pm.dispose();
+ pm.shutdown();
}
-
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java?rev=1125978&r1=1125977&r2=1125978&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java Sun May 22 14:55:36 2011
@@ -25,6 +25,7 @@ import org.apache.cayenne.access.DataCon
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.access.jdbc.BatchQueryBuilderFactory;
import org.apache.cayenne.configuration.server.ServerRuntime;
+import org.apache.cayenne.conn.DataSourceInfo;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.Module;
@@ -63,6 +64,7 @@ public class ServerCaseModule implements
binder.bind(UnitTestLifecycleManager.class).toInstance(
new ServerCaseLifecycleManager(testScope));
+ binder.bind(DataSourceInfo.class).toInstance(resources.getConnectionInfo());
binder.bind(DataSource.class).toProviderInstance(
new CayenneResourcesDataSourceProvider(resources));
binder.bind(DbAdapter.class).toProviderInstance(