chore(spanner): fix DatabaseClientImpl test

Author: harshachinta

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

@@ -3142,15 +3142,20 @@ public void testDatabaseOrInstanceDoesNotExistOnCreate() {
                         .readWriteTransaction()
                         .run(transaction -> transaction.executeUpdate(UPDATE_STATEMENT)));
             // No additional requests should have been sent by the client.
-            // Note that in case of the use of multiplexed sessions, then we have 2 requests:
-            // Note that in case of the use of regular sessions, then we have 1 request:
-            // 1. BatchCreateSessions for the session pool.
-            // 2. CreateSession for the multiplexed session.
-            assertThat(mockSpanner.getRequests())
-                .hasSize(
-                    spanner.getOptions().getSessionPoolOptions().getUseMultiplexedSession()
-                        ? 2
-                        : 1);
+            if (spanner.getOptions().getSessionPoolOptions().getUseMultiplexedSession()
+                && !spanner.getOptions().getSessionPoolOptions().getUseMultiplexedSessionForRW()) {
+              // Note that in case of the use of multiplexed sessions for read-only alone, then we
+              // have 2 requests:
+              // 1. BatchCreateSessions for the session pool.
+              // 2. CreateSession for the multiplexed session.
+              assertThat(mockSpanner.getRequests()).hasSize(2);
+            } else {
+              // Note that in case of the use of regular sessions, then we have 1 request:
+              // BatchCreateSessions for the session pool.
+              // Note that in case of the use of multiplexed sessions for read-write, then we have 1
+              // request: CreateSession for the multiplexed session.
+              assertThat(mockSpanner.getRequests()).hasSize(1);
+            }
           }
         }
         mockSpanner.reset();

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

@@ -22,6 +22,7 @@
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
 
 import com.google.cloud.NoCredentials;
 import com.google.cloud.spanner.MockSpannerServiceImpl.SimulatedExecutionTime;
@@ -59,7 +60,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
-import static org.junit.Assume.assumeFalse;
 
 @RunWith(JUnit4.class)
 public class RetryOnDifferentGrpcChannelMockServerTest extends AbstractMockServerTest {