From 9e993b2b0415e2f0cd9153a47365a75ac509f1c8 Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Thu, 27 Mar 2025 17:33:20 +0800 Subject: [PATCH] =?UTF-8?q?test:=20=E9=82=AE=E4=BB=B6=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/pom.xml | 4 - .../EmailTemplateController.java | 29 +-- .../configuration/EmailTemplateMapper.xml | 4 +- .../cn/bunny/services/config/WebConfig.java | 27 +++ .../EmailTemplateControllerTest.java | 189 +++++++++++++++++- .../log/UserLoginLogControllerTest.java | 14 +- 6 files changed, 234 insertions(+), 33 deletions(-) create mode 100644 service/src/test/java/cn/bunny/services/config/WebConfig.java diff --git a/service/pom.xml b/service/pom.xml index 3b7d656..bde7825 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -28,10 +28,6 @@ org.springframework.boot spring-boot-starter-web - - org.springframework.boot - spring-boot-starter-webflux - org.aspectj diff --git a/service/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java b/service/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java index d08d74e..98ce80f 100644 --- a/service/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java +++ b/service/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java @@ -14,9 +14,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import reactor.core.publisher.Mono; import java.util.List; import java.util.Map; @@ -34,12 +32,15 @@ import java.util.Map; @RequestMapping("api/emailTemplate") public class EmailTemplateController { - @Autowired - private EmailTemplateService emailTemplateService; + private final EmailTemplateService emailTemplateService; + + public EmailTemplateController(EmailTemplateService emailTemplateService) { + this.emailTemplateService = emailTemplateService; + } @Operation(summary = "分页查询邮件模板", description = "分页查询邮件模板") @GetMapping("getEmailTemplateList/{page}/{limit}") - public Mono>> getEmailTemplateList( + public Result> getEmailTemplateList( @Parameter(name = "page", description = "当前页", required = true) @PathVariable("page") Integer page, @Parameter(name = "limit", description = "每页记录数", required = true) @@ -47,34 +48,34 @@ public class EmailTemplateController { EmailTemplateDto dto) { Page pageParams = new Page<>(page, limit); PageResult pageResult = emailTemplateService.getEmailTemplateList(pageParams, dto); - return Mono.just(Result.success(pageResult)); + return Result.success(pageResult); } @Operation(summary = "获取邮件模板类型字段", description = "获取邮件模板类型字段") @GetMapping("getEmailTypes") - public Mono>>> getEmailTypes() { + public Result>> getEmailTypes() { List> list = emailTemplateService.getEmailTypes(); - return Mono.just(Result.success(list)); + return Result.success(list); } @Operation(summary = "添加邮件模板", description = "添加邮件模板") @PostMapping("addEmailTemplate") - public Mono> addEmailTemplate(@Valid @RequestBody EmailTemplateAddDto dto) { + public Result addEmailTemplate(@Valid @RequestBody EmailTemplateAddDto dto) { emailTemplateService.addEmailTemplate(dto); - return Mono.just(Result.success(ResultCodeEnum.ADD_SUCCESS)); + return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新邮件模板", description = "更新邮件模板") @PutMapping("updateEmailTemplate") - public Mono> updateEmailTemplate(@Valid @RequestBody EmailTemplateUpdateDto dto) { + public Result updateEmailTemplate(@Valid @RequestBody EmailTemplateUpdateDto dto) { emailTemplateService.updateEmailTemplate(dto); - return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS)); + return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "删除邮件模板", description = "删除邮件模板") @DeleteMapping("deleteEmailTemplate") - public Mono> deleteEmailTemplate(@RequestBody List ids) { + public Result deleteEmailTemplate(@RequestBody List ids) { emailTemplateService.deleteEmailTemplate(ids); - return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS)); + return Result.success(ResultCodeEnum.DELETE_SUCCESS); } } diff --git a/service/src/main/resources/mapper/configuration/EmailTemplateMapper.xml b/service/src/main/resources/mapper/configuration/EmailTemplateMapper.xml index e17adc6..a93ee8b 100644 --- a/service/src/main/resources/mapper/configuration/EmailTemplateMapper.xml +++ b/service/src/main/resources/mapper/configuration/EmailTemplateMapper.xml @@ -46,8 +46,8 @@ and template.type like CONCAT('%',#{dto.type},'%') - - and template.isDefault = #{dto.isDefault} + + and template.is_default = #{dto.isDefault} diff --git a/service/src/test/java/cn/bunny/services/config/WebConfig.java b/service/src/test/java/cn/bunny/services/config/WebConfig.java new file mode 100644 index 0000000..db1b5f1 --- /dev/null +++ b/service/src/test/java/cn/bunny/services/config/WebConfig.java @@ -0,0 +1,27 @@ +package cn.bunny.services.config; + +import cn.bunny.services.utils.TokenUtilsTest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.web.client.RestTemplate; + +@TestConfiguration +public class WebConfig { + @Value("${server.port}") + private String port; + + @Autowired + private TokenUtilsTest tokenUtils; + + @Bean + public RestTemplate restTemplate(RestTemplateBuilder builder) { + String token = tokenUtils.getToken(); + return builder.rootUri("http://localhost:" + port) + .defaultHeader("token", token) + .defaultHeader("Content-Type", "application/json") + .build(); + } +} diff --git a/service/src/test/java/cn/bunny/services/controller/configuration/EmailTemplateControllerTest.java b/service/src/test/java/cn/bunny/services/controller/configuration/EmailTemplateControllerTest.java index adc7675..6bb3601 100644 --- a/service/src/test/java/cn/bunny/services/controller/configuration/EmailTemplateControllerTest.java +++ b/service/src/test/java/cn/bunny/services/controller/configuration/EmailTemplateControllerTest.java @@ -1,36 +1,215 @@ package cn.bunny.services.controller.configuration; +import cn.bunny.dao.dto.system.email.template.EmailTemplateAddDto; +import cn.bunny.dao.dto.system.email.template.EmailTemplateUpdateDto; +import cn.bunny.dao.enums.EmailTemplateEnums; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.system.email.EmailTemplateVo; +import cn.bunny.services.utils.TokenUtilsTest; +import cn.hutool.crypto.digest.MD5; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson2.TypeReference; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers; +import org.springframework.test.context.web.WebAppConfiguration; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.util.UriComponentsBuilder; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +@SpringBootTest +@WebAppConfiguration class EmailTemplateControllerTest { + private static final String prefix = "/api/emailTemplate"; + + private String token; + + private MockMvc mockMvc; + + @Autowired + private WebApplicationContext webApplicationContext; + + @Autowired + private TokenUtilsTest tokenUtilsTest; + + @Autowired + private RestTemplate restTemplate; @BeforeEach void setUp() { + token = tokenUtilsTest.getToken(); + mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext) + .apply(SecurityMockMvcConfigurers.springSecurity()) + .build(); } @AfterEach void tearDown() { + } @Test - void getEmailTemplateList() { + void getEmailTemplateList() throws Exception { + String api = prefix + "/getEmailTemplateList/1/10"; + + mockMvc.perform(MockMvcRequestBuilders + .get(api) + .header("token", token) + .contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE) + .param("type", "code")) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(result -> { + String contentAsString = result.getResponse().getContentAsString(); + JSONObject jsonObject = JSONObject.parseObject(contentAsString); + + if (jsonObject == null) { + throw new Exception(contentAsString); + } + System.out.println(jsonObject); + }); } @Test - void getEmailTypes() { + void getEmailTypes() throws Exception { + String api = prefix + "/getEmailTypes"; + + mockMvc.perform(MockMvcRequestBuilders.get(api).header("token", token)) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(result -> { + String contentAsString = result.getResponse().getContentAsString(); + JSONObject jsonObject = JSONObject.parseObject(contentAsString); + + if (jsonObject == null) { + throw new Exception(contentAsString); + } + + System.out.println(jsonObject); + }); } @Test - void addEmailTemplate() { + void addEmailTemplate() throws Exception { + String api = prefix + "/addEmailTemplate"; + + EmailTemplateAddDto dto = EmailTemplateAddDto.builder() + .emailUser(2L) + .body("哈哈哈") + .templateName("测试") + .subject("test") + .type(EmailTemplateEnums.NOTIFICATION.getType()) + .isDefault(false) + .build(); + + mockMvc.perform(MockMvcRequestBuilders + .post(api) + .header("token", token) + .content(JSONObject.toJSONString(dto)) + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(result -> { + String contentAsString = result.getResponse().getContentAsString(); + JSONObject jsonObject = JSONObject.parseObject(contentAsString); + + System.out.println(jsonObject); + }); + + getEmailTemplateList(); } @Test - void updateEmailTemplate() { + void updateEmailTemplate() throws Exception { + String api = prefix + "/updateEmailTemplate"; + String restTemplateApi = prefix + "/getEmailTemplateList/1/10"; + + String url = UriComponentsBuilder.fromUriString(restTemplateApi) + .queryParam("subject", "test") + .build() + .toUriString(); + + Result> result = restTemplate.exchange( + url, + HttpMethod.GET, + new HttpEntity<>(null), + new ParameterizedTypeReference>>() { + } + ).getBody(); + + if (result == null) throw new Exception(); + if (!result.getCode().equals(200)) throw new Exception(result.getMessage()); + if (result.getData().getList().isEmpty()) throw new Exception("没有测试数据"); + + EmailTemplateVo emailTemplateVo = result.getData().getList().get(0); + EmailTemplateUpdateDto emailTemplateUpdateDto = new EmailTemplateUpdateDto(); + BeanUtils.copyProperties(emailTemplateVo, emailTemplateUpdateDto); + + System.out.println(emailTemplateUpdateDto); + + emailTemplateUpdateDto.setBody(MD5.create().digestHex16(LocalDateTime.now().toString())); + mockMvc.perform(MockMvcRequestBuilders.put(api) + .header("token", token) + .content(JSON.toJSONString(emailTemplateUpdateDto)) + .contentType(MediaType.APPLICATION_JSON) + ) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(result1 -> { + String contentAsString = result1.getResponse().getContentAsString(); + var pageResultResult = JSONObject.parseObject(contentAsString, new TypeReference>>() { + }); + if (pageResultResult == null) throw new Exception(contentAsString); + if (!pageResultResult.getCode().equals(200)) throw new Exception(pageResultResult.getMessage()); + + System.out.println(pageResultResult); + }); + + result = restTemplate.exchange( + url, + HttpMethod.GET, + new HttpEntity<>(null), + new ParameterizedTypeReference>>() { + } + ).getBody(); + + if (result == null) throw new Exception(); + if (!result.getCode().equals(200)) throw new Exception(result.getMessage()); + emailTemplateVo = result.getData().getList().get(0); + if (!emailTemplateVo.getBody().equals(emailTemplateUpdateDto.getBody())) { + throw new Exception(emailTemplateUpdateDto.getBody()); + } } @Test - void deleteEmailTemplate() { + void deleteEmailTemplate() throws Exception { + String api = prefix + "/deleteEmailTemplate"; + List ids = new ArrayList<>(); + ids.add(1905180657917157378L); + mockMvc.perform(MockMvcRequestBuilders + .delete(api) + .header("token", token) + .contentType(MediaType.APPLICATION_JSON) + .content(JSON.toJSONString(ids))) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(result -> { + String contentAsString = result.getResponse().getContentAsString(); + JSONObject jsonObject = JSONObject.parseObject(contentAsString); + System.out.println(jsonObject); + }); } } \ No newline at end of file diff --git a/service/src/test/java/cn/bunny/services/controller/log/UserLoginLogControllerTest.java b/service/src/test/java/cn/bunny/services/controller/log/UserLoginLogControllerTest.java index 03a541c..e2481e9 100644 --- a/service/src/test/java/cn/bunny/services/controller/log/UserLoginLogControllerTest.java +++ b/service/src/test/java/cn/bunny/services/controller/log/UserLoginLogControllerTest.java @@ -18,7 +18,10 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.core.ParameterizedTypeReference; -import org.springframework.http.*; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers; import org.springframework.test.context.web.WebAppConfiguration; @@ -98,16 +101,11 @@ class UserLoginLogControllerTest { Map params = JSON.parseObject(JSON.toJSONString(dto), new TypeReference<>() { }); - HttpHeaders headers = new HttpHeaders(); - headers.set("token", token); - headers.setContentType(MediaType.APPLICATION_JSON); - HttpEntity> request = new HttpEntity<>(params, headers); - // 发送请求 ResponseEntity>> response = restTemplate.exchange( - "http://localhost:7070" + prefix + "/getUserLoginLogList/1/10", + prefix + "/getUserLoginLogList/1/10", HttpMethod.GET, - request, + new HttpEntity<>(params), new ParameterizedTypeReference<>() { } );