Jiabao-Sun commented on code in PR #23243:
URL: https://github.com/apache/flink/pull/23243#discussion_r1314789249
##########
flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/AbstractMetricGroupTest.java:
##########
@@ -75,30 +70,30 @@ protected String getGroupName(CharacterFilter filter) {
return "";
}
};
- assertTrue(group.getAllVariables().isEmpty());
+ assertThat(group.getAllVariables().isEmpty()).isTrue();
registry.closeAsync().get();
}
@Test
- public void testGetAllVariablesWithOutExclusions() {
+ void testGetAllVariablesWithOutExclusions() {
MetricRegistry registry = NoOpMetricRegistry.INSTANCE;
AbstractMetricGroup<?> group = new ProcessMetricGroup(registry,
"host");
- assertThat(group.getAllVariables(),
IsMapContaining.hasKey(ScopeFormat.SCOPE_HOST));
+
assertThat(group.getAllVariables()).containsKey(ScopeFormat.SCOPE_HOST);
}
@Test
- public void testGetAllVariablesWithExclusions() {
+ void testGetAllVariablesWithExclusions() {
MetricRegistry registry = NoOpMetricRegistry.INSTANCE;
AbstractMetricGroup<?> group = new ProcessMetricGroup(registry,
"host");
- assertEquals(
- group.getAllVariables(-1,
Collections.singleton(ScopeFormat.SCOPE_HOST)).size(), 0);
+ assertThat(group.getAllVariables(-1,
Collections.singleton(ScopeFormat.SCOPE_HOST)))
+ .hasSize(0);
Review Comment:
```suggestion
.isEmpty();
```
##########
flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/JobManagerJobGroupTest.java:
##########
@@ -88,17 +85,17 @@ public void testGenerateScopeCustomWildcard() throws
Exception {
JobManagerMetricGroup.createJobManagerMetricGroup(registry,
"theHostName")
.addJob(jid, "myJobName");
- assertArrayEquals(
- new String[] {"peter", "some-constant", jid.toString()},
- jmGroup.getScopeComponents());
+ assertThat(jmGroup.getScopeComponents())
+ .containsAnyOf("peter", "some-constant", jid.toString());
Review Comment:
```suggestion
.containsExactly("peter", "some-constant", jid.toString());
```
##########
flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskManagerJobGroupTest.java:
##########
@@ -86,15 +82,14 @@ public void testGenerateScopeCustom() throws Exception {
registry, "theHostName", new ResourceID("test-tm-id"));
JobMetricGroup jmGroup = new TaskManagerJobMetricGroup(registry,
tmGroup, jid, "myJobName");
- assertArrayEquals(
- new String[] {"some-constant", "myJobName"},
jmGroup.getScopeComponents());
+
assertThat(jmGroup.getScopeComponents()).containsAnyOf("some-constant",
"myJobName");
Review Comment:
```suggestion
assertThat(jmGroup.getScopeComponents()).containsExactly("some-constant",
"myJobName");
```
##########
flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/JobManagerJobGroupTest.java:
##########
@@ -45,17 +43,17 @@ public void testGenerateScopeDefault() throws Exception {
JobManagerMetricGroup.createJobManagerMetricGroup(registry,
"theHostName")
.addJob(new JobID(), "myJobName");
- assertArrayEquals(
- new String[] {"theHostName", "jobmanager", "myJobName"},
- jmGroup.getScopeComponents());
+ assertThat(jmGroup.getScopeComponents())
+ .containsAnyOf("theHostName", "jobmanager", "myJobName");
Review Comment:
```suggestion
.containsExactly("theHostName", "jobmanager", "myJobName");
```
##########
flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/MetricGroupTest.java:
##########
@@ -87,14 +79,14 @@ public void sameGroupOnNameCollision() {
MetricGroup subgroup1 = group.addGroup(groupName);
MetricGroup subgroup2 = group.addGroup(groupName);
- assertNotNull(subgroup1);
- assertNotNull(subgroup2);
- assertTrue(subgroup1 == subgroup2);
+ assertThat(subgroup1).isNotNull();
+ assertThat(subgroup2).isNotNull();
+ assertThat(subgroup1).isEqualTo(subgroup2);
Review Comment:
```sugestion
assertThat(subgroup1).isSameAs(subgroup2);
```
##########
flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskMetricGroupTest.java:
##########
@@ -107,20 +100,17 @@ public void testGenerateScopeCustom() throws Exception {
TaskMetricGroup taskGroup =
tmGroup.addJob(jid, "myJobName").addTask(executionId,
"aTaskName");
- assertArrayEquals(
- new String[] {
- "test-tm-id", jid.toString(), vertexId.toString(),
executionId.toString()
- },
- taskGroup.getScopeComponents());
+ assertThat(taskGroup.getScopeComponents())
+ .containsAnyOf(
Review Comment:
```suggestion
.containsExactly(
```
##########
flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/JobManagerGroupTest.java:
##########
@@ -129,15 +126,13 @@ public void testGenerateScopeCustom() throws Exception {
JobManagerMetricGroup group =
JobManagerMetricGroup.createJobManagerMetricGroup(registry,
"host");
- assertArrayEquals(
- new String[] {"constant", "host", "foo", "host"},
group.getScopeComponents());
- assertEquals("constant.host.foo.host.name",
group.getMetricIdentifier("name"));
+ assertThat(group.getScopeComponents()).containsAnyOf("constant",
"host", "foo", "host");
Review Comment:
```suggestion
assertThat(group.getScopeComponents()).containsExactly("constant",
"host", "foo", "host");
```
##########
flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/InternalOperatorGroupTest.java:
##########
@@ -175,12 +166,12 @@ public void testVariables() {
private static void testVariable(
Map<String, String> variables, String key, String expectedValue) {
String actualValue = variables.get(key);
- assertNotNull(actualValue);
- assertEquals(expectedValue, actualValue);
+ assertThat(actualValue).isNotNull();
+ assertThat(actualValue).isEqualTo(expectedValue);
Review Comment:
```suggestion
assertThat(actualValue).isNotNull().isEqualTo(expectedValue);
```
##########
flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskManagerJobGroupTest.java:
##########
@@ -108,18 +103,16 @@ public void testGenerateScopeCustomWildcard() throws
Exception {
registry, "theHostName", new ResourceID("test-tm-id"));
JobMetricGroup jmGroup = new TaskManagerJobMetricGroup(registry,
tmGroup, jid, "myJobName");
- assertArrayEquals(
- new String[] {"peter", "test-tm-id", "some-constant",
jid.toString()},
- jmGroup.getScopeComponents());
+ assertThat(jmGroup.getScopeComponents())
+ .containsAnyOf("peter", "test-tm-id", "some-constant",
jid.toString());
Review Comment:
```suggestion
.containsExactly("peter", "test-tm-id", "some-constant",
jid.toString());
```
##########
flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/JobManagerGroupTest.java:
##########
@@ -106,21 +103,21 @@ public void testCloseClosesAll() throws Exception {
// ------------------------------------------------------------------------
@Test
- public void testGenerateScopeDefault() throws Exception {
+ void testGenerateScopeDefault() throws Exception {
MetricRegistryImpl registry =
new MetricRegistryImpl(
MetricRegistryTestUtils.defaultMetricRegistryConfiguration());
JobManagerMetricGroup group =
JobManagerMetricGroup.createJobManagerMetricGroup(registry,
"localhost");
- assertArrayEquals(new String[] {"localhost", "jobmanager"},
group.getScopeComponents());
- assertEquals("localhost.jobmanager.name",
group.getMetricIdentifier("name"));
+ assertThat(group.getScopeComponents()).containsAnyOf("localhost",
"jobmanager");
Review Comment:
```suggestion
assertThat(group.getScopeComponents()).containsExactly("localhost",
"jobmanager");
```
##########
flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/JobManagerJobGroupTest.java:
##########
@@ -66,16 +64,15 @@ public void testGenerateScopeCustom() throws Exception {
JobManagerMetricGroup.createJobManagerMetricGroup(registry,
"theHostName")
.addJob(new JobID(), "myJobName");
- assertArrayEquals(
- new String[] {"some-constant", "myJobName"},
jmGroup.getScopeComponents());
+
assertThat(jmGroup.getScopeComponents()).containsAnyOf("some-constant",
"myJobName");
Review Comment:
```suggestion
assertThat(jmGroup.getScopeComponents()).containsExactly("some-constant",
"myJobName");
```
##########
flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskManagerGroupTest.java:
##########
@@ -152,28 +144,27 @@ public void testCloseClosesAll() throws IOException {
group.close();
- assertTrue(tmGroup11.isClosed());
- assertTrue(tmGroup12.isClosed());
- assertTrue(tmGroup21.isClosed());
+ assertThat(tmGroup11.isClosed()).isTrue();
+ assertThat(tmGroup12.isClosed()).isTrue();
+ assertThat(tmGroup21.isClosed()).isTrue();
}
// ------------------------------------------------------------------------
// scope name tests
// ------------------------------------------------------------------------
@Test
- public void testGenerateScopeDefault() {
+ void testGenerateScopeDefault() {
TaskManagerMetricGroup group =
TaskManagerMetricGroup.createTaskManagerMetricGroup(
registry, "localhost", new ResourceID("id"));
- assertArrayEquals(
- new String[] {"localhost", "taskmanager", "id"},
group.getScopeComponents());
- assertEquals("localhost.taskmanager.id.name",
group.getMetricIdentifier("name"));
+ assertThat(group.getScopeComponents()).containsAnyOf("localhost",
"taskmanager", "id");
Review Comment:
```suggestion
assertThat(group.getScopeComponents()).containsExactly("localhost",
"taskmanager", "id");
```
##########
flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskManagerJobGroupTest.java:
##########
@@ -26,53 +26,49 @@
import org.apache.flink.runtime.metrics.MetricRegistryTestUtils;
import org.apache.flink.runtime.metrics.dump.QueryScopeInfo;
import org.apache.flink.runtime.metrics.util.DummyCharacterFilter;
-import org.apache.flink.util.TestLogger;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
/** Tests for the {@link TaskManagerJobMetricGroup}. */
-public class TaskManagerJobGroupTest extends TestLogger {
+class TaskManagerJobGroupTest {
private MetricRegistryImpl registry;
- @Before
- public void setup() {
+ @BeforeEach
+ void setup() {
registry =
new MetricRegistryImpl(
MetricRegistryTestUtils.defaultMetricRegistryConfiguration());
}
- @After
- public void teardown() throws Exception {
+ @AfterEach
+ void teardown() throws Exception {
if (registry != null) {
registry.closeAsync().get();
}
}
@Test
- public void testGenerateScopeDefault() {
+ void testGenerateScopeDefault() {
TaskManagerMetricGroup tmGroup =
TaskManagerMetricGroup.createTaskManagerMetricGroup(
registry, "theHostName", new ResourceID("test-tm-id"));
JobMetricGroup jmGroup =
new TaskManagerJobMetricGroup(registry, tmGroup, new JobID(),
"myJobName");
- assertArrayEquals(
- new String[] {"theHostName", "taskmanager", "test-tm-id",
"myJobName"},
- jmGroup.getScopeComponents());
+ assertThat(jmGroup.getScopeComponents())
+ .containsAnyOf("theHostName", "taskmanager", "test-tm-id",
"myJobName");
Review Comment:
```suggestion
.containsExactly("theHostName", "taskmanager", "test-tm-id",
"myJobName");
```
##########
flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskManagerGroupTest.java:
##########
@@ -182,21 +173,20 @@ public void testGenerateScopeCustom() throws Exception {
TaskManagerMetricGroup.createTaskManagerMetricGroup(
registry, "host", new ResourceID("id"));
- assertArrayEquals(
- new String[] {"constant", "host", "foo", "host"},
group.getScopeComponents());
- assertEquals("constant.host.foo.host.name",
group.getMetricIdentifier("name"));
+ assertThat(group.getScopeComponents()).containsAnyOf("constant",
"host", "foo", "host");
Review Comment:
```suggestion
assertThat(group.getScopeComponents()).containsExactly("constant",
"host", "foo", "host");
```
##########
flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/AbstractMetricGroupTest.java:
##########
@@ -75,30 +70,30 @@ protected String getGroupName(CharacterFilter filter) {
return "";
}
};
- assertTrue(group.getAllVariables().isEmpty());
+ assertThat(group.getAllVariables().isEmpty()).isTrue();
Review Comment:
assertThat(group.getAllVariables()).isEmpty();
##########
flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskMetricGroupTest.java:
##########
@@ -75,19 +71,16 @@ public void testGenerateScopeDefault() {
tmGroup.addJob(new JobID(), "myJobName")
.addTask(createExecutionAttemptId(new JobVertexID(),
13, 2), "aTaskName");
- assertArrayEquals(
- new String[] {
- "theHostName", "taskmanager", "test-tm-id", "myJobName",
"aTaskName", "13"
- },
- taskGroup.getScopeComponents());
+ assertThat(taskGroup.getScopeComponents())
+ .containsAnyOf(
Review Comment:
```suggestion
.containsExactly(
```
##########
flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskMetricGroupTest.java:
##########
@@ -135,25 +125,23 @@ public void testGenerateScopeWilcard() throws Exception {
TaskMetricGroup taskGroup =
tmGroup.addJob(new JobID(), "myJobName").addTask(executionId,
"aTaskName");
- assertArrayEquals(
- new String[] {
- "theHostName",
- "taskmanager",
- "test-tm-id",
- "myJobName",
- executionId.toString(),
- "13"
- },
- taskGroup.getScopeComponents());
-
- assertEquals(
- "theHostName.taskmanager.test-tm-id.myJobName." + executionId
+ ".13.name",
- taskGroup.getMetricIdentifier("name"));
+ assertThat(taskGroup.getScopeComponents())
+ .containsAnyOf(
Review Comment:
```suggestion
.containsExactly(
```
##########
flink-runtime/src/test/java/org/apache/flink/runtime/metrics/dump/MetricQueryServiceTest.java:
##########
@@ -158,13 +156,13 @@ public void testHandleOversizedMetricMessage() throws
Exception {
MetricDumpSerialization.MetricSerializationResult recoveredDump =
queryService.queryMetrics(TIMEOUT).get();
- assertTrue(recoveredDump.serializedCounters.length > 0);
- assertEquals(1, recoveredDump.numCounters);
- assertTrue(recoveredDump.serializedMeters.length > 0);
- assertEquals(1, recoveredDump.numMeters);
- assertTrue(recoveredDump.serializedGauges.length > 0);
- assertEquals(1, recoveredDump.numGauges);
- assertTrue(recoveredDump.serializedHistograms.length > 0);
- assertEquals(1, recoveredDump.numHistograms);
+ assertThat(recoveredDump.serializedCounters.length).isGreaterThan(0);
+ assertThat(recoveredDump.numCounters).isOne();
+ assertThat(recoveredDump.serializedMeters.length).isGreaterThan(0);
+ assertThat(recoveredDump.numMeters).isOne();
+ assertThat(recoveredDump.serializedGauges.length).isGreaterThan(0);
+ assertThat(recoveredDump.numGauges).isOne();
+ assertThat(recoveredDump.serializedHistograms.length).isGreaterThan(0);
Review Comment:
```suggestion
assertThat(recoveredDump.serializedCounters).isNotEmpty();
```
--
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]
