Update tests for createMultiplexedSession

Author: odeke-em

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionClient.java

@@ -117,6 +117,11 @@ Object value() {
         Option.REQUEST_ID, requestId);
   }
 
+  static Map<SpannerRpc.Option, ?> createRequestOptions(
+      XGoogSpannerRequestId requestId) {
+    return ImmutableMap.of(Option.REQUEST_ID, requestId);
+  }
+
   private final class BatchCreateSessionsRunnable implements Runnable {
     private final long channelHint;
     private final int sessionCount;
@@ -297,7 +302,7 @@ SessionImpl createMultiplexedSession() {
                   db.getName(),
                   spanner.getOptions().getDatabaseRole(),
                   spanner.getOptions().getSessionLabels(),
-                  createRequestOptions(channelId, reqId),
+                  createRequestOptions(reqId),
                   true);
       SessionImpl sessionImpl =
           new SessionImpl(

google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionClientTests.java

@@ -19,6 +19,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
@@ -207,7 +208,9 @@ public void onSessionCreateFailure(Throwable t, int createFailureForSessionCount
       client.createMultiplexedSession(consumer);
     }
     // for multiplexed session there is no channel hint pass in the RPC options
-    assertNull(options.getValue());
+    assertNotNull(options.getValue());
+    assertEquals(options.getValue().get(Option.CHANNEL_HINT), null);
+    assertNotNull(options.getValue().get(Option.REQUEST_ID));
     assertEquals(1, returnedSessionCount.get());
   }
 
@@ -239,7 +242,9 @@ public void onSessionCreateFailure(Throwable t, int createFailureForSessionCount
       client.createMultiplexedSession(consumer);
     }
     // for multiplexed session there is no channel hint pass in the RPC options
-    assertNull(options.getValue());
+    assertNotNull(options.getValue());
+    assertEquals(options.getValue().get(Option.CHANNEL_HINT), null);
+    assertNotNull(options.getValue().get(Option.REQUEST_ID));
   }
 
   @SuppressWarnings("unchecked")