diff --git a/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/GunMapperTest.java b/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/GunMapperIT.java similarity index 90% rename from jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/GunMapperTest.java rename to jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/GunMapperIT.java index 592c781..5eb5aac 100644 --- a/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/GunMapperTest.java +++ b/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/GunMapperIT.java @@ -17,14 +17,14 @@ import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; import java.time.LocalDateTime; import java.util.UUID; -import static sanbing.jcpp.app.dal.mapper.PileMapperTest.NORMAL_PILE_ID; -import static sanbing.jcpp.app.dal.mapper.StationMapperTest.NORMAL_STATION_ID; -import static sanbing.jcpp.app.dal.mapper.UserMapperTest.NORMAL_USER_ID; +import static sanbing.jcpp.app.dal.mapper.PileMapperIT.NORMAL_PILE_ID; +import static sanbing.jcpp.app.dal.mapper.StationMapperIT.NORMAL_STATION_ID; +import static sanbing.jcpp.app.dal.mapper.UserMapperIT.NORMAL_USER_ID; /** * @author baigod */ -public class GunMapperTest extends AbstractTestBase { +class GunMapperIT extends AbstractTestBase { static final UUID[] NORMAL_GUN_ID = new UUID[]{ UUID.fromString("8f1ffb5b-e536-4f2b-8cd0-31f7d0348a44"), UUID.fromString("ae256617-b747-4110-b27a-00773e03bed1"), diff --git a/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/OrderMapperTest.java b/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/OrderMapperIT.java similarity index 84% rename from jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/OrderMapperTest.java rename to jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/OrderMapperIT.java index dcc0aa8..beabff7 100644 --- a/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/OrderMapperTest.java +++ b/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/OrderMapperIT.java @@ -19,15 +19,15 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.UUID; -import static sanbing.jcpp.app.dal.mapper.GunMapperTest.NORMAL_GUN_ID; -import static sanbing.jcpp.app.dal.mapper.PileMapperTest.NORMAL_PILE_ID; -import static sanbing.jcpp.app.dal.mapper.StationMapperTest.NORMAL_STATION_ID; -import static sanbing.jcpp.app.dal.mapper.UserMapperTest.NORMAL_USER_ID; +import static sanbing.jcpp.app.dal.mapper.GunMapperIT.NORMAL_GUN_ID; +import static sanbing.jcpp.app.dal.mapper.PileMapperIT.NORMAL_PILE_ID; +import static sanbing.jcpp.app.dal.mapper.StationMapperIT.NORMAL_STATION_ID; +import static sanbing.jcpp.app.dal.mapper.UserMapperIT.NORMAL_USER_ID; /** * @author baigod */ -public class OrderMapperTest extends AbstractTestBase { +class OrderMapperIT extends AbstractTestBase { @Resource OrderMapper orderMapper; diff --git a/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/PileMapperTest.java b/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/PileMapperIT.java similarity index 92% rename from jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/PileMapperTest.java rename to jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/PileMapperIT.java index b3afb7b..46168eb 100644 --- a/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/PileMapperTest.java +++ b/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/PileMapperIT.java @@ -19,13 +19,13 @@ import java.text.DecimalFormat; import java.time.LocalDateTime; import java.util.UUID; -import static sanbing.jcpp.app.dal.mapper.StationMapperTest.NORMAL_STATION_ID; -import static sanbing.jcpp.app.dal.mapper.UserMapperTest.NORMAL_USER_ID; +import static sanbing.jcpp.app.dal.mapper.StationMapperIT.NORMAL_STATION_ID; +import static sanbing.jcpp.app.dal.mapper.UserMapperIT.NORMAL_USER_ID; /** * @author baigod */ -public class PileMapperTest extends AbstractTestBase { +class PileMapperIT extends AbstractTestBase { static final UUID[] NORMAL_PILE_ID = new UUID[]{ UUID.fromString("fd7b3f60-db6c-4347-bff3-3c922985b95c"), UUID.fromString("fa621927-6458-4e09-9666-99c52230db2b"), diff --git a/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/StationMapperTest.java b/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/StationMapperIT.java similarity index 93% rename from jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/StationMapperTest.java rename to jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/StationMapperIT.java index 63a6f02..5c3b44d 100644 --- a/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/StationMapperTest.java +++ b/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/StationMapperIT.java @@ -16,12 +16,12 @@ import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; import java.time.LocalDateTime; import java.util.UUID; -import static sanbing.jcpp.app.dal.mapper.UserMapperTest.NORMAL_USER_ID; +import static sanbing.jcpp.app.dal.mapper.UserMapperIT.NORMAL_USER_ID; /** * @author baigod */ -class StationMapperTest extends AbstractTestBase { +class StationMapperIT extends AbstractTestBase { static final UUID NORMAL_STATION_ID = UUID.fromString("07d80c81-fe99-4a1f-a6aa-dc4d798b5626"); @Resource diff --git a/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/UserMapperTest.java b/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/UserMapperIT.java similarity index 96% rename from jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/UserMapperTest.java rename to jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/UserMapperIT.java index be710a4..5ef9afc 100644 --- a/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/UserMapperTest.java +++ b/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/app/dal/mapper/UserMapperIT.java @@ -18,7 +18,7 @@ import java.util.UUID; /** * @author baigod */ -class UserMapperTest extends AbstractTestBase { +class UserMapperIT extends AbstractTestBase { static final UUID NORMAL_USER_ID = UUID.fromString("21cbf909-a23a-4396-840a-f34061f59f95"); @Resource diff --git a/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/infrastructure/cache/RedisCacheConfigurationTest.java b/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/infrastructure/cache/RedisCacheConfigurationIT.java similarity index 97% rename from jcpp-app-bootstrap/src/test/java/sanbing/jcpp/infrastructure/cache/RedisCacheConfigurationTest.java rename to jcpp-app-bootstrap/src/test/java/sanbing/jcpp/infrastructure/cache/RedisCacheConfigurationIT.java index 1c41e34..edd93f6 100644 --- a/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/infrastructure/cache/RedisCacheConfigurationTest.java +++ b/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/infrastructure/cache/RedisCacheConfigurationIT.java @@ -16,7 +16,7 @@ import java.util.Objects; import java.util.concurrent.CountDownLatch; import java.util.stream.IntStream; -class RedisCacheConfigurationTest extends AbstractTestBase { +class RedisCacheConfigurationIT extends AbstractTestBase { @Resource RedisTemplate redisTemplate; diff --git a/jcpp-protocol-bootstrap/src/test/java/sanbing/jcpp/protocol/AbstractProtocolTestBase.java b/jcpp-protocol-bootstrap/src/test/java/sanbing/jcpp/protocol/AbstractProtocolTestBase.java index a9ad896..1daa805 100644 --- a/jcpp-protocol-bootstrap/src/test/java/sanbing/jcpp/protocol/AbstractProtocolTestBase.java +++ b/jcpp-protocol-bootstrap/src/test/java/sanbing/jcpp/protocol/AbstractProtocolTestBase.java @@ -1,7 +1,8 @@ -package sanbing.jcpp.protocol; /** +/** * 抖音关注:程序员三丙 * 知识星球:https://t.zsxq.com/j9b21 */ +package sanbing.jcpp.protocol; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.TestMethodOrder; diff --git a/jcpp-protocol-bootstrap/src/test/java/sanbing/jcpp/protocol/adapter/DownlinkControllerTest.java b/jcpp-protocol-bootstrap/src/test/java/sanbing/jcpp/protocol/adapter/DownlinkControllerIT.java similarity index 95% rename from jcpp-protocol-bootstrap/src/test/java/sanbing/jcpp/protocol/adapter/DownlinkControllerTest.java rename to jcpp-protocol-bootstrap/src/test/java/sanbing/jcpp/protocol/adapter/DownlinkControllerIT.java index 016175b..624f24c 100644 --- a/jcpp-protocol-bootstrap/src/test/java/sanbing/jcpp/protocol/adapter/DownlinkControllerTest.java +++ b/jcpp-protocol-bootstrap/src/test/java/sanbing/jcpp/protocol/adapter/DownlinkControllerIT.java @@ -13,7 +13,7 @@ import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioSocketChannel; import jakarta.annotation.Resource; -import org.junit.After; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Value; @@ -38,7 +38,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultHandlers. import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import static sanbing.jcpp.protocol.listener.tcp.configs.BinaryHandlerConfiguration.LITTLE_ENDIAN_BYTE_ORDER; -class DownlinkControllerTest extends AbstractProtocolTestBase { +class DownlinkControllerIT extends AbstractProtocolTestBase { final String PROTOCOL_NAME = "yunkuaichongV150"; @Value("${service.protocols.yunkuaichongV150.listener.tcp.handler.configuration}") @@ -81,7 +81,7 @@ class DownlinkControllerTest extends AbstractProtocolTestBase { @Override protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { - log.info("接收到字节码:{}", msg); + log.info("接收到下行报文:{}", msg); } }); } @@ -92,8 +92,8 @@ class DownlinkControllerTest extends AbstractProtocolTestBase { channel = f.channel(); } - @After - public void tearDown() { + @AfterEach + void tearDown() { if (channel != null) { channel.close(); } @@ -101,7 +101,7 @@ class DownlinkControllerTest extends AbstractProtocolTestBase { } @Test - void remoteStartCharging() throws Exception { + void remoteStartChargingTest() throws Exception { // 先发送一段登录 channel.writeAndFlush(Unpooled.wrappedBuffer(HexUtil.decodeHex("6822001900012023121200001001011047562e393572313300898604d11722d0348606024E87"))).sync();