This is an automated email from the ASF dual-hosted git repository.
zhuzh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 11a0fc32c9c7171767e43cfbdbbaca5bac94f399
Author: JunRuiLee <jrlee....@gmail.com>
AuthorDate: Sun Jan 29 11:49:16 2023 +0800
[hotfix] Migrate ExecutionConfigTest to JUnit5.
---
.../flink/api/common/ExecutionConfigTest.java | 111 ++++++++++-----------
1 file changed, 51 insertions(+), 60 deletions(-)
diff --git
a/flink-core/src/test/java/org/apache/flink/api/common/ExecutionConfigTest.java
b/flink-core/src/test/java/org/apache/flink/api/common/ExecutionConfigTest.java
index 9a3ccf273e1..91786802cf4 100644
---
a/flink-core/src/test/java/org/apache/flink/api/common/ExecutionConfigTest.java
+++
b/flink-core/src/test/java/org/apache/flink/api/common/ExecutionConfigTest.java
@@ -28,13 +28,12 @@ import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.JobManagerOptions;
import org.apache.flink.core.testutils.CommonTestUtils;
import org.apache.flink.util.SerializedValue;
-import org.apache.flink.util.TestLogger;
import com.esotericsoftware.kryo.Kryo;
import com.esotericsoftware.kryo.Serializer;
import com.esotericsoftware.kryo.io.Input;
import com.esotericsoftware.kryo.io.Output;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.io.Serializable;
@@ -44,18 +43,13 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Random;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
-public class ExecutionConfigTest extends TestLogger {
+public class ExecutionConfigTest {
@Test
- public void testDoubleTypeRegistration() {
+ void testDoubleTypeRegistration() {
ExecutionConfig config = new ExecutionConfig();
List<Class<?>> types = Arrays.<Class<?>>asList(Double.class,
Integer.class, Double.class);
List<Class<?>> expectedTypes = Arrays.<Class<?>>asList(Double.class,
Integer.class);
@@ -67,50 +61,48 @@ public class ExecutionConfigTest extends TestLogger {
int counter = 0;
for (Class<?> tpe : config.getRegisteredKryoTypes()) {
- assertEquals(tpe, expectedTypes.get(counter++));
+ assertThat(tpe).isEqualTo(expectedTypes.get(counter++));
}
- assertEquals(expectedTypes.size(), counter);
+ assertThat(expectedTypes.size()).isEqualTo(counter);
}
@Test
- public void testConfigurationOfParallelism() {
+ void testConfigurationOfParallelism() {
ExecutionConfig config = new ExecutionConfig();
// verify explicit change in parallelism
int parallelism = 36;
config.setParallelism(parallelism);
- assertEquals(parallelism, config.getParallelism());
+ assertThat(parallelism).isEqualTo(config.getParallelism());
// verify that parallelism is reset to default flag value
parallelism = ExecutionConfig.PARALLELISM_DEFAULT;
config.setParallelism(parallelism);
- assertEquals(parallelism, config.getParallelism());
+ assertThat(parallelism).isEqualTo(config.getParallelism());
}
@Test
- public void testDisableGenericTypes() {
+ void testDisableGenericTypes() {
ExecutionConfig conf = new ExecutionConfig();
TypeInformation<Object> typeInfo = new
GenericTypeInfo<Object>(Object.class);
// by default, generic types are supported
TypeSerializer<Object> serializer = typeInfo.createSerializer(conf);
- assertTrue(serializer instanceof KryoSerializer);
+ assertThat(serializer instanceof KryoSerializer).isTrue();
// expect an exception when generic types are disabled
conf.disableGenericTypes();
- try {
- typeInfo.createSerializer(conf);
- fail("should have failed with an exception");
- } catch (UnsupportedOperationException e) {
- // expected
- }
+ assertThatThrownBy(
+ () -> typeInfo.createSerializer(conf),
+ "should have failed with an exception")
+ .isInstanceOf(UnsupportedOperationException.class);
}
@Test
- public void testExecutionConfigSerialization() throws IOException,
ClassNotFoundException {
+ void testExecutionConfigSerialization() throws IOException,
ClassNotFoundException {
final Random r = new Random();
final int parallelism = 1 + r.nextInt(10);
@@ -153,50 +145,49 @@ public class ExecutionConfigTest extends TestLogger {
final ExecutionConfig copy2 =
new
SerializedValue<>(config).deserializeValue(getClass().getClassLoader());
- assertNotNull(copy1);
- assertNotNull(copy2);
+ assertThat(copy1).isNotNull();
+ assertThat(copy2).isNotNull();
- assertEquals(config, copy1);
- assertEquals(config, copy2);
+ assertThat(config).isEqualTo(copy1);
+ assertThat(config).isEqualTo(copy2);
- assertEquals(closureCleanerEnabled, copy1.isClosureCleanerEnabled());
- assertEquals(forceAvroEnabled, copy1.isForceAvroEnabled());
- assertEquals(forceKryoEnabled, copy1.isForceKryoEnabled());
- assertEquals(disableGenericTypes, copy1.hasGenericTypesDisabled());
- assertEquals(objectReuseEnabled, copy1.isObjectReuseEnabled());
- assertEquals(parallelism, copy1.getParallelism());
+
assertThat(closureCleanerEnabled).isEqualTo(copy1.isClosureCleanerEnabled());
+ assertThat(forceAvroEnabled).isEqualTo(copy1.isForceAvroEnabled());
+ assertThat(forceKryoEnabled).isEqualTo(copy1.isForceKryoEnabled());
+
assertThat(disableGenericTypes).isEqualTo(copy1.hasGenericTypesDisabled());
+ assertThat(objectReuseEnabled).isEqualTo(copy1.isObjectReuseEnabled());
+ assertThat(parallelism).isEqualTo(copy1.getParallelism());
}
@Test
- public void testGlobalParametersNotNull() {
+ void testGlobalParametersNotNull() {
final ExecutionConfig config = new ExecutionConfig();
- assertNotNull(config.getGlobalJobParameters());
+ assertThat(config.getGlobalJobParameters()).isNotNull();
}
@Test
- public void testGlobalParametersHashCode() {
+ void testGlobalParametersHashCode() {
ExecutionConfig config = new ExecutionConfig();
ExecutionConfig anotherConfig = new ExecutionConfig();
- assertEquals(
- config.getGlobalJobParameters().hashCode(),
- anotherConfig.getGlobalJobParameters().hashCode());
+ assertThat(config.getGlobalJobParameters().hashCode())
+ .isEqualTo(anotherConfig.getGlobalJobParameters().hashCode());
}
@Test
- public void testReadingDefaultConfig() {
+ void testReadingDefaultConfig() {
ExecutionConfig executionConfig = new ExecutionConfig();
Configuration configuration = new Configuration();
// mutate config according to configuration
executionConfig.configure(configuration,
ExecutionConfigTest.class.getClassLoader());
- assertThat(executionConfig, equalTo(new ExecutionConfig()));
+ assertThat(executionConfig).isEqualTo(new ExecutionConfig());
}
@Test
- public void testLoadingRegisteredKryoTypesFromConfiguration() {
+ void testLoadingRegisteredKryoTypesFromConfiguration() {
ExecutionConfig configFromSetters = new ExecutionConfig();
configFromSetters.registerKryoType(ExecutionConfigTest.class);
configFromSetters.registerKryoType(TestSerializer1.class);
@@ -213,11 +204,11 @@ public class ExecutionConfigTest extends TestLogger {
configFromConfiguration.configure(
configuration, Thread.currentThread().getContextClassLoader());
- assertThat(configFromConfiguration, equalTo(configFromSetters));
+ assertThat(configFromConfiguration).isEqualTo(configFromSetters);
}
@Test
- public void testLoadingRegisteredPojoTypesFromConfiguration() {
+ void testLoadingRegisteredPojoTypesFromConfiguration() {
ExecutionConfig configFromSetters = new ExecutionConfig();
configFromSetters.registerPojoType(ExecutionConfigTest.class);
configFromSetters.registerPojoType(TestSerializer1.class);
@@ -234,11 +225,11 @@ public class ExecutionConfigTest extends TestLogger {
configFromConfiguration.configure(
configuration, Thread.currentThread().getContextClassLoader());
- assertThat(configFromConfiguration, equalTo(configFromSetters));
+ assertThat(configFromConfiguration).isEqualTo(configFromSetters);
}
@Test
- public void testLoadingRestartStrategyFromConfiguration() {
+ void testLoadingRestartStrategyFromConfiguration() {
ExecutionConfig configFromSetters = new ExecutionConfig();
configFromSetters.setRestartStrategy(
RestartStrategies.fixedDelayRestart(10, Time.minutes(2)));
@@ -254,11 +245,11 @@ public class ExecutionConfigTest extends TestLogger {
configFromConfiguration.configure(
configuration, Thread.currentThread().getContextClassLoader());
- assertThat(configFromConfiguration, equalTo(configFromSetters));
+ assertThat(configFromConfiguration).isEqualTo(configFromSetters);
}
@Test
- public void testLoadingDefaultKryoSerializersFromConfiguration() {
+ void testLoadingDefaultKryoSerializersFromConfiguration() {
ExecutionConfig configFromSetters = new ExecutionConfig();
configFromSetters.addDefaultKryoSerializer(
ExecutionConfigTest.class, TestSerializer1.class);
@@ -278,7 +269,7 @@ public class ExecutionConfigTest extends TestLogger {
configFromConfiguration.configure(
configuration, Thread.currentThread().getContextClassLoader());
- assertThat(configFromConfiguration, equalTo(configFromSetters));
+ assertThat(configFromConfiguration).isEqualTo(configFromSetters);
}
@Test
@@ -298,11 +289,11 @@ public class ExecutionConfigTest extends TestLogger {
configFromConfiguration.configure(
configuration, Thread.currentThread().getContextClassLoader());
- assertThat(configFromConfiguration.isDynamicGraph(),
is(expectIsDynamicGraph));
+
assertThat(configFromConfiguration.isDynamicGraph()).isEqualTo(expectIsDynamicGraph);
}
@Test
- public void
testNotOverridingRegisteredKryoTypesWithDefaultsFromConfiguration() {
+ void testNotOverridingRegisteredKryoTypesWithDefaultsFromConfiguration() {
ExecutionConfig config = new ExecutionConfig();
config.registerKryoType(ExecutionConfigTest.class);
config.registerKryoType(TestSerializer1.class);
@@ -315,11 +306,11 @@ public class ExecutionConfigTest extends TestLogger {
LinkedHashSet<Object> set = new LinkedHashSet<>();
set.add(ExecutionConfigTest.class);
set.add(TestSerializer1.class);
- assertThat(config.getRegisteredKryoTypes(), equalTo(set));
+ assertThat(config.getRegisteredKryoTypes()).isEqualTo(set);
}
@Test
- public void
testNotOverridingRegisteredPojoTypesWithDefaultsFromConfiguration() {
+ void testNotOverridingRegisteredPojoTypesWithDefaultsFromConfiguration() {
ExecutionConfig config = new ExecutionConfig();
config.registerPojoType(ExecutionConfigTest.class);
config.registerPojoType(TestSerializer1.class);
@@ -332,11 +323,11 @@ public class ExecutionConfigTest extends TestLogger {
LinkedHashSet<Object> set = new LinkedHashSet<>();
set.add(ExecutionConfigTest.class);
set.add(TestSerializer1.class);
- assertThat(config.getRegisteredPojoTypes(), equalTo(set));
+ assertThat(config.getRegisteredPojoTypes()).isEqualTo(set);
}
@Test
- public void
testNotOverridingRestartStrategiesWithDefaultsFromConfiguration() {
+ void testNotOverridingRestartStrategiesWithDefaultsFromConfiguration() {
ExecutionConfig config = new ExecutionConfig();
RestartStrategies.RestartStrategyConfiguration
restartStrategyConfiguration =
RestartStrategies.fixedDelayRestart(10, Time.minutes(2));
@@ -345,11 +336,11 @@ public class ExecutionConfigTest extends TestLogger {
// mutate config according to configuration
config.configure(new Configuration(),
Thread.currentThread().getContextClassLoader());
- assertThat(config.getRestartStrategy(),
equalTo(restartStrategyConfiguration));
+
assertThat(config.getRestartStrategy()).isEqualTo(restartStrategyConfiguration);
}
@Test
- public void testNotOverridingDefaultKryoSerializersFromConfiguration() {
+ void testNotOverridingDefaultKryoSerializersFromConfiguration() {
ExecutionConfig config = new ExecutionConfig();
config.addDefaultKryoSerializer(ExecutionConfigTest.class,
TestSerializer1.class);
config.addDefaultKryoSerializer(TestSerializer1.class,
TestSerializer2.class);
@@ -362,7 +353,7 @@ public class ExecutionConfigTest extends TestLogger {
LinkedHashMap<Class<?>, Class<? extends Serializer>> serialiers = new
LinkedHashMap<>();
serialiers.put(ExecutionConfigTest.class, TestSerializer1.class);
serialiers.put(TestSerializer1.class, TestSerializer2.class);
- assertThat(config.getDefaultKryoSerializerClasses(),
equalTo(serialiers));
+
assertThat(config.getDefaultKryoSerializerClasses()).isEqualTo(serialiers);
}
private static class TestSerializer1 extends
Serializer<ExecutionConfigTest>
