From 078d13b6d93cb492cef7bbeefde75ef43fa609ce Mon Sep 17 00:00:00 2001 From: guoyuqi Date: Wed, 19 Feb 2025 13:57:32 +0800 Subject: [PATCH] refactor: resolve repeat sql --- .../PersonalCenterControllerTests.java | 21 +++++++++++++++---- .../src/test/resources/dml/init_user_test.sql | 3 +-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/backend/crm/src/test/java/io/cordys/crm/system/controller/PersonalCenterControllerTests.java b/backend/crm/src/test/java/io/cordys/crm/system/controller/PersonalCenterControllerTests.java index 546bcd5d2..f7572a348 100644 --- a/backend/crm/src/test/java/io/cordys/crm/system/controller/PersonalCenterControllerTests.java +++ b/backend/crm/src/test/java/io/cordys/crm/system/controller/PersonalCenterControllerTests.java @@ -2,6 +2,7 @@ package io.cordys.crm.system.controller; import io.cordys.common.pager.Pager; import io.cordys.crm.base.BaseTest; +import io.cordys.crm.system.domain.Department; import io.cordys.crm.system.domain.User; import io.cordys.crm.system.dto.request.UserAddRequest; import io.cordys.crm.system.dto.request.UserPageRequest; @@ -33,13 +34,25 @@ public class PersonalCenterControllerTests extends BaseTest { @Resource private PersonalCenterService personalCenterService; + @Resource + private BaseMapper departmentBaseMapper; - @Sql(scripts = {"/dml/init_user_test.sql"}, - config = @SqlConfig(encoding = "utf-8", transactionMode = SqlConfig.TransactionMode.ISOLATED), - executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Test @Order(1) public void testGet() throws Exception { + Department department = new Department(); + department.setId("221"); + department.setName("部门222"); + department.setOrganizationId("100001"); + department.setParentId("4"); + department.setPos(222L); + department.setCreateTime(1736240043609L); + department.setUpdateTime(1736240043609L); + department.setCreateUser("gyq"); + department.setUpdateUser("gyq"); + department.setResource("INTERNAL"); + department.setResourceId(null); + departmentBaseMapper.insert(department); UserAddRequest request = new UserAddRequest(); request.setName("testPassword"); request.setPhone("12345678911"); @@ -90,7 +103,7 @@ public class PersonalCenterControllerTests extends BaseTest { this.requestPost("/personal/center/info/reset?password=Gyq124", null).andExpect(status().isOk()); - personalCenterService.resetUserPassword("Gyq124",userId); + personalCenterService.resetUserPassword("Gyq124", userId); } diff --git a/backend/crm/src/test/resources/dml/init_user_test.sql b/backend/crm/src/test/resources/dml/init_user_test.sql index 6321ad984..0e2002564 100644 --- a/backend/crm/src/test/resources/dml/init_user_test.sql +++ b/backend/crm/src/test/resources/dml/init_user_test.sql @@ -28,5 +28,4 @@ VALUES ('sur_1', 'r_1', '1', 1716175907000, 1716175907000, 'admin', 'admin'); INSERT INTO `sys_department`(`id`, `name`, `organization_id`, `parent_id`, `pos`, `create_time`, `update_time`, `create_user`, `update_user`, `resource`, `resource_id`) VALUES - ('9', '部门9', '100001', '4', 6, 1736240043609, 1736240043609, 'admin', 'admin', 'INTERNAL', NULL), - ('222', '部门222', '100001', '4', 6, 1736240043609, 1736240043609, 'gyq', 'gyq', 'INTERNAL', NULL); \ No newline at end of file + ('9', '部门9', '100001', '4', 6, 1736240043609, 1736240043609, 'admin', 'admin', 'INTERNAL', NULL);