Resolve some TODOs in test code

Author: Michael-A-McMahon

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

@@ -94,14 +94,12 @@ public void testCharacterTypes() {
 
       // Expect CLOB and String to map.
       verifyColumnMetadata(
-        connection, "CLOB", JDBCType.CLOB,
-        SqlTypeMap.toR2dbcType(JDBCType.CLOB),/* TODO: R2dbcType.CLOB,*/
+        connection, "CLOB", JDBCType.CLOB, R2dbcType.CLOB,
         null, null, String.class, "test");
 
       // Expect NCLOB and String to map
       verifyColumnMetadata(
-        connection, "NCLOB", JDBCType.NCLOB,
-        SqlTypeMap.toR2dbcType(JDBCType.NCLOB),/* TODO: R2dbcType.NCLOB,*/
+        connection, "NCLOB", JDBCType.NCLOB, R2dbcType.NCLOB,
         null, null, String.class, "test");
 
       // Expect LONG and String to map.

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

@@ -228,8 +228,7 @@ public void testMap() {
         () -> insertResult0.map((row, metadata) -> "unexpected"));
 
       // Expect row data publisher to reject multiple subscribers
-      // TODO: Is it necessary to verify this for an empty publisher?
-      // awaitError(IllegalStateException.class, insertRowPublisher0);
+      awaitError(IllegalStateException.class, insertRowPublisher0);
 
       Result insertResult1 = insertResults.next();
       Publisher<Object> insertRowPublisher1 =
@@ -243,8 +242,7 @@ public void testMap() {
         () -> insertResult1.map((row, metadata) -> "unexpected"));
 
       // Expect row data publisher to reject multiple subscribers
-      // TODO: Is it necessary to verify this for an empty publisher?
-      //awaitError(IllegalStateException.class, insertRowPublisher1);
+      awaitError(IllegalStateException.class, insertRowPublisher1);
 
       // Expect no rows from UPDATE
       consumeOne(connection.createStatement(
@@ -262,8 +260,7 @@ public void testMap() {
           assertThrows(IllegalStateException.class, updateResult::getRowsUpdated);
 
           // Expect row data publisher to reject multiple subscribers
-          // TODO: Is it necessary to verify this for an empty publisher?
-          // awaitError(IllegalStateException.class, updateRowPublisher);
+          awaitError(IllegalStateException.class, updateRowPublisher);
         });
 
       // Expect no rows from SELECT of zero rows
@@ -376,14 +373,10 @@ public void testMap() {
             () -> deleteResult.map((row, metadata) -> "unexpected"));
           assertThrows(IllegalStateException.class, deleteResult::getRowsUpdated);
 
-          return Mono.from(deleteRowPublisher);
-            // TODO: Is it necessary to verify this for an empty publisher?
-          /*
+          return Mono.from(deleteRowPublisher)
             .doOnTerminate(() ->
               // Expect row data publisher to reject multiple subscribers
               awaitError(IllegalStateException.class, deleteRowPublisher));
-
-           */
         }));
     }
     finally {