From 28e163d711f797045e772d67db6a35c50587d1dd Mon Sep 17 00:00:00 2001 From: livk Date: Mon, 2 Dec 2024 16:35:44 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=B5=8B=E8=AF=95=E7=94=A8?= =?UTF-8?q?=E4=BE=8B=E8=B0=83=E6=95=B4=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E5=B9=B6=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/livk/ck/jdbc/controller/UserControllerTest.java | 2 +- .../com/livk/ck/r2dbc/controller/UserControllerTest.java | 2 +- .../livk/graphql/r2dbc/controller/BookControllerTest.java | 2 +- .../graphql/r2dbc/controller/GreetingControllerTest.java | 2 +- .../com/livk/kafka/controller/ProducerControllerTest.java | 2 +- .../spring-mail/src/test/java/com/livk/mail/MailTest.java | 6 ------ .../com/livk/proto/amqp/controller/UserControllerTest.java | 2 +- .../com/livk/proto/kafka/controller/UserControllerTest.java | 2 +- .../livk/proto/pulsar/controller/UserControllerTest.java | 2 +- .../pulsar/producer/controller/MessageControllerTest.java | 2 +- .../com/livk/provider/controller/RabbitControllerTest.java | 2 +- .../rabbitmq-mqtt/src/test/java/com/livk/mqtt/MqttTest.java | 2 +- .../com/livk/caffeine/controller/CacheControllerTest.java | 6 +++--- .../test/java/com/livk/zookeeper/LockControllerTest.java | 2 +- .../curator/actuator/CuratorHealthIndicatorTest.java | 2 +- .../src/test/java/com/livk/curator/CuratorAppTest.java | 2 +- .../test/java/com/livk/curator/lock/ShopControllerTest.java | 2 +- .../java/com/livk/redisson/lock/ShopControllerTest.java | 2 +- .../com/livk/dynamic/controller/UserControllerTest.java | 2 +- .../test/java/com/livk/http/service/JavaServiceTest.java | 2 +- .../java/com/livk/http/service/SpringBootServiceTest.java | 2 +- .../test/java/com/livk/http/service/SpringServiceTest.java | 2 +- .../limit/controller/RateLimiterControllerTest.java | 2 +- .../com/livk/mysql/json/controller/UserControllerTest.java | 2 +- .../livk/postgres/json/controller/UserControllerTest.java | 2 +- .../com/livk/oss/minio/controller/OssControllerTest.java | 2 +- .../webflux/controller/StudentControllerTest.java | 2 +- .../redisearch/mvc/controller/StudentControllerTest.java | 2 +- .../com/livk/redisson/schedule/ScheduleControllerTest.java | 2 +- .../com/livk/commons/jackson/core/JacksonSupportTest.java | 2 +- .../test/java/com/livk/commons/web/RequestWrapperTest.java | 3 +-- .../com/livk/context/curator/CuratorOperationsTest.java | 2 +- .../java/com/livk/context/curator/CuratorTemplateTest.java | 2 +- .../java/com/livk/context/lock/support/CuratorLockTest.java | 2 +- .../com/livk/context/lock/support/RedissonLockTest.java | 2 +- .../mybatisplugins/type/mysql/MysqlJsonTypeHandlerTest.java | 2 +- .../type/postgresql/PostgresJsonTypeHandlerTest.java | 2 +- .../java/com/livk/context/redis/ReactiveRedisOpsTest.java | 2 +- .../src/test/java/com/livk/context/redis/RedisOpsTest.java | 2 +- .../com/livk/context/redisearch/RediSearchTemplateTest.java | 2 +- .../context/redisearch/StringRediSearchTemplateTest.java | 2 +- 41 files changed, 42 insertions(+), 49 deletions(-) diff --git a/spring-boot-example/spring-clickhouse/spring-clickhouse-jdbc/src/test/java/com/livk/ck/jdbc/controller/UserControllerTest.java b/spring-boot-example/spring-clickhouse/spring-clickhouse-jdbc/src/test/java/com/livk/ck/jdbc/controller/UserControllerTest.java index 806826031..ae11e791b 100644 --- a/spring-boot-example/spring-clickhouse/spring-clickhouse-jdbc/src/test/java/com/livk/ck/jdbc/controller/UserControllerTest.java +++ b/spring-boot-example/spring-clickhouse/spring-clickhouse-jdbc/src/test/java/com/livk/ck/jdbc/controller/UserControllerTest.java @@ -55,7 +55,7 @@ */ @SpringBootTest @AutoConfigureMockMvc -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) class UserControllerTest { diff --git a/spring-boot-example/spring-clickhouse/spring-clickhouse-r2dbc/src/test/java/com/livk/ck/r2dbc/controller/UserControllerTest.java b/spring-boot-example/spring-clickhouse/spring-clickhouse-r2dbc/src/test/java/com/livk/ck/r2dbc/controller/UserControllerTest.java index 33c1140f4..b930cc3fa 100644 --- a/spring-boot-example/spring-clickhouse/spring-clickhouse-r2dbc/src/test/java/com/livk/ck/r2dbc/controller/UserControllerTest.java +++ b/spring-boot-example/spring-clickhouse/spring-clickhouse-r2dbc/src/test/java/com/livk/ck/r2dbc/controller/UserControllerTest.java @@ -47,7 +47,7 @@ */ @SpringBootTest @AutoConfigureWebTestClient(timeout = "15000") -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) class UserControllerTest { diff --git a/spring-boot-example/spring-graphql/spring-graphql-r2dbc/src/test/java/com/livk/graphql/r2dbc/controller/BookControllerTest.java b/spring-boot-example/spring-graphql/spring-graphql-r2dbc/src/test/java/com/livk/graphql/r2dbc/controller/BookControllerTest.java index df936cb3e..64a8b1a45 100644 --- a/spring-boot-example/spring-graphql/spring-graphql-r2dbc/src/test/java/com/livk/graphql/r2dbc/controller/BookControllerTest.java +++ b/spring-boot-example/spring-graphql/spring-graphql-r2dbc/src/test/java/com/livk/graphql/r2dbc/controller/BookControllerTest.java @@ -54,7 +54,7 @@ @SpringBootTest @AutoConfigureWebTestClient(timeout = "15000") @TestMethodOrder(MethodOrderer.OrderAnnotation.class) -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class BookControllerTest { @Container diff --git a/spring-boot-example/spring-graphql/spring-graphql-r2dbc/src/test/java/com/livk/graphql/r2dbc/controller/GreetingControllerTest.java b/spring-boot-example/spring-graphql/spring-graphql-r2dbc/src/test/java/com/livk/graphql/r2dbc/controller/GreetingControllerTest.java index 1c5f0a158..4ab27cdf7 100644 --- a/spring-boot-example/spring-graphql/spring-graphql-r2dbc/src/test/java/com/livk/graphql/r2dbc/controller/GreetingControllerTest.java +++ b/spring-boot-example/spring-graphql/spring-graphql-r2dbc/src/test/java/com/livk/graphql/r2dbc/controller/GreetingControllerTest.java @@ -45,7 +45,7 @@ */ @SpringBootTest @AutoConfigureWebTestClient(timeout = "15000") -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class GreetingControllerTest { @Container diff --git a/spring-boot-example/spring-kafka/src/test/java/com/livk/kafka/controller/ProducerControllerTest.java b/spring-boot-example/spring-kafka/src/test/java/com/livk/kafka/controller/ProducerControllerTest.java index 368bd52f5..253a43504 100644 --- a/spring-boot-example/spring-kafka/src/test/java/com/livk/kafka/controller/ProducerControllerTest.java +++ b/spring-boot-example/spring-kafka/src/test/java/com/livk/kafka/controller/ProducerControllerTest.java @@ -46,7 +46,7 @@ */ @AutoConfigureMockMvc @SpringBootTest -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class ProducerControllerTest { @Container diff --git a/spring-boot-example/spring-mail/src/test/java/com/livk/mail/MailTest.java b/spring-boot-example/spring-mail/src/test/java/com/livk/mail/MailTest.java index dc5e3288b..1898b2c8c 100644 --- a/spring-boot-example/spring-mail/src/test/java/com/livk/mail/MailTest.java +++ b/spring-boot-example/spring-mail/src/test/java/com/livk/mail/MailTest.java @@ -22,7 +22,6 @@ import freemarker.template.Template; import freemarker.template.TemplateException; import jakarta.mail.internet.MimeMessage; -import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -51,7 +50,6 @@ * * @author livk */ -@Slf4j @SpringBootTest class MailTest { @@ -106,10 +104,8 @@ void test1() throws IOException, TemplateException { Template template = new Template("template", new StringReader(txt), configuration); String result = "www.baidu.com -> 123456"; String s1 = FreemarkerUtils.processTemplateIntoString(template, map); - log.info("processTemplateIntoString result:{}", s1); assertEquals(result, s1); String s2 = FreemarkerUtils.parse(txt, map); - log.info("parse result:{}", s2); assertEquals(result, s2); } @@ -125,7 +121,6 @@ void testSql() { String resultSql = "INSERT INTO sys_user(user_name,sex,age,address,status,create_time,update_time) VALUES (livk,1,26,shenzhen,1," + format + "," + format + "),(livk,1,26,shenzhen,1," + format + "," + format + ")"; String parse = parse(sql, map); - log.info("parse result:{}", parse); assertEquals(resultSql, parse); } @@ -135,7 +130,6 @@ private String parse(String freemarker, Map model) { return out.toString(); } catch (Exception e) { - log.error("{}", e.getMessage()); return ""; } } diff --git a/spring-boot-example/spring-protobuf-mq/spring-protobuf-amqp/src/test/java/com/livk/proto/amqp/controller/UserControllerTest.java b/spring-boot-example/spring-protobuf-mq/spring-protobuf-amqp/src/test/java/com/livk/proto/amqp/controller/UserControllerTest.java index 5f731f022..291964ee1 100644 --- a/spring-boot-example/spring-protobuf-mq/spring-protobuf-amqp/src/test/java/com/livk/proto/amqp/controller/UserControllerTest.java +++ b/spring-boot-example/spring-protobuf-mq/spring-protobuf-amqp/src/test/java/com/livk/proto/amqp/controller/UserControllerTest.java @@ -39,7 +39,7 @@ */ @SpringBootTest @AutoConfigureMockMvc -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class UserControllerTest { @Container diff --git a/spring-boot-example/spring-protobuf-mq/spring-protobuf-kafka/src/test/java/com/livk/proto/kafka/controller/UserControllerTest.java b/spring-boot-example/spring-protobuf-mq/spring-protobuf-kafka/src/test/java/com/livk/proto/kafka/controller/UserControllerTest.java index 0d03b4cdf..d917ebf94 100644 --- a/spring-boot-example/spring-protobuf-mq/spring-protobuf-kafka/src/test/java/com/livk/proto/kafka/controller/UserControllerTest.java +++ b/spring-boot-example/spring-protobuf-mq/spring-protobuf-kafka/src/test/java/com/livk/proto/kafka/controller/UserControllerTest.java @@ -37,7 +37,7 @@ */ @SpringBootTest @AutoConfigureMockMvc -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class UserControllerTest { @Container diff --git a/spring-boot-example/spring-protobuf-mq/spring-protobuf-pulsar/src/test/java/com/livk/proto/pulsar/controller/UserControllerTest.java b/spring-boot-example/spring-protobuf-mq/spring-protobuf-pulsar/src/test/java/com/livk/proto/pulsar/controller/UserControllerTest.java index 6166d20d5..331136add 100644 --- a/spring-boot-example/spring-protobuf-mq/spring-protobuf-pulsar/src/test/java/com/livk/proto/pulsar/controller/UserControllerTest.java +++ b/spring-boot-example/spring-protobuf-mq/spring-protobuf-pulsar/src/test/java/com/livk/proto/pulsar/controller/UserControllerTest.java @@ -39,7 +39,7 @@ */ @SpringBootTest @AutoConfigureMockMvc -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class UserControllerTest { @Container diff --git a/spring-boot-example/spring-pulsar/src/test/java/com/livk/pulsar/producer/controller/MessageControllerTest.java b/spring-boot-example/spring-pulsar/src/test/java/com/livk/pulsar/producer/controller/MessageControllerTest.java index b9063238e..9f44eee8f 100644 --- a/spring-boot-example/spring-pulsar/src/test/java/com/livk/pulsar/producer/controller/MessageControllerTest.java +++ b/spring-boot-example/spring-pulsar/src/test/java/com/livk/pulsar/producer/controller/MessageControllerTest.java @@ -47,7 +47,7 @@ */ @SpringBootTest({ "spring.pulsar.consumer.topics=livk-topic", "spring.pulsar.consumer.subscription.name=consumer" }) @AutoConfigureMockMvc -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class MessageControllerTest { @Container diff --git a/spring-boot-example/spring-rabbit/rabbit-provider/src/test/java/com/livk/provider/controller/RabbitControllerTest.java b/spring-boot-example/spring-rabbit/rabbit-provider/src/test/java/com/livk/provider/controller/RabbitControllerTest.java index 418d2c6d7..f4a2992f8 100644 --- a/spring-boot-example/spring-rabbit/rabbit-provider/src/test/java/com/livk/provider/controller/RabbitControllerTest.java +++ b/spring-boot-example/spring-rabbit/rabbit-provider/src/test/java/com/livk/provider/controller/RabbitControllerTest.java @@ -43,7 +43,7 @@ */ @SpringBootTest @AutoConfigureMockMvc -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class RabbitControllerTest { @Container diff --git a/spring-boot-example/spring-rabbit/rabbitmq-mqtt/src/test/java/com/livk/mqtt/MqttTest.java b/spring-boot-example/spring-rabbit/rabbitmq-mqtt/src/test/java/com/livk/mqtt/MqttTest.java index e9b815c4e..b8303d84b 100644 --- a/spring-boot-example/spring-rabbit/rabbitmq-mqtt/src/test/java/com/livk/mqtt/MqttTest.java +++ b/spring-boot-example/spring-rabbit/rabbitmq-mqtt/src/test/java/com/livk/mqtt/MqttTest.java @@ -38,7 +38,7 @@ * @author livk */ @SpringBootTest(classes = MqttApp.class) -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class MqttTest { @Container diff --git a/spring-boot-example/spring-redis/redis-caffeine/src/test/java/com/livk/caffeine/controller/CacheControllerTest.java b/spring-boot-example/spring-redis/redis-caffeine/src/test/java/com/livk/caffeine/controller/CacheControllerTest.java index 192720fb5..97bbd3438 100644 --- a/spring-boot-example/spring-redis/redis-caffeine/src/test/java/com/livk/caffeine/controller/CacheControllerTest.java +++ b/spring-boot-example/spring-redis/redis-caffeine/src/test/java/com/livk/caffeine/controller/CacheControllerTest.java @@ -50,7 +50,7 @@ @Slf4j @SpringBootTest @AutoConfigureMockMvc -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class CacheControllerTest { @Container @@ -90,7 +90,7 @@ void testGet() throws Exception { .getContentAsString(); result.add(newUUID); } - assertEquals(result.size(), 1); + assertEquals(1, result.size()); } @Test @@ -113,7 +113,7 @@ void testPut() throws Exception { .getContentAsString(); result.add(newUUID); } - assertEquals(result.size(), 3); + assertEquals(3, result.size()); } @Test diff --git a/spring-boot-example/spring-zookeeper/zookeeper-lock/src/test/java/com/livk/zookeeper/LockControllerTest.java b/spring-boot-example/spring-zookeeper/zookeeper-lock/src/test/java/com/livk/zookeeper/LockControllerTest.java index bbb5cb620..6cda8f52b 100644 --- a/spring-boot-example/spring-zookeeper/zookeeper-lock/src/test/java/com/livk/zookeeper/LockControllerTest.java +++ b/spring-boot-example/spring-zookeeper/zookeeper-lock/src/test/java/com/livk/zookeeper/LockControllerTest.java @@ -40,7 +40,7 @@ */ @SpringBootTest @AutoConfigureMockMvc -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class LockControllerTest { @Container diff --git a/spring-boot-extension-autoconfigure/src/test/java/com/livk/autoconfigure/curator/actuator/CuratorHealthIndicatorTest.java b/spring-boot-extension-autoconfigure/src/test/java/com/livk/autoconfigure/curator/actuator/CuratorHealthIndicatorTest.java index 7792e383b..a00cc1402 100644 --- a/spring-boot-extension-autoconfigure/src/test/java/com/livk/autoconfigure/curator/actuator/CuratorHealthIndicatorTest.java +++ b/spring-boot-extension-autoconfigure/src/test/java/com/livk/autoconfigure/curator/actuator/CuratorHealthIndicatorTest.java @@ -33,7 +33,7 @@ * * @author livk */ -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class CuratorHealthIndicatorTest { @Test diff --git a/spring-boot-extension-tests/curator-spring-boot-test/src/test/java/com/livk/curator/CuratorAppTest.java b/spring-boot-extension-tests/curator-spring-boot-test/src/test/java/com/livk/curator/CuratorAppTest.java index 54d9873ed..f96e97ba8 100644 --- a/spring-boot-extension-tests/curator-spring-boot-test/src/test/java/com/livk/curator/CuratorAppTest.java +++ b/spring-boot-extension-tests/curator-spring-boot-test/src/test/java/com/livk/curator/CuratorAppTest.java @@ -34,7 +34,7 @@ * @author livk */ @SpringBootTest -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class CuratorAppTest { @Container diff --git a/spring-boot-extension-tests/distributed-lock-boot-test/curator-lock-boot-test/src/test/java/com/livk/curator/lock/ShopControllerTest.java b/spring-boot-extension-tests/distributed-lock-boot-test/curator-lock-boot-test/src/test/java/com/livk/curator/lock/ShopControllerTest.java index bfa06c5df..21c100478 100644 --- a/spring-boot-extension-tests/distributed-lock-boot-test/curator-lock-boot-test/src/test/java/com/livk/curator/lock/ShopControllerTest.java +++ b/spring-boot-extension-tests/distributed-lock-boot-test/curator-lock-boot-test/src/test/java/com/livk/curator/lock/ShopControllerTest.java @@ -47,7 +47,7 @@ @TestMethodOrder(MethodOrderer.OrderAnnotation.class) @SpringBootTest @AutoConfigureMockMvc -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class ShopControllerTest { @Container diff --git a/spring-boot-extension-tests/distributed-lock-boot-test/redisson-lock-boot-test/src/test/java/com/livk/redisson/lock/ShopControllerTest.java b/spring-boot-extension-tests/distributed-lock-boot-test/redisson-lock-boot-test/src/test/java/com/livk/redisson/lock/ShopControllerTest.java index 86aa57a9c..609e6648c 100644 --- a/spring-boot-extension-tests/distributed-lock-boot-test/redisson-lock-boot-test/src/test/java/com/livk/redisson/lock/ShopControllerTest.java +++ b/spring-boot-extension-tests/distributed-lock-boot-test/redisson-lock-boot-test/src/test/java/com/livk/redisson/lock/ShopControllerTest.java @@ -47,7 +47,7 @@ @TestMethodOrder(MethodOrderer.OrderAnnotation.class) @SpringBootTest @AutoConfigureMockMvc -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class ShopControllerTest { @Container diff --git a/spring-boot-extension-tests/dynamic-datasource-boot-test/src/test/java/com/livk/dynamic/controller/UserControllerTest.java b/spring-boot-extension-tests/dynamic-datasource-boot-test/src/test/java/com/livk/dynamic/controller/UserControllerTest.java index 2d48c8392..600927eb7 100644 --- a/spring-boot-extension-tests/dynamic-datasource-boot-test/src/test/java/com/livk/dynamic/controller/UserControllerTest.java +++ b/spring-boot-extension-tests/dynamic-datasource-boot-test/src/test/java/com/livk/dynamic/controller/UserControllerTest.java @@ -47,7 +47,7 @@ */ @SpringBootTest @AutoConfigureMockMvc -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) class UserControllerTest { diff --git a/spring-boot-extension-tests/http-spring-boot-test/src/test/java/com/livk/http/service/JavaServiceTest.java b/spring-boot-extension-tests/http-spring-boot-test/src/test/java/com/livk/http/service/JavaServiceTest.java index fe532807f..b1807ee85 100644 --- a/spring-boot-extension-tests/http-spring-boot-test/src/test/java/com/livk/http/service/JavaServiceTest.java +++ b/spring-boot-extension-tests/http-spring-boot-test/src/test/java/com/livk/http/service/JavaServiceTest.java @@ -48,7 +48,7 @@ void java() { Map result = service.java(); assertNotEquals(result.get("java-version"), System.getProperty("java.version")); - assertEquals(result.get("java-version"), "17"); + assertEquals("17", result.get("java-version")); assertTrue(Boolean.parseBoolean(result.get("mockito"))); } diff --git a/spring-boot-extension-tests/http-spring-boot-test/src/test/java/com/livk/http/service/SpringBootServiceTest.java b/spring-boot-extension-tests/http-spring-boot-test/src/test/java/com/livk/http/service/SpringBootServiceTest.java index 69c316de5..c539312ce 100644 --- a/spring-boot-extension-tests/http-spring-boot-test/src/test/java/com/livk/http/service/SpringBootServiceTest.java +++ b/spring-boot-extension-tests/http-spring-boot-test/src/test/java/com/livk/http/service/SpringBootServiceTest.java @@ -49,7 +49,7 @@ void springBoot() { Map result = service.springBoot(); assertNotEquals(result.get("spring-boot-version"), SpringBootVersion.getVersion()); - assertEquals(result.get("spring-boot-version"), "1.0.0"); + assertEquals("1.0.0", result.get("spring-boot-version")); assertTrue(Boolean.parseBoolean(result.get("mockito"))); } diff --git a/spring-boot-extension-tests/http-spring-boot-test/src/test/java/com/livk/http/service/SpringServiceTest.java b/spring-boot-extension-tests/http-spring-boot-test/src/test/java/com/livk/http/service/SpringServiceTest.java index 581928fbb..0775d63cc 100644 --- a/spring-boot-extension-tests/http-spring-boot-test/src/test/java/com/livk/http/service/SpringServiceTest.java +++ b/spring-boot-extension-tests/http-spring-boot-test/src/test/java/com/livk/http/service/SpringServiceTest.java @@ -49,7 +49,7 @@ void spring() { Map result = service.spring(); assertNotEquals(result.get("spring-version"), SpringVersion.getVersion()); - assertEquals(result.get("spring-version"), "1.0.0"); + assertEquals("1.0.0", result.get("spring-version")); assertTrue(Boolean.parseBoolean(result.get("mockito"))); } diff --git a/spring-boot-extension-tests/limit-spring-boot-test/redisson-limit-spring-boot-test/src/test/java/com/livk/redisson/limit/controller/RateLimiterControllerTest.java b/spring-boot-extension-tests/limit-spring-boot-test/redisson-limit-spring-boot-test/src/test/java/com/livk/redisson/limit/controller/RateLimiterControllerTest.java index 5c9681f6b..a0b467ee5 100644 --- a/spring-boot-extension-tests/limit-spring-boot-test/redisson-limit-spring-boot-test/src/test/java/com/livk/redisson/limit/controller/RateLimiterControllerTest.java +++ b/spring-boot-extension-tests/limit-spring-boot-test/redisson-limit-spring-boot-test/src/test/java/com/livk/redisson/limit/controller/RateLimiterControllerTest.java @@ -38,7 +38,7 @@ */ @SpringBootTest @AutoConfigureMockMvc -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class RateLimiterControllerTest { @Container diff --git a/spring-boot-extension-tests/mybatis-extension-boot-test/mybatis-typehandler-mysql-boot-test/src/test/java/com/livk/mysql/json/controller/UserControllerTest.java b/spring-boot-extension-tests/mybatis-extension-boot-test/mybatis-typehandler-mysql-boot-test/src/test/java/com/livk/mysql/json/controller/UserControllerTest.java index 853593773..5f6e1b546 100644 --- a/spring-boot-extension-tests/mybatis-extension-boot-test/mybatis-typehandler-mysql-boot-test/src/test/java/com/livk/mysql/json/controller/UserControllerTest.java +++ b/spring-boot-extension-tests/mybatis-extension-boot-test/mybatis-typehandler-mysql-boot-test/src/test/java/com/livk/mysql/json/controller/UserControllerTest.java @@ -47,7 +47,7 @@ */ @SpringBootTest(classes = MySQLTypeHandlerExampleApp.class) @AutoConfigureMockMvc -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) class UserControllerTest { diff --git a/spring-boot-extension-tests/mybatis-extension-boot-test/mybatis-typehandler-postgresql-boot-test/src/test/java/com/livk/postgres/json/controller/UserControllerTest.java b/spring-boot-extension-tests/mybatis-extension-boot-test/mybatis-typehandler-postgresql-boot-test/src/test/java/com/livk/postgres/json/controller/UserControllerTest.java index 5646be15f..6145e98d0 100644 --- a/spring-boot-extension-tests/mybatis-extension-boot-test/mybatis-typehandler-postgresql-boot-test/src/test/java/com/livk/postgres/json/controller/UserControllerTest.java +++ b/spring-boot-extension-tests/mybatis-extension-boot-test/mybatis-typehandler-postgresql-boot-test/src/test/java/com/livk/postgres/json/controller/UserControllerTest.java @@ -47,7 +47,7 @@ */ @SpringBootTest(classes = PGSQLTypeHandlerExampleApp.class) @AutoConfigureMockMvc -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) class UserControllerTest { diff --git a/spring-boot-extension-tests/oss-spring-boot-test/oss-minio-spring-boot-test/src/test/java/com/livk/oss/minio/controller/OssControllerTest.java b/spring-boot-extension-tests/oss-spring-boot-test/oss-minio-spring-boot-test/src/test/java/com/livk/oss/minio/controller/OssControllerTest.java index 65a9e78a5..35c642f8b 100644 --- a/spring-boot-extension-tests/oss-spring-boot-test/oss-minio-spring-boot-test/src/test/java/com/livk/oss/minio/controller/OssControllerTest.java +++ b/spring-boot-extension-tests/oss-spring-boot-test/oss-minio-spring-boot-test/src/test/java/com/livk/oss/minio/controller/OssControllerTest.java @@ -44,7 +44,7 @@ */ @SpringBootTest @AutoConfigureMockMvc -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class OssControllerTest { @Container diff --git a/spring-boot-extension-tests/redis-spring-boot-test/redisearch-spring-boot-test/redisearch-spring-boot-test-webflux/src/test/java/com/livk/redisearch/webflux/controller/StudentControllerTest.java b/spring-boot-extension-tests/redis-spring-boot-test/redisearch-spring-boot-test/redisearch-spring-boot-test-webflux/src/test/java/com/livk/redisearch/webflux/controller/StudentControllerTest.java index d8049e8c5..5fe132393 100644 --- a/spring-boot-extension-tests/redis-spring-boot-test/redisearch-spring-boot-test/redisearch-spring-boot-test-webflux/src/test/java/com/livk/redisearch/webflux/controller/StudentControllerTest.java +++ b/spring-boot-extension-tests/redis-spring-boot-test/redisearch-spring-boot-test/redisearch-spring-boot-test-webflux/src/test/java/com/livk/redisearch/webflux/controller/StudentControllerTest.java @@ -36,7 +36,7 @@ */ @SpringBootTest @AutoConfigureWebTestClient -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class StudentControllerTest { @Container diff --git a/spring-boot-extension-tests/redis-spring-boot-test/redisearch-spring-boot-test/redisearch-spring-boot-test-webmvc/src/test/java/com/livk/redisearch/mvc/controller/StudentControllerTest.java b/spring-boot-extension-tests/redis-spring-boot-test/redisearch-spring-boot-test/redisearch-spring-boot-test-webmvc/src/test/java/com/livk/redisearch/mvc/controller/StudentControllerTest.java index 2d92e0179..6132dbb1f 100644 --- a/spring-boot-extension-tests/redis-spring-boot-test/redisearch-spring-boot-test/redisearch-spring-boot-test-webmvc/src/test/java/com/livk/redisearch/mvc/controller/StudentControllerTest.java +++ b/spring-boot-extension-tests/redis-spring-boot-test/redisearch-spring-boot-test/redisearch-spring-boot-test-webmvc/src/test/java/com/livk/redisearch/mvc/controller/StudentControllerTest.java @@ -42,7 +42,7 @@ */ @SpringBootTest @AutoConfigureMockMvc -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class StudentControllerTest { @Container diff --git a/spring-boot-extension-tests/redis-spring-boot-test/redisson-spring-boot-test/src/test/java/com/livk/redisson/schedule/ScheduleControllerTest.java b/spring-boot-extension-tests/redis-spring-boot-test/redisson-spring-boot-test/src/test/java/com/livk/redisson/schedule/ScheduleControllerTest.java index 147b71cca..bf06c63ba 100644 --- a/spring-boot-extension-tests/redis-spring-boot-test/redisson-spring-boot-test/src/test/java/com/livk/redisson/schedule/ScheduleControllerTest.java +++ b/spring-boot-extension-tests/redis-spring-boot-test/redisson-spring-boot-test/src/test/java/com/livk/redisson/schedule/ScheduleControllerTest.java @@ -39,7 +39,7 @@ */ @SpringBootTest @AutoConfigureMockMvc -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class ScheduleControllerTest { @Container diff --git a/spring-extension-commons/src/test/java/com/livk/commons/jackson/core/JacksonSupportTest.java b/spring-extension-commons/src/test/java/com/livk/commons/jackson/core/JacksonSupportTest.java index 557f1fcfc..715aae034 100644 --- a/spring-extension-commons/src/test/java/com/livk/commons/jackson/core/JacksonSupportTest.java +++ b/spring-extension-commons/src/test/java/com/livk/commons/jackson/core/JacksonSupportTest.java @@ -78,7 +78,7 @@ class JacksonSupportTest { 3 - """; + """; @Test void javaType() { diff --git a/spring-extension-commons/src/test/java/com/livk/commons/web/RequestWrapperTest.java b/spring-extension-commons/src/test/java/com/livk/commons/web/RequestWrapperTest.java index 01e170464..6f665c598 100644 --- a/spring-extension-commons/src/test/java/com/livk/commons/web/RequestWrapperTest.java +++ b/spring-extension-commons/src/test/java/com/livk/commons/web/RequestWrapperTest.java @@ -25,7 +25,6 @@ import org.springframework.http.MediaType; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.util.FileCopyUtils; -import org.springframework.util.MultiValueMap; import java.io.IOException; import java.util.List; @@ -59,7 +58,7 @@ void body() throws IOException { ServletInputStream inputStream = wrapper.getInputStream(); byte[] bytes = FileCopyUtils.copyToByteArray(inputStream); assertArrayEquals(JsonMapperUtils.writeValueAsBytes(map), bytes); - assertEquals(wrapper.getContentType(), MediaType.APPLICATION_JSON_VALUE); + assertEquals(MediaType.APPLICATION_JSON_VALUE, wrapper.getContentType()); } @Test diff --git a/spring-extension-context/src/test/java/com/livk/context/curator/CuratorOperationsTest.java b/spring-extension-context/src/test/java/com/livk/context/curator/CuratorOperationsTest.java index 0a39c04f4..0279ee709 100644 --- a/spring-extension-context/src/test/java/com/livk/context/curator/CuratorOperationsTest.java +++ b/spring-extension-context/src/test/java/com/livk/context/curator/CuratorOperationsTest.java @@ -52,7 +52,7 @@ */ @SpringJUnitConfig(CuratorConfig.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class CuratorOperationsTest { @Container diff --git a/spring-extension-context/src/test/java/com/livk/context/curator/CuratorTemplateTest.java b/spring-extension-context/src/test/java/com/livk/context/curator/CuratorTemplateTest.java index c72088e84..811ff2577 100644 --- a/spring-extension-context/src/test/java/com/livk/context/curator/CuratorTemplateTest.java +++ b/spring-extension-context/src/test/java/com/livk/context/curator/CuratorTemplateTest.java @@ -43,7 +43,7 @@ */ @SpringJUnitConfig(CuratorConfig.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class CuratorTemplateTest { @Container diff --git a/spring-extension-context/src/test/java/com/livk/context/lock/support/CuratorLockTest.java b/spring-extension-context/src/test/java/com/livk/context/lock/support/CuratorLockTest.java index 9eca755c5..1f9ded493 100644 --- a/spring-extension-context/src/test/java/com/livk/context/lock/support/CuratorLockTest.java +++ b/spring-extension-context/src/test/java/com/livk/context/lock/support/CuratorLockTest.java @@ -38,7 +38,7 @@ * @author livk */ @SpringJUnitConfig(CuratorLockConfig.class) -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class CuratorLockTest { @Container diff --git a/spring-extension-context/src/test/java/com/livk/context/lock/support/RedissonLockTest.java b/spring-extension-context/src/test/java/com/livk/context/lock/support/RedissonLockTest.java index 1f9c05dd8..ee05fd453 100644 --- a/spring-extension-context/src/test/java/com/livk/context/lock/support/RedissonLockTest.java +++ b/spring-extension-context/src/test/java/com/livk/context/lock/support/RedissonLockTest.java @@ -38,7 +38,7 @@ * @author livk */ @SpringJUnitConfig(RedissonLockConfig.class) -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class RedissonLockTest { @Container diff --git a/spring-extension-context/src/test/java/com/livk/context/mybatisplugins/type/mysql/MysqlJsonTypeHandlerTest.java b/spring-extension-context/src/test/java/com/livk/context/mybatisplugins/type/mysql/MysqlJsonTypeHandlerTest.java index 453d210e0..6c13801c3 100644 --- a/spring-extension-context/src/test/java/com/livk/context/mybatisplugins/type/mysql/MysqlJsonTypeHandlerTest.java +++ b/spring-extension-context/src/test/java/com/livk/context/mybatisplugins/type/mysql/MysqlJsonTypeHandlerTest.java @@ -43,7 +43,7 @@ * @author livk */ @SpringJUnitConfig(MybatisConfig.class) -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class MysqlJsonTypeHandlerTest { @Container diff --git a/spring-extension-context/src/test/java/com/livk/context/mybatisplugins/type/postgresql/PostgresJsonTypeHandlerTest.java b/spring-extension-context/src/test/java/com/livk/context/mybatisplugins/type/postgresql/PostgresJsonTypeHandlerTest.java index c1974d6dd..2cb5aa783 100644 --- a/spring-extension-context/src/test/java/com/livk/context/mybatisplugins/type/postgresql/PostgresJsonTypeHandlerTest.java +++ b/spring-extension-context/src/test/java/com/livk/context/mybatisplugins/type/postgresql/PostgresJsonTypeHandlerTest.java @@ -43,7 +43,7 @@ * @author livk */ @SpringJUnitConfig(MybatisConfig.class) -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class PostgresJsonTypeHandlerTest { @Container diff --git a/spring-extension-context/src/test/java/com/livk/context/redis/ReactiveRedisOpsTest.java b/spring-extension-context/src/test/java/com/livk/context/redis/ReactiveRedisOpsTest.java index 5b3d1b6e5..d4a81498b 100644 --- a/spring-extension-context/src/test/java/com/livk/context/redis/ReactiveRedisOpsTest.java +++ b/spring-extension-context/src/test/java/com/livk/context/redis/ReactiveRedisOpsTest.java @@ -40,7 +40,7 @@ * @author livk */ @SpringJUnitConfig(RedisFactoryConfig.class) -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class ReactiveRedisOpsTest { @Container diff --git a/spring-extension-context/src/test/java/com/livk/context/redis/RedisOpsTest.java b/spring-extension-context/src/test/java/com/livk/context/redis/RedisOpsTest.java index aacd39a3b..bf0a7dbec 100644 --- a/spring-extension-context/src/test/java/com/livk/context/redis/RedisOpsTest.java +++ b/spring-extension-context/src/test/java/com/livk/context/redis/RedisOpsTest.java @@ -38,7 +38,7 @@ * @author livk */ @SpringJUnitConfig(RedisFactoryConfig.class) -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class RedisOpsTest { @Container diff --git a/spring-extension-context/src/test/java/com/livk/context/redisearch/RediSearchTemplateTest.java b/spring-extension-context/src/test/java/com/livk/context/redisearch/RediSearchTemplateTest.java index c4e791142..5ab9fa999 100644 --- a/spring-extension-context/src/test/java/com/livk/context/redisearch/RediSearchTemplateTest.java +++ b/spring-extension-context/src/test/java/com/livk/context/redisearch/RediSearchTemplateTest.java @@ -32,7 +32,7 @@ * @author livk */ @SpringJUnitConfig(RediSearchConfig.class) -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(parallel = true) class RediSearchTemplateTest { @Container diff --git a/spring-extension-context/src/test/java/com/livk/context/redisearch/StringRediSearchTemplateTest.java b/spring-extension-context/src/test/java/com/livk/context/redisearch/StringRediSearchTemplateTest.java index 13d7c35dd..7d2865082 100644 --- a/spring-extension-context/src/test/java/com/livk/context/redisearch/StringRediSearchTemplateTest.java +++ b/spring-extension-context/src/test/java/com/livk/context/redisearch/StringRediSearchTemplateTest.java @@ -29,7 +29,7 @@ * @author livk */ @SpringJUnitConfig(RediSearchConfig.class) -@Testcontainers(disabledWithoutDocker = true) +@Testcontainers(disabledWithoutDocker = true, parallel = true) class StringRediSearchTemplateTest { @Container