diff --git a/src/test/java/io/lettuce/TestTags.java b/src/test/java/io/lettuce/TestTags.java new file mode 100644 index 0000000000..68a3434e02 --- /dev/null +++ b/src/test/java/io/lettuce/TestTags.java @@ -0,0 +1,32 @@ +/* + * Copyright 2024, Redis Ltd. and Contributors + * All rights reserved. + * + * Licensed under the MIT License. + */ + +package io.lettuce; + +/** + * Test tags for the different types of tests. + */ +public class TestTags { + + /** + * Tag for unit tests (run in isolation) + */ + public static final String UNIT_TEST = "unit"; + + /** + * Tag for integration tests (require a running environment) + */ + public static final String INTEGRATION_TEST = "integration"; + + /** + * Tag for tests that generate the different types of APIs. + * + * @see io.lettuce.apigenerator + */ + public static final String API_GENERATOR = "api_generator"; + +} diff --git a/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java b/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java index 8006578bd7..a6bd40f8d2 100644 --- a/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java +++ b/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java @@ -27,6 +27,7 @@ import java.util.function.Function; import java.util.function.Supplier; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -35,6 +36,8 @@ import io.lettuce.core.internal.LettuceSets; +import static io.lettuce.TestTags.API_GENERATOR; + /** * Create async API based on the templates. * @@ -76,6 +79,7 @@ Supplier> importSupplier() { @ParameterizedTest @MethodSource("arguments") + @Tag(API_GENERATOR) void createInterface(String argument) throws Exception { createFactory(argument).createInterface(); } diff --git a/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java b/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java index 7fc1a4f516..577c1b8f59 100644 --- a/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java +++ b/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java @@ -29,6 +29,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -37,6 +38,8 @@ import io.lettuce.core.internal.LettuceSets; +import static io.lettuce.TestTags.API_GENERATOR; + /** * Create async API based on the templates. * @@ -91,6 +94,7 @@ Supplier> importSupplier() { @ParameterizedTest @MethodSource("arguments") + @Tag(API_GENERATOR) void createInterface(String argument) throws Exception { createFactory(argument).createInterface(); } diff --git a/src/test/java/io/lettuce/apigenerator/CreateKotlinCoroutinesApi.java b/src/test/java/io/lettuce/apigenerator/CreateKotlinCoroutinesApi.java index ce38436e25..8007474b64 100644 --- a/src/test/java/io/lettuce/apigenerator/CreateKotlinCoroutinesApi.java +++ b/src/test/java/io/lettuce/apigenerator/CreateKotlinCoroutinesApi.java @@ -19,6 +19,7 @@ */ package io.lettuce.apigenerator; +import static io.lettuce.TestTags.API_GENERATOR; import static io.lettuce.apigenerator.Constants.KOTLIN_SOURCES; import static io.lettuce.apigenerator.Constants.TEMPLATES; @@ -28,6 +29,7 @@ import java.util.function.Function; import java.util.function.Supplier; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -59,6 +61,7 @@ Function commentInjector() { @ParameterizedTest @MethodSource("arguments") + @Tag(API_GENERATOR) void createInterface(String argument) throws Exception { createFactory(argument).create(); } diff --git a/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java b/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java index d66872e4bc..21097102be 100644 --- a/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java +++ b/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java @@ -30,6 +30,7 @@ import java.util.function.Function; import java.util.function.Supplier; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -44,6 +45,8 @@ import io.lettuce.core.internal.LettuceSets; +import static io.lettuce.TestTags.API_GENERATOR; + /** * Create reactive API based on the templates. * @@ -193,6 +196,7 @@ Supplier> importSupplier() { @ParameterizedTest @MethodSource("arguments") + @Tag(API_GENERATOR) void createInterface(String argument) throws Exception { createFactory(argument).createInterface(); } diff --git a/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java b/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java index 697bf5dce7..94210bd71b 100644 --- a/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java +++ b/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java @@ -28,6 +28,7 @@ import java.util.function.Predicate; import java.util.function.Supplier; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -36,6 +37,8 @@ import io.lettuce.core.internal.LettuceSets; +import static io.lettuce.TestTags.API_GENERATOR; + /** * Create sync API based on the templates. * @@ -84,6 +87,7 @@ Supplier> importSupplier() { @ParameterizedTest @MethodSource("arguments") + @Tag(API_GENERATOR) void createInterface(String argument) throws Exception { createFactory(argument).createInterface(); } diff --git a/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java b/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java index 9813912cc2..6f051d2fc3 100644 --- a/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java +++ b/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java @@ -29,6 +29,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -38,6 +39,9 @@ import io.lettuce.core.internal.LettuceSets; +import static io.lettuce.TestTags.API_GENERATOR; +import static io.lettuce.TestTags.UNIT_TEST; + /** * Create sync API based on the templates. * @@ -97,6 +101,7 @@ Supplier> importSupplier() { @ParameterizedTest @MethodSource("arguments") + @Tag(API_GENERATOR) void createInterface(String argument) throws Exception { createFactory(argument).createInterface(); } diff --git a/src/test/java/io/lettuce/codec/CRC16UnitTests.java b/src/test/java/io/lettuce/codec/CRC16UnitTests.java index 5f8ae13c22..693ef585db 100644 --- a/src/test/java/io/lettuce/codec/CRC16UnitTests.java +++ b/src/test/java/io/lettuce/codec/CRC16UnitTests.java @@ -1,10 +1,12 @@ package io.lettuce.codec; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -13,6 +15,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class CRC16UnitTests { static List parameters() { diff --git a/src/test/java/io/lettuce/core/AclSetuserArgsUnitTests.java b/src/test/java/io/lettuce/core/AclSetuserArgsUnitTests.java index aed35cd717..79f5685050 100644 --- a/src/test/java/io/lettuce/core/AclSetuserArgsUnitTests.java +++ b/src/test/java/io/lettuce/core/AclSetuserArgsUnitTests.java @@ -19,8 +19,10 @@ */ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.codec.StringCodec; @@ -33,6 +35,7 @@ * @author Mark Paluch * @author Rohan Nagar */ +@Tag(UNIT_TEST) class AclSetuserArgsUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java index 35e23a7b52..3be2c9200b 100644 --- a/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java +++ b/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.time.Duration; @@ -29,6 +30,7 @@ import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -43,6 +45,7 @@ * @author Will Glozer * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class AsyncConnectionIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/AuthenticationIntegrationTests.java b/src/test/java/io/lettuce/core/AuthenticationIntegrationTests.java index 8543dbeb9f..864a2103b0 100644 --- a/src/test/java/io/lettuce/core/AuthenticationIntegrationTests.java +++ b/src/test/java/io/lettuce/core/AuthenticationIntegrationTests.java @@ -1,10 +1,12 @@ package io.lettuce.core; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -24,6 +26,7 @@ * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @EnabledOnCommand("ACL") class AuthenticationIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/ClientIntegrationTests.java b/src/test/java/io/lettuce/core/ClientIntegrationTests.java index 9309c17e65..d2694a1fba 100644 --- a/src/test/java/io/lettuce/core/ClientIntegrationTests.java +++ b/src/test/java/io/lettuce/core/ClientIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import java.net.SocketAddress; @@ -10,6 +11,7 @@ import javax.enterprise.inject.New; import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -28,6 +30,7 @@ * @author Will Glozer * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class ClientIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/ClientMetricsIntegrationTests.java b/src/test/java/io/lettuce/core/ClientMetricsIntegrationTests.java index 55a9fd26f1..ab5b849cd3 100644 --- a/src/test/java/io/lettuce/core/ClientMetricsIntegrationTests.java +++ b/src/test/java/io/lettuce/core/ClientMetricsIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.Collection; @@ -7,6 +8,7 @@ import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import io.lettuce.test.ReflectionTestUtils; @@ -23,6 +25,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class ClientMetricsIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java index 8ca4c896e6..4e960caeea 100644 --- a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java +++ b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.test.ConnectionTestUtil.getChannel; import static io.lettuce.test.ConnectionTestUtil.getConnectionWatchdog; import static io.lettuce.test.ConnectionTestUtil.getStack; @@ -36,6 +37,7 @@ import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -60,6 +62,7 @@ * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class ClientOptionsIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java b/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java index 5d2134b05d..bb2d0f91a0 100644 --- a/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java +++ b/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.nio.ByteBuffer; @@ -10,6 +11,7 @@ import io.lettuce.core.json.JsonObject; import io.lettuce.core.json.JsonParser; import io.lettuce.core.json.JsonValue; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.protocol.Command; @@ -22,6 +24,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class ClientOptionsUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/CommandListenerIntegrationTests.java b/src/test/java/io/lettuce/core/CommandListenerIntegrationTests.java index 93037b91c4..34cfd3a39e 100644 --- a/src/test/java/io/lettuce/core/CommandListenerIntegrationTests.java +++ b/src/test/java/io/lettuce/core/CommandListenerIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; @@ -27,6 +28,7 @@ import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -43,6 +45,7 @@ * @author Mikhael Sokolov * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @SuppressWarnings({ "rawtypes", "unchecked" }) public class CommandListenerIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/ConnectMethodsIntegrationTests.java b/src/test/java/io/lettuce/core/ConnectMethodsIntegrationTests.java index a5879a4758..5eab339557 100644 --- a/src/test/java/io/lettuce/core/ConnectMethodsIntegrationTests.java +++ b/src/test/java/io/lettuce/core/ConnectMethodsIntegrationTests.java @@ -2,6 +2,7 @@ import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -10,9 +11,12 @@ import io.lettuce.core.cluster.api.async.AsyncNodeSelection; import io.lettuce.test.LettuceExtension; +import static io.lettuce.TestTags.INTEGRATION_TEST; + /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class ConnectMethodsIntegrationTests { diff --git a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java index 65e9ec1a6f..8f8b906fce 100644 --- a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import java.time.Duration; @@ -30,6 +31,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -53,6 +55,7 @@ * @author Mark Paluch * @author Tugdual Grall */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class ConnectionCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/ConnectionFutureUnitTests.java b/src/test/java/io/lettuce/core/ConnectionFutureUnitTests.java index 68f434ac77..562f6fc51b 100644 --- a/src/test/java/io/lettuce/core/ConnectionFutureUnitTests.java +++ b/src/test/java/io/lettuce/core/ConnectionFutureUnitTests.java @@ -1,11 +1,13 @@ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.internal.Futures; @@ -13,6 +15,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class ConnectionFutureUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/CopyArgsUnitTests.java b/src/test/java/io/lettuce/core/CopyArgsUnitTests.java index 4b5170b903..f4fd2fab87 100644 --- a/src/test/java/io/lettuce/core/CopyArgsUnitTests.java +++ b/src/test/java/io/lettuce/core/CopyArgsUnitTests.java @@ -2,8 +2,10 @@ import io.lettuce.core.codec.StringCodec; import io.lettuce.core.protocol.CommandArgs; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; /** @@ -11,6 +13,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class CopyArgsUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java b/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java index 94fa64205d..831328d215 100644 --- a/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java +++ b/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.io.*; @@ -13,6 +14,7 @@ import javax.crypto.spec.SecretKeySpec; import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -26,6 +28,7 @@ * @author Will Glozer * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class CustomCodecIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/ExceptionFactoryUnitTests.java b/src/test/java/io/lettuce/core/ExceptionFactoryUnitTests.java index 41af0392f5..43b31198b5 100644 --- a/src/test/java/io/lettuce/core/ExceptionFactoryUnitTests.java +++ b/src/test/java/io/lettuce/core/ExceptionFactoryUnitTests.java @@ -19,10 +19,12 @@ */ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.time.Duration; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.internal.ExceptionFactory; @@ -33,6 +35,7 @@ * @author Mark Paluch * @author Tobias Nehrlich */ +@Tag(UNIT_TEST) class ExceptionFactoryUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/GeoModelUnitTests.java b/src/test/java/io/lettuce/core/GeoModelUnitTests.java index 35e75bd2cf..b4c6437b7c 100644 --- a/src/test/java/io/lettuce/core/GeoModelUnitTests.java +++ b/src/test/java/io/lettuce/core/GeoModelUnitTests.java @@ -1,15 +1,18 @@ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.Collections; import java.util.Map; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class GeoModelUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/GeoValueUnitTests.java b/src/test/java/io/lettuce/core/GeoValueUnitTests.java index 6688b11b08..d3813afa14 100644 --- a/src/test/java/io/lettuce/core/GeoValueUnitTests.java +++ b/src/test/java/io/lettuce/core/GeoValueUnitTests.java @@ -1,9 +1,11 @@ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.util.Optional; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** @@ -11,6 +13,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class GeoValueUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/KeepAliveOptionsUnitTests.java b/src/test/java/io/lettuce/core/KeepAliveOptionsUnitTests.java index dfde78d0d5..a80aed6c0f 100644 --- a/src/test/java/io/lettuce/core/KeepAliveOptionsUnitTests.java +++ b/src/test/java/io/lettuce/core/KeepAliveOptionsUnitTests.java @@ -19,10 +19,12 @@ */ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.time.Duration; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.SocketOptions.KeepAliveOptions; @@ -32,6 +34,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class KeepAliveOptionsUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/KeyValueUnitTests.java b/src/test/java/io/lettuce/core/KeyValueUnitTests.java index 08191831d7..4dd357477a 100644 --- a/src/test/java/io/lettuce/core/KeyValueUnitTests.java +++ b/src/test/java/io/lettuce/core/KeyValueUnitTests.java @@ -16,18 +16,21 @@ */ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static io.lettuce.core.Value.just; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.Optional; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** * @author Will Glozer * @author Mark Paluch */ +@Tag(UNIT_TEST) class KeyValueUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/LimitUnitTests.java b/src/test/java/io/lettuce/core/LimitUnitTests.java index d4d6490e3f..223ef5464b 100644 --- a/src/test/java/io/lettuce/core/LimitUnitTests.java +++ b/src/test/java/io/lettuce/core/LimitUnitTests.java @@ -1,12 +1,15 @@ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class LimitUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java b/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java index b0ba4a3544..90aa5f1182 100644 --- a/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java +++ b/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; @@ -9,6 +10,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -24,6 +26,7 @@ @SuppressWarnings("rawtypes") @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) +@Tag(INTEGRATION_TEST) class PipeliningIntegrationTests extends TestSupport { private final RedisClient client; diff --git a/src/test/java/io/lettuce/core/ProtectedModeTests.java b/src/test/java/io/lettuce/core/ProtectedModeIntegrationTests.java similarity index 97% rename from src/test/java/io/lettuce/core/ProtectedModeTests.java rename to src/test/java/io/lettuce/core/ProtectedModeIntegrationTests.java index 490e6d99d7..671ad6047c 100644 --- a/src/test/java/io/lettuce/core/ProtectedModeTests.java +++ b/src/test/java/io/lettuce/core/ProtectedModeIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -9,6 +10,7 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.api.StatefulRedisConnection; @@ -24,7 +26,8 @@ /** * @author Mark Paluch */ -class ProtectedModeTests { +@Tag(INTEGRATION_TEST) +class ProtectedModeIntegrationTests { private static MockTcpServer server; diff --git a/src/test/java/io/lettuce/core/RangeUnitTests.java b/src/test/java/io/lettuce/core/RangeUnitTests.java index 5341c65ba4..35854b6a14 100644 --- a/src/test/java/io/lettuce/core/RangeUnitTests.java +++ b/src/test/java/io/lettuce/core/RangeUnitTests.java @@ -1,9 +1,11 @@ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static io.lettuce.core.Range.Boundary.excluding; import static io.lettuce.core.Range.Boundary.including; import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** @@ -11,6 +13,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class RangeUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationUnitTests.java b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationUnitTests.java index 2a1e701fb1..96a531f921 100644 --- a/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationUnitTests.java +++ b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -8,6 +9,7 @@ import java.util.concurrent.CountDownLatch; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -35,6 +37,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) class ReactiveBackpressurePropagationUnitTests { diff --git a/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java index 6b26c79295..940a181732 100644 --- a/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java +++ b/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.core.ClientOptions.DisconnectedBehavior.*; import static io.lettuce.core.ScriptOutputType.INTEGER; import static org.assertj.core.api.Assertions.*; @@ -31,6 +32,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -54,6 +56,7 @@ * @author Nikolai Perevozchikov * @author Tugdual Grall */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) class ReactiveConnectionIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/ReactiveStreamingOutputIntegrationTests.java b/src/test/java/io/lettuce/core/ReactiveStreamingOutputIntegrationTests.java index 98549b93ae..0d649e5993 100644 --- a/src/test/java/io/lettuce/core/ReactiveStreamingOutputIntegrationTests.java +++ b/src/test/java/io/lettuce/core/ReactiveStreamingOutputIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; @@ -8,6 +9,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -24,6 +26,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) class ReactiveStreamingOutputIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/RedisClientConnectIntegrationTests.java b/src/test/java/io/lettuce/core/RedisClientConnectIntegrationTests.java index 83e2c351e3..4e7c281e40 100644 --- a/src/test/java/io/lettuce/core/RedisClientConnectIntegrationTests.java +++ b/src/test/java/io/lettuce/core/RedisClientConnectIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.core.RedisURI.Builder.redis; import static io.lettuce.core.codec.StringCodec.UTF8; import static java.util.concurrent.TimeUnit.SECONDS; @@ -33,6 +34,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -47,6 +49,7 @@ * @author Jongyeol Choi */ @ExtendWith(LettuceExtension.class) +@Tag(INTEGRATION_TEST) class RedisClientConnectIntegrationTests extends TestSupport { private static final Duration EXPECTED_TIMEOUT = Duration.ofMillis(500); diff --git a/src/test/java/io/lettuce/core/RedisClientFactoryUnitTests.java b/src/test/java/io/lettuce/core/RedisClientFactoryUnitTests.java index 20351373d5..45c3d2288e 100644 --- a/src/test/java/io/lettuce/core/RedisClientFactoryUnitTests.java +++ b/src/test/java/io/lettuce/core/RedisClientFactoryUnitTests.java @@ -1,7 +1,9 @@ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.resource.ClientResources; @@ -12,6 +14,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class RedisClientFactoryUnitTests { private static final String URI = "redis://" + TestSettings.host() + ":" + TestSettings.port(); diff --git a/src/test/java/io/lettuce/core/RedisClientIntegrationTests.java b/src/test/java/io/lettuce/core/RedisClientIntegrationTests.java index 42c411f7a9..991286b906 100644 --- a/src/test/java/io/lettuce/core/RedisClientIntegrationTests.java +++ b/src/test/java/io/lettuce/core/RedisClientIntegrationTests.java @@ -15,6 +15,7 @@ import io.lettuce.test.resource.TestClientResources; import io.lettuce.test.settings.TestSettings; import io.netty.util.concurrent.EventExecutorGroup; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import java.lang.reflect.Field; @@ -25,6 +26,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; /** @@ -32,6 +34,7 @@ * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class RedisClientIntegrationTests extends TestSupport { private final ClientResources clientResources = TestClientResources.get(); diff --git a/src/test/java/io/lettuce/core/RedisClientListenerIntegrationTests.java b/src/test/java/io/lettuce/core/RedisClientListenerIntegrationTests.java index 478d5a1700..86062989fa 100644 --- a/src/test/java/io/lettuce/core/RedisClientListenerIntegrationTests.java +++ b/src/test/java/io/lettuce/core/RedisClientListenerIntegrationTests.java @@ -1,14 +1,18 @@ package io.lettuce.core; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.extension.ExtendWith; import io.lettuce.test.LettuceExtension; +import static io.lettuce.TestTags.INTEGRATION_TEST; + /** * Integration tests for {@link RedisConnectionStateListener} via {@link RedisClient}. * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class RedisClientListenerIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/RedisClientUnitTests.java b/src/test/java/io/lettuce/core/RedisClientUnitTests.java index 608035e43c..ce978ddb61 100644 --- a/src/test/java/io/lettuce/core/RedisClientUnitTests.java +++ b/src/test/java/io/lettuce/core/RedisClientUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; @@ -12,6 +13,7 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -29,6 +31,7 @@ */ @SuppressWarnings("unchecked") @ExtendWith(MockitoExtension.class) +@Tag(UNIT_TEST) class RedisClientUnitTests { @Mock diff --git a/src/test/java/io/lettuce/core/RedisCommandBuilderUnitTests.java b/src/test/java/io/lettuce/core/RedisCommandBuilderUnitTests.java index 16276b1703..d8e71cffb3 100644 --- a/src/test/java/io/lettuce/core/RedisCommandBuilderUnitTests.java +++ b/src/test/java/io/lettuce/core/RedisCommandBuilderUnitTests.java @@ -4,12 +4,14 @@ import io.lettuce.core.protocol.Command; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; /** @@ -17,6 +19,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class RedisCommandBuilderUnitTests { public static final String MY_KEY = "hKey"; diff --git a/src/test/java/io/lettuce/core/RedisContainerIntegrationTests.java b/src/test/java/io/lettuce/core/RedisContainerIntegrationTests.java index 10d939f5a5..5dda7a1166 100644 --- a/src/test/java/io/lettuce/core/RedisContainerIntegrationTests.java +++ b/src/test/java/io/lettuce/core/RedisContainerIntegrationTests.java @@ -7,9 +7,10 @@ package io.lettuce.core; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; import org.testcontainers.containers.ComposeContainer; -import org.testcontainers.containers.output.BaseConsumer; import org.testcontainers.containers.output.OutputFrame; import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.junit.jupiter.Testcontainers; @@ -20,38 +21,27 @@ @Testcontainers public class RedisContainerIntegrationTests { + private static final Logger LOGGER = LogManager.getLogger(RedisContainerIntegrationTests.class); + + private static final String REDIS_STACK_STANDALONE = "standalone-stack"; + + private static final String REDIS_STACK_CLUSTER = "clustered-stack"; + public static ComposeContainer CLUSTERED_STACK = new ComposeContainer( - new File("src/test/resources/docker/docker-compose.yml")).withExposedService("clustered-stack", 36379) - .withExposedService("clustered-stack", 36380).withExposedService("clustered-stack", 36381) - .withExposedService("clustered-stack", 36382).withExposedService("clustered-stack", 36383) - .withExposedService("clustered-stack", 36384).withExposedService("standalone-stack", 6379); + new File("src/test/resources/docker/docker-compose.yml")).withExposedService(REDIS_STACK_CLUSTER, 36379) + .withExposedService(REDIS_STACK_CLUSTER, 36380).withExposedService(REDIS_STACK_CLUSTER, 36381) + .withExposedService(REDIS_STACK_CLUSTER, 36382).withExposedService(REDIS_STACK_CLUSTER, 36383) + .withExposedService(REDIS_STACK_CLUSTER, 36384).withExposedService(REDIS_STACK_STANDALONE, 6379); @BeforeAll public static void setup() throws IOException, InterruptedException { // In case you need to debug the container uncomment these lines to redirect the output - CLUSTERED_STACK.withLogConsumer("clustered-stack", new SystemOutputConsumer("clustered")); - CLUSTERED_STACK.withLogConsumer("standalone-stack", new SystemOutputConsumer("standalone")); + CLUSTERED_STACK.withLogConsumer(REDIS_STACK_CLUSTER, (OutputFrame frame) -> LOGGER.debug(frame.getUtf8String())); + CLUSTERED_STACK.withLogConsumer(REDIS_STACK_STANDALONE, (OutputFrame frame) -> LOGGER.debug(frame.getUtf8String())); - CLUSTERED_STACK.waitingFor("clustered-stack", + CLUSTERED_STACK.waitingFor(REDIS_STACK_CLUSTER, Wait.forLogMessage(".*Background RDB transfer terminated with success.*", 1)); CLUSTERED_STACK.start(); - - } - - static public class SystemOutputConsumer extends BaseConsumer { - - String prefix; - - public SystemOutputConsumer(String prefix) { - this.prefix = prefix; - } - - @Override - public void accept(OutputFrame outputFrame) { - String output = String.format("%15s: %s", prefix, outputFrame.getUtf8String()); - System.out.print(output); - } - } } diff --git a/src/test/java/io/lettuce/core/RedisHandshakeUnitTests.java b/src/test/java/io/lettuce/core/RedisHandshakeUnitTests.java index ed96e8be7f..d4b968c4f3 100644 --- a/src/test/java/io/lettuce/core/RedisHandshakeUnitTests.java +++ b/src/test/java/io/lettuce/core/RedisHandshakeUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.nio.ByteBuffer; @@ -7,6 +8,7 @@ import java.util.Map; import java.util.concurrent.CompletionStage; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.output.CommandOutput; @@ -19,6 +21,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class RedisHandshakeUnitTests { public static final String ERR_UNKNOWN_COMMAND = "ERR unknown command 'CLIENT', with args beginning with: 'SETINFO' 'lib-name' 'Lettuce'"; diff --git a/src/test/java/io/lettuce/core/RedisJsonCommandBuilderUnitTests.java b/src/test/java/io/lettuce/core/RedisJsonCommandBuilderUnitTests.java index ca17b93bf9..4106a711c2 100644 --- a/src/test/java/io/lettuce/core/RedisJsonCommandBuilderUnitTests.java +++ b/src/test/java/io/lettuce/core/RedisJsonCommandBuilderUnitTests.java @@ -18,6 +18,7 @@ import io.lettuce.core.protocol.Command; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; @@ -25,6 +26,7 @@ import java.util.Collections; import java.util.List; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; /** @@ -32,6 +34,7 @@ * * @author Tihomir Mateev */ +@Tag(UNIT_TEST) class RedisJsonCommandBuilderUnitTests { public static final String MY_KEY = "bikes:inventory"; diff --git a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java index e368b84e99..5fa22762b4 100644 --- a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java +++ b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java @@ -19,12 +19,14 @@ */ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.io.File; import java.io.IOException; import java.time.Duration; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; @@ -35,6 +37,7 @@ * @author Mark Paluch * @author Guy Korland */ +@Tag(UNIT_TEST) class RedisURIBuilderUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/RedisURIUnitTests.java b/src/test/java/io/lettuce/core/RedisURIUnitTests.java index 999be45c29..077a3df076 100644 --- a/src/test/java/io/lettuce/core/RedisURIUnitTests.java +++ b/src/test/java/io/lettuce/core/RedisURIUnitTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.io.UnsupportedEncodingException; @@ -30,6 +31,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.internal.LettuceSets; @@ -42,6 +44,7 @@ * @author Lei Zhang * @author Jacob Halsey */ +@Tag(UNIT_TEST) class RedisURIUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/ScanArgsUnitTests.java b/src/test/java/io/lettuce/core/ScanArgsUnitTests.java index 2d655c3637..0d080df520 100644 --- a/src/test/java/io/lettuce/core/ScanArgsUnitTests.java +++ b/src/test/java/io/lettuce/core/ScanArgsUnitTests.java @@ -1,7 +1,9 @@ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.codec.StringCodec; @@ -10,6 +12,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class ScanArgsUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/ScanCursorUnitTests.java b/src/test/java/io/lettuce/core/ScanCursorUnitTests.java index 8cdeec4334..0f6345abe8 100644 --- a/src/test/java/io/lettuce/core/ScanCursorUnitTests.java +++ b/src/test/java/io/lettuce/core/ScanCursorUnitTests.java @@ -1,13 +1,16 @@ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class ScanCursorUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/ScanIteratorIntegrationTests.java b/src/test/java/io/lettuce/core/ScanIteratorIntegrationTests.java index c3b5a8e203..da3e121450 100644 --- a/src/test/java/io/lettuce/core/ScanIteratorIntegrationTests.java +++ b/src/test/java/io/lettuce/core/ScanIteratorIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.AssertionsForClassTypes.*; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; @@ -30,6 +31,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -42,6 +44,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) class ScanIteratorIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/ScanStreamIntegrationTests.java b/src/test/java/io/lettuce/core/ScanStreamIntegrationTests.java index f527eafcb7..dfa4078db9 100644 --- a/src/test/java/io/lettuce/core/ScanStreamIntegrationTests.java +++ b/src/test/java/io/lettuce/core/ScanStreamIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import java.util.List; @@ -27,6 +28,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -41,6 +43,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) class ScanStreamIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/ScoredValueUnitTests.java b/src/test/java/io/lettuce/core/ScoredValueUnitTests.java index 3a786971e3..fe101050dc 100644 --- a/src/test/java/io/lettuce/core/ScoredValueUnitTests.java +++ b/src/test/java/io/lettuce/core/ScoredValueUnitTests.java @@ -19,10 +19,12 @@ */ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.util.Optional; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** @@ -31,6 +33,7 @@ * @author Will Glozer * @author Mark Paluch */ +@Tag(UNIT_TEST) class ScoredValueUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/SocketOptionsIntegrationTests.java b/src/test/java/io/lettuce/core/SocketOptionsIntegrationTests.java index a7f7e2a548..65e01a93cf 100644 --- a/src/test/java/io/lettuce/core/SocketOptionsIntegrationTests.java +++ b/src/test/java/io/lettuce/core/SocketOptionsIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -8,6 +9,7 @@ import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -17,6 +19,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class SocketOptionsIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/SocketOptionsUnitTests.java b/src/test/java/io/lettuce/core/SocketOptionsUnitTests.java index 57aee0a22f..6160e261bd 100644 --- a/src/test/java/io/lettuce/core/SocketOptionsUnitTests.java +++ b/src/test/java/io/lettuce/core/SocketOptionsUnitTests.java @@ -19,12 +19,14 @@ */ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.time.Duration; import java.util.concurrent.TimeUnit; import io.lettuce.core.SocketOptions.TcpUserTimeoutOptions; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** @@ -32,6 +34,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class SocketOptionsUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/SslIntegrationTests.java b/src/test/java/io/lettuce/core/SslIntegrationTests.java index e9d6c1cd67..bbad87472a 100644 --- a/src/test/java/io/lettuce/core/SslIntegrationTests.java +++ b/src/test/java/io/lettuce/core/SslIntegrationTests.java @@ -34,6 +34,7 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -47,6 +48,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.test.settings.TestSettings.sslPort; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -58,6 +60,7 @@ * @author Mark Paluch * @author Adam McElwee */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class SslIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/SslOptionsUnitTests.java b/src/test/java/io/lettuce/core/SslOptionsUnitTests.java index c134da39a8..64ef28b28a 100644 --- a/src/test/java/io/lettuce/core/SslOptionsUnitTests.java +++ b/src/test/java/io/lettuce/core/SslOptionsUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.time.Duration; @@ -7,6 +8,7 @@ import javax.net.ssl.SSLParameters; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.netty.handler.ssl.SslContext; @@ -16,6 +18,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class SslOptionsUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/SubscriptionCommandUnitTests.java b/src/test/java/io/lettuce/core/SubscriptionCommandUnitTests.java index b0598788ae..6fa76b81ca 100644 --- a/src/test/java/io/lettuce/core/SubscriptionCommandUnitTests.java +++ b/src/test/java/io/lettuce/core/SubscriptionCommandUnitTests.java @@ -1,11 +1,13 @@ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.mockito.Mockito.*; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.reactivestreams.Subscriber; @@ -23,6 +25,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class SubscriptionCommandUnitTests { private RedisCodec codec = StringCodec.UTF8; diff --git a/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceUnitTests.java b/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceUnitTests.java index e033b7cf7b..facad48792 100644 --- a/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceUnitTests.java +++ b/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceUnitTests.java @@ -1,11 +1,13 @@ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.lang.reflect.*; import java.util.Arrays; import java.util.stream.Stream; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -17,6 +19,7 @@ * @author Mark Paluch * @since 3.0 */ +@Tag(UNIT_TEST) class SyncAsyncApiConvergenceUnitTests { @SuppressWarnings("rawtypes") diff --git a/src/test/java/io/lettuce/core/TimeoutOptionsUnitTests.java b/src/test/java/io/lettuce/core/TimeoutOptionsUnitTests.java index dd0ae8f4a1..1ceeced9b1 100644 --- a/src/test/java/io/lettuce/core/TimeoutOptionsUnitTests.java +++ b/src/test/java/io/lettuce/core/TimeoutOptionsUnitTests.java @@ -1,16 +1,19 @@ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static io.lettuce.core.TimeoutOptions.TimeoutSource; import static org.assertj.core.api.Assertions.assertThat; import java.time.Duration; import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class TimeoutOptionsUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java b/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java index ba440b03c6..f6b7d334f4 100644 --- a/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java +++ b/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import static org.junit.jupiter.api.Assumptions.*; @@ -11,6 +12,7 @@ import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.api.StatefulRedisConnection; @@ -25,6 +27,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class UnixDomainSocketIntegrationTests { private static final String MASTER_ID = "mymaster"; diff --git a/src/test/java/io/lettuce/core/Utf8StringCodecIntegrationTests.java b/src/test/java/io/lettuce/core/Utf8StringCodecIntegrationTests.java index 2feb8d11b5..a75940e5a8 100644 --- a/src/test/java/io/lettuce/core/Utf8StringCodecIntegrationTests.java +++ b/src/test/java/io/lettuce/core/Utf8StringCodecIntegrationTests.java @@ -19,12 +19,14 @@ */ package io.lettuce.core; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.Arrays; import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -36,6 +38,7 @@ * @author Will Glozer * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class Utf8StringCodecIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/ValueUnitTests.java b/src/test/java/io/lettuce/core/ValueUnitTests.java index f78b355091..e4b42e19df 100644 --- a/src/test/java/io/lettuce/core/ValueUnitTests.java +++ b/src/test/java/io/lettuce/core/ValueUnitTests.java @@ -1,11 +1,13 @@ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.util.NoSuchElementException; import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** @@ -13,6 +15,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class ValueUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/ZAggregateArgsUnitTests.java b/src/test/java/io/lettuce/core/ZAggregateArgsUnitTests.java index 1973c6393b..3de3d4f2b0 100644 --- a/src/test/java/io/lettuce/core/ZAggregateArgsUnitTests.java +++ b/src/test/java/io/lettuce/core/ZAggregateArgsUnitTests.java @@ -19,8 +19,10 @@ */ package io.lettuce.core; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.codec.StringCodec; @@ -29,6 +31,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class ZAggregateArgsUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientIntegrationTests.java index 64c5a04fab..5c1c6bd906 100644 --- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.test.LettuceExtension.*; import static org.assertj.core.api.Assertions.*; @@ -36,6 +37,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -65,6 +67,7 @@ * @author Mark Paluch * @author Jon Chambers */ +@Tag(INTEGRATION_TEST) @SuppressWarnings("rawtypes") @ExtendWith(LettuceExtension.class) class AdvancedClusterClientIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java index cfa4cc8519..e9e7eb3461 100644 --- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; @@ -36,6 +37,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -71,6 +73,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class AdvancedClusterReactiveIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java index c2352a7898..712d5af9e5 100644 --- a/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import java.io.IOException; @@ -34,6 +35,7 @@ import org.apache.commons.lang3.time.StopWatch; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -56,6 +58,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class AsyncConnectionProviderIntegrationTests { diff --git a/src/test/java/io/lettuce/core/cluster/ByteCodecClusterIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ByteCodecClusterIntegrationTests.java index 17f5ddd57c..95a38a785c 100644 --- a/src/test/java/io/lettuce/core/cluster/ByteCodecClusterIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/ByteCodecClusterIntegrationTests.java @@ -1,9 +1,11 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -15,6 +17,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class ByteCodecClusterIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsIntegrationTests.java index d83b7ee0cf..6eddfa2e0d 100644 --- a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import java.time.Duration; @@ -8,6 +9,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -22,6 +24,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class ClusterClientOptionsIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java index abd9b270c2..bf45314864 100644 --- a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java @@ -1,10 +1,12 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.nio.charset.StandardCharsets; import java.util.function.Predicate; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.ClientOptions; @@ -18,6 +20,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class ClusterClientOptionsUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java index ae92d0f231..78eace6029 100644 --- a/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.core.cluster.ClusterTestUtil.*; import static org.assertj.core.api.Assertions.*; @@ -10,6 +11,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -36,6 +38,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class ClusterCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java index 2c028f0b39..60205d324f 100644 --- a/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; @@ -8,6 +9,7 @@ import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -23,6 +25,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) class ClusterCommandUnitTests { diff --git a/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java index f76d481c00..9d7d96c870 100644 --- a/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -28,6 +29,7 @@ import java.util.concurrent.CompletableFuture; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentMatchers; @@ -65,6 +67,7 @@ * @author koisyu * @author Jim Brunner */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) class ClusterDistributionChannelWriterUnitTests { diff --git a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java index 524526457d..12b2cd66c5 100644 --- a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.mockito.ArgumentMatchers.*; @@ -8,6 +9,7 @@ import java.util.Queue; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -31,6 +33,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) class ClusterNodeEndpointUnitTests { diff --git a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java index 8f103c0861..4f30b3e2cb 100644 --- a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; @@ -10,6 +11,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisConnectionException; @@ -27,6 +29,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class ClusterPartiallyDownIntegrationTests extends TestSupport { private static ClientResources clientResources; diff --git a/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandIntegrationTests.java index ec9a315829..0d95d926dc 100644 --- a/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; @@ -7,6 +8,7 @@ import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -22,6 +24,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class ClusterReactiveCommandIntegrationTests { diff --git a/src/test/java/io/lettuce/core/cluster/ClusterReadOnlyCommandsUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterReadOnlyCommandsUnitTests.java index 633950693b..f5dfa8308e 100644 --- a/src/test/java/io/lettuce/core/cluster/ClusterReadOnlyCommandsUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterReadOnlyCommandsUnitTests.java @@ -1,7 +1,9 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.protocol.CommandType; @@ -12,6 +14,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class ClusterReadOnlyCommandsUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsUnitTests.java index 6932e034be..2844fd7fa4 100644 --- a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsUnitTests.java @@ -1,10 +1,12 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.time.Duration; import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.cluster.ClusterTopologyRefreshOptions.RefreshTrigger; @@ -14,6 +16,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class ClusterTopologyRefreshOptionsUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java index 6872005898..327f49c97d 100644 --- a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -8,6 +9,7 @@ import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; @@ -28,6 +30,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) class ClusterTopologyRefreshSchedulerUnitTests { diff --git a/src/test/java/io/lettuce/core/cluster/CommandSetIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/CommandSetIntegrationTests.java index 05c2c32263..d5eca13c5e 100644 --- a/src/test/java/io/lettuce/core/cluster/CommandSetIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/CommandSetIntegrationTests.java @@ -1,11 +1,13 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -20,6 +22,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) public class CommandSetIntegrationTests { diff --git a/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusUnitTests.java b/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusUnitTests.java index 2fa3597cd0..32980bfc91 100644 --- a/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.UNIT_TEST; import static io.lettuce.core.cluster.PartitionsConsensusTestSupport.createMap; import static io.lettuce.core.cluster.PartitionsConsensusTestSupport.createNode; import static io.lettuce.core.cluster.PartitionsConsensusTestSupport.createPartitions; @@ -9,6 +10,7 @@ import java.util.Collections; import java.util.Map; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisURI; @@ -18,6 +20,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class HealthyMajorityPartitionsConsensusUnitTests { private RedisClusterNode node1 = createNode(1); diff --git a/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusUnitTests.java b/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusUnitTests.java index 95af7f54f6..ede83f4fca 100644 --- a/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.UNIT_TEST; import static io.lettuce.core.cluster.PartitionsConsensusTestSupport.createMap; import static io.lettuce.core.cluster.PartitionsConsensusTestSupport.createNode; import static io.lettuce.core.cluster.PartitionsConsensusTestSupport.createPartitions; @@ -8,6 +9,7 @@ import java.util.Arrays; import java.util.Map; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisURI; @@ -17,6 +19,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class KnownMajorityPartitionsConsensusUnitTests { private RedisClusterNode node1 = createNode(1); diff --git a/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java index ec2faf90d8..e4200834b4 100644 --- a/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; @@ -15,6 +16,7 @@ import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -39,6 +41,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class NodeSelectionAsyncIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java index 5d7059dd8d..dc913dae85 100644 --- a/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import static org.assertj.core.api.Fail.fail; @@ -12,6 +13,7 @@ import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -31,6 +33,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class NodeSelectionSyncIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java b/src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java index a8187aa8fc..cdcf22437d 100644 --- a/src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java +++ b/src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java @@ -5,10 +5,14 @@ import io.lettuce.core.RedisURI; import io.lettuce.core.cluster.models.partitions.Partitions; import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class PartitionsConsensusTestSupport { static RedisClusterNode createNode(int nodeId) { diff --git a/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureUnitTests.java b/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureUnitTests.java index 578201423b..2831d57ec3 100644 --- a/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureUnitTests.java @@ -1,9 +1,11 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.HashMap; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.test.TestFutures; @@ -11,6 +13,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class PipelinedRedisFutureUnitTests { private PipelinedRedisFuture sut; diff --git a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java index 52ae370cc9..8a00a2cdad 100644 --- a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -32,6 +33,7 @@ import java.util.stream.IntStream; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -65,6 +67,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) class PooledClusterConnectionProviderUnitTests { diff --git a/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java b/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java index 9f37e07ac7..c86bddd0cc 100644 --- a/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; @@ -30,6 +31,7 @@ import java.util.regex.Pattern; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -46,6 +48,7 @@ * @author Omer Cilingir * @author Yohei Ueki */ +@Tag(UNIT_TEST) class ReadFromUnitTests { private Partitions sut = new Partitions(); diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryUnitTests.java similarity index 96% rename from src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTests.java rename to src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryUnitTests.java index f8741e0a78..5f552eca69 100644 --- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTests.java +++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryUnitTests.java @@ -1,10 +1,12 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.Arrays; import java.util.List; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisURI; @@ -16,7 +18,8 @@ /** * @author Mark Paluch */ -class RedisClusterClientFactoryTests { +@Tag(UNIT_TEST) +class RedisClusterClientFactoryUnitTests { private static final String URI = "redis://" + TestSettings.host() + ":" + TestSettings.port(); diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java index c48b6e8eab..00b87784f6 100644 --- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.core.cluster.ClusterTestUtil.*; import static org.assertj.core.api.Assertions.*; @@ -17,6 +18,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -56,6 +58,7 @@ */ @SuppressWarnings("unchecked") @ExtendWith(LettuceExtension.class) +@Tag(INTEGRATION_TEST) class RedisClusterClientIntegrationTests extends TestSupport { private final RedisClient client; diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java index 4d02a8fa5c..a276130532 100644 --- a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.test.settings.TestSettings.*; import static org.assertj.core.api.Assertions.*; import static org.junit.jupiter.api.Assumptions.*; @@ -9,6 +10,7 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisCommandExecutionException; @@ -27,6 +29,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class RedisClusterPasswordSecuredSslIntegrationTests extends TestSupport { private static final int CLUSTER_PORT_SSL_1 = 7442; diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java index d3543b7c40..54af0098c5 100644 --- a/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.regex.Pattern; @@ -27,6 +28,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -40,6 +42,7 @@ * @author Mark Paluch * @author Yohei Ueki */ +@Tag(INTEGRATION_TEST) @SuppressWarnings("unchecked") @ExtendWith(LettuceExtension.class) class RedisClusterReadFromIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupIntegrationTests.java similarity index 99% rename from src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java rename to src/test/java/io/lettuce/core/cluster/RedisClusterSetupIntegrationTests.java index 14e7a4bed4..62ac7848a2 100644 --- a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java +++ b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.core.cluster.ClusterTestSettings.*; import static io.lettuce.core.cluster.ClusterTestUtil.*; import static org.assertj.core.api.Assertions.*; @@ -36,6 +37,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.category.SlowTests; @@ -74,9 +76,10 @@ * @author dengliming * @since 3.0 */ +@Tag(INTEGRATION_TEST) @SuppressWarnings({ "unchecked" }) @SlowTests -public class RedisClusterSetupTest extends TestSupport { +public class RedisClusterSetupIntegrationTests extends TestSupport { private static final String host = TestSettings.hostAddr(); diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosIntegrationTests.java similarity index 97% rename from src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java rename to src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosIntegrationTests.java index 5887a7edc8..65aad4071b 100644 --- a/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java +++ b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.core.cluster.ClusterTestUtil.*; import static org.assertj.core.api.Assertions.*; @@ -31,6 +32,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; @@ -51,10 +53,11 @@ import io.lettuce.test.resource.TestClientResources; import io.lettuce.test.settings.TestSettings; +@Tag(INTEGRATION_TEST) @TestMethodOrder(MethodOrderer.MethodName.class) @SuppressWarnings("unchecked") @SlowTests -public class RedisClusterStressScenariosTest extends TestSupport { +public class RedisClusterStressScenariosIntegrationTests extends TestSupport { private static final String host = TestSettings.hostAddr(); diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilUnitTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilUnitTests.java index e0e707eecc..766c8b8cfe 100644 --- a/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilUnitTests.java @@ -1,10 +1,12 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.net.URI; import java.util.List; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisURI; @@ -12,6 +14,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class RedisClusterURIUtilUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientIntegrationTests.java index 0ab13d2b0c..e99fbd1ebb 100644 --- a/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientIntegrationTests.java @@ -1,10 +1,12 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.core.cluster.ClusterTestUtil.getOwnPartition; import static org.assertj.core.api.Assertions.assertThat; import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -20,6 +22,7 @@ * @author Mark Paluch */ @SuppressWarnings("unchecked") +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class RedisReactiveClusterClientIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierUnitTests.java b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierUnitTests.java index f19a3ec4ff..3bd9ee3087 100644 --- a/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierUnitTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -28,6 +29,7 @@ import java.util.HashSet; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -46,6 +48,7 @@ * @author Mark Paluch * @author Christian Lang */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) class RoundRobinSocketAddressSupplierUnitTests { diff --git a/src/test/java/io/lettuce/core/cluster/RoundRobinUnitTests.java b/src/test/java/io/lettuce/core/cluster/RoundRobinUnitTests.java index 86f8857120..db323925f7 100644 --- a/src/test/java/io/lettuce/core/cluster/RoundRobinUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/RoundRobinUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; @@ -7,6 +8,7 @@ import java.util.Collections; import java.util.HashSet; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisURI; @@ -17,6 +19,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class RoundRobinUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java index 67524a46f8..0683535170 100644 --- a/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.AssertionsForClassTypes.*; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; @@ -30,6 +31,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -48,6 +50,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) class ScanIteratorIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/cluster/ScanStreamIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ScanStreamIntegrationTests.java index 621ddb1b19..9b9974dd0e 100644 --- a/src/test/java/io/lettuce/core/cluster/ScanStreamIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/ScanStreamIntegrationTests.java @@ -2,6 +2,7 @@ import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -14,9 +15,12 @@ import io.lettuce.core.cluster.api.sync.RedisClusterCommands; import io.lettuce.test.LettuceExtension; +import static io.lettuce.TestTags.INTEGRATION_TEST; + /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class ScanStreamIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientIntegrationTests.java index fcf4fdbbd7..703ac44a7e 100644 --- a/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientIntegrationTests.java @@ -1,11 +1,13 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisURI; @@ -19,6 +21,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class SingleThreadedReactiveClusterClientIntegrationTests { private RedisClusterClient client; diff --git a/src/test/java/io/lettuce/core/cluster/SlotHashUnitTests.java b/src/test/java/io/lettuce/core/cluster/SlotHashUnitTests.java index b7b26c029a..7ef2d5032f 100644 --- a/src/test/java/io/lettuce/core/cluster/SlotHashUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/SlotHashUnitTests.java @@ -1,15 +1,18 @@ package io.lettuce.core.cluster; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.nio.ByteBuffer; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** * @author Mark Paluch * @since 3.0 */ +@Tag(UNIT_TEST) class SlotHashUnitTests { private static final byte[] BYTES = "123456789".getBytes(); diff --git a/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandIntegrationTests.java index 84f1d48a49..5f335c311a 100644 --- a/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandIntegrationTests.java @@ -1,11 +1,13 @@ package io.lettuce.core.cluster.commands; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import java.util.Arrays; import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -30,6 +32,7 @@ * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class CustomClusterCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandIntegrationTests.java index e162c52f22..2a91248963 100644 --- a/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandIntegrationTests.java @@ -7,12 +7,16 @@ import io.lettuce.core.cluster.ClusterTestUtil; import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; import io.lettuce.core.commands.GeoCommandIntegrationTests; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * Integration tests for {@link io.lettuce.core.api.sync.RedisGeoCommands} using Redis Cluster. * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class GeoClusterCommandIntegrationTests extends GeoCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandIntegrationTests.java index 6342a50874..5eb6920c18 100644 --- a/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandIntegrationTests.java @@ -5,12 +5,16 @@ import io.lettuce.core.cluster.ClusterTestUtil; import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; import io.lettuce.core.commands.HashCommandIntegrationTests; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * Integration tests for {@link io.lettuce.core.api.sync.RedisHashCommands} using Redis Cluster. * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) public class HashClusterCommandIntegrationTests extends HashCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandIntegrationTests.java index 9ad153da8c..757df6ea79 100644 --- a/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandIntegrationTests.java @@ -1,10 +1,12 @@ package io.lettuce.core.cluster.commands; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -21,6 +23,7 @@ * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) class KeyClusterCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandIntegrationTests.java index 145278a491..035bcd421d 100644 --- a/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandIntegrationTests.java @@ -1,9 +1,11 @@ package io.lettuce.core.cluster.commands; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.cluster.ClusterTestUtil; @@ -17,6 +19,7 @@ * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class ListClusterCommandIntegrationTests extends ListCommandIntegrationTests { private final RedisClusterCommands redis; diff --git a/src/test/java/io/lettuce/core/cluster/commands/StreamClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/StreamClusterCommandIntegrationTests.java index 18619d924d..7bbf667577 100644 --- a/src/test/java/io/lettuce/core/cluster/commands/StreamClusterCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/commands/StreamClusterCommandIntegrationTests.java @@ -7,13 +7,17 @@ import io.lettuce.core.cluster.ClusterTestUtil; import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; import io.lettuce.core.commands.StreamCommandIntegrationTests; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import static io.lettuce.TestTags.INTEGRATION_TEST; + /** * Integration tests for {@link io.lettuce.core.api.sync.RedisStreamCommands} using Redis Cluster. * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class StreamClusterCommandIntegrationTests extends StreamCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandIntegrationTests.java index 1b539abfc5..245faf490b 100644 --- a/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.cluster.commands; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import java.util.LinkedHashMap; @@ -7,6 +8,7 @@ import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.cluster.ClusterTestUtil; @@ -20,6 +22,7 @@ * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class StringClusterCommandIntegrationTests extends StringCommandIntegrationTests { private final RedisClusterCommands redis; diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandIntegrationTests.java index 6da2e608d0..582cb7c4b4 100644 --- a/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandIntegrationTests.java @@ -3,15 +3,19 @@ import javax.inject.Inject; import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; import io.lettuce.core.commands.HashCommandIntegrationTests; import io.lettuce.test.ReactiveSyncInvocationHandler; +import static io.lettuce.TestTags.INTEGRATION_TEST; + /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class HashClusterReactiveCommandIntegrationTests extends HashCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandIntegrationTests.java index f02e6901cb..689c4a1825 100644 --- a/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandIntegrationTests.java @@ -1,9 +1,11 @@ package io.lettuce.core.cluster.commands.reactive; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; @@ -15,6 +17,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class ListClusterReactiveCommandIntegrationTests extends ListCommandIntegrationTests { private final RedisClusterCommands redis; diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandIntegrationTests.java index 651bd529b2..1be2b44ee5 100644 --- a/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.cluster.commands.reactive; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.LinkedHashMap; @@ -7,6 +8,7 @@ import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; @@ -21,6 +23,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class StringClusterReactiveCommandIntegrationTests extends StringCommandIntegrationTests { private final StatefulRedisClusterConnection connection; diff --git a/src/test/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParserUnitTests.java b/src/test/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParserUnitTests.java index 8d028f00d4..4cf98596a2 100644 --- a/src/test/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParserUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParserUnitTests.java @@ -1,11 +1,13 @@ package io.lettuce.core.cluster.models.partitions; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.time.Duration; import java.util.Collections; import java.util.HashSet; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisURI; @@ -14,6 +16,7 @@ /** * Unit tests for {@link ClusterPartitionParser}. */ +@Tag(UNIT_TEST) class ClusterPartitionParserUnitTests { private static String nodes = "c37ab8396be428403d4e55c0d317348be27ed973 127.0.0.1:7381 master - 111 1401258245007 222 connected 7000 12000 12002-16383\n" diff --git a/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsUnitTests.java b/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsUnitTests.java index bad3da7e00..b6c38c37ce 100644 --- a/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.cluster.models.partitions; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.AssertionsForInterfaceTypes.*; import java.util.Arrays; @@ -7,6 +8,7 @@ import java.util.HashSet; import java.util.Iterator; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisURI; @@ -16,6 +18,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class PartitionsUnitTests { private RedisClusterNode node1 = new RedisClusterNode(RedisURI.create("localhost", 6379), "a", true, "", 0, 0, 0, diff --git a/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeUnitTests.java b/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeUnitTests.java index bace1dc5f2..39d9415be8 100644 --- a/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.cluster.models.partitions; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.util.Arrays; @@ -7,6 +8,7 @@ import java.util.Collections; import java.util.HashSet; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisURI; @@ -17,6 +19,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class RedisClusterNodeUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserUnitTests.java b/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserUnitTests.java index 9a47ad0894..28b4086909 100644 --- a/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.cluster.models.slots; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -7,12 +8,14 @@ import java.util.Arrays; import java.util.List; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.cluster.models.partitions.RedisClusterNode; import io.lettuce.core.internal.LettuceLists; @SuppressWarnings("unchecked") +@Tag(UNIT_TEST) class ClusterSlotsParserUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java index cd08f520e6..7cba0dd163 100644 --- a/src/test/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.cluster.pubsub; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import java.util.List; @@ -11,6 +12,7 @@ import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -42,6 +44,7 @@ * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class RedisClusterPubSubConnectionIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java index 6106fa571c..48cc3e8acc 100644 --- a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.cluster.topology; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -40,6 +41,7 @@ import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -71,6 +73,7 @@ * @author Mark Paluch * @author Christian Weitendorf */ +@Tag(UNIT_TEST) @SuppressWarnings("unchecked") @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) diff --git a/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsUnitTests.java index cc98c276ff..d83381e0b6 100644 --- a/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsUnitTests.java @@ -19,11 +19,13 @@ */ package io.lettuce.core.cluster.topology; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.util.Arrays; import java.util.Set; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisURI; @@ -33,6 +35,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class NodeTopologyViewsUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java index fcf3f0e8dd..f376dec702 100644 --- a/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java @@ -19,10 +19,12 @@ */ package io.lettuce.core.cluster.topology; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.nio.ByteBuffer; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisURI; @@ -35,6 +37,7 @@ * @author Mark Paluch * @author Xujs */ +@Tag(UNIT_TEST) class RequestsUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java index 5e027077d7..416c6c3527 100644 --- a/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java +++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.cluster.topology; +import static io.lettuce.TestTags.UNIT_TEST; import static io.lettuce.core.cluster.topology.TopologyComparators.isChanged; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -26,6 +27,7 @@ import java.util.*; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisURI; @@ -40,6 +42,7 @@ * @author Mark Paluch * @author Alessandro Simi */ +@Tag(UNIT_TEST) class TopologyComparatorsUnitTests { private RedisClusterNodeSnapshot node1 = createNode("1"); diff --git a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java index c11212c228..77c0f3073b 100644 --- a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java +++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.cluster.topology; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import java.time.Duration; @@ -12,6 +13,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -42,6 +44,7 @@ * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @SuppressWarnings({ "unchecked" }) @SlowTests @ExtendWith(LettuceExtension.class) diff --git a/src/test/java/io/lettuce/core/codec/ByteArrayCodecUnitTests.java b/src/test/java/io/lettuce/core/codec/ByteArrayCodecUnitTests.java index c8f2394dac..9442517fe0 100644 --- a/src/test/java/io/lettuce/core/codec/ByteArrayCodecUnitTests.java +++ b/src/test/java/io/lettuce/core/codec/ByteArrayCodecUnitTests.java @@ -1,11 +1,14 @@ package io.lettuce.core.codec; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; +@Tag(UNIT_TEST) class ByteArrayCodecUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/codec/CipherCodecUnitTests.java b/src/test/java/io/lettuce/core/codec/CipherCodecUnitTests.java index c6f8c1e654..82b680fc69 100644 --- a/src/test/java/io/lettuce/core/codec/CipherCodecUnitTests.java +++ b/src/test/java/io/lettuce/core/codec/CipherCodecUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.codec; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -14,6 +15,7 @@ import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -27,6 +29,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class CipherCodecUnitTests { private final SecretKeySpec key = new SecretKeySpec("1234567890123456".getBytes(), "AES"); diff --git a/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java b/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java index 0351d9a51a..6c22a4fdf4 100644 --- a/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java +++ b/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java @@ -1,10 +1,12 @@ package io.lettuce.core.codec; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** @@ -12,6 +14,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class CompressionCodecUnitTests { private String key = "key"; diff --git a/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java b/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java index 8dfdd1ca56..03961d9188 100644 --- a/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java +++ b/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java @@ -19,11 +19,13 @@ */ package io.lettuce.core.codec; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.netty.buffer.ByteBuf; @@ -36,6 +38,7 @@ * @author Mark Paluch * @author Dimitris Mandalidis */ +@Tag(UNIT_TEST) class StringCodecUnitTests { private String teststring = "hello üäü~∑†®†ª€∂‚¶¢ Wørld"; diff --git a/src/test/java/io/lettuce/core/commands/AclCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/AclCommandIntegrationTests.java index 9ed326d999..7fbeb7cf9f 100644 --- a/src/test/java/io/lettuce/core/commands/AclCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/AclCommandIntegrationTests.java @@ -19,11 +19,13 @@ */ package io.lettuce.core.commands; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -47,6 +49,7 @@ * @author Mikhael Sokolov * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) @EnabledOnCommand("ACL") diff --git a/src/test/java/io/lettuce/core/commands/BitCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/BitCommandIntegrationTests.java index 2752bc813c..6bc667e9b4 100644 --- a/src/test/java/io/lettuce/core/commands/BitCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/BitCommandIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.commands; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.core.BitFieldArgs.offset; import static io.lettuce.core.BitFieldArgs.signed; import static io.lettuce.core.BitFieldArgs.typeWidthBasedOffset; @@ -33,6 +34,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -48,6 +50,7 @@ * @author Will Glozer * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class BitCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/commands/CustomCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/CustomCommandIntegrationTests.java index ceb49722e2..cadfa08f3e 100644 --- a/src/test/java/io/lettuce/core/commands/CustomCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/CustomCommandIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.commands; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import static org.junit.jupiter.api.Assumptions.*; @@ -27,6 +28,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -53,6 +55,7 @@ * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class CustomCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/commands/FunctionCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/FunctionCommandIntegrationTests.java index 5340b07c0b..e303080bef 100644 --- a/src/test/java/io/lettuce/core/commands/FunctionCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/FunctionCommandIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.commands; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.core.ScriptOutputType.*; import static org.assertj.core.api.Assertions.*; @@ -10,6 +11,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -29,6 +31,7 @@ * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) @EnabledOnCommand("FUNCTION") diff --git a/src/test/java/io/lettuce/core/commands/GeoCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/GeoCommandIntegrationTests.java index 478fb117ed..849b3cdeb6 100644 --- a/src/test/java/io/lettuce/core/commands/GeoCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/GeoCommandIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.commands; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import static org.junit.jupiter.api.Assumptions.*; @@ -9,6 +10,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -22,6 +24,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @EnabledOnCommand("GEOADD") @TestInstance(TestInstance.Lifecycle.PER_CLASS) diff --git a/src/test/java/io/lettuce/core/commands/HLLCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/HLLCommandIntegrationTests.java index 7749a2fd50..1c7e26a6bf 100644 --- a/src/test/java/io/lettuce/core/commands/HLLCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/HLLCommandIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.commands; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Fail.fail; @@ -7,6 +8,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -18,6 +20,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class HLLCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java index 2cd1608e4a..70a2a263e2 100644 --- a/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java @@ -33,6 +33,7 @@ import io.lettuce.test.ListStreamingAdapter; import io.lettuce.test.condition.EnabledOnCommand; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -48,6 +49,7 @@ import java.util.Map; import java.util.Set; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.offset; import static org.awaitility.Awaitility.await; @@ -59,6 +61,7 @@ * @author Mark Paluch * @author Hodur Heidarsson */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class HashCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/commands/KeyCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/KeyCommandIntegrationTests.java index 45d7e3840d..c24e231f17 100644 --- a/src/test/java/io/lettuce/core/commands/KeyCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/KeyCommandIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.commands; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import java.time.Duration; @@ -33,6 +34,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -58,6 +60,7 @@ * @author Mark Paluch * @author dengliming */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class KeyCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/commands/ListCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/ListCommandIntegrationTests.java index 4f26a86804..d5ea4c4673 100644 --- a/src/test/java/io/lettuce/core/commands/ListCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/ListCommandIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.commands; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import static org.junit.jupiter.api.Assumptions.*; @@ -30,6 +31,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -52,6 +54,7 @@ * @author Mikhael Sokolov * @author M Sazzadul Hoque */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class ListCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/commands/NumericCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/NumericCommandIntegrationTests.java index 6a2a7c1000..963a4cbc99 100644 --- a/src/test/java/io/lettuce/core/commands/NumericCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/NumericCommandIntegrationTests.java @@ -19,12 +19,14 @@ */ package io.lettuce.core.commands; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.offset; import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -37,6 +39,7 @@ * @author Will Glozer * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class NumericCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandIntegrationTests.java index 25d75291de..2e94eb035c 100644 --- a/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.commands; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.test.settings.TestSettings.*; import static org.assertj.core.api.Assertions.*; import static org.junit.jupiter.api.Assumptions.*; @@ -9,6 +10,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -28,6 +30,7 @@ * @author Will Glozer * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class RunOnlyOnceServerCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/commands/ScriptingCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/ScriptingCommandIntegrationTests.java index 1c7afd30e2..bc2b83eb53 100644 --- a/src/test/java/io/lettuce/core/commands/ScriptingCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/ScriptingCommandIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.commands; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.core.ScriptOutputType.*; import static io.lettuce.core.ScriptOutputType.BOOLEAN; import static io.lettuce.core.ScriptOutputType.INTEGER; @@ -31,6 +32,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -52,6 +54,7 @@ * @author Mark Paluch * @author dengliming */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class ScriptingCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java index 0952d592af..d523a88555 100644 --- a/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java @@ -35,6 +35,7 @@ import io.lettuce.test.condition.RedisConditions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -54,6 +55,7 @@ import io.lettuce.test.condition.EnabledOnCommand; import io.lettuce.test.settings.TestSettings; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assumptions.assumeFalse; @@ -67,6 +69,7 @@ * @author Zhang Jessey * @author dengliming */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class ServerCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/commands/SetCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/SetCommandIntegrationTests.java index 9f0d579eac..4775635663 100644 --- a/src/test/java/io/lettuce/core/commands/SetCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/SetCommandIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.commands; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assumptions.assumeTrue; @@ -31,6 +32,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -47,6 +49,7 @@ * @author Mark Paluch * @author dengliming */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class SetCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/commands/SortCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/SortCommandIntegrationTests.java index a408016469..356dd41c51 100644 --- a/src/test/java/io/lettuce/core/commands/SortCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/SortCommandIntegrationTests.java @@ -19,12 +19,14 @@ */ package io.lettuce.core.commands; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.core.SortArgs.Builder.*; import static org.assertj.core.api.Assertions.*; import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -41,6 +43,7 @@ * @author Will Glozer * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class SortCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java index 1e37c5850d..d53e5c16e8 100644 --- a/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.commands; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.core.Range.Boundary.*; import static io.lettuce.core.ZStoreArgs.Builder.*; import static io.lettuce.core.ZStoreArgs.Builder.max; @@ -35,6 +36,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -54,6 +56,7 @@ * @author dengliming * @author Mikhael Sokolov */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class SortedSetCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java index 0a4b233a9c..1816d3f480 100644 --- a/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java @@ -31,6 +31,7 @@ import io.lettuce.test.LettuceExtension; import io.lettuce.test.condition.EnabledOnCommand; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -45,6 +46,7 @@ import java.util.List; import java.util.Map; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.core.protocol.CommandType.XINFO; import static org.assertj.core.api.Assertions.assertThat; @@ -57,6 +59,7 @@ @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) @EnabledOnCommand("XADD") +@Tag(INTEGRATION_TEST) public class StreamCommandIntegrationTests extends TestSupport { private final RedisCommands redis; diff --git a/src/test/java/io/lettuce/core/commands/StringCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/StringCommandIntegrationTests.java index 0bee9425fd..1ed444023f 100644 --- a/src/test/java/io/lettuce/core/commands/StringCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/StringCommandIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.commands; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.core.SetArgs.Builder.*; import static io.lettuce.core.StringMatchResult.*; import static org.assertj.core.api.Assertions.*; @@ -32,6 +33,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -56,6 +58,7 @@ * @author dengliming * @author Andrey Shlykov */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class StringCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/commands/TransactionCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/TransactionCommandIntegrationTests.java index df8d6adf86..c0f4b5f92d 100644 --- a/src/test/java/io/lettuce/core/commands/TransactionCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/TransactionCommandIntegrationTests.java @@ -19,12 +19,14 @@ */ package io.lettuce.core.commands; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -37,6 +39,7 @@ * @author Will Glozer * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class TransactionCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/commands/reactive/AclReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/AclReactiveCommandIntegrationTests.java index e3fba38f39..ebc7b3ef06 100644 --- a/src/test/java/io/lettuce/core/commands/reactive/AclReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/reactive/AclReactiveCommandIntegrationTests.java @@ -5,12 +5,16 @@ import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.commands.AclCommandIntegrationTests; import io.lettuce.test.ReactiveSyncInvocationHandler; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * Integration tests though the reactive facade for {@link AclCommandIntegrationTests}. * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class AclReactiveCommandIntegrationTests extends AclCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandIntegrationTests.java index ed5c30f36d..648a074885 100644 --- a/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.commands.reactive; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.core.BitFieldArgs.offset; import static io.lettuce.core.BitFieldArgs.signed; import static io.lettuce.core.BitFieldArgs.typeWidthBasedOffset; @@ -8,6 +9,7 @@ import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import reactor.test.StepVerifier; @@ -22,6 +24,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class BitReactiveCommandIntegrationTests extends BitCommandIntegrationTests { private RedisStringReactiveCommands reactive; diff --git a/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandIntegrationTests.java index 6e82d20391..20c4a63381 100644 --- a/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandIntegrationTests.java @@ -2,6 +2,7 @@ import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -18,9 +19,12 @@ import io.lettuce.core.protocol.CommandType; import io.lettuce.test.LettuceExtension; +import static io.lettuce.TestTags.INTEGRATION_TEST; + /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class CustomReactiveCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/commands/reactive/FunctionReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/FunctionReactiveCommandIntegrationTests.java index f9bf8958d4..dddbb1ca3e 100644 --- a/src/test/java/io/lettuce/core/commands/reactive/FunctionReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/reactive/FunctionReactiveCommandIntegrationTests.java @@ -6,10 +6,14 @@ import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.commands.FunctionCommandIntegrationTests; import io.lettuce.test.ReactiveSyncInvocationHandler; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class FunctionReactiveCommandIntegrationTests extends FunctionCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandIntegrationTests.java index da0975c0b2..9617c695a8 100644 --- a/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandIntegrationTests.java @@ -1,11 +1,13 @@ package io.lettuce.core.commands.reactive; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.offset; import javax.inject.Inject; import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import reactor.test.StepVerifier; @@ -17,6 +19,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class GeoReactiveCommandIntegrationTests extends GeoCommandIntegrationTests { private final StatefulRedisConnection connection; diff --git a/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandIntegrationTests.java index fe4d90d746..f0e4737c95 100644 --- a/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandIntegrationTests.java @@ -5,10 +5,14 @@ import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.commands.HLLCommandIntegrationTests; import io.lettuce.test.ReactiveSyncInvocationHandler; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class HLLReactiveCommandIntegrationTests extends HLLCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandIntegrationTests.java index cca4947dca..57f566f389 100644 --- a/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.commands.reactive; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.stream.Collectors; @@ -7,6 +8,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import reactor.test.StepVerifier; @@ -19,6 +21,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class HashReactiveCommandIntegrationTests extends HashCommandIntegrationTests { private final StatefulRedisConnection connection; diff --git a/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandIntegrationTests.java index 134f4ce1a6..5dd50109c7 100644 --- a/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandIntegrationTests.java @@ -5,10 +5,14 @@ import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.commands.KeyCommandIntegrationTests; import io.lettuce.test.ReactiveSyncInvocationHandler; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class KeyReactiveCommandIntegrationTests extends KeyCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandIntegrationTests.java index 58e4f43d35..bec74c7ac4 100644 --- a/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandIntegrationTests.java @@ -5,10 +5,14 @@ import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.commands.ListCommandIntegrationTests; import io.lettuce.test.ReactiveSyncInvocationHandler; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class ListReactiveCommandIntegrationTests extends ListCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandIntegrationTests.java index 39a0fb78e1..40761770cd 100644 --- a/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandIntegrationTests.java @@ -5,10 +5,14 @@ import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.commands.NumericCommandIntegrationTests; import io.lettuce.test.ReactiveSyncInvocationHandler; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class NumericReactiveCommandIntegrationTests extends NumericCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandIntegrationTests.java index fcd5a574d4..824fdbf988 100644 --- a/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandIntegrationTests.java @@ -6,10 +6,14 @@ import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.commands.ScriptingCommandIntegrationTests; import io.lettuce.test.ReactiveSyncInvocationHandler; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class ScriptingReactiveCommandIntegrationTests extends ScriptingCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandIntegrationTests.java index b811298065..e8d60e951c 100644 --- a/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandIntegrationTests.java @@ -1,11 +1,13 @@ package io.lettuce.core.commands.reactive; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisClient; @@ -22,6 +24,7 @@ * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class ServerReactiveCommandIntegrationTests extends ServerCommandIntegrationTests { private RedisReactiveCommands reactive; diff --git a/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandIntegrationTests.java index 8bef010797..759bdf2702 100644 --- a/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandIntegrationTests.java @@ -5,10 +5,14 @@ import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.commands.SetCommandIntegrationTests; import io.lettuce.test.ReactiveSyncInvocationHandler; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class SetReactiveCommandIntegrationTests extends SetCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandIntegrationTests.java index 6e7bcc95e6..b8f7e3dfc5 100644 --- a/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandIntegrationTests.java @@ -5,10 +5,14 @@ import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.commands.SortCommandIntegrationTests; import io.lettuce.test.ReactiveSyncInvocationHandler; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class SortReactiveCommandIntegrationTests extends SortCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandIntegrationTests.java index 71ab51524a..9f2a1511a1 100644 --- a/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandIntegrationTests.java @@ -1,9 +1,11 @@ package io.lettuce.core.commands.reactive; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import reactor.test.StepVerifier; @@ -18,6 +20,7 @@ * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class SortedSetReactiveCommandIntegrationTests extends SortedSetCommandIntegrationTests { private final RedisReactiveCommands reactive; diff --git a/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandIntegrationTests.java index 218bd4e412..b1d17175e0 100644 --- a/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandIntegrationTests.java @@ -5,10 +5,14 @@ import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.commands.StreamCommandIntegrationTests; import io.lettuce.test.ReactiveSyncInvocationHandler; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class StreamReactiveCommandIntegrationTests extends StreamCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandIntegrationTests.java index ea81cebd85..7a878799af 100644 --- a/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandIntegrationTests.java @@ -2,6 +2,7 @@ import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; @@ -13,9 +14,12 @@ import io.lettuce.core.commands.StringCommandIntegrationTests; import io.lettuce.test.ReactiveSyncInvocationHandler; +import static io.lettuce.TestTags.INTEGRATION_TEST; + /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class StringReactiveCommandIntegrationTests extends StringCommandIntegrationTests { private final RedisCommands redis; diff --git a/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandIntegrationTests.java index 771da89434..bba86a02ed 100644 --- a/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandIntegrationTests.java @@ -1,9 +1,11 @@ package io.lettuce.core.commands.reactive; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.KeyValue; @@ -18,6 +20,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) public class TransactionReactiveCommandIntegrationTests extends TransactionCommandIntegrationTests { private final RedisClient client; diff --git a/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandIntegrationTests.java index 9cdbb9f1e7..680ccc63f6 100644 --- a/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandIntegrationTests.java @@ -5,10 +5,14 @@ import io.lettuce.core.RedisClient; import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.commands.BitCommandIntegrationTests; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class BitTxCommandIntegrationTests extends BitCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandIntegrationTests.java index 8d2f19c08d..5ff47979cd 100644 --- a/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandIntegrationTests.java @@ -6,10 +6,14 @@ import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.commands.GeoCommandIntegrationTests; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class GeoTxCommandIntegrationTests extends GeoCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandIntegrationTests.java index c3707fe685..89d1d50e48 100644 --- a/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandIntegrationTests.java @@ -4,10 +4,14 @@ import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.commands.HLLCommandIntegrationTests; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class HLLTxCommandIntegrationTests extends HLLCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandIntegrationTests.java index 12965fd2c3..20fe65db72 100644 --- a/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandIntegrationTests.java @@ -4,10 +4,14 @@ import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.commands.HashCommandIntegrationTests; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class HashTxCommandIntegrationTests extends HashCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandIntegrationTests.java index cc9e298302..eb7b6db497 100644 --- a/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandIntegrationTests.java @@ -6,10 +6,14 @@ import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.commands.KeyCommandIntegrationTests; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) public class KeyTxCommandIntegrationTests extends KeyCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandIntegrationTests.java index b86291b0f6..281168af8f 100644 --- a/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandIntegrationTests.java @@ -4,10 +4,14 @@ import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.commands.ListCommandIntegrationTests; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class ListTxCommandIntegrationTests extends ListCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandIntegrationTests.java index 47714e0b87..2372f58f86 100644 --- a/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandIntegrationTests.java @@ -4,10 +4,14 @@ import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.commands.SetCommandIntegrationTests; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class SetTxCommandIntegrationTests extends SetCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandIntegrationTests.java index 8813b5e34f..01e23a594d 100644 --- a/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandIntegrationTests.java @@ -4,10 +4,14 @@ import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.commands.SortCommandIntegrationTests; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class SortTxCommandIntegrationTests extends SortCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandIntegrationTests.java index 3d443f6a1e..283976ad09 100644 --- a/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandIntegrationTests.java @@ -4,10 +4,14 @@ import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.commands.SortedSetCommandIntegrationTests; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class SortedSetTxCommandIntegrationTests extends SortedSetCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/commands/transactional/StreamTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/StreamTxCommandIntegrationTests.java index 489be34ef9..814baad9a3 100644 --- a/src/test/java/io/lettuce/core/commands/transactional/StreamTxCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/transactional/StreamTxCommandIntegrationTests.java @@ -3,14 +3,18 @@ import javax.inject.Inject; import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.commands.StreamCommandIntegrationTests; +import static io.lettuce.TestTags.INTEGRATION_TEST; + /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class StreamTxCommandIntegrationTests extends StreamCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandIntegrationTests.java index 46e388460e..fe83617f6f 100644 --- a/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandIntegrationTests.java @@ -4,10 +4,14 @@ import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.commands.StringCommandIntegrationTests; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class StringTxCommandIntegrationTests extends StringCommandIntegrationTests { @Inject diff --git a/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyUnitTests.java b/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyUnitTests.java index 7163785b42..105eda036c 100644 --- a/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyUnitTests.java +++ b/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.dynamic; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -8,6 +9,7 @@ import java.util.concurrent.Future; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -26,6 +28,7 @@ */ @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) +@Tag(UNIT_TEST) class BatchExecutableCommandLookupStrategyUnitTests { @Mock diff --git a/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryUnitTests.java b/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryUnitTests.java index 99e3bb5a3c..f7560d1131 100644 --- a/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryUnitTests.java +++ b/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryUnitTests.java @@ -1,10 +1,12 @@ package io.lettuce.core.dynamic; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import java.util.concurrent.Future; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.ScanArgs; @@ -28,6 +30,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class CommandSegmentCommandFactoryUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/dynamic/ConversionServiceUnitTests.java b/src/test/java/io/lettuce/core/dynamic/ConversionServiceUnitTests.java index 3a684a5882..28e01b4ff3 100644 --- a/src/test/java/io/lettuce/core/dynamic/ConversionServiceUnitTests.java +++ b/src/test/java/io/lettuce/core/dynamic/ConversionServiceUnitTests.java @@ -1,10 +1,12 @@ package io.lettuce.core.dynamic; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import java.util.function.Function; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; @@ -14,6 +16,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class ConversionServiceUnitTests { private ConversionService sut = new ConversionService(); diff --git a/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodUnitTests.java b/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodUnitTests.java index c60efd0973..b4f1c5a5a9 100644 --- a/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodUnitTests.java +++ b/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodUnitTests.java @@ -1,10 +1,12 @@ package io.lettuce.core.dynamic; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.lang.reflect.Method; import java.util.concurrent.Future; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; @@ -12,6 +14,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class DeclaredCommandMethodUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierUnitTests.java b/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierUnitTests.java index 8ad6f2e84d..84b7227ff7 100644 --- a/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierUnitTests.java +++ b/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierUnitTests.java @@ -1,11 +1,13 @@ package io.lettuce.core.dynamic; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import static org.assertj.core.api.Fail.fail; import java.lang.reflect.Method; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.GeoCoordinates; @@ -24,6 +26,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class DefaultCommandMethodVerifierUnitTests { private DefaultCommandMethodVerifier sut; diff --git a/src/test/java/io/lettuce/core/dynamic/ParameterBinderUnitTests.java b/src/test/java/io/lettuce/core/dynamic/ParameterBinderUnitTests.java index bb065be03e..1808904da6 100644 --- a/src/test/java/io/lettuce/core/dynamic/ParameterBinderUnitTests.java +++ b/src/test/java/io/lettuce/core/dynamic/ParameterBinderUnitTests.java @@ -1,11 +1,13 @@ package io.lettuce.core.dynamic; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.Base64; import java.util.Collections; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; @@ -21,6 +23,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) class ParameterBinderUnitTests { diff --git a/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryUnitTests.java b/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryUnitTests.java index 11bd196489..8a9114f8ba 100644 --- a/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryUnitTests.java +++ b/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryUnitTests.java @@ -1,10 +1,12 @@ package io.lettuce.core.dynamic; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import java.lang.reflect.Method; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; @@ -26,6 +28,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) class ReactiveCommandSegmentCommandFactoryUnitTests { diff --git a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersUnitTests.java b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersUnitTests.java index 151d8ddbe4..f75fbe989f 100644 --- a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersUnitTests.java +++ b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersUnitTests.java @@ -1,8 +1,10 @@ package io.lettuce.core.dynamic; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; @@ -16,6 +18,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class ReactiveTypeAdaptersUnitTests { private ConversionService conversionService = new ConversionService(); diff --git a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionIntegrationTests.java index 3bcb712b50..069ca7f2de 100644 --- a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionIntegrationTests.java +++ b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionIntegrationTests.java @@ -1,10 +1,12 @@ package io.lettuce.core.dynamic; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -19,6 +21,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class ReactiveTypeAdaptionIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncIntegrationTests.java index df94daa623..b98cd8154b 100644 --- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncIntegrationTests.java +++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.dynamic; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.concurrent.CompletableFuture; @@ -7,6 +8,7 @@ import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -18,6 +20,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class RedisCommandsAsyncIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java index b786eb62c5..54466d87d9 100644 --- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java +++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.dynamic; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; @@ -27,6 +28,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -48,6 +50,7 @@ * @author Mark Paluch * @author Lucio Paiva */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class RedisCommandsBatchingIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterIntegrationTests.java index d430f8b485..a561ec0063 100644 --- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterIntegrationTests.java +++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.dynamic; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.time.Duration; @@ -8,6 +9,7 @@ import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -22,6 +24,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class RedisCommandsClusterIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsIntegrationTests.java index 351989f03f..21c2b1e987 100644 --- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsIntegrationTests.java +++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.dynamic; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.mockito.Mockito.doThrow; @@ -9,6 +10,7 @@ import org.apache.commons.pool2.impl.GenericObjectPool; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mockito; @@ -30,6 +32,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class RedisCommandsIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveIntegrationTests.java index d394bb10bb..baa0f65d20 100644 --- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveIntegrationTests.java +++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveIntegrationTests.java @@ -3,6 +3,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -15,9 +16,12 @@ import io.lettuce.test.LettuceExtension; import io.reactivex.Maybe; +import static io.lettuce.TestTags.INTEGRATION_TEST; + /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class RedisCommandsReactiveIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncIntegrationTests.java index 37181b0460..d9b04db9ff 100644 --- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncIntegrationTests.java +++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.dynamic; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import java.util.Collections; @@ -8,6 +9,7 @@ import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -26,6 +28,7 @@ * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class RedisCommandsSyncIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/dynamic/SimpleBatcherUnitTests.java b/src/test/java/io/lettuce/core/dynamic/SimpleBatcherUnitTests.java index 11f425b2d1..592bfe29ba 100644 --- a/src/test/java/io/lettuce/core/dynamic/SimpleBatcherUnitTests.java +++ b/src/test/java/io/lettuce/core/dynamic/SimpleBatcherUnitTests.java @@ -1,10 +1,12 @@ package io.lettuce.core.dynamic; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.Arrays; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -20,6 +22,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) class SimpleBatcherUnitTests { diff --git a/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java b/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java index 7c86802307..9aced2ff7a 100644 --- a/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java +++ b/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.dynamic.codec; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -28,6 +29,7 @@ import java.util.Map; import java.util.Set; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.Range; @@ -46,6 +48,7 @@ * @author Mark Paluch * @author Manyanda Chitimbo */ +@Tag(UNIT_TEST) class AnnotationRedisCodecResolverUnitTests { private List> codecs = Arrays.asList(new StringCodec(), new ByteArrayCodec()); diff --git a/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersUnitTests.java b/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersUnitTests.java index 3eadb15d3d..35f690f766 100644 --- a/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersUnitTests.java +++ b/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersUnitTests.java @@ -1,11 +1,13 @@ package io.lettuce.core.dynamic.codec; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.lang.reflect.Method; import java.util.List; import java.util.Map; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.KeyValue; @@ -19,6 +21,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class ParameterWrappersUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryUnitTests.java b/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryUnitTests.java index afaabf21fb..5f26fbf68f 100644 --- a/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryUnitTests.java +++ b/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryUnitTests.java @@ -1,12 +1,15 @@ package io.lettuce.core.dynamic.intercept; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class InvocationProxyFactoryUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverUnitTests.java b/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverUnitTests.java index f20e53badf..0ad4183bed 100644 --- a/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverUnitTests.java +++ b/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.dynamic.output; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.lang.reflect.Method; @@ -7,6 +8,7 @@ import java.util.List; import java.util.Map; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.codec.RedisCodec; @@ -18,6 +20,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class CodecAwareOutputResolverUnitTests { private CodecAwareOutputFactoryResolver resolver = new CodecAwareOutputFactoryResolver( diff --git a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverUnitTests.java b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverUnitTests.java index c6486cabb5..a5d77a455f 100644 --- a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverUnitTests.java +++ b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverUnitTests.java @@ -1,11 +1,13 @@ package io.lettuce.core.dynamic.output; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.lang.reflect.Method; import java.util.Collection; import java.util.List; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; @@ -22,6 +24,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class OutputRegistryCommandOutputFactoryResolverUnitTests { private OutputRegistryCommandOutputFactoryResolver resolver = new OutputRegistryCommandOutputFactoryResolver( diff --git a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryUnitTests.java b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryUnitTests.java index 0d20f3401c..f0a2d557ba 100644 --- a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryUnitTests.java +++ b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryUnitTests.java @@ -1,10 +1,12 @@ package io.lettuce.core.dynamic.output; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.nio.ByteBuffer; import java.util.List; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.ScoredValue; @@ -18,6 +20,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class OutputRegistryUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryUnitTests.java b/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryUnitTests.java index dc5ba7f910..741f110b36 100644 --- a/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryUnitTests.java +++ b/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryUnitTests.java @@ -1,7 +1,9 @@ package io.lettuce.core.dynamic.segment; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.dynamic.CommandMethod; @@ -15,6 +17,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class AnnotationCommandSegmentFactoryUnitTests { private AnnotationCommandSegmentFactory factory = new AnnotationCommandSegmentFactory(); diff --git a/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationUnitTests.java b/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationUnitTests.java index 7b98b1dcbf..d2620eaabf 100644 --- a/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationUnitTests.java +++ b/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationUnitTests.java @@ -1,16 +1,19 @@ package io.lettuce.core.dynamic.support; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.Collection; import java.util.List; import java.util.Set; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class ParametrizedTypeInformationUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationUnitTests.java b/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationUnitTests.java index fe20304f66..354fa85f66 100644 --- a/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationUnitTests.java +++ b/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.dynamic.support; +import static io.lettuce.TestTags.UNIT_TEST; import static io.lettuce.core.dynamic.support.ClassTypeInformation.from; import static org.assertj.core.api.Assertions.assertThat; @@ -7,11 +8,13 @@ import java.util.Collection; import java.util.List; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class WildcardTypeInformationUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredIntegrationTests.java b/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredIntegrationTests.java index ab91f9bd7f..21d9eb5e83 100644 --- a/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredIntegrationTests.java +++ b/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredIntegrationTests.java @@ -1,10 +1,12 @@ package io.lettuce.core.event; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.time.Duration; import java.time.temporal.ChronoUnit; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; @@ -19,6 +21,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class ConnectionEventsTriggeredIntegrationTests extends TestSupport { @Test diff --git a/src/test/java/io/lettuce/core/event/DefaultEventBusUnitTests.java b/src/test/java/io/lettuce/core/event/DefaultEventBusUnitTests.java index 5d39762010..da0e5f4412 100644 --- a/src/test/java/io/lettuce/core/event/DefaultEventBusUnitTests.java +++ b/src/test/java/io/lettuce/core/event/DefaultEventBusUnitTests.java @@ -1,9 +1,11 @@ package io.lettuce.core.event; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.concurrent.ArrayBlockingQueue; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -16,6 +18,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) class DefaultEventBusUnitTests { diff --git a/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsUnitTests.java b/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsUnitTests.java index cdc9790fad..11c915c441 100644 --- a/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsUnitTests.java +++ b/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsUnitTests.java @@ -1,15 +1,18 @@ package io.lettuce.core.event; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.time.Duration; import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class DefaultEventPublisherOptionsUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerUnitTests.java b/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerUnitTests.java index 6b1f2c17f7..fcb2d33a93 100644 --- a/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerUnitTests.java +++ b/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerUnitTests.java @@ -1,16 +1,19 @@ package io.lettuce.core.internal; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.Collection; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class AbstractInvocationHandlerUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/internal/FuturesUnitTests.java b/src/test/java/io/lettuce/core/internal/FuturesUnitTests.java index d7c1868d44..4931fa2f67 100644 --- a/src/test/java/io/lettuce/core/internal/FuturesUnitTests.java +++ b/src/test/java/io/lettuce/core/internal/FuturesUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.internal; +import static io.lettuce.TestTags.UNIT_TEST; import static java.util.concurrent.TimeUnit.SECONDS; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -13,6 +14,7 @@ import java.util.concurrent.Executors; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisCommandExecutionException; @@ -24,6 +26,7 @@ * @author Mark Paluch * @author Tihomir Mateev */ +@Tag(UNIT_TEST) class FuturesUnitTests { @BeforeEach diff --git a/src/test/java/io/lettuce/core/internal/HostAndPortUnitTests.java b/src/test/java/io/lettuce/core/internal/HostAndPortUnitTests.java index 273e8cae67..0e931d1351 100644 --- a/src/test/java/io/lettuce/core/internal/HostAndPortUnitTests.java +++ b/src/test/java/io/lettuce/core/internal/HostAndPortUnitTests.java @@ -1,13 +1,16 @@ package io.lettuce.core.internal; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class HostAndPortUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/internal/LettuceStringsTests.java b/src/test/java/io/lettuce/core/internal/LettuceStringsTests.java index fb3b65aaf7..b236dc4a91 100644 --- a/src/test/java/io/lettuce/core/internal/LettuceStringsTests.java +++ b/src/test/java/io/lettuce/core/internal/LettuceStringsTests.java @@ -19,13 +19,16 @@ */ package io.lettuce.core.internal; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** * @author Kevin McLaughlin */ +@Tag(UNIT_TEST) class LettuceStringsTests { @Test diff --git a/src/test/java/io/lettuce/core/internal/TimeoutProviderUnitTests.java b/src/test/java/io/lettuce/core/internal/TimeoutProviderUnitTests.java index f14ae94ffc..ef354e9f98 100644 --- a/src/test/java/io/lettuce/core/internal/TimeoutProviderUnitTests.java +++ b/src/test/java/io/lettuce/core/internal/TimeoutProviderUnitTests.java @@ -1,11 +1,13 @@ package io.lettuce.core.internal; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import java.time.Duration; import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.TimeoutOptions; @@ -16,6 +18,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class TimeoutProviderUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/json/DefaultJsonParserUnitTests.java b/src/test/java/io/lettuce/core/json/DefaultJsonParserUnitTests.java index b99933fccf..101ec78ded 100644 --- a/src/test/java/io/lettuce/core/json/DefaultJsonParserUnitTests.java +++ b/src/test/java/io/lettuce/core/json/DefaultJsonParserUnitTests.java @@ -7,16 +7,19 @@ package io.lettuce.core.json; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; /** * Unit tests for {@link DefaultJsonParser}. */ +@Tag(UNIT_TEST) class DefaultJsonParserUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/json/DelegateJsonArrayUnitTests.java b/src/test/java/io/lettuce/core/json/DelegateJsonArrayUnitTests.java index 1b681af0d3..8921968023 100644 --- a/src/test/java/io/lettuce/core/json/DelegateJsonArrayUnitTests.java +++ b/src/test/java/io/lettuce/core/json/DelegateJsonArrayUnitTests.java @@ -7,16 +7,19 @@ package io.lettuce.core.json; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import java.util.Iterator; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; /** * Unit tests for {@link DelegateJsonArray}. */ +@Tag(UNIT_TEST) class DelegateJsonArrayUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/json/DelegateJsonObjectUnitTests.java b/src/test/java/io/lettuce/core/json/DelegateJsonObjectUnitTests.java index 5a9bde49a1..fe14469d47 100644 --- a/src/test/java/io/lettuce/core/json/DelegateJsonObjectUnitTests.java +++ b/src/test/java/io/lettuce/core/json/DelegateJsonObjectUnitTests.java @@ -7,13 +7,16 @@ package io.lettuce.core.json; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; /** * Unit tests for {@link DelegateJsonObject}. */ +@Tag(UNIT_TEST) class DelegateJsonObjectUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/json/DelegateJsonValueUnitTests.java b/src/test/java/io/lettuce/core/json/DelegateJsonValueUnitTests.java index 657572f09b..cbefa3ffb3 100644 --- a/src/test/java/io/lettuce/core/json/DelegateJsonValueUnitTests.java +++ b/src/test/java/io/lettuce/core/json/DelegateJsonValueUnitTests.java @@ -7,13 +7,16 @@ package io.lettuce.core.json; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; /** * Unit tests for {@link DelegateJsonValue}. */ +@Tag(UNIT_TEST) class DelegateJsonValueUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/json/RedisJsonClusterIntegrationTests.java b/src/test/java/io/lettuce/core/json/RedisJsonClusterIntegrationTests.java index 7c2746d4c0..5bcbfd5376 100644 --- a/src/test/java/io/lettuce/core/json/RedisJsonClusterIntegrationTests.java +++ b/src/test/java/io/lettuce/core/json/RedisJsonClusterIntegrationTests.java @@ -17,6 +17,7 @@ import io.lettuce.core.json.arguments.JsonSetArgs; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -30,8 +31,10 @@ import java.util.Arrays; import java.util.List; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; +@Tag(INTEGRATION_TEST) public class RedisJsonClusterIntegrationTests extends RedisContainerIntegrationTests { protected static RedisClusterClient client; diff --git a/src/test/java/io/lettuce/core/json/RedisJsonIntegrationTests.java b/src/test/java/io/lettuce/core/json/RedisJsonIntegrationTests.java index fbf64bef3d..d8473ee964 100644 --- a/src/test/java/io/lettuce/core/json/RedisJsonIntegrationTests.java +++ b/src/test/java/io/lettuce/core/json/RedisJsonIntegrationTests.java @@ -21,6 +21,7 @@ import io.lettuce.core.json.arguments.JsonRangeArgs; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -36,8 +37,10 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutionException; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; +@Tag(INTEGRATION_TEST) public class RedisJsonIntegrationTests extends RedisContainerIntegrationTests { private static final String BIKES_INVENTORY = "bikes:inventory"; diff --git a/src/test/java/io/lettuce/core/json/UnproccessedJsonValueUnitTests.java b/src/test/java/io/lettuce/core/json/UnproccessedJsonValueUnitTests.java index 1d35326f3f..2123bfb7e1 100644 --- a/src/test/java/io/lettuce/core/json/UnproccessedJsonValueUnitTests.java +++ b/src/test/java/io/lettuce/core/json/UnproccessedJsonValueUnitTests.java @@ -22,15 +22,18 @@ import io.lettuce.core.codec.StringCodec; import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; /** * Unit tests for {@link UnproccessedJsonValue}. */ +@Tag(UNIT_TEST) class UnproccessedJsonValueUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/masterreplica/ConnectionsUnitTests.java b/src/test/java/io/lettuce/core/masterreplica/ConnectionsUnitTests.java index 2c32c0c019..7bbfeeaf83 100644 --- a/src/test/java/io/lettuce/core/masterreplica/ConnectionsUnitTests.java +++ b/src/test/java/io/lettuce/core/masterreplica/ConnectionsUnitTests.java @@ -1,11 +1,13 @@ package io.lettuce.core.masterreplica; +import static io.lettuce.TestTags.UNIT_TEST; import static org.mockito.Mockito.*; import java.util.Collections; import java.util.concurrent.CompletableFuture; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -20,6 +22,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) class ConnectionsUnitTests { diff --git a/src/test/java/io/lettuce/core/masterreplica/CustomCommandIntegrationTests.java b/src/test/java/io/lettuce/core/masterreplica/CustomCommandIntegrationTests.java index 5d0702d15d..bab2535fba 100644 --- a/src/test/java/io/lettuce/core/masterreplica/CustomCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/masterreplica/CustomCommandIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.masterreplica; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assumptions.assumeTrue; @@ -10,6 +11,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -25,6 +27,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class CustomCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaChannelWriterUnitTests.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaChannelWriterUnitTests.java index fead0e6a8f..7acce94210 100644 --- a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaChannelWriterUnitTests.java +++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaChannelWriterUnitTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.masterreplica; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -28,6 +29,7 @@ import java.util.List; import java.util.concurrent.CompletableFuture; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -49,6 +51,7 @@ * @author Mark Paluch * @author Jim Brunner */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) class MasterReplicaChannelWriterUnitTests { diff --git a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaConnectionProviderUnitTests.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaConnectionProviderUnitTests.java index 81b0e4bda2..5ebe878d4b 100644 --- a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaConnectionProviderUnitTests.java +++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaConnectionProviderUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.masterreplica; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -9,6 +10,7 @@ import java.util.concurrent.CompletableFuture; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -29,6 +31,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) class MasterReplicaConnectionProviderUnitTests { diff --git a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaIntegrationTests.java similarity index 97% rename from src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java rename to src/test/java/io/lettuce/core/masterreplica/MasterReplicaIntegrationTests.java index 97c3d27a8c..d5aa5b82bb 100644 --- a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java +++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.masterreplica; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import static org.junit.jupiter.api.Assumptions.*; @@ -10,6 +11,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.AbstractRedisClientTest; @@ -30,7 +32,8 @@ * * @author Mark Paluch */ -class MasterReplicaTest extends AbstractRedisClientTest { +@Tag(INTEGRATION_TEST) +class MasterReplicaIntegrationTests extends AbstractRedisClientTest { private RedisURI masterURI = RedisURI.Builder.redis(host, TestSettings.port(3)).withPassword(passwd) .withClientName("my-client").withDatabase(5).build(); diff --git a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java index 5e19c1a679..1697835398 100644 --- a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java +++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java @@ -2,6 +2,7 @@ import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -18,11 +19,14 @@ import io.lettuce.test.resource.FastShutdown; import io.lettuce.test.settings.TestSettings; +import static io.lettuce.TestTags.INTEGRATION_TEST; + /** * Integration test for Master/Replica using Redis Sentinel over SSL. * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class MasterReplicaSentinelSslIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTopologyProviderUnitTests.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTopologyProviderUnitTests.java index dc354e4175..f772e5e84c 100644 --- a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTopologyProviderUnitTests.java +++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTopologyProviderUnitTests.java @@ -19,11 +19,13 @@ */ package io.lettuce.core.masterreplica; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.List; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisURI; @@ -37,6 +39,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class MasterReplicaTopologyProviderUnitTests { private StatefulRedisConnection connectionMock = mock(StatefulRedisConnection.class); diff --git a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTopologyRefreshUnitTests.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTopologyRefreshUnitTests.java index ee305db84c..4fd2b6aeee 100644 --- a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTopologyRefreshUnitTests.java +++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTopologyRefreshUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.masterreplica; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; @@ -12,6 +13,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -30,6 +32,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) class MasterReplicaTopologyRefreshUnitTests { diff --git a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaUtilsUnitTests.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaUtilsUnitTests.java index 107bd5f6bd..1eef489024 100644 --- a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaUtilsUnitTests.java +++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaUtilsUnitTests.java @@ -1,9 +1,11 @@ package io.lettuce.core.masterreplica; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.AssertionsForInterfaceTypes.*; import java.util.Arrays; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisURI; @@ -14,6 +16,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class MasterReplicaUtilsUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/masterreplica/SentinelTopologyRefreshUnitTests.java b/src/test/java/io/lettuce/core/masterreplica/SentinelTopologyRefreshUnitTests.java index ba1b95148c..68421063d4 100644 --- a/src/test/java/io/lettuce/core/masterreplica/SentinelTopologyRefreshUnitTests.java +++ b/src/test/java/io/lettuce/core/masterreplica/SentinelTopologyRefreshUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.masterreplica; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -12,6 +13,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; @@ -42,6 +44,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) @SuppressWarnings("unchecked") @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) diff --git a/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java b/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaIntegrationTests.java similarity index 97% rename from src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java rename to src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaIntegrationTests.java index 0828ddfab2..40c2f720d6 100644 --- a/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java +++ b/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.masterreplica; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import static org.junit.jupiter.api.Assumptions.*; @@ -10,6 +11,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.AbstractRedisClientTest; @@ -28,7 +30,8 @@ * * @author Mark Paluch */ -class StaticMasterReplicaTest extends AbstractRedisClientTest { +@Tag(INTEGRATION_TEST) +class StaticMasterReplicaIntegrationTests extends AbstractRedisClientTest { private StatefulRedisMasterReplicaConnection connection; diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveIntegrationTests.java similarity index 97% rename from src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java rename to src/test/java/io/lettuce/core/masterslave/MasterSlaveIntegrationTests.java index 009bc24536..eb36a731a8 100644 --- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java +++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.masterslave; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import static org.junit.jupiter.api.Assumptions.*; @@ -10,6 +11,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.AbstractRedisClientTest; @@ -28,7 +30,8 @@ /** * @author Mark Paluch */ -class MasterSlaveTest extends AbstractRedisClientTest { +@Tag(INTEGRATION_TEST) +class MasterSlaveIntegrationTests extends AbstractRedisClientTest { private RedisURI upstreamURI = RedisURI.Builder.redis(host, TestSettings.port(3)).withPassword(passwd) .withClientName("my-client").withDatabase(5).build(); diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java index 9a0a5b603a..b7ef1ee4b2 100644 --- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java +++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java @@ -1,6 +1,7 @@ package io.lettuce.core.masterslave; -import static io.lettuce.core.masterslave.MasterSlaveTest.slaveCall; +import static io.lettuce.TestTags.INTEGRATION_TEST; +import static io.lettuce.core.masterslave.MasterSlaveIntegrationTests.slaveCall; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -10,6 +11,7 @@ import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -24,6 +26,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class MasterSlaveSentinelIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveIntegrationTests.java similarity index 96% rename from src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java rename to src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveIntegrationTests.java index 91d0ea4f4f..d9e6186f95 100644 --- a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java +++ b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.masterslave; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import static org.junit.jupiter.api.Assumptions.*; @@ -9,6 +10,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.AbstractRedisClientTest; @@ -25,7 +27,8 @@ /** * @author Mark Paluch */ -class StaticMasterSlaveTest extends AbstractRedisClientTest { +@Tag(INTEGRATION_TEST) +class StaticMasterSlaveIntegrationTests extends AbstractRedisClientTest { private StatefulRedisMasterSlaveConnection connection; diff --git a/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java b/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java index 91734cd678..80c7bc33da 100644 --- a/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java +++ b/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java @@ -19,15 +19,18 @@ */ package io.lettuce.core.metrics; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** * @author Larry Battle */ +@Tag(UNIT_TEST) class CommandLatencyCollectorOptionsUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java b/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java index d2556570ef..b141e5e3ea 100644 --- a/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java +++ b/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java @@ -1,7 +1,9 @@ package io.lettuce.core.metrics; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.protocol.CommandKeyword; @@ -13,6 +15,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class CommandLatencyIdUnitTests { private CommandLatencyId sut = CommandLatencyId.create(LocalAddress.ANY, new LocalAddress("me"), CommandKeyword.ADDR); diff --git a/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptionsUnitTests.java b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptionsUnitTests.java index 84c99a9241..606aa1c6f4 100644 --- a/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptionsUnitTests.java +++ b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptionsUnitTests.java @@ -1,14 +1,17 @@ package io.lettuce.core.metrics; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class DefaultCommandLatencyCollectorOptionsUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorUnitTests.java b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorUnitTests.java index 3fba67c3dc..7206b3c3f3 100644 --- a/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorUnitTests.java +++ b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorUnitTests.java @@ -19,11 +19,13 @@ */ package io.lettuce.core.metrics; +import static io.lettuce.TestTags.UNIT_TEST; import static java.util.concurrent.TimeUnit.*; import static org.assertj.core.api.Assertions.*; import java.util.Map; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; @@ -36,6 +38,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) class DefaultCommandLatencyCollectorUnitTests { diff --git a/src/test/java/io/lettuce/core/metrics/MicrometerCommandLatencyRecorderUnitTests.java b/src/test/java/io/lettuce/core/metrics/MicrometerCommandLatencyRecorderUnitTests.java index edd1f63656..1aa514c6d6 100644 --- a/src/test/java/io/lettuce/core/metrics/MicrometerCommandLatencyRecorderUnitTests.java +++ b/src/test/java/io/lettuce/core/metrics/MicrometerCommandLatencyRecorderUnitTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.metrics; +import static io.lettuce.TestTags.UNIT_TEST; import static io.lettuce.core.metrics.MicrometerCommandLatencyRecorder.*; import static org.assertj.core.api.Assertions.*; @@ -27,6 +28,7 @@ import org.apache.commons.lang3.ArrayUtils; import org.assertj.core.api.InstanceOfAssertFactories; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; @@ -46,6 +48,7 @@ * * @author Steven Sheehy */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) class MicrometerCommandLatencyRecorderUnitTests { diff --git a/src/test/java/io/lettuce/core/metrics/MicrometerOptionsUnitTests.java b/src/test/java/io/lettuce/core/metrics/MicrometerOptionsUnitTests.java index 3035aa1b60..ce0d66445f 100644 --- a/src/test/java/io/lettuce/core/metrics/MicrometerOptionsUnitTests.java +++ b/src/test/java/io/lettuce/core/metrics/MicrometerOptionsUnitTests.java @@ -19,11 +19,13 @@ */ package io.lettuce.core.metrics; +import static io.lettuce.TestTags.UNIT_TEST; import static io.lettuce.core.metrics.MicrometerOptions.*; import static org.assertj.core.api.Assertions.*; import java.time.Duration; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.protocol.Command; @@ -37,6 +39,7 @@ * @author André Tibola * @author Mark Paluch */ +@Tag(UNIT_TEST) class MicrometerOptionsUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/models/command/CommandDetailParserUnitTests.java b/src/test/java/io/lettuce/core/models/command/CommandDetailParserUnitTests.java index 60e54774de..e52cf8c9f9 100644 --- a/src/test/java/io/lettuce/core/models/command/CommandDetailParserUnitTests.java +++ b/src/test/java/io/lettuce/core/models/command/CommandDetailParserUnitTests.java @@ -19,12 +19,14 @@ */ package io.lettuce.core.models.command; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.internal.LettuceLists; @@ -35,6 +37,7 @@ * @author Mark Paluch * @author Mikhael Sokolov */ +@Tag(UNIT_TEST) class CommandDetailParserUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/models/role/RoleParserUnitTests.java b/src/test/java/io/lettuce/core/models/role/RoleParserUnitTests.java index ddd7440502..d68c375180 100644 --- a/src/test/java/io/lettuce/core/models/role/RoleParserUnitTests.java +++ b/src/test/java/io/lettuce/core/models/role/RoleParserUnitTests.java @@ -1,11 +1,13 @@ package io.lettuce.core.models.role; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.internal.HostAndPort; @@ -14,6 +16,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class RoleParserUnitTests { private static final long REPLICATION_OFFSET_1 = 3167038L; diff --git a/src/test/java/io/lettuce/core/models/stream/PendingParserUnitTests.java b/src/test/java/io/lettuce/core/models/stream/PendingParserUnitTests.java index cdcddf71d5..73579a83f0 100644 --- a/src/test/java/io/lettuce/core/models/stream/PendingParserUnitTests.java +++ b/src/test/java/io/lettuce/core/models/stream/PendingParserUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.models.stream; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.time.Duration; @@ -7,6 +8,7 @@ import java.util.Collections; import java.util.List; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.Range; @@ -14,6 +16,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class PendingParserUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java index f3406b867a..8836e03a93 100644 --- a/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java +++ b/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java @@ -1,9 +1,11 @@ package io.lettuce.core.output; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.nio.ByteBuffer; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.codec.StringCodec; @@ -11,6 +13,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class BooleanListOutputUnitTests { private BooleanListOutput sut = new BooleanListOutput<>(StringCodec.UTF8); diff --git a/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java index 6f14c5271b..9c09e80a36 100644 --- a/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java +++ b/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java @@ -1,9 +1,11 @@ package io.lettuce.core.output; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.nio.ByteBuffer; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.GeoCoordinates; @@ -12,6 +14,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class GeoCoordinatesListOutputUnitTests { private GeoCoordinatesListOutput sut = new GeoCoordinatesListOutput<>(StringCodec.UTF8); diff --git a/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java index 085dcc90b3..0c672db874 100644 --- a/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java +++ b/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java @@ -1,9 +1,11 @@ package io.lettuce.core.output; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.nio.ByteBuffer; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.GeoCoordinates; @@ -13,6 +15,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class GeoCoordinatesValueListOutputUnitTests { private GeoCoordinatesValueListOutput sut = new GeoCoordinatesValueListOutput<>(StringCodec.UTF8); diff --git a/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java index b173391f19..33ab016fd2 100644 --- a/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java +++ b/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java @@ -1,9 +1,11 @@ package io.lettuce.core.output; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.nio.ByteBuffer; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.GeoCoordinates; @@ -14,6 +16,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class GeoWithinListOutputUnitTests { private GeoWithinListOutput sut = new GeoWithinListOutput<>(StringCodec.UTF8, false, false, false); diff --git a/src/test/java/io/lettuce/core/output/IntegerListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/IntegerListOutputUnitTests.java index 4ed64548c4..8a19682227 100644 --- a/src/test/java/io/lettuce/core/output/IntegerListOutputUnitTests.java +++ b/src/test/java/io/lettuce/core/output/IntegerListOutputUnitTests.java @@ -1,6 +1,7 @@ package io.lettuce.core.output; import io.lettuce.core.codec.StringCodec; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -9,12 +10,14 @@ import java.util.Collection; import java.util.List; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; /** * @author Tihomir Mateev */ +@Tag(UNIT_TEST) class IntegerListOutputUnitTests { static Collection parameters() { diff --git a/src/test/java/io/lettuce/core/output/JsonTypeListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/JsonTypeListOutputUnitTests.java index 99607040b6..c3bf3788fb 100644 --- a/src/test/java/io/lettuce/core/output/JsonTypeListOutputUnitTests.java +++ b/src/test/java/io/lettuce/core/output/JsonTypeListOutputUnitTests.java @@ -10,16 +10,19 @@ import io.lettuce.core.codec.StringCodec; import io.lettuce.core.json.DefaultJsonParser; import io.lettuce.core.json.JsonType; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; /** * Unit tests for {@link JsonTypeListOutput}. */ +@Tag(UNIT_TEST) class JsonTypeListOutputUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/output/JsonValueListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/JsonValueListOutputUnitTests.java index 97cbf82759..dd27dd1773 100644 --- a/src/test/java/io/lettuce/core/output/JsonValueListOutputUnitTests.java +++ b/src/test/java/io/lettuce/core/output/JsonValueListOutputUnitTests.java @@ -9,15 +9,18 @@ import io.lettuce.core.codec.StringCodec; import io.lettuce.core.json.DefaultJsonParser; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; /** * Unit tests for {@link JsonValueListOutput}. */ +@Tag(UNIT_TEST) class JsonValueListOutputUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java index 8c1831f192..de3faa28f4 100644 --- a/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java +++ b/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.output; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.nio.ByteBuffer; @@ -7,6 +8,7 @@ import java.util.Collection; import java.util.List; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -15,6 +17,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class ListOutputUnitTests { static Collection parameters() { diff --git a/src/test/java/io/lettuce/core/output/MapOutputUnitTests.java b/src/test/java/io/lettuce/core/output/MapOutputUnitTests.java index 0c4aa8951f..d8622dc342 100644 --- a/src/test/java/io/lettuce/core/output/MapOutputUnitTests.java +++ b/src/test/java/io/lettuce/core/output/MapOutputUnitTests.java @@ -1,9 +1,11 @@ package io.lettuce.core.output; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.nio.ByteBuffer; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.codec.StringCodec; @@ -13,6 +15,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class MapOutputUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/output/MultiOutputUnitTests.java b/src/test/java/io/lettuce/core/output/MultiOutputUnitTests.java index a7b9792d09..c8d73c2c37 100644 --- a/src/test/java/io/lettuce/core/output/MultiOutputUnitTests.java +++ b/src/test/java/io/lettuce/core/output/MultiOutputUnitTests.java @@ -1,9 +1,11 @@ package io.lettuce.core.output; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.nio.ByteBuffer; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.codec.StringCodec; @@ -13,6 +15,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class MultiOutputUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/output/NestedMultiOutputUnitTests.java b/src/test/java/io/lettuce/core/output/NestedMultiOutputUnitTests.java index 76234eff23..6166c6abf9 100644 --- a/src/test/java/io/lettuce/core/output/NestedMultiOutputUnitTests.java +++ b/src/test/java/io/lettuce/core/output/NestedMultiOutputUnitTests.java @@ -19,10 +19,12 @@ */ package io.lettuce.core.output; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.nio.charset.StandardCharsets; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.codec.StringCodec; @@ -30,6 +32,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class NestedMultiOutputUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/output/NumberListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/NumberListOutputUnitTests.java index 50d585f103..24055d2538 100644 --- a/src/test/java/io/lettuce/core/output/NumberListOutputUnitTests.java +++ b/src/test/java/io/lettuce/core/output/NumberListOutputUnitTests.java @@ -9,16 +9,19 @@ import io.lettuce.core.codec.StringCodec; import io.lettuce.core.json.JsonType; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; /** * Unit tests for {@link NumberListOutput}. */ +@Tag(UNIT_TEST) class NumberListOutputUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/output/ObjectOutputTests.java b/src/test/java/io/lettuce/core/output/ObjectOutputUnitTests.java similarity index 96% rename from src/test/java/io/lettuce/core/output/ObjectOutputTests.java rename to src/test/java/io/lettuce/core/output/ObjectOutputUnitTests.java index 87c0fa9813..8fd36f1a2a 100644 --- a/src/test/java/io/lettuce/core/output/ObjectOutputTests.java +++ b/src/test/java/io/lettuce/core/output/ObjectOutputUnitTests.java @@ -1,10 +1,12 @@ package io.lettuce.core.output; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.util.List; import java.util.Map; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.codec.StringCodec; @@ -17,7 +19,8 @@ * * @author Mark Paluch */ -class ObjectOutputTests { +@Tag(UNIT_TEST) +class ObjectOutputUnitTests { @Test void shouldParseHelloWithModules() { diff --git a/src/test/java/io/lettuce/core/output/ReplayOutputUnitTests.java b/src/test/java/io/lettuce/core/output/ReplayOutputUnitTests.java index c6c3dee693..c15f55139c 100644 --- a/src/test/java/io/lettuce/core/output/ReplayOutputUnitTests.java +++ b/src/test/java/io/lettuce/core/output/ReplayOutputUnitTests.java @@ -1,11 +1,13 @@ package io.lettuce.core.output; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Collections; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.codec.StringCodec; @@ -13,6 +15,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class ReplayOutputUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java index 2b357b6b1b..f71b1b54cb 100644 --- a/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java +++ b/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java @@ -1,9 +1,11 @@ package io.lettuce.core.output; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.nio.ByteBuffer; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.ScoredValue; @@ -12,6 +14,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class ScoredValueListOutputUnitTests { private ScoredValueListOutput sut = new ScoredValueListOutput<>(StringCodec.UTF8); diff --git a/src/test/java/io/lettuce/core/output/SocketAddressOutputUnitTests.java b/src/test/java/io/lettuce/core/output/SocketAddressOutputUnitTests.java index dcb741abdc..0b1bf7dd3c 100644 --- a/src/test/java/io/lettuce/core/output/SocketAddressOutputUnitTests.java +++ b/src/test/java/io/lettuce/core/output/SocketAddressOutputUnitTests.java @@ -1,10 +1,12 @@ package io.lettuce.core.output; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.net.InetSocketAddress; import java.nio.ByteBuffer; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.codec.StringCodec; @@ -12,6 +14,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class SocketAddressOutputUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/output/StreamReadOutputUnitTests.java b/src/test/java/io/lettuce/core/output/StreamReadOutputUnitTests.java index 3b9eddee7c..af7a7883d0 100644 --- a/src/test/java/io/lettuce/core/output/StreamReadOutputUnitTests.java +++ b/src/test/java/io/lettuce/core/output/StreamReadOutputUnitTests.java @@ -1,9 +1,11 @@ package io.lettuce.core.output; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.nio.ByteBuffer; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.StreamMessage; @@ -14,6 +16,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class StreamReadOutputUnitTests { private StreamReadOutput sut = new StreamReadOutput<>(StringCodec.UTF8); diff --git a/src/test/java/io/lettuce/core/output/TrackingInfoParserTest.java b/src/test/java/io/lettuce/core/output/TrackingInfoParserUnitTests.java similarity index 96% rename from src/test/java/io/lettuce/core/output/TrackingInfoParserTest.java rename to src/test/java/io/lettuce/core/output/TrackingInfoParserUnitTests.java index 9ac5945381..259ab24718 100644 --- a/src/test/java/io/lettuce/core/output/TrackingInfoParserTest.java +++ b/src/test/java/io/lettuce/core/output/TrackingInfoParserUnitTests.java @@ -9,12 +9,15 @@ import io.lettuce.core.TrackingInfo; import io.lettuce.core.protocol.CommandKeyword; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -class TrackingInfoParserTest { +@Tag(UNIT_TEST) +class TrackingInfoParserUnitTests { @Test void parseResp3() { diff --git a/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java b/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java index 6e85a0a49a..a905e9d97d 100644 --- a/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java +++ b/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.protocol; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.nio.charset.StandardCharsets; @@ -8,6 +9,7 @@ import java.util.concurrent.TimeoutException; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisCommandExecutionException; @@ -25,6 +27,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) public class AsyncCommandUnitTests { private RedisCodec codec = StringCodec.UTF8; diff --git a/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java index 910461962b..9a7db091f0 100644 --- a/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java +++ b/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java @@ -1,11 +1,13 @@ package io.lettuce.core.protocol; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.Arrays; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.codec.ByteArrayCodec; @@ -18,6 +20,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class CommandArgsUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java index 243b9f8b55..833625df55 100644 --- a/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java +++ b/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.protocol; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import static org.assertj.core.api.Fail.fail; import static org.mockito.AdditionalMatchers.*; @@ -45,6 +46,7 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; @@ -87,6 +89,7 @@ * @author Gavin Cook * @author Shaphan */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) class CommandHandlerUnitTests { diff --git a/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java index f40b5fac13..167ccf60e7 100644 --- a/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java +++ b/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java @@ -1,10 +1,12 @@ package io.lettuce.core.protocol; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.nio.charset.StandardCharsets; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisException; @@ -18,6 +20,7 @@ * @author Will Glozer * @author Mark Paluch */ +@Tag(UNIT_TEST) public class CommandUnitTests { private Command sut; diff --git a/src/test/java/io/lettuce/core/protocol/CommandWrapperUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandWrapperUnitTests.java index b25706a2d4..0e5b4460cc 100644 --- a/src/test/java/io/lettuce/core/protocol/CommandWrapperUnitTests.java +++ b/src/test/java/io/lettuce/core/protocol/CommandWrapperUnitTests.java @@ -1,11 +1,13 @@ package io.lettuce.core.protocol; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.codec.RedisCodec; @@ -18,6 +20,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class CommandWrapperUnitTests { private RedisCodec codec = StringCodec.UTF8; diff --git a/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java b/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java index d2f720d3fe..d1621181ef 100644 --- a/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java +++ b/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.protocol; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.fail; @@ -16,6 +17,7 @@ import javax.inject.Inject; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -40,6 +42,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) class ConnectionFailureIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/protocol/DecodeBufferPoliciesUnitTests.java b/src/test/java/io/lettuce/core/protocol/DecodeBufferPoliciesUnitTests.java index 1b72467c1d..2e6c1b7732 100644 --- a/src/test/java/io/lettuce/core/protocol/DecodeBufferPoliciesUnitTests.java +++ b/src/test/java/io/lettuce/core/protocol/DecodeBufferPoliciesUnitTests.java @@ -1,9 +1,11 @@ package io.lettuce.core.protocol; +import static io.lettuce.TestTags.UNIT_TEST; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -16,6 +18,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) class DecodeBufferPoliciesUnitTests { diff --git a/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java b/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java index 8080848920..9b0a8cd7be 100644 --- a/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java +++ b/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.protocol; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -23,6 +24,7 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; @@ -50,6 +52,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) class DefaultEndpointUnitTests { diff --git a/src/test/java/io/lettuce/core/protocol/RatioDecodeBufferPolicyTest.java b/src/test/java/io/lettuce/core/protocol/RatioDecodeBufferPolicyUnitTests.java similarity index 93% rename from src/test/java/io/lettuce/core/protocol/RatioDecodeBufferPolicyTest.java rename to src/test/java/io/lettuce/core/protocol/RatioDecodeBufferPolicyUnitTests.java index b48a86dc45..f57ccd0b8b 100644 --- a/src/test/java/io/lettuce/core/protocol/RatioDecodeBufferPolicyTest.java +++ b/src/test/java/io/lettuce/core/protocol/RatioDecodeBufferPolicyUnitTests.java @@ -19,10 +19,12 @@ */ package io.lettuce.core.protocol; +import static io.lettuce.TestTags.UNIT_TEST; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -35,8 +37,9 @@ * * @author Shaphan */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) -class RatioDecodeBufferPolicyTest { +class RatioDecodeBufferPolicyUnitTests { @Mock ByteBuf buffer; diff --git a/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp2UnitTests.java b/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp2UnitTests.java index a31c20bea1..ef188425ca 100644 --- a/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp2UnitTests.java +++ b/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp2UnitTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.protocol; +import static io.lettuce.TestTags.UNIT_TEST; import static io.lettuce.core.protocol.RedisStateMachine.State; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -50,6 +51,7 @@ * @author Will Glozer * @author Mark Paluch */ +@Tag(UNIT_TEST) class RedisStateMachineResp2UnitTests { private RedisCodec codec = StringCodec.UTF8; diff --git a/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp3UnitTests.java b/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp3UnitTests.java index f00c27b8ba..443ec3b75d 100644 --- a/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp3UnitTests.java +++ b/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp3UnitTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.protocol; +import static io.lettuce.TestTags.UNIT_TEST; import static io.lettuce.core.protocol.RedisStateMachine.State; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -51,6 +52,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class RedisStateMachineResp3UnitTests { private RedisCodec codec = StringCodec.UTF8; diff --git a/src/test/java/io/lettuce/core/protocol/SharedLockTest.java b/src/test/java/io/lettuce/core/protocol/SharedLockUnitTests.java similarity index 92% rename from src/test/java/io/lettuce/core/protocol/SharedLockTest.java rename to src/test/java/io/lettuce/core/protocol/SharedLockUnitTests.java index a10e712ae4..593d319f42 100644 --- a/src/test/java/io/lettuce/core/protocol/SharedLockTest.java +++ b/src/test/java/io/lettuce/core/protocol/SharedLockUnitTests.java @@ -1,12 +1,16 @@ package io.lettuce.core.protocol; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -public class SharedLockTest { +import static io.lettuce.TestTags.UNIT_TEST; + +@Tag(UNIT_TEST) +public class SharedLockUnitTests { @Test public void safety_on_reentrant_lock_exclusive_on_writers() throws InterruptedException { diff --git a/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java b/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java index 54b3de051d..81217d8d0d 100644 --- a/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java +++ b/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.protocol; +import static io.lettuce.TestTags.UNIT_TEST; import static io.lettuce.core.protocol.RedisStateMachine.State; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -46,6 +47,7 @@ * @author Will Glozer * @author Mark Paluch */ +@Tag(UNIT_TEST) class StateMachineUnitTests { private RedisCodec codec = StringCodec.UTF8; diff --git a/src/test/java/io/lettuce/core/protocol/TransactionalCommandUnitTests.java b/src/test/java/io/lettuce/core/protocol/TransactionalCommandUnitTests.java index 838d3498a7..a656c9fc95 100644 --- a/src/test/java/io/lettuce/core/protocol/TransactionalCommandUnitTests.java +++ b/src/test/java/io/lettuce/core/protocol/TransactionalCommandUnitTests.java @@ -1,7 +1,9 @@ package io.lettuce.core.protocol; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisException; @@ -11,6 +13,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class TransactionalCommandUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandBuilderUnitTests.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandBuilderUnitTests.java index 89e93b234e..a07ecd8c47 100644 --- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandBuilderUnitTests.java +++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandBuilderUnitTests.java @@ -9,14 +9,17 @@ import io.lettuce.core.protocol.CommandArgs; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; +import static io.lettuce.TestTags.UNIT_TEST; import static io.lettuce.core.protocol.CommandType.*; import static org.assertj.core.api.Assertions.assertThat; +@Tag(UNIT_TEST) class PubSubCommandBuilderUnitTests { private PubSubCommandBuilder commandBuilder; diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java index 871915adae..2e2825f95a 100644 --- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java +++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.pubsub; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -7,6 +8,7 @@ import java.util.Queue; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; @@ -40,6 +42,7 @@ * @author Mark Paluch * @author Giridhar Kannan */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) class PubSubCommandHandlerUnitTests { diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandIntegrationTests.java similarity index 99% rename from src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java rename to src/test/java/io/lettuce/core/pubsub/PubSubCommandIntegrationTests.java index c6fd838050..fdd7780558 100644 --- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java +++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.pubsub; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import java.nio.ByteBuffer; @@ -32,9 +33,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.assertj.core.util.Arrays; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.AbstractRedisClientTest; @@ -68,7 +69,8 @@ * @author Tihomir Mateev * @author Ali Takavci */ -class PubSubCommandTest extends AbstractRedisClientTest { +@Tag(INTEGRATION_TEST) +class PubSubCommandIntegrationTests extends AbstractRedisClientTest { RedisPubSubAsyncCommands pubsub; diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandResp2Test.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandResp2IntegrationTests.java similarity index 91% rename from src/test/java/io/lettuce/core/pubsub/PubSubCommandResp2Test.java rename to src/test/java/io/lettuce/core/pubsub/PubSubCommandResp2IntegrationTests.java index 7f822f6586..2529608688 100644 --- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandResp2Test.java +++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandResp2IntegrationTests.java @@ -19,9 +19,11 @@ */ package io.lettuce.core.pubsub; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.ClientOptions; @@ -35,7 +37,8 @@ * * @author Mark Paluch */ -class PubSubCommandResp2Test extends PubSubCommandTest { +@Tag(INTEGRATION_TEST) +class PubSubCommandResp2IntegrationTests extends PubSubCommandIntegrationTests { @Override protected ClientOptions getOptions() { diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubEndpointUnitTests.java b/src/test/java/io/lettuce/core/pubsub/PubSubEndpointUnitTests.java index bf109ee0bb..1cb65875e9 100644 --- a/src/test/java/io/lettuce/core/pubsub/PubSubEndpointUnitTests.java +++ b/src/test/java/io/lettuce/core/pubsub/PubSubEndpointUnitTests.java @@ -1,10 +1,12 @@ package io.lettuce.core.pubsub; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicInteger; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.ByteBufferCodec; @@ -19,6 +21,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class PubSubEndpointUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveIntegrationTests.java similarity index 98% rename from src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java rename to src/test/java/io/lettuce/core/pubsub/PubSubReactiveIntegrationTests.java index 7dd7d11001..6f3250db83 100644 --- a/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java +++ b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.pubsub; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import java.time.Duration; @@ -29,6 +30,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import reactor.core.Disposable; @@ -53,7 +55,8 @@ * @author Mark Paluch * @author Ali Takavci */ -class PubSubReactiveTest extends AbstractRedisClientTest implements RedisPubSubListener { +@Tag(INTEGRATION_TEST) +class PubSubReactiveIntegrationTests extends AbstractRedisClientTest implements RedisPubSubListener { private RedisPubSubReactiveCommands pubsub; diff --git a/src/test/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImplUnitTests.java b/src/test/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImplUnitTests.java index 49dee5c2d8..4b6c3b5d77 100644 --- a/src/test/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImplUnitTests.java +++ b/src/test/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImplUnitTests.java @@ -8,17 +8,20 @@ import io.lettuce.core.protocol.AsyncCommand; import io.lettuce.core.protocol.RedisCommand; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import java.util.concurrent.ExecutionException; +import static io.lettuce.TestTags.UNIT_TEST; import static io.lettuce.core.protocol.CommandType.*; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; +@Tag(UNIT_TEST) class RedisPubSubAsyncCommandsImplUnitTests { private RedisPubSubAsyncCommandsImpl commands; diff --git a/src/test/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImplUnitTests.java b/src/test/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImplUnitTests.java index 160a601125..8cd91df26a 100644 --- a/src/test/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImplUnitTests.java +++ b/src/test/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImplUnitTests.java @@ -8,8 +8,10 @@ import io.lettuce.core.resource.ClientResources; import io.lettuce.core.tracing.Tracing; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import static io.lettuce.TestTags.UNIT_TEST; import static org.junit.Assert.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.mockito.Mockito.*; @@ -19,6 +21,7 @@ import java.util.HashSet; import java.util.List; +@Tag(UNIT_TEST) class StatefulRedisPubSubConnectionImplUnitTests { private StatefulRedisPubSubConnectionImpl connection; diff --git a/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtLeastOnceIntegrationTests.java similarity index 98% rename from src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java rename to src/test/java/io/lettuce/core/reliability/AtLeastOnceIntegrationTests.java index 9243d301d5..7dbac3bf99 100644 --- a/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java +++ b/src/test/java/io/lettuce/core/reliability/AtLeastOnceIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.reliability; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import static org.junit.jupiter.api.Assumptions.*; @@ -10,6 +11,7 @@ import io.lettuce.core.TimeoutOptions; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.AbstractRedisClientTest; @@ -39,7 +41,8 @@ /** * @author Mark Paluch */ -class AtLeastOnceTest extends AbstractRedisClientTest { +@Tag(INTEGRATION_TEST) +class AtLeastOnceIntegrationTests extends AbstractRedisClientTest { private String key = "key"; diff --git a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtMostOnceIntegrationTests.java similarity index 98% rename from src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java rename to src/test/java/io/lettuce/core/reliability/AtMostOnceIntegrationTests.java index 4bc3406c09..d377269bad 100644 --- a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java +++ b/src/test/java/io/lettuce/core/reliability/AtMostOnceIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.reliability; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.test.ConnectionTestUtil.*; import static org.assertj.core.api.Assertions.*; import static org.junit.jupiter.api.Assumptions.*; @@ -11,6 +12,7 @@ import io.lettuce.core.TimeoutOptions; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.AbstractRedisClientTest; @@ -40,8 +42,9 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @SuppressWarnings("rawtypes") -class AtMostOnceTest extends AbstractRedisClientTest { +class AtMostOnceIntegrationTests extends AbstractRedisClientTest { private String key = "key"; diff --git a/src/test/java/io/lettuce/core/resource/ConstantDelayUnitTests.java b/src/test/java/io/lettuce/core/resource/ConstantDelayUnitTests.java index 7a171b4891..84f690926c 100644 --- a/src/test/java/io/lettuce/core/resource/ConstantDelayUnitTests.java +++ b/src/test/java/io/lettuce/core/resource/ConstantDelayUnitTests.java @@ -1,16 +1,19 @@ package io.lettuce.core.resource; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.time.Duration; import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class ConstantDelayUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayUnitTests.java b/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayUnitTests.java index 3c0d3faf0e..82999144de 100644 --- a/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayUnitTests.java +++ b/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayUnitTests.java @@ -19,18 +19,21 @@ */ package io.lettuce.core.resource; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.time.Duration; import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** * @author Jongyeol Choi * @author Mark Paluch */ +@Tag(UNIT_TEST) class DecorrelatedJitterDelayUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java index 33dfd39f30..46a89396a0 100644 --- a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java +++ b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.resource; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -26,6 +27,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import reactor.test.StepVerifier; @@ -50,6 +52,7 @@ * @author Mark Paluch * @author Yohei Ueki */ +@Tag(UNIT_TEST) class DefaultClientResourcesUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderUnitTests.java b/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderUnitTests.java index cd274cb681..de525d04e2 100644 --- a/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderUnitTests.java +++ b/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderUnitTests.java @@ -1,9 +1,11 @@ package io.lettuce.core.resource; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.test.TestFutures; @@ -13,6 +15,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class DefaultEventLoopGroupProviderUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTests.java b/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTests.java index 412ebaa28b..df85740941 100644 --- a/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTests.java +++ b/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.resource; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -13,6 +14,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** @@ -20,6 +22,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) @Disabled("Tests require an internet connection") class DirContextDnsResolverTests { diff --git a/src/test/java/io/lettuce/core/resource/EqualJitterDelayUnitTests.java b/src/test/java/io/lettuce/core/resource/EqualJitterDelayUnitTests.java index 12885548e9..55b7f20263 100644 --- a/src/test/java/io/lettuce/core/resource/EqualJitterDelayUnitTests.java +++ b/src/test/java/io/lettuce/core/resource/EqualJitterDelayUnitTests.java @@ -19,18 +19,21 @@ */ package io.lettuce.core.resource; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.time.Duration; import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** * @author Jongyeol Choi * @author Mark Paluch */ +@Tag(UNIT_TEST) class EqualJitterDelayUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/resource/ExponentialDelayUnitTests.java b/src/test/java/io/lettuce/core/resource/ExponentialDelayUnitTests.java index 9a4b6dfe9b..f971b3478c 100644 --- a/src/test/java/io/lettuce/core/resource/ExponentialDelayUnitTests.java +++ b/src/test/java/io/lettuce/core/resource/ExponentialDelayUnitTests.java @@ -1,15 +1,18 @@ package io.lettuce.core.resource; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** * @author Mark Paluch */ +@Tag(UNIT_TEST) class ExponentialDelayUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/resource/FullJitterDelayUnitTests.java b/src/test/java/io/lettuce/core/resource/FullJitterDelayUnitTests.java index 440b4f219d..b6875c4481 100644 --- a/src/test/java/io/lettuce/core/resource/FullJitterDelayUnitTests.java +++ b/src/test/java/io/lettuce/core/resource/FullJitterDelayUnitTests.java @@ -19,18 +19,21 @@ */ package io.lettuce.core.resource; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.time.Duration; import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** * @author Jongyeol Choi * @author Mark Paluch */ +@Tag(UNIT_TEST) class FullJitterDelayUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverUnitTests.java b/src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverUnitTests.java index 50c79ed570..764d49d7de 100644 --- a/src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverUnitTests.java +++ b/src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.resource; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; @@ -10,6 +11,7 @@ import java.util.function.Function; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -23,6 +25,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) class MappingSocketAddressResolverUnitTests { diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelAclIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelAclIntegrationTests.java index 12eecc1231..9c515d0051 100644 --- a/src/test/java/io/lettuce/core/sentinel/SentinelAclIntegrationTests.java +++ b/src/test/java/io/lettuce/core/sentinel/SentinelAclIntegrationTests.java @@ -1,10 +1,12 @@ package io.lettuce.core.sentinel; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -23,6 +25,7 @@ * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @EnabledOnCommand("ACL") public class SentinelAclIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java index 4dc95d7c58..1d37c04dcf 100644 --- a/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.sentinel; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.test.settings.TestSettings.*; import static org.assertj.core.api.Assertions.*; @@ -13,6 +14,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -31,6 +33,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) public class SentinelCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java index 9f269fe9be..1d9077cfa0 100644 --- a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java +++ b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.sentinel; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; @@ -11,6 +12,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -28,6 +30,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) public class SentinelConnectionIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java index e67abc5cfc..78b07330d7 100644 --- a/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java +++ b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.sentinel; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import java.util.regex.Matcher; @@ -28,6 +29,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -45,6 +47,7 @@ * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) public class SentinelServerCommandIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java index 7adc3221bc..b8fdc03138 100644 --- a/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java +++ b/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.sentinel; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static io.lettuce.test.settings.TestSettings.sslPort; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assumptions.assumeTrue; @@ -9,6 +10,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -30,6 +32,7 @@ * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) class SentinelSslIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandIntegrationTests.java similarity index 70% rename from src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java rename to src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandIntegrationTests.java index 03ecca13c9..e2bb9f9b63 100644 --- a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandIntegrationTests.java @@ -2,20 +2,23 @@ import javax.inject.Inject; -import io.lettuce.RedisBug; import io.lettuce.core.RedisClient; import io.lettuce.core.sentinel.SentinelCommandIntegrationTests; import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection; import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands; import io.lettuce.test.ReactiveSyncInvocationHandler; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ -public class SentinelReactiveCommandTest extends SentinelCommandIntegrationTests { +@Tag(INTEGRATION_TEST) +public class SentinelReactiveCommandIntegrationTests extends SentinelCommandIntegrationTests { @Inject - public SentinelReactiveCommandTest(RedisClient redisClient) { + public SentinelReactiveCommandIntegrationTests(RedisClient redisClient) { super(redisClient); } diff --git a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandIntegrationTests.java similarity index 69% rename from src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java rename to src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandIntegrationTests.java index 759ce65bca..05c69e4de0 100644 --- a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandIntegrationTests.java @@ -7,14 +7,18 @@ import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection; import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands; import io.lettuce.test.ReactiveSyncInvocationHandler; +import org.junit.jupiter.api.Tag; + +import static io.lettuce.TestTags.INTEGRATION_TEST; /** * @author Mark Paluch */ -public class SentinelServerReactiveCommandTest extends SentinelServerCommandIntegrationTests { +@Tag(INTEGRATION_TEST) +public class SentinelServerReactiveCommandIntegrationTests extends SentinelServerCommandIntegrationTests { @Inject - public SentinelServerReactiveCommandTest(RedisClient redisClient) { + public SentinelServerReactiveCommandIntegrationTests(RedisClient redisClient) { super(redisClient); } diff --git a/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportIntegrationTests.java b/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportIntegrationTests.java index 798d16c4b5..86b08c28a4 100644 --- a/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportIntegrationTests.java +++ b/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.support; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -10,6 +11,7 @@ import org.apache.commons.pool2.impl.GenericObjectPoolConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.*; @@ -30,6 +32,7 @@ * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class AsyncConnectionPoolSupportIntegrationTests extends TestSupport { private static RedisClient client; diff --git a/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationUnitTests.java b/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationUnitTests.java index 1dfdbb9677..64e4b19ce2 100644 --- a/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationUnitTests.java +++ b/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.support; +import static io.lettuce.TestTags.UNIT_TEST; import static io.lettuce.core.internal.Futures.failed; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -13,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -26,6 +28,7 @@ /** * @author Mark Paluch */ +@Tag(UNIT_TEST) @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) class AsyncPoolWithValidationUnitTests { diff --git a/src/test/java/io/lettuce/core/support/BoundedAsyncPoolUnitTests.java b/src/test/java/io/lettuce/core/support/BoundedAsyncPoolUnitTests.java index a6818a80d3..e4e0ccee77 100644 --- a/src/test/java/io/lettuce/core/support/BoundedAsyncPoolUnitTests.java +++ b/src/test/java/io/lettuce/core/support/BoundedAsyncPoolUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.support; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; @@ -9,6 +10,7 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.atomic.AtomicInteger; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.RedisException; @@ -19,6 +21,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class BoundedAsyncPoolUnitTests { private AtomicInteger counter = new AtomicInteger(); diff --git a/src/test/java/io/lettuce/core/support/CdiIntegrationTests.java b/src/test/java/io/lettuce/core/support/CdiIntegrationTests.java index 9edefdb1c0..51d6289c3a 100644 --- a/src/test/java/io/lettuce/core/support/CdiIntegrationTests.java +++ b/src/test/java/io/lettuce/core/support/CdiIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.support; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -9,6 +10,7 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.AbstractRedisClientTest; @@ -22,6 +24,7 @@ * @author Mark Paluch * @since 3.0 */ +@Tag(INTEGRATION_TEST) class CdiIntegrationTests { private static SeContainer container; diff --git a/src/test/java/io/lettuce/core/support/CommonsPool2ConfigConverterUnitTests.java b/src/test/java/io/lettuce/core/support/CommonsPool2ConfigConverterUnitTests.java index 757156e7d7..82772e35c1 100644 --- a/src/test/java/io/lettuce/core/support/CommonsPool2ConfigConverterUnitTests.java +++ b/src/test/java/io/lettuce/core/support/CommonsPool2ConfigConverterUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.support; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.function.BiConsumer; @@ -7,6 +8,7 @@ import org.apache.commons.pool2.impl.BaseObjectPoolConfig; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** @@ -14,6 +16,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class CommonsPool2ConfigConverterUnitTests { @Test diff --git a/src/test/java/io/lettuce/core/support/ConnectionPoolSupportIntegrationTests.java b/src/test/java/io/lettuce/core/support/ConnectionPoolSupportIntegrationTests.java index 05b98024c8..ed38435edb 100644 --- a/src/test/java/io/lettuce/core/support/ConnectionPoolSupportIntegrationTests.java +++ b/src/test/java/io/lettuce/core/support/ConnectionPoolSupportIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.support; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -12,6 +13,7 @@ import org.apache.commons.pool2.impl.SoftReferenceObjectPool; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.test.ReflectionTestUtils; @@ -40,6 +42,7 @@ /** * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) class ConnectionPoolSupportIntegrationTests extends TestSupport { private static RedisClient client; diff --git a/src/test/java/io/lettuce/core/support/caching/ClientsideCachingIntegrationTests.java b/src/test/java/io/lettuce/core/support/caching/ClientsideCachingIntegrationTests.java index bb598e5ea7..8ccd81fa4b 100644 --- a/src/test/java/io/lettuce/core/support/caching/ClientsideCachingIntegrationTests.java +++ b/src/test/java/io/lettuce/core/support/caching/ClientsideCachingIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.support.caching; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.HashMap; @@ -11,6 +12,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -33,6 +35,7 @@ * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) @ExtendWith(LettuceExtension.class) @EnabledOnCommand("ACL") public class ClientsideCachingIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java b/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java index 060ee42e53..f9437e69aa 100644 --- a/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java +++ b/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java @@ -19,6 +19,7 @@ */ package io.lettuce.core.tracing; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; @@ -30,6 +31,7 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import brave.ScopedSpan; @@ -56,6 +58,7 @@ * @author Daniel Albuquerque * @author Anuraag Agrawal */ +@Tag(INTEGRATION_TEST) @EnabledOnCommand("HELLO") class BraveTracingIntegrationTests extends TestSupport { diff --git a/src/test/java/io/lettuce/core/tracing/BraveTracingUnitTests.java b/src/test/java/io/lettuce/core/tracing/BraveTracingUnitTests.java index dcd9b4c5a9..5adcb64e7f 100644 --- a/src/test/java/io/lettuce/core/tracing/BraveTracingUnitTests.java +++ b/src/test/java/io/lettuce/core/tracing/BraveTracingUnitTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.tracing; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.util.Queue; @@ -8,6 +9,7 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.test.ReflectionTestUtils; @@ -28,6 +30,7 @@ * @author Mark Paluch * @author Daniel Albuquerque */ +@Tag(UNIT_TEST) class BraveTracingUnitTests extends TestSupport { private static Tracing clientTracing; diff --git a/src/test/java/io/lettuce/core/tracing/SynchronousIntegrationTests.java b/src/test/java/io/lettuce/core/tracing/SynchronousIntegrationTests.java index 8dee823075..1330316a28 100644 --- a/src/test/java/io/lettuce/core/tracing/SynchronousIntegrationTests.java +++ b/src/test/java/io/lettuce/core/tracing/SynchronousIntegrationTests.java @@ -1,5 +1,6 @@ package io.lettuce.core.tracing; +import static io.lettuce.TestTags.INTEGRATION_TEST; import static org.assertj.core.api.Assertions.*; import java.util.concurrent.LinkedBlockingQueue; @@ -16,12 +17,14 @@ import io.micrometer.observation.ObservationRegistry; import io.micrometer.tracing.exporter.FinishedSpan; import io.micrometer.tracing.test.SampleTestRunner; +import org.junit.jupiter.api.Tag; /** * Collection of tests that log metrics and tracing using the synchronous API. * * @author Mark Paluch */ +@Tag(INTEGRATION_TEST) public class SynchronousIntegrationTests extends SampleTestRunner { SynchronousIntegrationTests() { diff --git a/src/test/kotlin/io/lettuce/core/CoroutinesIntegrationTests.kt b/src/test/kotlin/io/lettuce/core/CoroutinesIntegrationTests.kt index 150da82af3..2abf2b59f9 100644 --- a/src/test/kotlin/io/lettuce/core/CoroutinesIntegrationTests.kt +++ b/src/test/kotlin/io/lettuce/core/CoroutinesIntegrationTests.kt @@ -1,11 +1,13 @@ package io.lettuce.core +import io.lettuce.TestTags import io.lettuce.core.api.StatefulRedisConnection import io.lettuce.core.api.coroutines import io.lettuce.test.LettuceExtension import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.toList import kotlinx.coroutines.runBlocking +import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.Timeout @@ -17,6 +19,7 @@ import javax.inject.Inject * * @author Mark Paluch */ +@Tag(TestTags.INTEGRATION_TEST) @ExtendWith(LettuceExtension::class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) @OptIn(ExperimentalLettuceCoroutinesApi::class) diff --git a/src/test/kotlin/io/lettuce/core/ScanFlowIntegrationTests.kt b/src/test/kotlin/io/lettuce/core/ScanFlowIntegrationTests.kt index 58f23c5499..ad83fd5fc1 100644 --- a/src/test/kotlin/io/lettuce/core/ScanFlowIntegrationTests.kt +++ b/src/test/kotlin/io/lettuce/core/ScanFlowIntegrationTests.kt @@ -19,6 +19,7 @@ */ package io.lettuce.core +import io.lettuce.TestTags import io.lettuce.core.api.StatefulRedisConnection import io.lettuce.core.api.coroutines import io.lettuce.test.LettuceExtension @@ -28,6 +29,7 @@ import kotlinx.coroutines.flow.toList import kotlinx.coroutines.runBlocking import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.extension.ExtendWith @@ -39,6 +41,7 @@ import javax.inject.Inject * @author Mikhael Sokolov * @author Mark Paluch */ +@Tag(TestTags.INTEGRATION_TEST) @ExtendWith(LettuceExtension::class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) internal class ScanFlowIntegrationTests @Inject constructor(private val connection: StatefulRedisConnection) : TestSupport() { diff --git a/src/test/kotlin/io/lettuce/core/TransactionExtensionsIntegrationTests.kt b/src/test/kotlin/io/lettuce/core/TransactionExtensionsIntegrationTests.kt index af3479c3d7..81b04d45b7 100644 --- a/src/test/kotlin/io/lettuce/core/TransactionExtensionsIntegrationTests.kt +++ b/src/test/kotlin/io/lettuce/core/TransactionExtensionsIntegrationTests.kt @@ -19,6 +19,7 @@ */ package io.lettuce.core; +import io.lettuce.TestTags import io.lettuce.core.api.StatefulRedisConnection import io.lettuce.core.api.async.multi import io.lettuce.core.api.sync.multi @@ -27,6 +28,7 @@ import kotlinx.coroutines.future.await import kotlinx.coroutines.runBlocking import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import javax.inject.Inject @@ -37,6 +39,7 @@ import javax.inject.Inject * @author Mark Paluch * @author Mikhael Sokolov */ +@Tag(TestTags.INTEGRATION_TEST) @ExtendWith(LettuceExtension::class) class TransactionExtensionsIntegrationTests : TestSupport() { diff --git a/src/test/kotlin/io/lettuce/core/api/coroutines/CoroutinesIntegrationTests.kt b/src/test/kotlin/io/lettuce/core/api/coroutines/CoroutinesIntegrationTests.kt index ac55bf2d69..5dee65b309 100644 --- a/src/test/kotlin/io/lettuce/core/api/coroutines/CoroutinesIntegrationTests.kt +++ b/src/test/kotlin/io/lettuce/core/api/coroutines/CoroutinesIntegrationTests.kt @@ -1,5 +1,6 @@ package io.lettuce.core.api.coroutines +import io.lettuce.TestTags import io.lettuce.core.RedisClient import io.lettuce.core.TestSupport import io.lettuce.core.api.StatefulRedisConnection @@ -12,6 +13,7 @@ import io.lettuce.test.LettuceExtension import io.lettuce.test.condition.EnabledOnCommand import kotlinx.coroutines.runBlocking import org.assertj.core.api.Assertions.assertThat +import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import javax.inject.Inject @@ -21,6 +23,7 @@ import javax.inject.Inject * * @author Mark Paluch */ +@Tag(TestTags.INTEGRATION_TEST) @ExtendWith(LettuceExtension::class) class CoroutinesIntegrationTests : TestSupport() { diff --git a/src/test/kotlin/io/lettuce/core/event/jfr/JfrEventRecorderUnitTests.java b/src/test/kotlin/io/lettuce/core/event/jfr/JfrEventRecorderUnitTests.java index c2e459a178..2a105bebbf 100644 --- a/src/test/kotlin/io/lettuce/core/event/jfr/JfrEventRecorderUnitTests.java +++ b/src/test/kotlin/io/lettuce/core/event/jfr/JfrEventRecorderUnitTests.java @@ -1,5 +1,7 @@ package io.lettuce.core.event.jfr; +import static io.lettuce.TestTags.INTEGRATION_TEST; +import static io.lettuce.TestTags.UNIT_TEST; import static org.assertj.core.api.Assertions.*; import java.io.File; @@ -12,6 +14,7 @@ import jdk.jfr.consumer.RecordedEvent; import jdk.jfr.consumer.RecordingFile; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.lettuce.core.event.connection.ConnectionActivatedEvent; @@ -23,6 +26,7 @@ * * @author Mark Paluch */ +@Tag(UNIT_TEST) class JfrEventRecorderUnitTests { @Test diff --git a/src/test/resources/log4j2-test.xml b/src/test/resources/log4j2-test.xml index 7969c32138..efb5371536 100644 --- a/src/test/resources/log4j2-test.xml +++ b/src/test/resources/log4j2-test.xml @@ -12,6 +12,8 @@ + +