test: Fix ordered publish failure test by forcing scheduled work to be done

README.md

@@ -59,13 +59,13 @@ implementation 'com.google.cloud:google-cloud-pubsub'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-pubsub:1.129.4'
+implementation 'com.google.cloud:google-cloud-pubsub:1.129.5'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.129.4"
+libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.129.5"
 ```
 <!-- {x-version-update-end} -->
 
@@ -411,7 +411,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-pubsub/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-pubsub.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsub/1.129.4
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsub/1.129.5
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/PublisherImplTest.java

@@ -511,9 +511,6 @@ public void testEnableMessageOrdering_overwritesMaxAttempts() throws Exception {
    *   <li>publish with key orderA, which should now succeed
    * </ol>
    */
-  /*
-  Temporarily disabled due to https://github.com/googleapis/java-pubsub/issues/1861.
-  TODO(maitrimangal): Enable once resolved.
   @Test
   public void testResumePublish() throws Exception {
     Publisher publisher =
@@ -575,8 +572,8 @@ public void testResumePublish() throws Exception {
     testPublisherServiceImpl.addPublishResponse(
         PublishResponse.newBuilder().addMessageIds("5").addMessageIds("6"));
 
-    Assert.assertEquals("5", future5.get());
-    Assert.assertEquals("6", future6.get());
+    assertEquals("5", future5.get());
+    assertEquals("6", future6.get());
 
     // Resume publishing of "orderA", which should now succeed
     publisher.resumePublish("orderA");
@@ -587,8 +584,8 @@ public void testResumePublish() throws Exception {
     testPublisherServiceImpl.addPublishResponse(
         PublishResponse.newBuilder().addMessageIds("7").addMessageIds("8"));
 
-    Assert.assertEquals("7", future7.get());
-    Assert.assertEquals("8", future8.get());
+    assertEquals("7", future7.get());
+    assertEquals("8", future8.get());
 
     shutdownTestPublisher(publisher);
   }
@@ -633,6 +630,7 @@ public void testPublishThrowExceptionForUnsubmittedOrderingKeyMessage() throws E
     } catch (ExecutionException e) {
       assertEquals(SequentialExecutorService.CallbackExecutor.CANCELLATION_EXCEPTION, e.getCause());
     }
+    fakeExecutor.advanceTime(Duration.ZERO);
 
     // A subsequent attempt fails immediately.
     ApiFuture<String> publishFuture4 = sendTestMessageWithOrderingKey(publisher, "D", "a");
@@ -643,7 +641,6 @@ public void testPublishThrowExceptionForUnsubmittedOrderingKeyMessage() throws E
       assertEquals(SequentialExecutorService.CallbackExecutor.CANCELLATION_EXCEPTION, e.getCause());
     }
   }
-  */
 
   private ApiFuture<String> sendTestMessageWithOrderingKey(
       Publisher publisher, String data, String orderingKey) {