This is an automated email from the ASF dual-hosted git repository. xtsong pushed a commit to branch release-1.16 in repository https://gitbox.apache.org/repos/asf/flink.git
commit 3423354aa5571ca68407f838eab6d5f61a6046a8 Author: Yuxin Tan <[email protected]> AuthorDate: Sun Oct 23 17:25:30 2022 +0800 [hotfix][tests] Migrate MetricFetcherTest to JUnit5 --- .../handler/legacy/metrics/MetricFetcherTest.java | 80 ++++++++++++---------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcherTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcherTest.java index a7259988672..27ce10cf128 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcherTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcherTest.java @@ -37,12 +37,11 @@ import org.apache.flink.runtime.webmonitor.RestfulGateway; import org.apache.flink.runtime.webmonitor.TestingRestfulGateway; import org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever; import org.apache.flink.runtime.webmonitor.retriever.MetricQueryServiceGateway; -import org.apache.flink.util.TestLogger; +import org.apache.flink.util.TestLoggerExtension; import org.apache.flink.util.concurrent.Executors; -import org.junit.Test; - -import javax.annotation.Nonnull; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import java.util.Collections; import java.util.HashMap; @@ -50,14 +49,13 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicInteger; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** Tests for the MetricFetcher. */ -public class MetricFetcherTest extends TestLogger { +@ExtendWith(TestLoggerExtension.class) +class MetricFetcherTest { @Test - public void testUpdate() { + void testUpdate() { final Time timeout = Time.seconds(10L); // ========= setup TaskManager @@ -133,30 +131,37 @@ public class MetricFetcherTest extends TestLogger { fetcher.update(); MetricStore store = fetcher.getMetricStore(); synchronized (store) { - assertEquals("7", store.getJobManagerMetricStore().getMetric("abc.hist_min")); - assertEquals("6", store.getJobManagerMetricStore().getMetric("abc.hist_max")); - assertEquals("4.0", store.getJobManagerMetricStore().getMetric("abc.hist_mean")); - assertEquals("0.5", store.getJobManagerMetricStore().getMetric("abc.hist_median")); - assertEquals("5.0", store.getJobManagerMetricStore().getMetric("abc.hist_stddev")); - assertEquals("0.75", store.getJobManagerMetricStore().getMetric("abc.hist_p75")); - assertEquals("0.9", store.getJobManagerMetricStore().getMetric("abc.hist_p90")); - assertEquals("0.95", store.getJobManagerMetricStore().getMetric("abc.hist_p95")); - assertEquals("0.98", store.getJobManagerMetricStore().getMetric("abc.hist_p98")); - assertEquals("0.99", store.getJobManagerMetricStore().getMetric("abc.hist_p99")); - assertEquals("0.999", store.getJobManagerMetricStore().getMetric("abc.hist_p999")); - - assertEquals( - "x", - store.getTaskManagerMetricStore(tmRID.toString()).metrics.get("abc.gauge")); - assertEquals("5.0", store.getJobMetricStore(jobID.toString()).metrics.get("abc.jc")); - assertEquals( - "2", - store.getTaskMetricStore(jobID.toString(), "taskid").metrics.get("2.abc.tc")); - assertEquals( - "1", - store.getTaskMetricStore(jobID.toString(), "taskid") - .metrics - .get("2.opname.abc.oc")); + assertThat(store.getJobManagerMetricStore().getMetric("abc.hist_min")).isEqualTo("7"); + assertThat(store.getJobManagerMetricStore().getMetric("abc.hist_max")).isEqualTo("6"); + assertThat(store.getJobManagerMetricStore().getMetric("abc.hist_mean")) + .isEqualTo("4.0"); + assertThat(store.getJobManagerMetricStore().getMetric("abc.hist_median")) + .isEqualTo("0.5"); + assertThat(store.getJobManagerMetricStore().getMetric("abc.hist_stddev")) + .isEqualTo("5.0"); + assertThat(store.getJobManagerMetricStore().getMetric("abc.hist_p75")) + .isEqualTo("0.75"); + assertThat(store.getJobManagerMetricStore().getMetric("abc.hist_p90")).isEqualTo("0.9"); + assertThat(store.getJobManagerMetricStore().getMetric("abc.hist_p95")) + .isEqualTo("0.95"); + assertThat(store.getJobManagerMetricStore().getMetric("abc.hist_p98")) + .isEqualTo("0.98"); + assertThat(store.getJobManagerMetricStore().getMetric("abc.hist_p99")) + .isEqualTo("0.99"); + assertThat(store.getJobManagerMetricStore().getMetric("abc.hist_p999")) + .isEqualTo("0.999"); + + assertThat(store.getTaskManagerMetricStore(tmRID.toString()).metrics.get("abc.gauge")) + .isEqualTo("x"); + assertThat(store.getJobMetricStore(jobID.toString()).metrics.get("abc.jc")) + .isEqualTo("5.0"); + assertThat(store.getTaskMetricStore(jobID.toString(), "taskid").metrics.get("2.abc.tc")) + .isEqualTo("2"); + assertThat( + store.getTaskMetricStore(jobID.toString(), "taskid") + .metrics + .get("2.opname.abc.oc")) + .isEqualTo("1"); } } @@ -228,7 +233,7 @@ public class MetricFetcherTest extends TestLogger { } @Test - public void testLongUpdateInterval() { + void testLongUpdateInterval() { final long updateInterval = 1000L; final AtomicInteger requestMetricQueryServiceGatewaysCounter = new AtomicInteger(0); final RestfulGateway restfulGateway = @@ -239,11 +244,11 @@ public class MetricFetcherTest extends TestLogger { fetcher.update(); fetcher.update(); - assertThat(requestMetricQueryServiceGatewaysCounter.get(), is(1)); + assertThat(requestMetricQueryServiceGatewaysCounter).hasValue(1); } @Test - public void testShortUpdateInterval() throws InterruptedException { + void testShortUpdateInterval() throws InterruptedException { final long updateInterval = 1L; final AtomicInteger requestMetricQueryServiceGatewaysCounter = new AtomicInteger(0); final RestfulGateway restfulGateway = @@ -263,10 +268,9 @@ public class MetricFetcherTest extends TestLogger { fetcher.update(); - assertThat(requestMetricQueryServiceGatewaysCounter.get(), is(2)); + assertThat(requestMetricQueryServiceGatewaysCounter).hasValue(2); } - @Nonnull private MetricFetcher createMetricFetcher(long updateInterval, RestfulGateway restfulGateway) { return new MetricFetcherImpl<>( () -> CompletableFuture.completedFuture(restfulGateway),
