Add LDAP tests

Author: Michael-A-McMahon

pom.xml

@@ -87,6 +87,17 @@
             <arg>-Xlint:-processing</arg>
             <arg>-Xlint:-serial</arg>
           </compilerArgs>
+          <!-- LDAP URL tests require the java.naming module -->
+          <!-- Maven seems to ignore the forceJavacCompilerUse.
+            This results in an error when passing the addModules option to
+            the javax.tools API. For this reason, Oracle R2DBC's module-info is
+            declaring a depency on the java.naming module.
+            TODO: Figure out how to make maven compile tests correctly, and 
+            remove the java.naming depenency from Oracle R2DBC.
+          <fork>true</fork>
+          <forceJavacCompilerUse>true</forceJavacCompilerUse>
+          <testCompilerArgument>- -add-modules java.naming</testCompilerArgument>
+          -->
           <showWarnings>true</showWarnings>
           <release>${java.version}</release>
         </configuration>
@@ -150,6 +161,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>3.0.0-M5</version>
         <configuration>
+          <!-- Include tests in the oracle.r2dbc.test package -->
           <includes>
             <include>**/*Test.java</include>
             <include>**/*TestKit.java</include>
@@ -278,7 +290,6 @@
       <artifactId>reactor-test</artifactId>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 
   <profiles>

src/main/java/module-info.java

@@ -30,6 +30,7 @@
     with oracle.r2dbc.impl.OracleConnectionFactoryProviderImpl;
 
   requires java.sql;
+  requires java.naming;
   requires com.oracle.database.jdbc;
   requires reactor.core;
   requires transitive org.reactivestreams;

src/test/java/oracle/r2dbc/impl/OracleReactiveJdbcAdapterTest.java

@@ -23,6 +23,7 @@
 
 import io.r2dbc.spi.Connection;
 import io.r2dbc.spi.ConnectionFactories;
+import io.r2dbc.spi.ConnectionFactory;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import io.r2dbc.spi.Option;
 import io.r2dbc.spi.R2dbcTimeoutException;
@@ -31,10 +32,12 @@
 import oracle.jdbc.datasource.OracleDataSource;
 import oracle.r2dbc.OracleR2dbcOptions;
 import oracle.r2dbc.test.DatabaseConfig;
+import oracle.r2dbc.util.TestContextFactory;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import javax.naming.spi.NamingManager;
 import java.io.IOException;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
@@ -216,12 +219,7 @@ public void testCreateDataSource() throws SQLException {
   public void testTnsAdmin() throws IOException {
 
     // Create an Oracle Net Descriptor
-    String descriptor = format(
-      "(DESCRIPTION=(ADDRESS=(HOST=%s)(PORT=%d)(PROTOCOL=%s))" +
-        "(CONNECT_DATA=(SERVICE_NAME=%s)))",
-      host(), port(),
-      Objects.requireNonNullElse(protocol(), "tcp"),
-      serviceName());
+    String descriptor = createDescriptor();
 
     // Create a tnsnames.ora file with an alias for the descriptor
     Files.writeString(Path.of("tnsnames.ora"),
@@ -525,6 +523,102 @@ public void testVSessionOptions() {
       tryAwaitNone(connection.close());
     }
   }
+  /**
+   * Verifies the use of the LDAP protocol in an r2dbc:oracle URL.
+   */
+  @Test
+  public void testLdapUrl() throws Exception {
+
+    // Configure Oracle R2DBC with an R2DBC URL having the LDAP protocol and the
+    // given path.
+    String ldapPath = "sales,cn=OracleContext,dc=com";
+    ConnectionFactory ldapConnectionFactory = ConnectionFactories.get(
+      ConnectionFactoryOptions.parse(format(
+          "r2dbc:oracle:ldap://ldap.example.com:9999/%s", ldapPath))
+        .mutate()
+        .option(ConnectionFactoryOptions.USER, DatabaseConfig.user())
+        .option(ConnectionFactoryOptions.PASSWORD, DatabaseConfig.password())
+        .build());
+
+    // Set up the mock LDAP context factory. See JavaDoc of TestContextFactory
+    // for details about this.
+    NamingManager.setInitialContextFactoryBuilder(environment ->
+      new TestContextFactory());
+    TestContextFactory.bind(ldapPath, createDescriptor());
+
+    // Now verify that the LDAP URL is resolved to the descriptor
+    Connection ldapConnection = awaitOne(ldapConnectionFactory.create());
+    try {
+      assertEquals(
+        "Hello, LDAP",
+        awaitOne(
+          awaitOne(ldapConnection.createStatement(
+              "SELECT 'Hello, LDAP' FROM sys.dual")
+            .execute())
+            .map(row -> row.get(0))));
+    }
+    finally {
+      tryAwaitNone(ldapConnection.close());
+    }
+  }
+
+  /**
+   * Verifies the use of the LDAP protocol in an r2dbc:oracle URL having
+   * multiple LDAP endpoints
+   */
+  @Test
+  public void testMultiLdapUrl() throws Exception {
+
+    // Configure Oracle R2DBC with an R2DBC URL having the LDAP protocol and
+    // multiple LDAP endpoints. Only the last endpoint will contain the given
+    // path, and so the previous endpoints are invalid.
+    String ldapPath = "cn=salesdept,cn=OracleContext,dc=com/salesdb";
+    ConnectionFactory ldapConnectionFactory = ConnectionFactories.get(
+      ConnectionFactoryOptions.parse(format(
+        "r2dbc:oracle:" +
+          "ldap://ldap1.example.com:7777/cn=salesdept0,cn=OracleContext,dc=com/salesdb" +
+          "%%20ldap://ldap1.example.com:7777/cn=salesdept1,cn=OracleContext,dc=com/salesdb" +
+          "%%20ldap://ldap3.example.com:7777/%s", ldapPath))
+        .mutate()
+        .option(ConnectionFactoryOptions.USER, DatabaseConfig.user())
+        .option(ConnectionFactoryOptions.PASSWORD, DatabaseConfig.password())
+        .build());
+
+    // Set up the mock LDAP context factory. A descriptor is bound to the last
+    // endpoint only. See JavaDoc of TestContextFactory for details about this.
+    NamingManager.setInitialContextFactoryBuilder(environment ->
+      new TestContextFactory());
+    TestContextFactory.bind("salesdb", createDescriptor());
+
+    // Now verify that the LDAP URL is resolved to the descriptor
+    Connection ldapConnection = awaitOne(ldapConnectionFactory.create());
+    try {
+      assertEquals(
+        "Hello, LDAP",
+        awaitOne(
+          awaitOne(ldapConnection.createStatement(
+            "SELECT 'Hello, LDAP' FROM sys.dual")
+            .execute())
+            .map(row -> row.get(0))));
+    }
+    finally {
+      tryAwaitNone(ldapConnection.close());
+    }
+  }
+
+  /**
+   * Returns an Oracle Net Descriptor having the values configured by
+   * {@link DatabaseConfig}
+   * @return An Oracle Net Descriptor for the test database.
+   */
+  private static String createDescriptor() {
+    return format(
+      "(DESCRIPTION=(ADDRESS=(HOST=%s)(PORT=%d)(PROTOCOL=%s))" +
+        "(CONNECT_DATA=(SERVICE_NAME=%s)))",
+      host(), port(),
+      Objects.requireNonNullElse(protocol(), "tcp"),
+      serviceName());
+  }
 
   /**
    * Verifies that an attempt to connect with a {@code listeningChannel}