chore(spanner): revert skipped tests to another PR

Author: harshachinta

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

@@ -61,33 +61,17 @@ public void clearRequests() {
   @Test
   public void testAsyncRunner_doesNotReturnCommitTimestampBeforeCommit() {
     AsyncRunner runner = client().runAsync();
-    if (isMultiplexedSessionsEnabledForRW()) {
-      ExecutionException e =
-          assertThrows(ExecutionException.class, () -> runner.getCommitTimestamp().get());
-      Throwable cause = e.getCause();
-      assertTrue(cause instanceof IllegalStateException);
-      assertTrue(cause.getMessage().contains("runAsync() has not yet been called"));
-    } else {
-      IllegalStateException e =
-          assertThrows(IllegalStateException.class, () -> runner.getCommitTimestamp());
-      assertTrue(e.getMessage().contains("runAsync() has not yet been called"));
-    }
+    IllegalStateException e =
+        assertThrows(IllegalStateException.class, () -> runner.getCommitTimestamp());
+    assertTrue(e.getMessage().contains("runAsync() has not yet been called"));
   }
 
   @Test
   public void testAsyncRunner_doesNotReturnCommitResponseBeforeCommit() {
     AsyncRunner runner = client().runAsync();
-    if (isMultiplexedSessionsEnabledForRW()) {
-      ExecutionException e =
-          assertThrows(ExecutionException.class, () -> runner.getCommitResponse().get());
-      Throwable cause = e.getCause();
-      assertTrue(cause instanceof IllegalStateException);
-      assertTrue(cause.getMessage().contains("runAsync() has not yet been called"));
-    } else {
-      IllegalStateException e =
-          assertThrows(IllegalStateException.class, () -> runner.getCommitResponse());
-      assertTrue(e.getMessage().contains("runAsync() has not yet been called"));
-    }
+    IllegalStateException e =
+        assertThrows(IllegalStateException.class, () -> runner.getCommitResponse());
+    assertTrue(e.getMessage().contains("runAsync() has not yet been called"));
   }
 
   @Test
@@ -524,8 +508,6 @@ public void asyncRunnerWaitsUntilAsyncBatchUpdateHasFinished() throws Exception
 
   @Test
   public void closeTransactionBeforeEndOfAsyncQuery() throws Exception {
-    // TODO(sriharshach): Fix this unittest
-    assumeFalse("Skipping for mux", isMultiplexedSessionsEnabledForRW());
     final BlockingQueue<String> results = new SynchronousQueue<>();
     final SettableApiFuture<Boolean> finished = SettableApiFuture.create();
     DatabaseClientImpl clientImpl = (DatabaseClientImpl) client();

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

@@ -251,11 +251,6 @@ public void asyncTransactionManagerUpdate() throws Exception {
 
   @Test
   public void asyncTransactionManagerIsNonBlocking() throws Exception {
-    // TODO: Remove this condition once DelayedAsyncTransactionManager is made non-blocking with
-    // multiplexed sessions.
-    assumeFalse(
-        "DelayedAsyncTransactionManager is currently blocking with multiplexed sessions.",
-        spanner.getOptions().getSessionPoolOptions().getUseMultiplexedSessionForRW());
     mockSpanner.freeze();
     try (AsyncTransactionManager manager = clientWithEmptySessionPool().transactionManagerAsync()) {
       TransactionContextFuture transactionContextFuture = manager.beginAsync();
@@ -639,11 +634,6 @@ public void asyncTransactionManagerBatchUpdate() throws Exception {
 
   @Test
   public void asyncTransactionManagerIsNonBlockingWithBatchUpdate() throws Exception {
-    // TODO: Remove this condition once DelayedAsyncTransactionManager is made non-blocking with
-    // multiplexed sessions.
-    assumeFalse(
-        "DelayedAsyncTransactionManager is currently blocking with multiplexed sessions.",
-        spanner.getOptions().getSessionPoolOptions().getUseMultiplexedSessionForRW());
     mockSpanner.freeze();
     try (AsyncTransactionManager manager = clientWithEmptySessionPool().transactionManagerAsync()) {
       TransactionContextFuture transactionContextFuture = manager.beginAsync();
@@ -952,6 +942,11 @@ public void asyncTransactionManagerBatchUpdateAbortedWithoutGettingResult() thro
     }
     assertThat(attempt.get()).isEqualTo(2);
     List<Class<? extends AbstractMessage>> requests = mockSpanner.getRequestTypes();
+    // Remove the CreateSession requests for multiplexed sessions, as those are not relevant for
+    // this test if multiplexed session for read-write is not enabled.
+    if (!isMultiplexedSessionsEnabledForRW()){
+      requests.removeIf(request -> request == CreateSessionRequest.class);
+    }
     int size = Iterables.size(requests);
     assertThat(size).isIn(Range.closed(5, 6));
     if (size == 5) {