You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by th...@apache.org on 2019/11/02 19:56:32 UTC
[commons-dbutils] 02/04: Add coverage for proxied methods in
DriverProxy
This is an automated email from the ASF dual-hosted git repository.
thecarlhall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git
commit 2b47fc924e31e674707fbfd60c0dd692179ff137
Author: Carl Hall <th...@apache.org>
AuthorDate: Sat Nov 2 11:37:00 2019 -0700
Add coverage for proxied methods in DriverProxy
---
.../java/org/apache/commons/dbutils/DbUtils.java | 2 +-
.../org/apache/commons/dbutils/DbUtilsTest.java | 44 +++++++++++++++++++++-
2 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbutils/DbUtils.java b/src/main/java/org/apache/commons/dbutils/DbUtils.java
index 99d2c88..0ce654a 100644
--- a/src/main/java/org/apache/commons/dbutils/DbUtils.java
+++ b/src/main/java/org/apache/commons/dbutils/DbUtils.java
@@ -337,7 +337,7 @@ public final class DbUtils {
*
* @since 1.6
*/
- private static final class DriverProxy implements Driver {
+ static final class DriverProxy implements Driver {
private boolean parentLoggerSupported = true;
diff --git a/src/test/java/org/apache/commons/dbutils/DbUtilsTest.java b/src/test/java/org/apache/commons/dbutils/DbUtilsTest.java
index 52b42d2..1907c8b 100644
--- a/src/test/java/org/apache/commons/dbutils/DbUtilsTest.java
+++ b/src/test/java/org/apache/commons/dbutils/DbUtilsTest.java
@@ -16,16 +16,23 @@
*/
package org.apache.commons.dbutils;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import java.sql.Connection;
+import java.sql.Driver;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
+import java.util.Properties;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
public class DbUtilsTest {
@@ -282,4 +289,39 @@ public class DbUtilsTest {
}
+ public static class DriverProxyTest {
+ private static final Driver mockedDriver = mock(Driver.class);
+ private DbUtils.DriverProxy proxy;
+
+ @Before
+ public void setUp() {
+ proxy = new DbUtils.DriverProxy(mockedDriver);
+ }
+
+ @After
+ public void tearDown() {
+ reset(mockedDriver);
+ }
+
+ @Test
+ public void testProxiedMethods() throws Exception {
+ proxy.getMajorVersion();
+ verify(mockedDriver).getMajorVersion();
+ proxy.getMinorVersion();
+ verify(mockedDriver).getMinorVersion();
+ proxy.jdbcCompliant();
+ verify(mockedDriver).jdbcCompliant();
+
+ String url = "testUrl";
+ proxy.acceptsURL(url);
+ verify(mockedDriver).acceptsURL(url);
+
+ Properties props = new Properties();
+ props.setProperty("test", "true");
+ proxy.connect(url, props);
+ verify(mockedDriver).connect(url, props);
+ proxy.getPropertyInfo(url, props);
+ verify(mockedDriver).getPropertyInfo(url, props);
+ }
+ }
}