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:
chenjianxing 2022-08-16 14:40:07 +08:00 committed by jianxing
parent 1e802c10b9
commit 13ba8c56e4
17 changed files with 46 additions and 567 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/base/domain/TestCase.java
View File

@ -33,8 +33,6 @@ public class TestCase implements Serializable {
private Integer num;
private String otherTestName;
private String reviewStatus;
private String tags;

70
backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java
View File

@ -1044,76 +1044,6 @@ public class TestCaseExample {
return (Criteria) this;
}
public Criteria andOtherTestNameIsNull() {
addCriterion("other_test_name is null");
return (Criteria) this;
}
public Criteria andOtherTestNameIsNotNull() {
addCriterion("other_test_name is not null");
return (Criteria) this;
}
public Criteria andOtherTestNameEqualTo(String value) {
addCriterion("other_test_name =", value, "otherTestName");
return (Criteria) this;
}
public Criteria andOtherTestNameNotEqualTo(String value) {
addCriterion("other_test_name <>", value, "otherTestName");
return (Criteria) this;
}
public Criteria andOtherTestNameGreaterThan(String value) {
addCriterion("other_test_name >", value, "otherTestName");
return (Criteria) this;
}
public Criteria andOtherTestNameGreaterThanOrEqualTo(String value) {
addCriterion("other_test_name >=", value, "otherTestName");
return (Criteria) this;
}
public Criteria andOtherTestNameLessThan(String value) {
addCriterion("other_test_name <", value, "otherTestName");
return (Criteria) this;
}
public Criteria andOtherTestNameLessThanOrEqualTo(String value) {
addCriterion("other_test_name <=", value, "otherTestName");
return (Criteria) this;
}
public Criteria andOtherTestNameLike(String value) {
addCriterion("other_test_name like", value, "otherTestName");
return (Criteria) this;
}
public Criteria andOtherTestNameNotLike(String value) {
addCriterion("other_test_name not like", value, "otherTestName");
return (Criteria) this;
}
public Criteria andOtherTestNameIn(List<String> values) {
addCriterion("other_test_name in", values, "otherTestName");
return (Criteria) this;
}
public Criteria andOtherTestNameNotIn(List<String> values) {
addCriterion("other_test_name not in", values, "otherTestName");
return (Criteria) this;
}
public Criteria andOtherTestNameBetween(String value1, String value2) {
addCriterion("other_test_name between", value1, value2, "otherTestName");
return (Criteria) this;
}
public Criteria andOtherTestNameNotBetween(String value1, String value2) {
addCriterion("other_test_name not between", value1, value2, "otherTestName");
return (Criteria) this;
}
public Criteria andReviewStatusIsNull() {
addCriterion("review_status is null");
return (Criteria) this;

4
backend/src/main/java/io/metersphere/base/domain/TestPlan.java
View File

@ -19,10 +19,6 @@ public class TestPlan implements Serializable {
private String stage;
private String testCaseMatchRule;
private String executorMatchRule;
private Long createTime;
private Long updateTime;

140
backend/src/main/java/io/metersphere/base/domain/TestPlanExample.java
View File

@ -594,146 +594,6 @@ public class TestPlanExample {
return (Criteria) this;
}
public Criteria andTestCaseMatchRuleIsNull() {
addCriterion("test_case_match_rule is null");
return (Criteria) this;
}
public Criteria andTestCaseMatchRuleIsNotNull() {
addCriterion("test_case_match_rule is not null");
return (Criteria) this;
}
public Criteria andTestCaseMatchRuleEqualTo(String value) {
addCriterion("test_case_match_rule =", value, "testCaseMatchRule");
return (Criteria) this;
}
public Criteria andTestCaseMatchRuleNotEqualTo(String value) {
addCriterion("test_case_match_rule <>", value, "testCaseMatchRule");
return (Criteria) this;
}
public Criteria andTestCaseMatchRuleGreaterThan(String value) {
addCriterion("test_case_match_rule >", value, "testCaseMatchRule");
return (Criteria) this;
}
public Criteria andTestCaseMatchRuleGreaterThanOrEqualTo(String value) {
addCriterion("test_case_match_rule >=", value, "testCaseMatchRule");
return (Criteria) this;
}
public Criteria andTestCaseMatchRuleLessThan(String value) {
addCriterion("test_case_match_rule <", value, "testCaseMatchRule");
return (Criteria) this;
}
public Criteria andTestCaseMatchRuleLessThanOrEqualTo(String value) {
addCriterion("test_case_match_rule <=", value, "testCaseMatchRule");
return (Criteria) this;
}
public Criteria andTestCaseMatchRuleLike(String value) {
addCriterion("test_case_match_rule like", value, "testCaseMatchRule");
return (Criteria) this;
}
public Criteria andTestCaseMatchRuleNotLike(String value) {
addCriterion("test_case_match_rule not like", value, "testCaseMatchRule");
return (Criteria) this;
}
public Criteria andTestCaseMatchRuleIn(List<String> values) {
addCriterion("test_case_match_rule in", values, "testCaseMatchRule");
return (Criteria) this;
}
public Criteria andTestCaseMatchRuleNotIn(List<String> values) {
addCriterion("test_case_match_rule not in", values, "testCaseMatchRule");
return (Criteria) this;
}
public Criteria andTestCaseMatchRuleBetween(String value1, String value2) {
addCriterion("test_case_match_rule between", value1, value2, "testCaseMatchRule");
return (Criteria) this;
}
public Criteria andTestCaseMatchRuleNotBetween(String value1, String value2) {
addCriterion("test_case_match_rule not between", value1, value2, "testCaseMatchRule");
return (Criteria) this;
}
public Criteria andExecutorMatchRuleIsNull() {
addCriterion("executor_match_rule is null");
return (Criteria) this;
}
public Criteria andExecutorMatchRuleIsNotNull() {
addCriterion("executor_match_rule is not null");
return (Criteria) this;
}
public Criteria andExecutorMatchRuleEqualTo(String value) {
addCriterion("executor_match_rule =", value, "executorMatchRule");
return (Criteria) this;
}
public Criteria andExecutorMatchRuleNotEqualTo(String value) {
addCriterion("executor_match_rule <>", value, "executorMatchRule");
return (Criteria) this;
}
public Criteria andExecutorMatchRuleGreaterThan(String value) {
addCriterion("executor_match_rule >", value, "executorMatchRule");
return (Criteria) this;
}
public Criteria andExecutorMatchRuleGreaterThanOrEqualTo(String value) {
addCriterion("executor_match_rule >=", value, "executorMatchRule");
return (Criteria) this;
}
public Criteria andExecutorMatchRuleLessThan(String value) {
addCriterion("executor_match_rule <", value, "executorMatchRule");
return (Criteria) this;
}
public Criteria andExecutorMatchRuleLessThanOrEqualTo(String value) {
addCriterion("executor_match_rule <=", value, "executorMatchRule");
return (Criteria) this;
}
public Criteria andExecutorMatchRuleLike(String value) {
addCriterion("executor_match_rule like", value, "executorMatchRule");
return (Criteria) this;
}
public Criteria andExecutorMatchRuleNotLike(String value) {
addCriterion("executor_match_rule not like", value, "executorMatchRule");
return (Criteria) this;
}
public Criteria andExecutorMatchRuleIn(List<String> values) {
addCriterion("executor_match_rule in", values, "executorMatchRule");
return (Criteria) this;
}
public Criteria andExecutorMatchRuleNotIn(List<String> values) {
addCriterion("executor_match_rule not in", values, "executorMatchRule");
return (Criteria) this;
}
public Criteria andExecutorMatchRuleBetween(String value1, String value2) {
addCriterion("executor_match_rule between", value1, value2, "executorMatchRule");
return (Criteria) this;
}
public Criteria andExecutorMatchRuleNotBetween(String value1, String value2) {
addCriterion("executor_match_rule not between", value1, value2, "executorMatchRule");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("create_time is null");
return (Criteria) this;

59
backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml
View File

@ -16,7 +16,6 @@
<result column="update_time" jdbcType="BIGINT" property="updateTime" />
<result column="sort" jdbcType="INTEGER" property="sort" />
<result column="num" jdbcType="INTEGER" property="num" />
<result column="other_test_name" jdbcType="VARCHAR" property="otherTestName" />
<result column="review_status" jdbcType="VARCHAR" property="reviewStatus" />
<result column="tags" jdbcType="VARCHAR" property="tags" />
<result column="demand_id" jdbcType="VARCHAR" property="demandId" />
@ -103,9 +102,9 @@
</sql>
<sql id="Base_Column_List">
id, node_id, test_id, node_path, project_id, `name`, `type`, maintainer, priority,
`method`, create_time, update_time, sort, num, other_test_name, review_status, tags,
demand_id, demand_name, `status`, step_model, custom_num, create_user, original_status,
delete_time, delete_user_id, `order`, case_public, version_id, ref_id, latest, last_execute_result
`method`, create_time, update_time, sort, num, review_status, tags, demand_id, demand_name,
`status`, step_model, custom_num, create_user, original_status, delete_time, delete_user_id,
`order`, case_public, version_id, ref_id, latest, last_execute_result
</sql>
<sql id="Blob_Column_List">
prerequisite, remark, steps, step_description, expected_result, custom_fields
@ -163,28 +162,28 @@
node_path, project_id, `name`,
`type`, maintainer, priority,
`method`, create_time, update_time,
sort, num, other_test_name,
review_status, tags, demand_id,
demand_name, `status`, step_model,
custom_num, create_user, original_status,
delete_time, delete_user_id, `order`,
case_public, version_id, ref_id,
latest, last_execute_result, prerequisite,
remark, steps, step_description,
expected_result, custom_fields)
sort, num, review_status,
tags, demand_id, demand_name,
`status`, step_model, custom_num,
create_user, original_status, delete_time,
delete_user_id, `order`, case_public,
version_id, ref_id, latest,
last_execute_result, prerequisite, remark,
steps, step_description, expected_result,
custom_fields)
values (#{id,jdbcType=VARCHAR}, #{nodeId,jdbcType=VARCHAR}, #{testId,jdbcType=VARCHAR},
#{nodePath,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
#{type,jdbcType=VARCHAR}, #{maintainer,jdbcType=VARCHAR}, #{priority,jdbcType=VARCHAR},
#{method,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT},
#{sort,jdbcType=INTEGER}, #{num,jdbcType=INTEGER}, #{otherTestName,jdbcType=VARCHAR},
#{reviewStatus,jdbcType=VARCHAR}, #{tags,jdbcType=VARCHAR}, #{demandId,jdbcType=VARCHAR},
#{demandName,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{stepModel,jdbcType=VARCHAR},
#{customNum,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{originalStatus,jdbcType=VARCHAR},
#{deleteTime,jdbcType=BIGINT}, #{deleteUserId,jdbcType=VARCHAR}, #{order,jdbcType=BIGINT},
#{casePublic,jdbcType=BIT}, #{versionId,jdbcType=VARCHAR}, #{refId,jdbcType=VARCHAR},
#{latest,jdbcType=BIT}, #{lastExecuteResult,jdbcType=VARCHAR}, #{prerequisite,jdbcType=LONGVARCHAR},
#{remark,jdbcType=LONGVARCHAR}, #{steps,jdbcType=LONGVARCHAR}, #{stepDescription,jdbcType=LONGVARCHAR},
#{expectedResult,jdbcType=LONGVARCHAR}, #{customFields,jdbcType=LONGVARCHAR})
#{sort,jdbcType=INTEGER}, #{num,jdbcType=INTEGER}, #{reviewStatus,jdbcType=VARCHAR},
#{tags,jdbcType=VARCHAR}, #{demandId,jdbcType=VARCHAR}, #{demandName,jdbcType=VARCHAR},
#{status,jdbcType=VARCHAR}, #{stepModel,jdbcType=VARCHAR}, #{customNum,jdbcType=VARCHAR},
#{createUser,jdbcType=VARCHAR}, #{originalStatus,jdbcType=VARCHAR}, #{deleteTime,jdbcType=BIGINT},
#{deleteUserId,jdbcType=VARCHAR}, #{order,jdbcType=BIGINT}, #{casePublic,jdbcType=BIT},
#{versionId,jdbcType=VARCHAR}, #{refId,jdbcType=VARCHAR}, #{latest,jdbcType=BIT},
#{lastExecuteResult,jdbcType=VARCHAR}, #{prerequisite,jdbcType=LONGVARCHAR}, #{remark,jdbcType=LONGVARCHAR},
#{steps,jdbcType=LONGVARCHAR}, #{stepDescription,jdbcType=LONGVARCHAR}, #{expectedResult,jdbcType=LONGVARCHAR},
#{customFields,jdbcType=LONGVARCHAR})
</insert>
<insert id="insertSelective" parameterType="io.metersphere.base.domain.TestCaseWithBLOBs">
insert into test_case
@ -231,9 +230,6 @@
<if test="num != null">
num,
</if>
<if test="otherTestName != null">
other_test_name,
</if>
<if test="reviewStatus != null">
review_status,
</if>
@ -347,9 +343,6 @@
<if test="num != null">
#{num,jdbcType=INTEGER},
</if>
<if test="otherTestName != null">
#{otherTestName,jdbcType=VARCHAR},
</if>
<if test="reviewStatus != null">
#{reviewStatus,jdbcType=VARCHAR},
</if>
@ -472,9 +465,6 @@
<if test="record.num != null">
num = #{record.num,jdbcType=INTEGER},
</if>
<if test="record.otherTestName != null">
other_test_name = #{record.otherTestName,jdbcType=VARCHAR},
</if>
<if test="record.reviewStatus != null">
review_status = #{record.reviewStatus,jdbcType=VARCHAR},
</if>
@ -565,7 +555,6 @@
update_time = #{record.updateTime,jdbcType=BIGINT},
sort = #{record.sort,jdbcType=INTEGER},
num = #{record.num,jdbcType=INTEGER},
other_test_name = #{record.otherTestName,jdbcType=VARCHAR},
review_status = #{record.reviewStatus,jdbcType=VARCHAR},
tags = #{record.tags,jdbcType=VARCHAR},
demand_id = #{record.demandId,jdbcType=VARCHAR},
@ -609,7 +598,6 @@
update_time = #{record.updateTime,jdbcType=BIGINT},
sort = #{record.sort,jdbcType=INTEGER},
num = #{record.num,jdbcType=INTEGER},
other_test_name = #{record.otherTestName,jdbcType=VARCHAR},
review_status = #{record.reviewStatus,jdbcType=VARCHAR},
tags = #{record.tags,jdbcType=VARCHAR},
demand_id = #{record.demandId,jdbcType=VARCHAR},
@ -673,9 +661,6 @@
<if test="num != null">
num = #{num,jdbcType=INTEGER},
</if>
<if test="otherTestName != null">
other_test_name = #{otherTestName,jdbcType=VARCHAR},
</if>
<if test="reviewStatus != null">
review_status = #{reviewStatus,jdbcType=VARCHAR},
</if>
@ -763,7 +748,6 @@
update_time = #{updateTime,jdbcType=BIGINT},
sort = #{sort,jdbcType=INTEGER},
num = #{num,jdbcType=INTEGER},
other_test_name = #{otherTestName,jdbcType=VARCHAR},
review_status = #{reviewStatus,jdbcType=VARCHAR},
tags = #{tags,jdbcType=VARCHAR},
demand_id = #{demandId,jdbcType=VARCHAR},
@ -804,7 +788,6 @@
update_time = #{updateTime,jdbcType=BIGINT},
sort = #{sort,jdbcType=INTEGER},
num = #{num,jdbcType=INTEGER},
other_test_name = #{otherTestName,jdbcType=VARCHAR},
review_status = #{reviewStatus,jdbcType=VARCHAR},
tags = #{tags,jdbcType=VARCHAR},
demand_id = #{demandId,jdbcType=VARCHAR},

67
backend/src/main/java/io/metersphere/base/mapper/TestPlanMapper.xml
View File

@ -9,8 +9,6 @@
<result column="description" jdbcType="VARCHAR" property="description" />
<result column="status" jdbcType="VARCHAR" property="status" />
<result column="stage" jdbcType="VARCHAR" property="stage" />
<result column="test_case_match_rule" jdbcType="VARCHAR" property="testCaseMatchRule" />
<result column="executor_match_rule" jdbcType="VARCHAR" property="executorMatchRule" />
<result column="create_time" jdbcType="BIGINT" property="createTime" />
<result column="update_time" jdbcType="BIGINT" property="updateTime" />
<result column="planned_start_time" jdbcType="BIGINT" property="plannedStartTime" />
@ -88,10 +86,9 @@
</where>
</sql>
<sql id="Base_Column_List">
id, workspace_id, report_id, `name`, description, `status`, stage, test_case_match_rule,
executor_match_rule, create_time, update_time, planned_start_time, planned_end_time,
actual_start_time, actual_end_time, creator, project_id, execution_times, automatic_status_update,
repeat_case
id, workspace_id, report_id, `name`, description, `status`, stage, create_time, update_time,
planned_start_time, planned_end_time, actual_start_time, actual_end_time, creator,
project_id, execution_times, automatic_status_update, repeat_case
</sql>
<sql id="Blob_Column_List">
tags, report_summary, report_config, run_mode_config
@ -147,22 +144,20 @@
<insert id="insert" parameterType="io.metersphere.base.domain.TestPlanWithBLOBs">
insert into test_plan (id, workspace_id, report_id,
`name`, description, `status`,
stage, test_case_match_rule, executor_match_rule,
create_time, update_time, planned_start_time,
planned_end_time, actual_start_time, actual_end_time,
creator, project_id, execution_times,
automatic_status_update, repeat_case, tags,
report_summary, report_config, run_mode_config
)
stage, create_time, update_time,
planned_start_time, planned_end_time, actual_start_time,
actual_end_time, creator, project_id,
execution_times, automatic_status_update, repeat_case,
tags, report_summary, report_config,
run_mode_config)
values (#{id,jdbcType=VARCHAR}, #{workspaceId,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR},
#{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR},
#{stage,jdbcType=VARCHAR}, #{testCaseMatchRule,jdbcType=VARCHAR}, #{executorMatchRule,jdbcType=VARCHAR},
#{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{plannedStartTime,jdbcType=BIGINT},
#{plannedEndTime,jdbcType=BIGINT}, #{actualStartTime,jdbcType=BIGINT}, #{actualEndTime,jdbcType=BIGINT},
#{creator,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{executionTimes,jdbcType=INTEGER},
#{automaticStatusUpdate,jdbcType=BIT}, #{repeatCase,jdbcType=BIT}, #{tags,jdbcType=LONGVARCHAR},
#{reportSummary,jdbcType=LONGVARCHAR}, #{reportConfig,jdbcType=LONGVARCHAR}, #{runModeConfig,jdbcType=LONGVARCHAR}
)
#{stage,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT},
#{plannedStartTime,jdbcType=BIGINT}, #{plannedEndTime,jdbcType=BIGINT}, #{actualStartTime,jdbcType=BIGINT},
#{actualEndTime,jdbcType=BIGINT}, #{creator,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR},
#{executionTimes,jdbcType=INTEGER}, #{automaticStatusUpdate,jdbcType=BIT}, #{repeatCase,jdbcType=BIT},
#{tags,jdbcType=LONGVARCHAR}, #{reportSummary,jdbcType=LONGVARCHAR}, #{reportConfig,jdbcType=LONGVARCHAR},
#{runModeConfig,jdbcType=LONGVARCHAR})
</insert>
<insert id="insertSelective" parameterType="io.metersphere.base.domain.TestPlanWithBLOBs">
insert into test_plan
@ -188,12 +183,6 @@
<if test="stage != null">
stage,
</if>
<if test="testCaseMatchRule != null">
test_case_match_rule,
</if>
<if test="executorMatchRule != null">
executor_match_rule,
</if>
<if test="createTime != null">
create_time,
</if>
@ -262,12 +251,6 @@
<if test="stage != null">
#{stage,jdbcType=VARCHAR},
</if>
<if test="testCaseMatchRule != null">
#{testCaseMatchRule,jdbcType=VARCHAR},
</if>
<if test="executorMatchRule != null">
#{executorMatchRule,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=BIGINT},
</if>
@ -345,12 +328,6 @@
<if test="record.stage != null">
stage = #{record.stage,jdbcType=VARCHAR},
</if>
<if test="record.testCaseMatchRule != null">
test_case_match_rule = #{record.testCaseMatchRule,jdbcType=VARCHAR},
</if>
<if test="record.executorMatchRule != null">
executor_match_rule = #{record.executorMatchRule,jdbcType=VARCHAR},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=BIGINT},
</if>
@ -410,8 +387,6 @@
description = #{record.description,jdbcType=VARCHAR},
`status` = #{record.status,jdbcType=VARCHAR},
stage = #{record.stage,jdbcType=VARCHAR},
test_case_match_rule = #{record.testCaseMatchRule,jdbcType=VARCHAR},
executor_match_rule = #{record.executorMatchRule,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=BIGINT},
update_time = #{record.updateTime,jdbcType=BIGINT},
planned_start_time = #{record.plannedStartTime,jdbcType=BIGINT},
@ -440,8 +415,6 @@
description = #{record.description,jdbcType=VARCHAR},
`status` = #{record.status,jdbcType=VARCHAR},
stage = #{record.stage,jdbcType=VARCHAR},
test_case_match_rule = #{record.testCaseMatchRule,jdbcType=VARCHAR},
executor_match_rule = #{record.executorMatchRule,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=BIGINT},
update_time = #{record.updateTime,jdbcType=BIGINT},
planned_start_time = #{record.plannedStartTime,jdbcType=BIGINT},
@ -478,12 +451,6 @@
<if test="stage != null">
stage = #{stage,jdbcType=VARCHAR},
</if>
<if test="testCaseMatchRule != null">
test_case_match_rule = #{testCaseMatchRule,jdbcType=VARCHAR},
</if>
<if test="executorMatchRule != null">
executor_match_rule = #{executorMatchRule,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=BIGINT},
</if>
@ -540,8 +507,6 @@
description = #{description,jdbcType=VARCHAR},
`status` = #{status,jdbcType=VARCHAR},
stage = #{stage,jdbcType=VARCHAR},
test_case_match_rule = #{testCaseMatchRule,jdbcType=VARCHAR},
executor_match_rule = #{executorMatchRule,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=BIGINT},
update_time = #{updateTime,jdbcType=BIGINT},
planned_start_time = #{plannedStartTime,jdbcType=BIGINT},
@ -567,8 +532,6 @@
description = #{description,jdbcType=VARCHAR},
`status` = #{status,jdbcType=VARCHAR},
stage = #{stage,jdbcType=VARCHAR},
test_case_match_rule = #{testCaseMatchRule,jdbcType=VARCHAR},
executor_match_rule = #{executorMatchRule,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=BIGINT},
update_time = #{updateTime,jdbcType=BIGINT},
planned_start_time = #{plannedStartTime,jdbcType=BIGINT},

9
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
View File

@ -262,7 +262,7 @@
test_case.id, test_case.node_id, test_case.node_path, test_case.project_id, test_case.`name`,
test_case.`type`, test_case.maintainer, test_case.priority, test_case.`method`,
test_case.create_time, test_case.update_time, test_case.test_id, test_case.sort, test_case.num,
test_case.other_test_name, test_case.review_status, test_case.tags,
test_case.review_status, test_case.tags,
test_case.demand_id, test_case.demand_name, test_case.`status`,
test_case.custom_num, test_case.step_model, test_case.create_user,
test_case.ref_id
@ -286,7 +286,7 @@
test_case.version_id,
test_case.`type`, test_case.maintainer, test_case.priority, test_case.`method`,
test_case.create_time, test_case.update_time, test_case.test_id, test_case.sort, test_case.num,
test_case.other_test_name, test_case.review_status, test_case.tags,
test_case.review_status, test_case.tags,
test_case.demand_id, test_case.demand_name, test_case.`status`,
test_case.custom_num, test_case.step_model, test_case.create_user,
test_case.custom_fields,test_case.case_public ,
@ -425,7 +425,7 @@
test_case.id, test_case.node_id, test_case.node_path, test_case.project_id, test_case.`name`,
test_case.`type`, test_case.maintainer, test_case.priority, test_case.`method`,
test_case.create_time, test_case.update_time, test_case.test_id, test_case.sort, test_case.num,
test_case.other_test_name, test_case.review_status, test_case.tags,
test_case.review_status, test_case.tags,
test_case.demand_id, test_case.demand_name, test_case.`status`,
test_case.custom_num, test_case.step_model, test_case.create_user,
test_case.custom_fields,test_case.case_public,test_case.ref_id ,test_case.`order`
@ -1264,9 +1264,6 @@
<if test="record.num != null">
num = #{record.num,jdbcType=INTEGER},
</if>
<if test="record.otherTestName != null">
other_test_name = #{record.otherTestName,jdbcType=VARCHAR},
</if>
<if test="record.reviewStatus != null">
review_status = #{record.reviewStatus,jdbcType=VARCHAR},
</if>

3
backend/src/main/java/io/metersphere/log/vo/track/TestCaseReference.java
View File

@ -19,7 +19,6 @@ public class TestCaseReference {
testCaseColumns.put("remark", "备注");
testCaseColumns.put("customNum", "ID");
testCaseColumns.put("steps", "用例步骤");
testCaseColumns.put("other_test_name", "其他名称");
testCaseColumns.put("review_status", "评审状态");
testCaseColumns.put("tags", "标签");
testCaseColumns.put("demand_name", "需求名称");
@ -33,4 +32,4 @@ public class TestCaseReference {
testCaseColumns.put("ms-dff-col", "tags,steps");
}
}
}

6
backend/src/main/resources/db/migration/V129__2.1.0__release.sql
View File

@ -62,3 +62,9 @@ ALTER TABLE `api_scenario_report`
ADD INDEX index_relevance_test_plan_report_id (`relevance_test_plan_report_id`);
ALTER TABLE `load_test_report`
ADD INDEX index_relevance_test_plan_report_id (`relevance_test_plan_report_id`);
-- V129__2-1-0_drop_useless_column
--
ALTER TABLE test_case DROP COLUMN other_test_name;
ALTER TABLE test_plan DROP COLUMN test_case_match_rule;
ALTER TABLE test_plan DROP COLUMN executor_match_rule;

4
frontend/src/business/components/project/notification/track/TestCaseNotification.vue
View File

@ -130,10 +130,6 @@ export default {
label:this.$t('test_track.case.number'),
value:'num',
},
{
label:this.$t('test_track.other_test_name'),
value:'otherTestName',
},
{
label:this.$t('test_track.review.review_status'),
value:'reviewStatus',

6
frontend/src/business/components/track/case/TestCase.vue
View File

@ -53,7 +53,6 @@
:version-enable="versionEnable"
@testCaseEdit="editTestCase"
@testCaseCopy="copyTestCase"
@testCaseDetail="showTestCaseDetail"
@getTrashList="getTrashList"
@getPublicList="getPublicList"
@refresh="refreshTrashNode"
@ -77,7 +76,6 @@
@testCaseEdit="editTestCase"
@testCaseEditShow="editTestCaseShow"
@testCaseCopy="copyTestCase"
@testCaseDetail="showTestCaseDetail"
@getTrashList="getTrashList"
@getPublicList="getPublicList"
@refresh="refresh"
@ -112,7 +110,6 @@
@refreshTable="refresh"
@testCaseEdit="editTestCase"
@testCaseCopy="copyTestCase"
@testCaseDetail="showTestCaseDetail"
@getTrashList="getTrashList"
@getPublicList="getPublicList"
@refresh="refresh"
@ -689,9 +686,6 @@ export default {
testCase.isCopy = true;
this.addTab({name: 'edit', testCaseInfo: testCase});
},
showTestCaseDetail(testCase) {
this.testCaseReadOnly = true;
},
refresh(data) {
if (this.selectNodeIds && this.selectNodeIds.length > 0) {
this.$store.commit('setTestCaseSelectNode', {});

234
frontend/src/business/components/track/case/components/TestCaseDetail.vue
View File

@ -1,234 +0,0 @@
<template>
<el-row :gutter="5">
<el-col :span="15">
<el-card class="case-detail-form-card">
<el-form :model="form" ref="caseFrom" v-loading="result.loading">
<el-row>
<el-col :span="10" :offset="1">
<el-form-item
:placeholder="$t('test_track.case.input_name')"
:label="$t('test_track.case.name')"
:label-width="formLabelWidth"
prop="name">
<el-input :disabled="readOnly" v-model="testCase.name"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('test_track.case.module')" :label-width="formLabelWidth" prop="module">
<el-input :disabled="readOnly" v-model="testCase.nodePath"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10" :offset="1">
<el-form-item :label="$t('test_track.case.maintainer')" :label-width="formLabelWidth" prop="maintainer">
<el-select :disabled="readOnly" v-model="testCase.maintainer"
:placeholder="$t('test_track.case.input_maintainer')" filterable>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('test_track.case.priority')" :label-width="formLabelWidth" prop="priority">
<el-select :disabled="readOnly" v-model="testCase.priority" clearable
:placeholder="$t('test_track.case.input_priority')">
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10" :offset="1">
<el-form-item :label="$t('test_track.case.type')" :label-width="formLabelWidth" prop="type">
<el-select :disabled="readOnly" v-model="testCase.type"
:placeholder="$t('test_track.case.input_type')">
<el-option :label="$t('commons.functional')" value="functional"></el-option>
<el-option :label="$t('commons.performance')" value="performance"></el-option>
<el-option :label="$t('commons.api')" value="api"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('test_track.case.method')" :label-width="formLabelWidth" prop="method">
<el-select :disabled="readOnly" v-model="testCase.method" :placeholder="$t('test_track.case.input_method')">
<el-option :label="$t('test_track.case.auto')" value="auto"></el-option>
<el-option :label="$t('test_track.case.manual')" value="manual"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="testCase.method && testCase.method == 'auto'">
<el-col :span="10" :offset="1">
<el-form-item :label="$t('test_track.case.relate_test')" :label-width="formLabelWidth" prop="testId">
<el-select filterable :disabled="readOnly" v-model="testCase.testId"
:placeholder="$t('test_track.case.input_type')">
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" v-if="testCase.testId=='other'">
<el-form-item :label="$t('test_track.case.test_name')" :label-width="formLabelWidth" prop="testId">
<el-input v-model="testCase.otherTestName" :placeholder="$t('test_track.case.input_test_case')"
:disabled="readOnly"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row style="margin-top: 15px;">
<el-col :offset="1">{{ $t('test_track.case.prerequisite') }}:</el-col>
</el-row>
<el-row type="flex" justify="center" style="margin-top: 10px;">
<el-col :span="22">
<el-form-item prop="prerequisite">
<el-input :disabled="readOnly" v-model="testCase.prerequisite"
type="textarea"
:autosize="{ minRows: 2, maxRows: 4}"
:rows="2"
:placeholder="$t('test_track.case.input_prerequisite')"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="testCase.method && testCase.method != 'auto'" style="margin-bottom: 10px">
<el-col :offset="1">{{ $t('test_track.case.steps') }}:</el-col>
</el-row>
<el-row v-if="testCase.method && testCase.method != 'auto'" type="flex" justify="center">
<el-col :span="22">
<el-table
v-if="isStepTableAlive"
:data="JSON.parse(testCase.steps)"
class="tb-edit"
border
size="mini"
:default-sort="{prop: 'num', order: 'ascending'}"
highlight-current-row>
<el-table-column :label="$t('test_track.case.number')" prop="num" min-width="15%"></el-table-column>
<el-table-column :label="$t('test_track.case.step_desc')" prop="desc" min-width="35%">
<template v-slot:default="scope">
<el-input
class="table-edit-input"
size="mini"
:disabled="readOnly"
type="textarea"
:autosize="{ minRows: 1, maxRows: 6}"
:rows="2"
v-model="scope.row.desc"
:placeholder="$t('commons.input_content')"
clearable/>
</template>
</el-table-column>
<el-table-column :label="$t('test_track.case.expected_results')" prop="result" min-width="35%">
<template v-slot:default="scope">
<el-input
class="table-edit-input"
size="mini"
:disabled="readOnly"
type="textarea"
:autosize="{ minRows: 1, maxRows: 6}"
:rows="2"
v-model="scope.row.result"
:placeholder="$t('commons.input_content')"
clearable/>
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
<el-row style="margin-top: 15px;margin-bottom: 10px">
<el-col :offset="1">{{ $t('commons.remark') }}:</el-col>
</el-row>
<el-row type="flex" justify="center">
<el-col :span="22">
<el-form-item prop="remark">
<el-input v-model="testCase.remark"
:autosize="{ minRows: 2, maxRows: 4}"
type="textarea"
:disabled="readOnly"
:rows="2"
:placeholder="$t('commons.input_content')"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
</el-col>
<el-col :span="9">
<case-comment :case-id="testCaseId" :read-only="true" class="case-detail-comment"/>
</el-col>
</el-row>
</template>
<script>
import CaseComment from "@/business/components/track/case/components/CaseComment";
export default {
name: "TestCaseDetail",
components: {CaseComment},
data() {
return {
result: {},
testCase: {},
dialogFormVisible: false,
readOnly: true,
form: {
name: '',
module: '',
maintainer: '',
priority: '',
type: '',
method: '',
prerequisite: '',
testId: '',
otherTestName: '',
steps: [{
num: 1,
desc: '',
result: ''
}],
remark: '',
},
workspaceId: '',
formLabelWidth: "80px",
isStepTableAlive: true,
methodOptions: [
{value: 'auto', label: this.$t('test_track.case.auto')},
{value: 'manual', label: this.$t('test_track.case.manual')}
]
};
},
mounted() {
this.$get('test/case/get/' + this.testCaseId, response => {
this.testCase = response.data;
});
},
methods: {},
props: {
testCaseId: {
type: String
}
},
}
</script>
<style scoped>
.case-detail-form-card {
height: 600px;
overflow: auto;
}
.case-detail-form-card >>> .el-card__body {
padding: 20px 0;
}
.case-detail-comment {
min-width: 320px;
height: 600px;
overflow: auto;
}
</style>

1
frontend/src/business/components/track/case/components/TestCaseEdit.vue
View File

@ -235,7 +235,6 @@ export default {
method: '',
prerequisite: '',
testId: '',
otherTestName: '',
steps: [{
num: 1,
desc: '',

5
frontend/src/business/components/track/case/components/TestCaseList.vue
View File

@ -236,7 +236,6 @@ import {TEST_CASE_CONFIGS} from "../../../common/components/search/search-compon
import BatchEdit from "./BatchEdit";
import {TEST_CASE_LIST} from "@/common/js/constants";
import StatusTableItem from "@/business/components/track/common/tableItems/planview/StatusTableItem";
import TestCaseDetail from "./TestCaseDetail";
import ReviewStatus from "@/business/components/track/case/components/ReviewStatus";
import MsTag from "@/business/components/common/components/MsTag";
import ApiStatus from "@/business/components/api/definition/components/list/ApiStatus.vue";
@ -317,7 +316,6 @@ export default {
MsTableHeader,
BatchEdit,
StatusTableItem,
TestCaseDetail,
ReviewStatus,
MsTag, ApiStatus,
"relationshipGraphDrawer": relationshipGraphDrawer.default,
@ -1011,9 +1009,6 @@ export default {
this.$refs.table.clear();
this.$emit('refreshAll');
},
showDetail(row, event, column) {
this.$emit('testCaseDetail', row);
},
importTestCase() {
if (!this.projectId) {
this.$warning(this.$t('commons.check_project_tip'));

1
frontend/src/i18n/en-US.js
View File

@ -2079,7 +2079,6 @@ export default {
ui_scenario_test_case: "UI Scenario Case",
report_statistics: "Report Statistics",
sort: 'Sort',
other_test_name: 'Other Test Name',
demand: {
id: 'Demand ID',
name: 'Demand Name',

1
frontend/src/i18n/zh-CN.js
View File

@ -2087,7 +2087,6 @@ export default {
ui_scenario_test_case: "UI 测试用例",
report_statistics: "报告统计",
sort: '种类',
other_test_name: '其他测试名称',
automatic_status_update: "自动状态更新",
case: {
list: "列表",

1
frontend/src/i18n/zh-TW.js
View File

@ -2084,7 +2084,6 @@ export default {
ui_scenario_test_case: "UI 測試用例",
report_statistics: "報告統計",
sort: '種類',
other_test_name: '其他測試名稱',
automatic_status_update: "自動狀態更新",
case: {
list: "列表",