You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by gu...@apache.org on 2023/06/07 02:57:10 UTC

[flink] 01/02: [hotfix] Migrate SlotManagerConfigurationTest to Junit5 and AssertJ.

This is an automated email from the ASF dual-hosted git repository.

guoweijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 9e12704a777c25364f8f51930c35b97cb65cf247
Author: Weijie Guo <re...@163.com>
AuthorDate: Mon Jun 5 19:54:02 2023 +0800

    [hotfix] Migrate SlotManagerConfigurationTest to Junit5 and AssertJ.
---
 .../slotmanager/SlotManagerConfigurationTest.java  | 23 +++++++++-------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/SlotManagerConfigurationTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/SlotManagerConfigurationTest.java
index c37ec035e1f..782392e6378 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/SlotManagerConfigurationTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/SlotManagerConfigurationTest.java
@@ -22,23 +22,20 @@ import org.apache.flink.configuration.Configuration;
 import org.apache.flink.configuration.JobManagerOptions;
 import org.apache.flink.configuration.ResourceManagerOptions;
 import org.apache.flink.runtime.resourcemanager.WorkerResourceSpec;
-import org.apache.flink.util.TestLogger;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /** Tests for {@link SlotManagerConfiguration}. */
-public class SlotManagerConfigurationTest extends TestLogger {
+class SlotManagerConfigurationTest {
 
     /**
      * Tests that {@link SlotManagerConfiguration#getSlotRequestTimeout()} returns the value
      * configured under key {@link JobManagerOptions#SLOT_REQUEST_TIMEOUT}.
      */
     @Test
-    public void testSetSlotRequestTimeout() throws Exception {
+    void testSetSlotRequestTimeout() throws Exception {
         final long slotIdleTimeout = 42;
 
         final Configuration configuration = new Configuration();
@@ -46,9 +43,8 @@ public class SlotManagerConfigurationTest extends TestLogger {
         final SlotManagerConfiguration slotManagerConfiguration =
                 SlotManagerConfiguration.fromConfiguration(configuration, WorkerResourceSpec.ZERO);
 
-        assertThat(
-                slotManagerConfiguration.getSlotRequestTimeout().toMilliseconds(),
-                is(equalTo(slotIdleTimeout)));
+        assertThat(slotIdleTimeout)
+                .isEqualTo(slotManagerConfiguration.getSlotRequestTimeout().toMilliseconds());
     }
 
     /**
@@ -56,7 +52,7 @@ public class SlotManagerConfigurationTest extends TestLogger {
      * JobManagerOptions#SLOT_REQUEST_TIMEOUT} if set.
      */
     @Test
-    public void testPreferLegacySlotRequestTimeout() throws Exception {
+    void testPreferLegacySlotRequestTimeout() throws Exception {
         final long legacySlotIdleTimeout = 42;
 
         final Configuration configuration = new Configuration();
@@ -65,8 +61,7 @@ public class SlotManagerConfigurationTest extends TestLogger {
         final SlotManagerConfiguration slotManagerConfiguration =
                 SlotManagerConfiguration.fromConfiguration(configuration, WorkerResourceSpec.ZERO);
 
-        assertThat(
-                slotManagerConfiguration.getSlotRequestTimeout().toMilliseconds(),
-                is(equalTo(legacySlotIdleTimeout)));
+        assertThat(legacySlotIdleTimeout)
+                .isEqualTo(slotManagerConfiguration.getSlotRequestTimeout().toMilliseconds());
     }
 }