完善mock和测试

git-svn-id: http://code.alibabatech.com/svn/druid/trunk@825 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-09-16 16:22:06 +00:00
parent f8af2331ad
commit 439e917f8f
2 changed files with 132 additions and 6 deletions
@@ -190,11 +190,11 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
public void incrementRollbackCount() {
rollbackCount.incrementAndGet();
}
public long getStartTransactionCount() {
return startTransactionCount.get();
}
public void incrementStartTransactionCount() {
startTransactionCount.incrementAndGet();
}
@@ -249,7 +249,10 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
public void setValidConnectionCheckerClassName(String validConnectionCheckerClass) throws Exception {
Class<?> clazz = DruidLoaderUtils.loadClass(validConnectionCheckerClass);
ValidConnectionChecker validConnectionChecker = (ValidConnectionChecker) clazz.newInstance();
ValidConnectionChecker validConnectionChecker = null;
if (clazz != null) {
validConnectionChecker = (ValidConnectionChecker) clazz.newInstance();
}
this.validConnectionChecker = validConnectionChecker;
}
@@ -467,9 +470,13 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
this.passwordCallback = passwordCallback;
}
public void setPasswordCallback(String passwordCallbackClassName) throws Exception {
Class<?> clazz = Thread.currentThread().getContextClassLoader().loadClass(passwordCallbackClassName);
this.passwordCallback = (PasswordCallback) clazz.newInstance();
public void setPasswordCallbackClassName(String passwordCallbackClassName) throws Exception {
Class<?> clazz = DruidLoaderUtils.loadClass(passwordCallbackClassName);
if (clazz != null) {
this.passwordCallback = (PasswordCallback) clazz.newInstance();
} else {
this.passwordCallback = null;
}
}
public NameCallback getUserCallback() {