Add test for DriverManager.getConnection() am: aa9807c512 am: ff3c5f008aandroid-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-release

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/18235482

Change-Id: Id6754a47eaf08b24623e33dfc33f12b3cd4df8dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 27 insertions, 1 deletions

diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ConnectionTest.java b/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ConnectionTest.java
index 22409f7..36583c6 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ConnectionTest.java
+++ b/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ConnectionTest.java
@@ -19,8 +19,12 @@ package org.apache.harmony.sql.tests.java.sql;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
 import java.util.HashMap;
 
+import java.util.Properties;
 import junit.framework.TestCase;
 
 public class ConnectionTest extends TestCase {
@@ -85,5 +89,25 @@ public class ConnectionTest extends TestCase {
 
     } // end method testPublicStatics
 
+    private static final String CONNECTION_URL = TestHelper_Driver4.URL_SCHEME + ":data2";
+
+    public void testGetConnection_unauthenticated() {
+        try {
+            DriverManager.getConnection(CONNECTION_URL);
+            fail("TestHelper_Driver4 should throw SQLException for unauthenicated connection");
+        } catch (SQLException e) {
+            // expected
+        }
+    }
+
+    public void testGetConnection_authenticated() throws SQLException {
+        Properties credentials = new Properties();
+        credentials.put(TestHelper_Driver4.userProperty, TestHelper_Driver4.validuser);
+        credentials.put(TestHelper_Driver4.passwordProperty, TestHelper_Driver4.validpassword);
+        Connection conn = DriverManager.getConnection(CONNECTION_URL, credentials);
+        assertTrue(conn instanceof TestHelper_Connection1);
+    }
+
+
 } // end class ConnectionTest
 
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java b/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java
index f4fa4d8..a44ab2e 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java
+++ b/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java
@@ -28,6 +28,8 @@ import java.util.Properties;
  * Basic JDBC driver implementation to help with tests
  */
 public class TestHelper_Driver4 implements Driver {
+    static final String URL_SCHEME = "jdbc:mikes4";
+
     int majorVersion = 1;
 
     int minorVersion = 0;
@@ -47,7 +49,7 @@ public class TestHelper_Driver4 implements Driver {
 
     protected TestHelper_Driver4() {
         super();
-        baseURL = "jdbc:mikes4";
+        baseURL = URL_SCHEME;
     } // end constructor TestHelper_Driver4()
 
     public boolean acceptsURL(String url) throws SQLException {