You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fa...@apache.org on 2023/12/29 02:10:41 UTC
(flink) 01/03: [FLINK-33942][configuration][junit5-migration] Migrate DelegatingConfigurationTest to Junit5 and Assertj
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit f66b9435a664ed6264e08e70e7926520e4c47e7e
Author: Rui Fan <19...@gmail.com>
AuthorDate: Tue Dec 26 17:06:20 2023 +0800
[FLINK-33942][configuration][junit5-migration] Migrate DelegatingConfigurationTest to Junit5 and Assertj
---
.../configuration/DelegatingConfigurationTest.java | 44 ++++++++++------------
1 file changed, 19 insertions(+), 25 deletions(-)
diff --git a/flink-core/src/test/java/org/apache/flink/configuration/DelegatingConfigurationTest.java b/flink-core/src/test/java/org/apache/flink/configuration/DelegatingConfigurationTest.java
index bbd4692a13a..cec52629806 100644
--- a/flink-core/src/test/java/org/apache/flink/configuration/DelegatingConfigurationTest.java
+++ b/flink-core/src/test/java/org/apache/flink/configuration/DelegatingConfigurationTest.java
@@ -18,8 +18,7 @@
package org.apache.flink.configuration;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -27,14 +26,13 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
/** Tests for the {@link DelegatingConfiguration}. */
-public class DelegatingConfigurationTest {
+class DelegatingConfigurationTest {
@Test
- public void testIfDelegatesImplementAllMethods() throws IllegalArgumentException {
+ void testIfDelegatesImplementAllMethods() throws IllegalArgumentException {
// For each method in the Configuration class...
Method[] confMethods = Configuration.class.getDeclaredMethods();
@@ -70,27 +68,28 @@ public class DelegatingConfigurationTest {
}
}
- assertTrue(
- "Configuration method '"
- + configurationMethod.getName()
- + "' has not been wrapped correctly in DelegatingConfiguration wrapper",
- hasMethod);
+ assertThat(hasMethod)
+ .as(
+ "Configuration method '"
+ + configurationMethod.getName()
+ + "' has not been wrapped correctly in DelegatingConfiguration wrapper")
+ .isTrue();
}
}
@Test
- public void testDelegationConfigurationWithNullPrefix() {
+ void testDelegationConfigurationWithNullPrefix() {
Configuration backingConf = new Configuration();
backingConf.setValueInternal("test-key", "value", false);
DelegatingConfiguration configuration = new DelegatingConfiguration(backingConf, null);
Set<String> keySet = configuration.keySet();
- assertEquals(keySet, backingConf.keySet());
+ assertThat(backingConf.keySet()).isEqualTo(keySet);
}
@Test
- public void testDelegationConfigurationWithPrefix() {
+ void testDelegationConfigurationWithPrefix() {
String prefix = "pref-";
String expectedKey = "key";
@@ -102,9 +101,7 @@ public class DelegatingConfigurationTest {
DelegatingConfiguration configuration = new DelegatingConfiguration(backingConf, prefix);
Set<String> keySet = configuration.keySet();
-
- assertEquals(keySet.size(), 1);
- assertEquals(keySet.iterator().next(), expectedKey);
+ assertThat(keySet).hasSize(1).containsExactly(expectedKey);
/*
* Key does not match the prefix
@@ -113,13 +110,11 @@ public class DelegatingConfigurationTest {
backingConf.setValueInternal("test-key", "value", false);
configuration = new DelegatingConfiguration(backingConf, prefix);
- keySet = configuration.keySet();
-
- assertTrue(keySet.isEmpty());
+ assertThat(configuration.keySet()).isEmpty();
}
@Test
- public void testDelegationConfigurationToMapConsistentWithAddAllToProperties() {
+ void testDelegationConfigurationToMapConsistentWithAddAllToProperties() {
Configuration conf = new Configuration();
conf.setString("k0", "v0");
conf.setString("prefix.k1", "v1");
@@ -136,15 +131,14 @@ public class DelegatingConfigurationTest {
mapProperties.put(entry.getKey(), entry.getValue());
}
// Verification
- assertEquals(properties, mapProperties);
+ assertThat(mapProperties).isEqualTo(properties);
}
@Test
- public void testSetReturnsDelegatingConfiguration() {
+ void testSetReturnsDelegatingConfiguration() {
final Configuration conf = new Configuration();
final DelegatingConfiguration delegatingConf = new DelegatingConfiguration(conf, "prefix.");
- Assertions.assertThat(delegatingConf.set(CoreOptions.DEFAULT_PARALLELISM, 1))
- .isSameAs(delegatingConf);
+ assertThat(delegatingConf.set(CoreOptions.DEFAULT_PARALLELISM, 1)).isSameAs(delegatingConf);
}
}