commit 2b47fc924e31e674707fbfd60c0dd692179ff137
author Carl Hall <thecarlhall@apache.org> Sat Nov 02 11:37:00 2019 -0700
committer Carl Hall <thecarlhall@apache.org> Sat Nov 02 12:49:12 2019 -0700
tree c082e19eeb5fd4ef140e62702fb8fe78e7c285ea
parent 324fef13bd7e1589c28df26ddd81080b76ee7a4c

Add coverage for proxied methods in DriverProxy

src/main/java/org/apache/commons/dbutils/DbUtils.java

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 @@
      *
      * @since 1.6
      */
-    private static final class DriverProxy implements Driver {
+    static final class DriverProxy implements Driver {
 
         private boolean parentLoggerSupported = true;
 

src/test/java/org/apache/commons/dbutils/DbUtilsTest.java

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 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);
+        }
+    }
 }