review comment changes.

Author: ritiktrianz

athena-jdbc/src/test/java/com/amazonaws/athena/connectors/jdbc/JdbcEnvironmentPropertiesTest.java

@@ -136,19 +136,4 @@ public void testSecretWithSpecialCharacters() {
         String expected = BASE_CONNECTION_STRING + "?${" + specialSecret + "}";
         assertEquals(expected, result.get(DEFAULT));
     }
-
-    @Test
-    public void testMultipleSecretsAndParams() {
-        String secret1 = "secret1";
-        String secret2 = "secret2";
-        String params = "param1=value1&param2=value2";
-        
-        connectionProperties.put(SECRET_NAME, secret1 + "," + secret2);
-        connectionProperties.put(JDBC_PARAMS, params);
-        
-        Map<String, String> result = jdbcEnvironmentProperties.connectionPropertiesToEnvironment(connectionProperties);
-        String expected = BASE_CONNECTION_STRING + "?" + params + "&${" + secret1 + "," + secret2 + "}";
-        assertEquals(expected, result.get(DEFAULT));
-    }
-
 }

athena-jdbc/src/test/java/com/amazonaws/athena/connectors/jdbc/manager/JDBCUtilTest.java

@@ -138,10 +138,11 @@ public void createJdbcMetadataHandlerMap()
     @Test(expected = IllegalArgumentException.class)
     public void createJdbcMetadataHandlerMapDifferentDatabasesThrows()
     {
+        // Mux with different database types is not supported.
         JDBCUtil.createJdbcMetadataHandlerMap(ImmutableMap.<String, String>builder()
-                .put("testCatalog1_connection_string", CONNECTION_STRING1)
-                .put("testCatalog2_connection_string", CONNECTION_STRING2)
-                .put(DEFAULT, CONNECTION_STRING2)
+                .put("testCatalog_connection_string", CONNECTION_STRING1)
+                .put("wrong_connection_string", CONNECTION_STRING2)
+                .put(DEFAULT, CONNECTION_STRING1)
                 .put("AWS_LAMBDA_FUNCTION_NAME", "functionName")
                 .build(), new FakeDatabaseMetadataHandlerFactory());
     }
@@ -179,10 +180,11 @@ public void createJdbcRecordHandlerMap()
     @Test(expected = IllegalArgumentException.class)
     public void createJdbcRecordHandlerMapDifferentDatabasesThrows()
     {
+        // Mux with different database types is not supported.
         JDBCUtil.createJdbcRecordHandlerMap(ImmutableMap.<String, String>builder()
-                .put("testCatalog1_connection_string", CONNECTION_STRING1)
-                .put("testCatalog2_connection_string", CONNECTION_STRING2)
-                .put(DEFAULT, CONNECTION_STRING2)
+                .put("testCatalog_connection_string", CONNECTION_STRING1)
+                .put("wrong_connection_string", CONNECTION_STRING2)
+                .put(DEFAULT, CONNECTION_STRING1)
                 .put("AWS_LAMBDA_FUNCTION_NAME", "functionName")
                 .build(), new FakeDatabaseRecordHandlerFactory());
     }