From 71cb3df4e25f3e76c4bdbfa4be2616f9ecd3906e Mon Sep 17 00:00:00 2001 From: eziosudo Date: Wed, 5 Jul 2023 21:03:57 -0700 Subject: [PATCH 1/2] exclude integration tests in "./gradlew unitTest" by adding @Tag("integration") exclude integration tests in "./gradlew unitTest" by adding @Category(IntegrationTest.class) --- .../kafka/connect/integration/StartAndStopCounterTest.java | 3 +++ .../kafka/connect/integration/StartAndStopLatchTest.java | 3 +++ .../streams/integration/KTableEfficientRangeQueryTest.java | 3 +++ .../KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java | 2 ++ .../integration/KTableKTableForeignKeyJoinDistributedTest.java | 2 ++ .../integration/KTableKTableForeignKeyJoinIntegrationTest.java | 2 ++ .../kafka/streams/integration/LagFetchIntegrationTest.java | 2 ++ .../kafka/streams/integration/MetricsIntegrationTest.java | 2 ++ .../streams/integration/MetricsReporterIntegrationTest.java | 2 ++ .../streams/integration/NamedTopologyIntegrationTest.java | 2 ++ .../streams/integration/OptimizedKTableIntegrationTest.java | 2 ++ .../integration/PurgeRepartitionTopicIntegrationTest.java | 2 ++ .../streams/integration/QueryableStateIntegrationTest.java | 2 ++ .../kafka/streams/integration/RegexSourceIntegrationTest.java | 2 ++ .../integration/StandbyTaskCreationIntegrationTest.java | 2 ++ 15 files changed, 33 insertions(+) diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/StartAndStopCounterTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/StartAndStopCounterTest.java index 7820a6d94d8e3..43cb86149da22 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/StartAndStopCounterTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/StartAndStopCounterTest.java @@ -24,14 +24,17 @@ import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.test.IntegrationTest; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +@Category(IntegrationTest.class) public class StartAndStopCounterTest { private StartAndStopCounter counter; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/StartAndStopLatchTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/StartAndStopLatchTest.java index d2732ea4bb28d..4dd352961ee7a 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/StartAndStopLatchTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/StartAndStopLatchTest.java @@ -27,13 +27,16 @@ import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.test.IntegrationTest; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +@Category(IntegrationTest.class) public class StartAndStopLatchTest { private Time clock; diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/KTableEfficientRangeQueryTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/KTableEfficientRangeQueryTest.java index 581baa59482fd..571bbf95ed03b 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/KTableEfficientRangeQueryTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/KTableEfficientRangeQueryTest.java @@ -34,11 +34,13 @@ import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.streams.state.ReadOnlyKeyValueStore; import org.apache.kafka.streams.state.Stores; +import org.apache.kafka.test.IntegrationTest; import org.apache.kafka.test.TestUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.rules.TestName; import org.junit.rules.Timeout; import org.junit.runner.RunWith; @@ -61,6 +63,7 @@ import static org.hamcrest.MatcherAssert.assertThat; @RunWith(Parameterized.class) +@Category({IntegrationTest.class}) public class KTableEfficientRangeQueryTest { @Rule public Timeout globalTimeout = Timeout.seconds(600); diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java index 997d846e3bf34..38691ea7e2942 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java @@ -49,6 +49,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.api.Tag; import java.io.IOException; import java.util.Collections; @@ -65,6 +66,7 @@ @Timeout(600) @Category({IntegrationTest.class}) +@Tag("integration") public class KTableKTableForeignKeyInnerJoinMultiIntegrationTest { private final static int NUM_BROKERS = 1; diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinDistributedTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinDistributedTest.java index ff5b67965f64c..52e5f050c0438 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinDistributedTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinDistributedTest.java @@ -42,6 +42,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.api.Tag; import java.io.IOException; import java.util.Arrays; @@ -58,6 +59,7 @@ @Timeout(600) @Category({IntegrationTest.class}) +@Tag("integration") public class KTableKTableForeignKeyJoinDistributedTest { private static final int NUM_BROKERS = 1; private static final String LEFT_TABLE = "left_table"; diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinIntegrationTest.java index b76b5ddc0dbf5..e30d14e23120f 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinIntegrationTest.java @@ -41,6 +41,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.Tag; import org.junit.rules.TestName; import org.junit.rules.Timeout; import org.junit.runner.RunWith; @@ -65,6 +66,7 @@ @RunWith(Parameterized.class) @Category(IntegrationTest.class) +@Tag("integration") public class KTableKTableForeignKeyJoinIntegrationTest { @Rule public Timeout globalTimeout = Timeout.seconds(600); diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/LagFetchIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/LagFetchIntegrationTest.java index 9fe78fbb52b58..a69b20ba41318 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/LagFetchIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/LagFetchIntegrationTest.java @@ -47,6 +47,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.api.Tag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -75,6 +76,7 @@ @Timeout(600) @Category({IntegrationTest.class}) +@Tag("integration") public class LagFetchIntegrationTest { public static final EmbeddedKafkaCluster CLUSTER = new EmbeddedKafkaCluster(1); diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/MetricsIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/MetricsIntegrationTest.java index 8821a0cebec43..9d1f3e4ad68ad 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/MetricsIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/MetricsIntegrationTest.java @@ -51,6 +51,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.api.Tag; import java.io.IOException; import java.time.Duration; @@ -68,6 +69,7 @@ @Timeout(600) @Category({IntegrationTest.class}) +@Tag("integration") @SuppressWarnings("deprecation") public class MetricsIntegrationTest { private static final int NUM_BROKERS = 1; diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/MetricsReporterIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/MetricsReporterIntegrationTest.java index d9441d8ca6985..40c47cf2bf0f4 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/MetricsReporterIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/MetricsReporterIntegrationTest.java @@ -35,6 +35,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.api.Tag; import java.io.IOException; import java.util.HashMap; @@ -48,6 +49,7 @@ @Timeout(600) @Category({IntegrationTest.class}) +@Tag("integration") public class MetricsReporterIntegrationTest { private static final int NUM_BROKERS = 1; diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/NamedTopologyIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/NamedTopologyIntegrationTest.java index 6c4908e1beabc..c2e61dafe4d7e 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/NamedTopologyIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/NamedTopologyIntegrationTest.java @@ -72,6 +72,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.api.Tag; import java.time.Duration; import java.util.Collection; @@ -105,6 +106,7 @@ @Timeout(600) @Category(IntegrationTest.class) +@Tag("integration") public class NamedTopologyIntegrationTest { public static final EmbeddedKafkaCluster CLUSTER = new EmbeddedKafkaCluster(1); diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/OptimizedKTableIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/OptimizedKTableIntegrationTest.java index 9f6e1d213b071..5f81c31236451 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/OptimizedKTableIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/OptimizedKTableIntegrationTest.java @@ -63,11 +63,13 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.api.Tag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @Timeout(600) @Category(IntegrationTest.class) +@Tag("integration") public class OptimizedKTableIntegrationTest { private static final Logger LOG = LoggerFactory.getLogger(OptimizedKTableIntegrationTest.class); private static final int NUM_BROKERS = 1; diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java index 3b4db318eead2..7fde73559820d 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java @@ -44,6 +44,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.api.Tag; import java.io.IOException; import java.time.Duration; @@ -56,6 +57,7 @@ @Timeout(600) @Category({IntegrationTest.class}) +@Tag("integration") public class PurgeRepartitionTopicIntegrationTest { private static final int NUM_BROKERS = 1; diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java index f3c9bcc2628e5..bab2549f21afe 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java @@ -69,6 +69,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.api.Tag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -120,6 +121,7 @@ @Timeout(600) @Category({IntegrationTest.class}) +@Tag("integration") @SuppressWarnings("deprecation") public class QueryableStateIntegrationTest { private static final Logger log = LoggerFactory.getLogger(QueryableStateIntegrationTest.class); diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/RegexSourceIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/RegexSourceIntegrationTest.java index bfbf4288d7fdb..2027defb8493f 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/RegexSourceIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/RegexSourceIntegrationTest.java @@ -55,6 +55,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.api.Tag; import java.io.IOException; import java.util.ArrayList; @@ -81,6 +82,7 @@ */ @Timeout(600) @Category({IntegrationTest.class}) +@Tag("integration") public class RegexSourceIntegrationTest { private static final int NUM_BROKERS = 1; public static final EmbeddedKafkaCluster CLUSTER = new EmbeddedKafkaCluster(NUM_BROKERS); diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/StandbyTaskCreationIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/StandbyTaskCreationIntegrationTest.java index d84d267b448d3..c31cfd840a31d 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/StandbyTaskCreationIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/StandbyTaskCreationIntegrationTest.java @@ -41,6 +41,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.api.Tag; import java.io.IOException; import java.util.Properties; @@ -50,6 +51,7 @@ @Timeout(600) @Category({IntegrationTest.class}) +@Tag("integration") public class StandbyTaskCreationIntegrationTest { private static final int NUM_BROKERS = 1; From 6479d5c304ee948090cd4b19cf351320e6f23c46 Mon Sep 17 00:00:00 2001 From: eziosudo Date: Sat, 8 Jul 2023 17:15:50 -0700 Subject: [PATCH 2/2] remove @Category({IntegrationTest.class}) from Junit5 tests --- .../KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java | 3 --- .../integration/KTableKTableForeignKeyJoinDistributedTest.java | 3 --- .../integration/KTableKTableForeignKeyJoinIntegrationTest.java | 2 -- .../kafka/streams/integration/LagFetchIntegrationTest.java | 3 --- .../kafka/streams/integration/MetricsIntegrationTest.java | 3 --- .../streams/integration/MetricsReporterIntegrationTest.java | 3 --- .../streams/integration/NamedTopologyIntegrationTest.java | 3 --- .../streams/integration/OptimizedKTableIntegrationTest.java | 3 --- .../integration/PurgeRepartitionTopicIntegrationTest.java | 3 --- .../streams/integration/QueryableStateIntegrationTest.java | 3 --- .../kafka/streams/integration/RegexSourceIntegrationTest.java | 3 --- .../integration/StandbyTaskCreationIntegrationTest.java | 3 --- 12 files changed, 35 deletions(-) diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java index 38691ea7e2942..dd387405cb04d 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java @@ -40,9 +40,7 @@ import org.apache.kafka.streams.kstream.ValueJoiner; import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.streams.utils.UniqueTopicSerdeScope; -import org.apache.kafka.test.IntegrationTest; import org.apache.kafka.test.TestUtils; -import org.junit.experimental.categories.Category; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; @@ -65,7 +63,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @Timeout(600) -@Category({IntegrationTest.class}) @Tag("integration") public class KTableKTableForeignKeyInnerJoinMultiIntegrationTest { private final static int NUM_BROKERS = 1; diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinDistributedTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinDistributedTest.java index 52e5f050c0438..d775c9e54c9f5 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinDistributedTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinDistributedTest.java @@ -32,9 +32,7 @@ import org.apache.kafka.streams.integration.utils.IntegrationTestUtils; import org.apache.kafka.streams.kstream.KTable; import org.apache.kafka.streams.kstream.ValueJoiner; -import org.apache.kafka.test.IntegrationTest; import org.apache.kafka.test.TestUtils; -import org.junit.experimental.categories.Category; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; @@ -58,7 +56,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @Timeout(600) -@Category({IntegrationTest.class}) @Tag("integration") public class KTableKTableForeignKeyJoinDistributedTest { private static final int NUM_BROKERS = 1; diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinIntegrationTest.java index e30d14e23120f..b76b5ddc0dbf5 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinIntegrationTest.java @@ -41,7 +41,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.junit.jupiter.api.Tag; import org.junit.rules.TestName; import org.junit.rules.Timeout; import org.junit.runner.RunWith; @@ -66,7 +65,6 @@ @RunWith(Parameterized.class) @Category(IntegrationTest.class) -@Tag("integration") public class KTableKTableForeignKeyJoinIntegrationTest { @Rule public Timeout globalTimeout = Timeout.seconds(600); diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/LagFetchIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/LagFetchIntegrationTest.java index a69b20ba41318..03461fcbbc5d5 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/LagFetchIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/LagFetchIntegrationTest.java @@ -37,9 +37,7 @@ import org.apache.kafka.streams.processor.StateRestoreListener; import org.apache.kafka.streams.processor.internals.StreamThread; import org.apache.kafka.streams.processor.internals.assignment.FallbackPriorTaskAssignor; -import org.apache.kafka.test.IntegrationTest; import org.apache.kafka.test.TestUtils; -import org.junit.experimental.categories.Category; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; @@ -75,7 +73,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; @Timeout(600) -@Category({IntegrationTest.class}) @Tag("integration") public class LagFetchIntegrationTest { public static final EmbeddedKafkaCluster CLUSTER = new EmbeddedKafkaCluster(1); diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/MetricsIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/MetricsIntegrationTest.java index 9d1f3e4ad68ad..a577a29c6ba21 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/MetricsIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/MetricsIntegrationTest.java @@ -41,9 +41,7 @@ import org.apache.kafka.streams.state.SessionStore; import org.apache.kafka.streams.state.Stores; import org.apache.kafka.streams.state.WindowStore; -import org.apache.kafka.test.IntegrationTest; import org.apache.kafka.test.TestUtils; -import org.junit.experimental.categories.Category; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; @@ -68,7 +66,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; @Timeout(600) -@Category({IntegrationTest.class}) @Tag("integration") @SuppressWarnings("deprecation") public class MetricsIntegrationTest { diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/MetricsReporterIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/MetricsReporterIntegrationTest.java index 40c47cf2bf0f4..860b8da7c1ebd 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/MetricsReporterIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/MetricsReporterIntegrationTest.java @@ -27,8 +27,6 @@ import org.apache.kafka.streams.integration.utils.EmbeddedKafkaCluster; import org.apache.kafka.streams.kstream.Consumed; import org.apache.kafka.streams.kstream.Produced; -import org.apache.kafka.test.IntegrationTest; -import org.junit.experimental.categories.Category; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; @@ -48,7 +46,6 @@ import static org.hamcrest.MatcherAssert.assertThat; @Timeout(600) -@Category({IntegrationTest.class}) @Tag("integration") public class MetricsReporterIntegrationTest { private static final int NUM_BROKERS = 1; diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/NamedTopologyIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/NamedTopologyIntegrationTest.java index c2e61dafe4d7e..de1241e953643 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/NamedTopologyIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/NamedTopologyIntegrationTest.java @@ -56,7 +56,6 @@ import org.apache.kafka.streams.state.Stores; import org.apache.kafka.streams.state.internals.StreamsMetadataImpl; import org.apache.kafka.streams.utils.UniqueTopicSerdeScope; -import org.apache.kafka.test.IntegrationTest; import org.apache.kafka.test.TestUtils; import java.util.Arrays; @@ -64,7 +63,6 @@ import java.util.LinkedList; import java.util.Map; import java.util.Queue; -import org.junit.experimental.categories.Category; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; @@ -105,7 +103,6 @@ import static java.util.Collections.singletonList; @Timeout(600) -@Category(IntegrationTest.class) @Tag("integration") public class NamedTopologyIntegrationTest { public static final EmbeddedKafkaCluster CLUSTER = new EmbeddedKafkaCluster(1); diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/OptimizedKTableIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/OptimizedKTableIntegrationTest.java index 5f81c31236451..be30c447f8cb5 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/OptimizedKTableIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/OptimizedKTableIntegrationTest.java @@ -52,10 +52,8 @@ import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.streams.state.QueryableStoreTypes; import org.apache.kafka.streams.state.ReadOnlyKeyValueStore; -import org.apache.kafka.test.IntegrationTest; import org.apache.kafka.test.NoRetryException; import org.apache.kafka.test.TestUtils; -import org.junit.experimental.categories.Category; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; @@ -68,7 +66,6 @@ import org.slf4j.LoggerFactory; @Timeout(600) -@Category(IntegrationTest.class) @Tag("integration") public class OptimizedKTableIntegrationTest { private static final Logger LOG = LoggerFactory.getLogger(OptimizedKTableIntegrationTest.class); diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java index 7fde73559820d..774fa57b98847 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java @@ -33,11 +33,9 @@ import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.integration.utils.EmbeddedKafkaCluster; import org.apache.kafka.streams.integration.utils.IntegrationTestUtils; -import org.apache.kafka.test.IntegrationTest; import org.apache.kafka.test.MockMapper; import org.apache.kafka.test.TestCondition; import org.apache.kafka.test.TestUtils; -import org.junit.experimental.categories.Category; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; @@ -56,7 +54,6 @@ import java.util.Set; @Timeout(600) -@Category({IntegrationTest.class}) @Tag("integration") public class PurgeRepartitionTopicIntegrationTest { private static final int NUM_BROKERS = 1; diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java index bab2549f21afe..97816ebdc1b21 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java @@ -56,12 +56,10 @@ import org.apache.kafka.streams.state.ReadOnlySessionStore; import org.apache.kafka.streams.state.ReadOnlyWindowStore; import org.apache.kafka.streams.state.WindowStoreIterator; -import org.apache.kafka.test.IntegrationTest; import org.apache.kafka.test.MockMapper; import org.apache.kafka.test.NoRetryException; import org.apache.kafka.test.TestUtils; import org.hamcrest.Matchers; -import org.junit.experimental.categories.Category; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; @@ -120,7 +118,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; @Timeout(600) -@Category({IntegrationTest.class}) @Tag("integration") @SuppressWarnings("deprecation") public class QueryableStateIntegrationTest { diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/RegexSourceIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/RegexSourceIntegrationTest.java index 2027defb8493f..4a64c84cf75da 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/RegexSourceIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/RegexSourceIntegrationTest.java @@ -41,13 +41,11 @@ import org.apache.kafka.streams.processor.internals.DefaultKafkaClientSupplier; import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.streams.state.StoreBuilder; -import org.apache.kafka.test.IntegrationTest; import org.apache.kafka.test.MockApiProcessorSupplier; import org.apache.kafka.test.MockKeyValueStoreBuilder; import org.apache.kafka.test.StreamsTestUtils; import org.apache.kafka.test.TestCondition; import org.apache.kafka.test.TestUtils; -import org.junit.experimental.categories.Category; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; @@ -81,7 +79,6 @@ * an embedded Kafka cluster. */ @Timeout(600) -@Category({IntegrationTest.class}) @Tag("integration") public class RegexSourceIntegrationTest { private static final int NUM_BROKERS = 1; diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/StandbyTaskCreationIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/StandbyTaskCreationIntegrationTest.java index c31cfd840a31d..95eab415c33a3 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/StandbyTaskCreationIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/StandbyTaskCreationIntegrationTest.java @@ -32,9 +32,7 @@ import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.streams.state.StoreBuilder; import org.apache.kafka.streams.state.Stores; -import org.apache.kafka.test.IntegrationTest; import org.apache.kafka.test.TestUtils; -import org.junit.experimental.categories.Category; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; @@ -50,7 +48,6 @@ import static org.apache.kafka.streams.integration.utils.IntegrationTestUtils.safeUniqueTestName; @Timeout(600) -@Category({IntegrationTest.class}) @Tag("integration") public class StandbyTaskCreationIntegrationTest { private static final int NUM_BROKERS = 1;