diff --git a/pulsar-broker/src/test/java/org/apache/bookkeeper/mledger/impl/MangedLedgerInterceptorImplTest2.java b/pulsar-broker/src/test/java/org/apache/bookkeeper/mledger/impl/MangedLedgerInterceptorImpl2Test.java similarity index 96% rename from pulsar-broker/src/test/java/org/apache/bookkeeper/mledger/impl/MangedLedgerInterceptorImplTest2.java rename to pulsar-broker/src/test/java/org/apache/bookkeeper/mledger/impl/MangedLedgerInterceptorImpl2Test.java index 080ef9ea4c5fe..1be66a7f9d8f5 100644 --- a/pulsar-broker/src/test/java/org/apache/bookkeeper/mledger/impl/MangedLedgerInterceptorImplTest2.java +++ b/pulsar-broker/src/test/java/org/apache/bookkeeper/mledger/impl/MangedLedgerInterceptorImpl2Test.java @@ -39,9 +39,9 @@ */ @Slf4j @Test(groups = "broker") -public class MangedLedgerInterceptorImplTest2 extends MockedBookKeeperTestCase { +public class MangedLedgerInterceptorImpl2Test extends MockedBookKeeperTestCase { - public static void switchLedgerManually(ManagedLedgerImpl ledger){ + private static void switchLedgerManually(ManagedLedgerImpl ledger){ LedgerHandle originalLedgerHandle = ledger.currentLedger; ledger.ledgerClosed(ledger.currentLedger); ledger.createLedgerAfterClosed(); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java index aa190cd2e0a73..aff13f1a1ca21 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java @@ -538,15 +538,15 @@ private void testE2EPulsarFunctionLocalRun(String jarFilePathUrl, int parallelis totalMsgs); // validate prometheus metrics - String prometheusMetrics = PulsarFunctionTestUtils.getPrometheusMetrics(metricsPort); + String prometheusMetrics = TestPulsarFunctionUtils.getPrometheusMetrics(metricsPort); log.info("prometheus metrics: {}", prometheusMetrics); - Map metricsMap = new HashMap<>(); + Map metricsMap = new HashMap<>(); Arrays.asList(prometheusMetrics.split("\n")).forEach(line -> { if (line.startsWith("pulsar_function_processed_successfully_total")) { - Map metrics = PulsarFunctionTestUtils.parseMetrics(line); + Map metrics = TestPulsarFunctionUtils.parseMetrics(line); assertFalse(metrics.isEmpty()); - PulsarFunctionTestUtils.Metric m = metrics.get("pulsar_function_processed_successfully_total"); + TestPulsarFunctionUtils.Metric m = metrics.get("pulsar_function_processed_successfully_total"); if (m != null) { metricsMap.put(m.tags.get("instance_id"), m); } @@ -556,7 +556,7 @@ private void testE2EPulsarFunctionLocalRun(String jarFilePathUrl, int parallelis double totalMsgRecv = 0.0; for (int i = 0; i < parallelism; i++) { - PulsarFunctionTestUtils.Metric m = metricsMap.get(String.valueOf(i)); + TestPulsarFunctionUtils.Metric m = metricsMap.get(String.valueOf(i)); Assert.assertNotNull(m); assertEquals(m.tags.get("cluster"), config.getClusterName()); assertEquals(m.tags.get("instance_id"), String.valueOf(i)); @@ -843,15 +843,15 @@ private void testPulsarSourceLocalRun(String jarFilePathUrl, int parallelism) th assertEquals(admin.topics().getStats(sinkTopic).getPublishers().size(), parallelism); // validate prometheus metrics - String prometheusMetrics = PulsarFunctionTestUtils.getPrometheusMetrics(metricsPort); + String prometheusMetrics = TestPulsarFunctionUtils.getPrometheusMetrics(metricsPort); log.info("prometheus metrics: {}", prometheusMetrics); - Map metricsMap = new HashMap<>(); + Map metricsMap = new HashMap<>(); Arrays.asList(prometheusMetrics.split("\n")).forEach(line -> { if (line.startsWith("pulsar_source_written_total")) { - Map metrics = PulsarFunctionTestUtils.parseMetrics(line); + Map metrics = TestPulsarFunctionUtils.parseMetrics(line); assertFalse(metrics.isEmpty()); - PulsarFunctionTestUtils.Metric m = metrics.get("pulsar_source_written_total"); + TestPulsarFunctionUtils.Metric m = metrics.get("pulsar_source_written_total"); if (m != null) { metricsMap.put(m.tags.get("instance_id"), m); } @@ -860,7 +860,7 @@ private void testPulsarSourceLocalRun(String jarFilePathUrl, int parallelism) th Assert.assertEquals(metricsMap.size(), parallelism); for (int i = 0; i < parallelism; i++) { - PulsarFunctionTestUtils.Metric m = metricsMap.get(String.valueOf(i)); + TestPulsarFunctionUtils.Metric m = metricsMap.get(String.valueOf(i)); Assert.assertNotNull(m); assertEquals(m.tags.get("cluster"), config.getClusterName()); assertEquals(m.tags.get("instance_id"), String.valueOf(i)); @@ -1002,22 +1002,22 @@ private void testPulsarSinkLocalRun(String jarFilePathUrl, int parallelism, Stri }, 5, 200)); // validate prometheus metrics - String prometheusMetrics = PulsarFunctionTestUtils.getPrometheusMetrics(metricsPort); + String prometheusMetrics = TestPulsarFunctionUtils.getPrometheusMetrics(metricsPort); log.info("prometheus metrics: {}", prometheusMetrics); - Map metricsMap = new HashMap<>(); + Map metricsMap = new HashMap<>(); Arrays.asList(prometheusMetrics.split("\n")).forEach(line -> { if (line.startsWith("pulsar_sink_written_total")) { - Map metrics = PulsarFunctionTestUtils.parseMetrics(line); + Map metrics = TestPulsarFunctionUtils.parseMetrics(line); assertFalse(metrics.isEmpty()); - PulsarFunctionTestUtils.Metric m = metrics.get("pulsar_sink_written_total"); + TestPulsarFunctionUtils.Metric m = metrics.get("pulsar_sink_written_total"); if (m != null) { metricsMap.put(m.tags.get("instance_id"), m); } } else if (line.startsWith("pulsar_sink_sink_exceptions_total")) { - Map metrics = PulsarFunctionTestUtils.parseMetrics(line); + Map metrics = TestPulsarFunctionUtils.parseMetrics(line); assertFalse(metrics.isEmpty()); - PulsarFunctionTestUtils.Metric m = metrics.get("pulsar_sink_sink_exceptions_total"); + TestPulsarFunctionUtils.Metric m = metrics.get("pulsar_sink_sink_exceptions_total"); if (m == null) { m = metrics.get("pulsar_sink_sink_exceptions_1min_total"); } @@ -1028,7 +1028,7 @@ private void testPulsarSinkLocalRun(String jarFilePathUrl, int parallelism, Stri double totalNumRecvMsg = 0; for (int i = 0; i < parallelism; i++) { - PulsarFunctionTestUtils.Metric m = metricsMap.get(String.valueOf(i)); + TestPulsarFunctionUtils.Metric m = metricsMap.get(String.valueOf(i)); Assert.assertNotNull(m); assertEquals(m.tags.get("cluster"), config.getClusterName()); assertEquals(m.tags.get("instance_id"), String.valueOf(i)); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionTestUtils.java b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/TestPulsarFunctionUtils.java similarity index 98% rename from pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionTestUtils.java rename to pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/TestPulsarFunctionUtils.java index 292c571c3bc65..71f10cc2cbc39 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionTestUtils.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/TestPulsarFunctionUtils.java @@ -39,7 +39,8 @@ import static com.google.common.base.Preconditions.checkArgument; @Slf4j -public class PulsarFunctionTestUtils { +@Test(groups = "functions-worker") +public class TestPulsarFunctionUtils { public static String getPrometheusMetrics(int metricsPort) throws IOException { StringBuilder result = new StringBuilder(); URL url = new URL(String.format("http://%s:%s/metrics", "localhost", metricsPort)); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarBatchSourceE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarBatchSourceE2ETest.java index 90a1a53750261..3fa4aeb550c92 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarBatchSourceE2ETest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarBatchSourceE2ETest.java @@ -35,7 +35,7 @@ import org.apache.pulsar.common.policies.data.TopicStats; import org.apache.pulsar.functions.utils.FunctionCommon; -import org.apache.pulsar.functions.worker.PulsarFunctionTestUtils; +import org.apache.pulsar.functions.worker.TestPulsarFunctionUtils; import org.apache.pulsar.io.batchdiscovery.ImmediateTriggerer; import org.testng.annotations.Test; @@ -102,11 +102,11 @@ private void testPulsarBatchSourceStats(String jarFilePathUrl) throws Exception }, 50, 150); assertEquals(admin.topics().getStats(sinkTopic2).getPublishers().size(), 1); - String prometheusMetrics = PulsarFunctionTestUtils.getPrometheusMetrics(pulsar.getListenPortHTTP().get()); + String prometheusMetrics = TestPulsarFunctionUtils.getPrometheusMetrics(pulsar.getListenPortHTTP().get()); log.info("prometheusMetrics: {}", prometheusMetrics); - Map metrics = PulsarFunctionTestUtils.parseMetrics(prometheusMetrics); - PulsarFunctionTestUtils.Metric m = metrics.get("pulsar_source_received_total"); + Map metrics = TestPulsarFunctionUtils.parseMetrics(prometheusMetrics); + TestPulsarFunctionUtils.Metric m = metrics.get("pulsar_source_received_total"); assertEquals(m.tags.get("cluster"), config.getClusterName()); assertEquals(m.tags.get("instance_id"), "0"); assertEquals(m.tags.get("name"), sourceName); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java index d549dca1e8702..ab4925bfeb8de 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java @@ -67,7 +67,7 @@ import org.apache.pulsar.functions.instance.InstanceUtils; import org.apache.pulsar.functions.utils.FunctionCommon; import org.apache.pulsar.functions.worker.FunctionRuntimeManager; -import org.apache.pulsar.functions.worker.PulsarFunctionTestUtils; +import org.apache.pulsar.functions.worker.TestPulsarFunctionUtils; import org.awaitility.Awaitility; import org.testng.Assert; import org.testng.annotations.Test; @@ -373,11 +373,11 @@ public void testPulsarFunctionStats() throws Exception { functionStats.getAvgProcessLatency()); // validate prometheus metrics empty - String prometheusMetrics = PulsarFunctionTestUtils.getPrometheusMetrics(pulsar.getListenPortHTTP().get()); + String prometheusMetrics = TestPulsarFunctionUtils.getPrometheusMetrics(pulsar.getListenPortHTTP().get()); log.info("prometheus metrics: {}", prometheusMetrics); - Map metrics = PulsarFunctionTestUtils.parseMetrics(prometheusMetrics); - PulsarFunctionTestUtils.Metric m = metrics.get("pulsar_function_received_total"); + Map metrics = TestPulsarFunctionUtils.parseMetrics(prometheusMetrics); + TestPulsarFunctionUtils.Metric m = metrics.get("pulsar_function_received_total"); assertEquals(m.tags.get("cluster"), config.getClusterName()); assertEquals(m.tags.get("instance_id"), "0"); assertEquals(m.tags.get("name"), functionName); @@ -533,10 +533,10 @@ public void testPulsarFunctionStats() throws Exception { assertEquals(functionInstanceStats, functionStats.instances.get(0).getMetrics()); // validate prometheus metrics - prometheusMetrics = PulsarFunctionTestUtils.getPrometheusMetrics(pulsar.getListenPortHTTP().get()); + prometheusMetrics = TestPulsarFunctionUtils.getPrometheusMetrics(pulsar.getListenPortHTTP().get()); log.info("prometheus metrics: {}", prometheusMetrics); - metrics = PulsarFunctionTestUtils.parseMetrics(prometheusMetrics); + metrics = TestPulsarFunctionUtils.parseMetrics(prometheusMetrics); m = metrics.get("pulsar_function_received_total"); assertEquals(m.tags.get("cluster"), config.getClusterName()); assertEquals(m.tags.get("instance_id"), "0"); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarSinkE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarSinkE2ETest.java index 7e0dbabb105f9..7edc87bb996d4 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarSinkE2ETest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarSinkE2ETest.java @@ -53,7 +53,7 @@ import org.apache.pulsar.functions.LocalRunner; import org.apache.pulsar.functions.api.Record; import org.apache.pulsar.functions.utils.FunctionCommon; -import org.apache.pulsar.functions.worker.PulsarFunctionTestUtils; +import org.apache.pulsar.functions.worker.TestPulsarFunctionUtils; import org.apache.pulsar.io.core.Sink; import org.apache.pulsar.io.core.SinkContext; import org.awaitility.Awaitility; @@ -122,9 +122,9 @@ public void testReadCompactedSink() throws Exception { // 5 Sink should only read compacted value, so we will only receive compacted messages Awaitility.await().ignoreExceptions().untilAsserted(() -> { - String prometheusMetrics = PulsarFunctionTestUtils.getPrometheusMetrics(pulsar.getListenPortHTTP().get()); - Map metrics = PulsarFunctionTestUtils.parseMetrics(prometheusMetrics); - PulsarFunctionTestUtils.Metric m = metrics.get("pulsar_sink_received_total"); + String prometheusMetrics = TestPulsarFunctionUtils.getPrometheusMetrics(pulsar.getListenPortHTTP().get()); + Map metrics = TestPulsarFunctionUtils.parseMetrics(prometheusMetrics); + TestPulsarFunctionUtils.Metric m = metrics.get("pulsar_sink_received_total"); assertEquals(m.value, maxKeys); }); } @@ -271,11 +271,11 @@ private void testPulsarSinkStats(String jarFilePathUrl, Function assertEquals(sinkInstanceStatus.status.numSystemExceptions, 0)); // validate prometheus metrics empty - String prometheusMetrics = PulsarFunctionTestUtils.getPrometheusMetrics(pulsar.getListenPortHTTP().get()); + String prometheusMetrics = TestPulsarFunctionUtils.getPrometheusMetrics(pulsar.getListenPortHTTP().get()); log.info("prometheus metrics: {}", prometheusMetrics); - Map metrics = PulsarFunctionTestUtils.parseMetrics(prometheusMetrics); - PulsarFunctionTestUtils.Metric m = metrics.get("pulsar_sink_received_total"); + Map metrics = TestPulsarFunctionUtils.parseMetrics(prometheusMetrics); + TestPulsarFunctionUtils.Metric m = metrics.get("pulsar_sink_received_total"); assertEquals(m.tags.get("cluster"), config.getClusterName()); assertEquals(m.tags.get("instance_id"), "0"); assertEquals(m.tags.get("name"), sinkName); @@ -364,10 +364,10 @@ private void testPulsarSinkStats(String jarFilePathUrl, Function assertEquals(sinkInstanceStatus.status.numSystemExceptions, 0)); // get stats after producing - prometheusMetrics = PulsarFunctionTestUtils.getPrometheusMetrics(pulsar.getListenPortHTTP().get()); + prometheusMetrics = TestPulsarFunctionUtils.getPrometheusMetrics(pulsar.getListenPortHTTP().get()); log.info("prometheusMetrics: {}", prometheusMetrics); - metrics = PulsarFunctionTestUtils.parseMetrics(prometheusMetrics); + metrics = TestPulsarFunctionUtils.parseMetrics(prometheusMetrics); m = metrics.get("pulsar_sink_received_total"); assertEquals(m.tags.get("cluster"), config.getClusterName()); assertEquals(m.tags.get("instance_id"), "0"); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarSourceE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarSourceE2ETest.java index 99d16447bf894..1b7ffca22832e 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarSourceE2ETest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarSourceE2ETest.java @@ -33,7 +33,7 @@ import org.apache.pulsar.common.io.SourceConfig; import org.apache.pulsar.common.policies.data.TopicStats; import org.apache.pulsar.functions.utils.FunctionCommon; -import org.apache.pulsar.functions.worker.PulsarFunctionTestUtils; +import org.apache.pulsar.functions.worker.TestPulsarFunctionUtils; import org.testng.annotations.Test; import com.google.common.collect.Lists; @@ -106,11 +106,11 @@ private void testPulsarSourceStats(String jarFilePathUrl) throws Exception { }, 50, 150); assertEquals(admin.topics().getStats(sinkTopic2).getPublishers().size(), 1); - String prometheusMetrics = PulsarFunctionTestUtils.getPrometheusMetrics(pulsar.getListenPortHTTP().get()); + String prometheusMetrics = TestPulsarFunctionUtils.getPrometheusMetrics(pulsar.getListenPortHTTP().get()); log.info("prometheusMetrics: {}", prometheusMetrics); - Map metrics = PulsarFunctionTestUtils.parseMetrics(prometheusMetrics); - PulsarFunctionTestUtils.Metric m = metrics.get("pulsar_source_received_total"); + Map metrics = TestPulsarFunctionUtils.parseMetrics(prometheusMetrics); + TestPulsarFunctionUtils.Metric m = metrics.get("pulsar_source_received_total"); assertEquals(m.tags.get("cluster"), config.getClusterName()); assertEquals(m.tags.get("instance_id"), "0"); assertEquals(m.tags.get("name"), sourceName); diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyKeyStoreTlsTestWithAuth.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyKeyStoreTlsWithAuthTest.java similarity index 99% rename from pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyKeyStoreTlsTestWithAuth.java rename to pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyKeyStoreTlsWithAuthTest.java index 6a9745f05507b..1f21281a6f6ab 100644 --- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyKeyStoreTlsTestWithAuth.java +++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyKeyStoreTlsWithAuthTest.java @@ -51,7 +51,7 @@ import org.testng.annotations.Test; @Slf4j -public class ProxyKeyStoreTlsTestWithAuth extends MockedPulsarServiceBaseTest { +public class ProxyKeyStoreTlsWithAuthTest extends MockedPulsarServiceBaseTest { private ProxyService proxyService; private ProxyConfiguration proxyConfig = new ProxyConfiguration(); diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyKeyStoreTlsTestWithoutAuth.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyKeyStoreTlsWithoutAuthTest.java similarity index 99% rename from pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyKeyStoreTlsTestWithoutAuth.java rename to pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyKeyStoreTlsWithoutAuthTest.java index 4ceb85a852492..d7935755ce040 100644 --- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyKeyStoreTlsTestWithoutAuth.java +++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyKeyStoreTlsWithoutAuthTest.java @@ -47,7 +47,7 @@ import org.testng.annotations.Test; @Slf4j -public class ProxyKeyStoreTlsTestWithoutAuth extends MockedPulsarServiceBaseTest { +public class ProxyKeyStoreTlsWithoutAuthTest extends MockedPulsarServiceBaseTest { private ProxyService proxyService; private ProxyConfiguration proxyConfig = new ProxyConfiguration(); diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTlsTestWithAuth.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTlsWithAuthTest.java similarity index 98% rename from pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTlsTestWithAuth.java rename to pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTlsWithAuthTest.java index f6dff8fc3ea49..ec5cace8a06df 100644 --- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTlsTestWithAuth.java +++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTlsWithAuthTest.java @@ -34,7 +34,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -public class ProxyTlsTestWithAuth extends MockedPulsarServiceBaseTest { +public class ProxyTlsWithAuthTest extends MockedPulsarServiceBaseTest { private ProxyService proxyService; private ProxyConfiguration proxyConfig = new ProxyConfiguration();