You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/03/04 23:31:47 UTC
svn commit: r1574229 -
/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java
Author: markt
Date: Tue Mar 4 22:31:46 2014
New Revision: 1574229
URL: http://svn.apache.org/r1574229
Log:
Handle the maxActive -> maxTotal rename
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java
Modified: tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java?rev=1574229&r1=1574228&r2=1574229&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java (original)
+++ tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java Tue Mar 4 22:31:46 2014
@@ -17,11 +17,15 @@
package org.apache.tomcat.jdbc.test;
import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Properties;
import org.junit.After;
import org.junit.Before;
+//import org.apache.commons.dbcp2.BasicDataSource;
+//import org.apache.commons.dbcp2.BasicDataSourceFactory;
import org.apache.tomcat.dbcp.dbcp2.BasicDataSource;
import org.apache.tomcat.dbcp.dbcp2.BasicDataSourceFactory;
import org.apache.tomcat.jdbc.pool.PoolConfiguration;
@@ -74,7 +78,11 @@ public abstract class DefaultTestCase {
try {
Properties p = new Properties();
for (int i=0; i< ALL_PROPERTIES.length; i++) {
- String name = "get" + Character.toUpperCase(ALL_PROPERTIES[i].charAt(0)) + ALL_PROPERTIES[i].substring(1);
+
+ String property = ALL_PROPERTIES[i];
+ String dbcpProperty = handleRenames(property);
+
+ String name = "get" + Character.toUpperCase(property.charAt(0)) + property.substring(1);
String bname = "is" + name.substring(3);
Method get = null;
try {
@@ -96,7 +104,7 @@ public abstract class DefaultTestCase {
if (get!=null) {
Object value = get.invoke(datasource.getPoolProperties(), new Object[0]);
if (value!=null) {
- p.setProperty(ALL_PROPERTIES[i], value.toString());
+ p.setProperty(dbcpProperty, value.toString());
}
}
}
@@ -106,6 +114,13 @@ public abstract class DefaultTestCase {
}
}
+ private String handleRenames(String oldName) {
+ if (RENAMED.containsKey(oldName)) {
+ return RENAMED.get(oldName);
+ }
+ return oldName;
+ }
+
protected void transferPropertiesToC3P0() throws Exception {
// System.setProperty("com.mchange.v2.log.FallbackMLog.DEFAULT_CUTOFF_LEVEL", "WARNING");
// MLog.getLogger().setLevel(MLevel.WARNING);
@@ -250,6 +265,9 @@ public abstract class DefaultTestCase {
PROP_CONNECTIONPROPERTIES
};
+ private static final Map<String,String> RENAMED = new HashMap<>();
-
+ static {
+ RENAMED.put(PROP_MAXACTIVE, "maxTotal");
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org