From 5e49367cf5f7a9d51ea8e7acf6f4cb0ed12d8420 Mon Sep 17 00:00:00 2001 From: zhuangtianxiang <2913129173@qq.com> Date: Wed, 8 Jan 2025 10:07:39 +0800 Subject: [PATCH] =?UTF-8?q?refactor(test):=20=E9=87=8D=E6=9E=84=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 DeviceServiceTest、EventServiceTest、ParamServiceTest、PropertyServiceTest 和 ServeServiceTest 中添加备注字段- 移除了未使用的导入语句 - 删除了 UserServiceTest 中的注释代码 --- .../gateway/service/iot/DeviceServiceTest.java | 4 ++-- .../edu/gateway/service/iot/EventServiceTest.java | 4 ++-- .../edu/gateway/service/iot/ParamServiceTest.java | 2 +- .../gateway/service/iot/ProductServiceTest.java | 2 -- .../gateway/service/iot/PropertyServiceTest.java | 2 +- .../edu/gateway/service/iot/ServeServiceTest.java | 7 ++----- .../gateway/service/system/UserServiceTest.java | 15 --------------- 7 files changed, 8 insertions(+), 28 deletions(-) diff --git a/src/test/java/com/zsc/edu/gateway/service/iot/DeviceServiceTest.java b/src/test/java/com/zsc/edu/gateway/service/iot/DeviceServiceTest.java index 56322c9..7b79cf6 100644 --- a/src/test/java/com/zsc/edu/gateway/service/iot/DeviceServiceTest.java +++ b/src/test/java/com/zsc/edu/gateway/service/iot/DeviceServiceTest.java @@ -52,13 +52,13 @@ public class DeviceServiceTest { @Test void createProduct() { - DeviceDto dto = new DeviceDto("DEVICE_3", null, null, null, null, 121L); + DeviceDto dto = new DeviceDto("DEVICE_3", null, null, null, null, 121L, "备注"); Device device = service.create(dto); assertNotNull(device); List devices = service.list(new LambdaQueryWrapper().like(Device::getName, "DEVICE")); assertEquals(3, devices.size()); // 不能创建其他已存在的同名同代码部门 - DeviceDto dto2 = new DeviceDto(device2.getName(), null, null, null, null, 121L); + DeviceDto dto2 = new DeviceDto(device2.getName(), null, null, null, null, 121L, "备注"); assertThrows(ConstraintException.class, () -> service.create(dto2)); } diff --git a/src/test/java/com/zsc/edu/gateway/service/iot/EventServiceTest.java b/src/test/java/com/zsc/edu/gateway/service/iot/EventServiceTest.java index a947730..842766d 100644 --- a/src/test/java/com/zsc/edu/gateway/service/iot/EventServiceTest.java +++ b/src/test/java/com/zsc/edu/gateway/service/iot/EventServiceTest.java @@ -64,13 +64,13 @@ public class EventServiceTest { @Test void createProduct() { - EventDto dto = new EventDto(121L, "EVENT_3", "测试3", Event.Type.ACTIVE, createParam()); + EventDto dto = new EventDto(121L, "EVENT_3", "测试3", "备注", Event.Type.ACTIVE, createParam()); Event Event = service.create(dto); assertNotNull(Event); List events = service.list(new QueryWrapper().like("name", "EVENT")); assertEquals(3, events.size()); // 不能创建其他已存在的同名同代码部门 - EventDto dto2 = new EventDto(121L, event2.getName(), "测试1", null, null); + EventDto dto2 = new EventDto(121L, event2.getName(), "测试1", "备注", null, null); assertThrows(ConstraintException.class, () -> service.create(dto2)); } diff --git a/src/test/java/com/zsc/edu/gateway/service/iot/ParamServiceTest.java b/src/test/java/com/zsc/edu/gateway/service/iot/ParamServiceTest.java index 9a54570..6f78c52 100644 --- a/src/test/java/com/zsc/edu/gateway/service/iot/ParamServiceTest.java +++ b/src/test/java/com/zsc/edu/gateway/service/iot/ParamServiceTest.java @@ -60,7 +60,7 @@ public class ParamServiceTest { @Test void createParams() { - ParamDto dto = new ParamDto("PARAM_NAME_3", "测试1", DataType.DATE, Param.Type.OUTPUT); + ParamDto dto = new ParamDto("PARAM_NAME_3", "测试1", "备注", DataType.DATE, Param.Type.OUTPUT); List params = new ArrayList<>(); params.add(dto); Long foreignId = 1L; diff --git a/src/test/java/com/zsc/edu/gateway/service/iot/ProductServiceTest.java b/src/test/java/com/zsc/edu/gateway/service/iot/ProductServiceTest.java index 4661a07..5709c48 100644 --- a/src/test/java/com/zsc/edu/gateway/service/iot/ProductServiceTest.java +++ b/src/test/java/com/zsc/edu/gateway/service/iot/ProductServiceTest.java @@ -1,7 +1,6 @@ package com.zsc.edu.gateway.service.iot; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.zsc.edu.gateway.domain.iot.ParamBuilder; import com.zsc.edu.gateway.domain.iot.ProductBuilder; import com.zsc.edu.gateway.exception.ConstraintException; import com.zsc.edu.gateway.modules.iot.product.dto.ProductDto; @@ -12,7 +11,6 @@ import com.zsc.edu.gateway.modules.iot.tsl.dto.ParamDto; import com.zsc.edu.gateway.modules.iot.tsl.entity.DataType; import com.zsc.edu.gateway.modules.iot.tsl.entity.Param; import com.zsc.edu.gateway.modules.iot.tsl.repo.ParamRepository; -import com.zsc.edu.gateway.modules.iot.tsl.service.ParamService; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/zsc/edu/gateway/service/iot/PropertyServiceTest.java b/src/test/java/com/zsc/edu/gateway/service/iot/PropertyServiceTest.java index 71f67fe..df44717 100644 --- a/src/test/java/com/zsc/edu/gateway/service/iot/PropertyServiceTest.java +++ b/src/test/java/com/zsc/edu/gateway/service/iot/PropertyServiceTest.java @@ -53,7 +53,7 @@ public class PropertyServiceTest { @Test void createProduct() { - PropertyDto dto = new PropertyDto(121L, "PROPERTY_3", "测试3", null, null); + PropertyDto dto = new PropertyDto(121L, "PROPERTY_3", "测试3", "测试", null, null); Property property = service.create(dto); assertNotNull(property); List properties = service.list(new LambdaQueryWrapper().like(Property::getName, "PROPERTY")); diff --git a/src/test/java/com/zsc/edu/gateway/service/iot/ServeServiceTest.java b/src/test/java/com/zsc/edu/gateway/service/iot/ServeServiceTest.java index bb96941..f549f01 100644 --- a/src/test/java/com/zsc/edu/gateway/service/iot/ServeServiceTest.java +++ b/src/test/java/com/zsc/edu/gateway/service/iot/ServeServiceTest.java @@ -1,11 +1,8 @@ package com.zsc.edu.gateway.service.iot; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.zsc.edu.gateway.domain.iot.ProductBuilder; import com.zsc.edu.gateway.domain.iot.ServeBuilder; import com.zsc.edu.gateway.exception.ConstraintException; -import com.zsc.edu.gateway.modules.iot.product.dto.ProductDto; -import com.zsc.edu.gateway.modules.iot.product.entity.Product; import com.zsc.edu.gateway.modules.iot.tsl.dto.ParamDto; import com.zsc.edu.gateway.modules.iot.tsl.dto.ServeDto; import com.zsc.edu.gateway.modules.iot.tsl.entity.DataType; @@ -63,13 +60,13 @@ public class ServeServiceTest { @Test void createProduct() { - ServeDto dto = new ServeDto(121L, "SERVE_3", "测试3", createParam(), createParam()); + ServeDto dto = new ServeDto(121L, "SERVE_3", "测试3", "备注", createParam(), createParam()); Serve serve = service.create(dto); assertNotNull(serve); List serves = service.list(new LambdaQueryWrapper().like(Serve::getName, "SERVE")); assertEquals(3, serves.size()); // 不能创建其他已存在的同名同代码部门 - ServeDto dto2 = new ServeDto(121L, serve2.getName(), "测试1", null, null); + ServeDto dto2 = new ServeDto(121L, serve2.getName(), "测试1", "备注", null, null); assertThrows(ConstraintException.class, () -> service.create(dto2)); } diff --git a/src/test/java/com/zsc/edu/gateway/service/system/UserServiceTest.java b/src/test/java/com/zsc/edu/gateway/service/system/UserServiceTest.java index 0f400cc..b740c71 100644 --- a/src/test/java/com/zsc/edu/gateway/service/system/UserServiceTest.java +++ b/src/test/java/com/zsc/edu/gateway/service/system/UserServiceTest.java @@ -109,19 +109,4 @@ public class UserServiceTest { } -// @Test -// void test() { -// User user=userRepository.selectByUsername("admin"); -// Set authorities= authorityRepository.selectAuthoritiesByRoleId(user.getRoleId()); -// user.role.authorities=authorities; -// System.out.println(user); -// -// } -// @Test -// void test1() { -//// User user=userRepository.selectByUsername("admin"); -//// System.out.println(user); -// String admin = passwordEncoder.encode("admin"); -// System.out.println(admin); -// } }