Use of utility test method

XComp · Nov 25, 2024 · da42067 · da42067
1 parent 9b4e87e
commit da42067
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 23 deletions.
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/LeaderElectionTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/LeaderElectionTest.java
@@ -48,6 +48,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.apache.flink.core.testutils.FlinkAssertions.assertThatFuture;
+import static org.apache.flink.runtime.leaderelection.LeaderElectionTestUtils.assertRunAsLeaderOmitsCallbackDueToLostLeadership;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /** Tests for leader election. */
@@ -121,16 +122,6 @@ private static void assertRunAsLeaderSuccessfully(
         assertThat(callbackTriggered).isTrue();
     }
 
-    private static void assertRunAsLeaderOmitsCallbackDueToLostLeadership(
-            LeaderElection testInstance, UUID leaderSessionId) {
-        final AtomicBoolean callbackTriggered = new AtomicBoolean(false);
-        final CompletableFuture<Void> resultFuture =
-                testInstance.runAsLeader(leaderSessionId, () -> callbackTriggered.set(true));
-
-        assertThatFuture(resultFuture).eventuallyFailsWith(LeadershipLostException.class);
-        assertThat(callbackTriggered).isFalse();
-    }
-
     private static final class ManualLeaderContender implements LeaderContender {
 
         private static final UUID NULL_LEADER_SESSION_ID = new UUID(0L, 0L);

diff --git a/...e/src/test/java/org/apache/flink/runtime/leaderelection/StandaloneLeaderElectionTest.java b/...e/src/test/java/org/apache/flink/runtime/leaderelection/StandaloneLeaderElectionTest.java
@@ -26,7 +26,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static org.apache.flink.core.testutils.FlinkAssertions.assertThatFuture;
+import static org.apache.flink.runtime.leaderelection.LeaderElectionTestUtils.assertRunAsLeaderOmitsCallbackDueToLostLeadership;
 import static org.apache.flink.runtime.leaderelection.LeaderElectionTestUtils.assertRunAsLeaderSuccessfully;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -88,27 +88,18 @@ void testRunAsLeaderWithContender() throws Exception {
             testInstance.startLeaderElection(contender);
 
             assertRunAsLeaderSuccessfully(testInstance, SESSION_ID);
-            assertRunAsLeaderFailsDueToLostLeadership(testInstance, UUID.randomUUID());
+            assertRunAsLeaderOmitsCallbackDueToLostLeadership(testInstance, UUID.randomUUID());
         }
     }
 
     @Test
     void testRunAsLeaderWithoutContender() throws Exception {
         try (final LeaderElection testInstance = new StandaloneLeaderElection(SESSION_ID)) {
-            assertRunAsLeaderFailsDueToLostLeadership(testInstance, SESSION_ID);
-            assertRunAsLeaderFailsDueToLostLeadership(testInstance, UUID.randomUUID());
+            assertRunAsLeaderOmitsCallbackDueToLostLeadership(testInstance, SESSION_ID);
+            assertRunAsLeaderOmitsCallbackDueToLostLeadership(testInstance, UUID.randomUUID());
         }
     }
 
-    private static void assertRunAsLeaderFailsDueToLostLeadership(
-            LeaderElection testInstance, UUID sessionId) {
-        final AtomicBoolean callbackTriggered = new AtomicBoolean(false);
-        final CompletableFuture<Void> resultFuture =
-                testInstance.runAsLeader(sessionId, () -> callbackTriggered.set(true));
-        assertThatFuture(resultFuture).eventuallyFailsWith(LeadershipLostException.class);
-        assertThat(callbackTriggered).isFalse();
-    }
-
     @Test
     void testRevokeCallOnClose() throws Exception {
         final AtomicBoolean revokeLeadershipCalled = new AtomicBoolean(false);