1996fanrui commented on code in PR #23199:
URL: https://github.com/apache/flink/pull/23199#discussion_r1298527676
##########
flink-runtime/src/test/java/org/apache/flink/runtime/util/config/memory/ProcessMemoryUtilsTestBase.java:
##########
@@ -63,86 +62,83 @@ protected ProcessMemoryUtilsTestBase(
this.newOptionForLegacyHeapOption =
checkNotNull(newOptionForLegacyHeapOption);
}
- @Before
- public void setup() {
+ @BeforeEach
+ void setup() {
oldEnvVariables = System.getenv();
}
- @After
- public void teardown() {
+ @AfterEach
+ void teardown() {
if (oldEnvVariables != null) {
CommonTestUtils.setEnv(oldEnvVariables, true);
}
}
@Test
- public void testGenerateJvmParameters() {
+ void testGenerateJvmParameters() {
ProcessMemorySpec spec = JvmArgTestingProcessMemorySpec.generate();
String jvmParamsStr =
ProcessMemoryUtils.generateJvmParametersStr(spec, true);
Map<String, String> configs =
ConfigurationUtils.parseJvmArgString(jvmParamsStr);
- assertThat(configs.size(), is(4));
- assertThat(MemorySize.parse(configs.get("-Xmx")),
is(spec.getJvmHeapMemorySize()));
- assertThat(MemorySize.parse(configs.get("-Xms")),
is(spec.getJvmHeapMemorySize()));
- assertThat(
- MemorySize.parse(configs.get("-XX:MaxMetaspaceSize=")),
- is(spec.getJvmMetaspaceSize()));
- assertThat(
- MemorySize.parse(configs.get("-XX:MaxDirectMemorySize=")),
- is(spec.getJvmDirectMemorySize()));
+ assertThat(configs).hasSize(4);
+
assertThat(MemorySize.parse(configs.get("-Xmx"))).isEqualTo(spec.getJvmHeapMemorySize());
+
assertThat(MemorySize.parse(configs.get("-Xms"))).isEqualTo(spec.getJvmHeapMemorySize());
+ assertThat(MemorySize.parse(configs.get("-XX:MaxMetaspaceSize=")))
+ .isEqualTo(spec.getJvmMetaspaceSize());
+ assertThat(MemorySize.parse(configs.get("-XX:MaxDirectMemorySize=")))
+ .isEqualTo(spec.getJvmDirectMemorySize());
}
@Test
- public void testGenerateJvmParametersWithoutDirectMemoryLimit() {
+ void testGenerateJvmParametersWithoutDirectMemoryLimit() {
ProcessMemorySpec spec = JvmArgTestingProcessMemorySpec.generate();
String jvmParamsStr =
ProcessMemoryUtils.generateJvmParametersStr(spec, false);
Map<String, String> configs =
ConfigurationUtils.parseJvmArgString(jvmParamsStr);
- assertThat(configs.size(), is(3));
- assertThat(MemorySize.parse(configs.get("-Xmx")),
is(spec.getJvmHeapMemorySize()));
- assertThat(MemorySize.parse(configs.get("-Xms")),
is(spec.getJvmHeapMemorySize()));
- assertThat(
- MemorySize.parse(configs.get("-XX:MaxMetaspaceSize=")),
- is(spec.getJvmMetaspaceSize()));
- assertThat(configs.containsKey("-XX:MaxDirectMemorySize="), is(false));
+ assertThat(configs).hasSize(3);
+
assertThat(MemorySize.parse(configs.get("-Xmx"))).isEqualTo(spec.getJvmHeapMemorySize());
+
assertThat(MemorySize.parse(configs.get("-Xms"))).isEqualTo(spec.getJvmHeapMemorySize());
+ assertThat(MemorySize.parse(configs.get("-XX:MaxMetaspaceSize=")))
+ .isEqualTo(spec.getJvmMetaspaceSize());
+ assertThat(configs.containsKey("-XX:MaxDirectMemorySize=")).isFalse();
}
@Test
- public void testConfigTotalFlinkMemory() {
+ void testConfigTotalFlinkMemory() {
MemorySize totalFlinkMemorySize = MemorySize.parse("1g");
Configuration conf = new Configuration();
conf.set(options.getTotalFlinkMemoryOption(), totalFlinkMemorySize);
T processSpec = processSpecFromConfig(conf);
- assertThat(processSpec.getTotalFlinkMemorySize(),
is(totalFlinkMemorySize));
+
assertThat(processSpec.getTotalFlinkMemorySize()).isEqualTo(totalFlinkMemorySize);
}
@Test
- public void testConfigTotalProcessMemorySize() {
+ void testConfigTotalProcessMemorySize() {
MemorySize totalProcessMemorySize = MemorySize.parse("2g");
Configuration conf = new Configuration();
conf.set(options.getTotalProcessMemoryOption(),
totalProcessMemorySize);
T processSpec = processSpecFromConfig(conf);
- assertThat(processSpec.getTotalProcessMemorySize(),
is(totalProcessMemorySize));
+
assertThat(processSpec.getTotalProcessMemorySize()).isEqualTo(totalProcessMemorySize);
}
@Test
- public void testExceptionShouldContainRequiredConfigOptions() {
+ void testExceptionShouldContainRequiredConfigOptions() {
try {
processSpecFromConfig(new Configuration());
} catch (IllegalConfigurationException e) {
options.getRequiredFineGrainedOptions()
- .forEach(option -> assertThat(e.getMessage(),
containsString(option.key())));
- assertThat(e.getMessage(),
containsString(options.getTotalFlinkMemoryOption().key()));
- assertThat(e.getMessage(),
containsString(options.getTotalProcessMemoryOption().key()));
+ .forEach(option ->
assertThat(e).hasMessageContaining(option.key()));
+
assertThat(e).hasMessageContaining(options.getTotalFlinkMemoryOption().key());
+
assertThat(e).hasMessageContaining(options.getTotalProcessMemoryOption().key());
Review Comment:
Sorry, it's typo. I have updated.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
