test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(用例管理): 修改同步需求未过滤已删除用例的问题

This commit is contained in:
guoyuqi 2024-09-10 16:10:47 +08:00 committed by Craftsman
parent 34f98bbb80
commit 0a3d9e360d
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseDemandMapper.xml
View File

@ -21,7 +21,7 @@
select functional_case_demand.id, functional_case_demand.demand_id, functional_case_demand.case_id select functional_case_demand.id, functional_case_demand.demand_id, functional_case_demand.case_id
from functional_case_demand from functional_case_demand
left join functional_case on functional_case.id = functional_case_demand.case_id left join functional_case on functional_case.id = functional_case_demand.case_id
where functional_case.project_id = #{projectId} and functional_case_demand.demand_platform=#{platform} where functional_case.project_id = #{projectId} and functional_case_demand.demand_platform=#{platform} and functional_case.deleted = false
</select> </select>
<select id="selectDemandIdsByCaseId" resultType="java.lang.String"> <select id="selectDemandIdsByCaseId" resultType="java.lang.String">

24
backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseDemandControllerTests.java
View File

@ -45,6 +45,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.UUID;
import static org.mockserver.model.HttpRequest.request; import static org.mockserver.model.HttpRequest.request;
import static org.mockserver.model.HttpResponse.response; import static org.mockserver.model.HttpResponse.response;
@ -131,6 +132,7 @@ public class FunctionalCaseDemandControllerTests extends BaseTest {
demandList = new ArrayList<>(); demandList = new ArrayList<>();
demandDTO = new DemandDTO(); demandDTO = new DemandDTO();
demandDTO.setDemandName("手动加入孩子"); demandDTO.setDemandName("手动加入孩子");
demandDTO.setDemandId("001001");
demandDTO.setParent("001"); demandDTO.setParent("001");
demandList.add(demandDTO); demandList.add(demandDTO);
functionalCaseDemandRequest.setDemandList(demandList); functionalCaseDemandRequest.setDemandList(demandList);
@ -408,8 +410,23 @@ public class FunctionalCaseDemandControllerTests extends BaseTest {
public void cancelDemand() throws Exception { public void cancelDemand() throws Exception {
FunctionalCaseDemandExample functionalCaseDemandExample = new FunctionalCaseDemandExample(); FunctionalCaseDemandExample functionalCaseDemandExample = new FunctionalCaseDemandExample();
functionalCaseDemandExample.createCriteria().andCaseIdEqualTo("DEMAND_TEST_FUNCTIONAL_CASE_ID"); functionalCaseDemandExample.createCriteria().andCaseIdEqualTo("DEMAND_TEST_FUNCTIONAL_CASE_ID");
List<FunctionalCaseDemand> beforeList = functionalCaseDemandMapper.selectByExample(functionalCaseDemandExample);
String id = getId("DEMAND_TEST_FUNCTIONAL_CASE_ID"); String id = getId("DEMAND_TEST_FUNCTIONAL_CASE_ID");
FunctionalCaseDemand functionalCaseDemandInDb = functionalCaseDemandMapper.selectByPrimaryKey(id);
FunctionalCaseDemand functionalCaseDemand = new FunctionalCaseDemand();
functionalCaseDemand.setCaseId("DEMAND_TEST_FUNCTIONAL_CASE_ID");
functionalCaseDemand.setParent(functionalCaseDemandInDb.getDemandId());
functionalCaseDemand.setDemandId("qwerr");
functionalCaseDemand.setDemandUrl("dddd");
functionalCaseDemand.setDemandPlatform("Metersphere");
functionalCaseDemand.setId(UUID.randomUUID().toString());
functionalCaseDemand.setWithParent(false);
functionalCaseDemand.setDemandName("加一下副需求");
functionalCaseDemand.setUpdateTime(System.currentTimeMillis());
functionalCaseDemand.setCreateTime(System.currentTimeMillis());
functionalCaseDemand.setCreateUser("admin");
functionalCaseDemand.setUpdateUser("admin");
functionalCaseDemandMapper.insert(functionalCaseDemand);
List<FunctionalCaseDemand> beforeList = functionalCaseDemandMapper.selectByExample(functionalCaseDemandExample);
mockMvc.perform(MockMvcRequestBuilders.get(URL_DEMAND_CANCEL+id).header(SessionConstants.HEADER_TOKEN, sessionId) mockMvc.perform(MockMvcRequestBuilders.get(URL_DEMAND_CANCEL+id).header(SessionConstants.HEADER_TOKEN, sessionId)
.header(SessionConstants.CSRF_TOKEN, csrfToken) .header(SessionConstants.CSRF_TOKEN, csrfToken)
.contentType(MediaType.APPLICATION_JSON)) .contentType(MediaType.APPLICATION_JSON))
@ -419,6 +436,11 @@ public class FunctionalCaseDemandControllerTests extends BaseTest {
List<FunctionalCaseDemand> after = functionalCaseDemandMapper.selectByExample(functionalCaseDemandExample); List<FunctionalCaseDemand> after = functionalCaseDemandMapper.selectByExample(functionalCaseDemandExample);
Assertions.assertTrue(beforeList.size()>after.size()); Assertions.assertTrue(beforeList.size()>after.size());
checkLog("DEMAND_TEST_FUNCTIONAL_CASE_ID", OperationLogType.DISASSOCIATE); checkLog("DEMAND_TEST_FUNCTIONAL_CASE_ID", OperationLogType.DISASSOCIATE);
id = getId("DEMAND_TEST_FUNCTIONAL_CASE_ID");
mockMvc.perform(MockMvcRequestBuilders.get(URL_DEMAND_CANCEL+id).header(SessionConstants.HEADER_TOKEN, sessionId)
.header(SessionConstants.CSRF_TOKEN, csrfToken)
.contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isOk());
} }
@Test @Test