From 6533c456236e3685d18698fb8469c12c54af0b5f Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 12 Apr 2024 13:17:46 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A2=AB=E7=A6=81=E7=94=A8=E7=9A=84=E6=96=AD?=
 =?UTF-8?q?=E8=A8=80=E8=BF=98=E5=8F=AF=E4=BB=A5=E6=89=A7=E8=A1=8C=E7=9A=84?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1039000 --user=王孝刚 【接口测试】场景-创建场景-添加响应头断言多个，保存后再禁用所有断言不生效
https://www.tapd.cn/55049933/s/1495749
---
 .../processor/assertion/ResponseHeaderAssertionConverter.java  | 3 ++-
 .../jmeter/processor/assertion/VariableAssertionConverter.java | 3 ++-
 .../project/api/assertion/body/MsJSONPathAssertionItem.java    | 3 ++-
 .../project/api/assertion/body/MsRegexAssertionItem.java       | 2 +-
 .../project/api/assertion/body/MsXPathAssertionItem.java       | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/ResponseHeaderAssertionConverter.java b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/ResponseHeaderAssertionConverter.java
index d847ca4251..57508e9425 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/ResponseHeaderAssertionConverter.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/ResponseHeaderAssertionConverter.java
@@ -34,7 +34,8 @@ public class ResponseHeaderAssertionConverter extends AssertionConverter<MsRespo
     public boolean isHeaderAssertionValid(MsResponseHeaderAssertion.ResponseHeaderAssertionItem headerAssertionItem) {
         return StringUtils.isNotBlank(headerAssertionItem.getHeader())
                 && StringUtils.isNotBlank(headerAssertionItem.getCondition())
-                && StringUtils.isNotBlank(headerAssertionItem.getExpectedValue());
+                && StringUtils.isNotBlank(headerAssertionItem.getExpectedValue())
+                && BooleanUtils.isTrue(headerAssertionItem.getEnable());
     }
 
     private ResponseAssertion parse2ResponseAssertion(MsResponseHeaderAssertion.ResponseHeaderAssertionItem msAssertion,
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/VariableAssertionConverter.java b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/VariableAssertionConverter.java
index a50a0391f4..1233ec31d1 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/VariableAssertionConverter.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/VariableAssertionConverter.java
@@ -63,7 +63,8 @@ public class VariableAssertionConverter extends AssertionConverter<MsVariableAss
 
     public boolean isValid(MsVariableAssertion.VariableAssertionItem variableAssertionItem) {
         return StringUtils.isNotBlank(variableAssertionItem.getVariableName())
-                && StringUtils.isNotBlank(variableAssertionItem.getCondition());
+                && StringUtils.isNotBlank(variableAssertionItem.getCondition())
+                && BooleanUtils.isTrue(variableAssertionItem.getEnable());
     }
 
     private static String parse2BeanshellJSR233Script(MsVariableAssertion.VariableAssertionItem variableAssertionItem) {
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/api/assertion/body/MsJSONPathAssertionItem.java b/backend/services/project-management/src/main/java/io/metersphere/project/api/assertion/body/MsJSONPathAssertionItem.java
index c5d2dbca16..4090fbe170 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/api/assertion/body/MsJSONPathAssertionItem.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/api/assertion/body/MsJSONPathAssertionItem.java
@@ -3,6 +3,7 @@ package io.metersphere.project.api.assertion.body;
 import io.metersphere.system.valid.EnumValue;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 
 /**
@@ -30,7 +31,7 @@ public class MsJSONPathAssertionItem extends MsBodyAssertionItem {
     private String expectedValue;
 
     public boolean isValid() {
-        return StringUtils.isNotBlank(expression) && StringUtils.isNotBlank(condition);
+        return StringUtils.isNotBlank(expression) && StringUtils.isNotBlank(condition) && BooleanUtils.isTrue(this.getEnable());
     }
 }
 
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/api/assertion/body/MsRegexAssertionItem.java b/backend/services/project-management/src/main/java/io/metersphere/project/api/assertion/body/MsRegexAssertionItem.java
index 5f357a1620..2956a7866e 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/api/assertion/body/MsRegexAssertionItem.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/api/assertion/body/MsRegexAssertionItem.java
@@ -16,6 +16,6 @@ public class MsRegexAssertionItem extends MsBodyAssertionItem {
     private String expression;
 
     public boolean isValid() {
-        return StringUtils.isNotBlank(expression);
+        return StringUtils.isNotBlank(expression) && Boolean.TRUE.equals(this.getEnable());
     }
 }
\ No newline at end of file
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/api/assertion/body/MsXPathAssertionItem.java b/backend/services/project-management/src/main/java/io/metersphere/project/api/assertion/body/MsXPathAssertionItem.java
index 33111a4239..74154cbdee 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/api/assertion/body/MsXPathAssertionItem.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/api/assertion/body/MsXPathAssertionItem.java
@@ -21,6 +21,6 @@ public class MsXPathAssertionItem extends MsBodyAssertionItem {
     private String expectedValue;
 
     public boolean isValid() {
-        return StringUtils.isNotBlank(expression);
+        return StringUtils.isNotBlank(expression) && Boolean.TRUE.equals(this.getEnable());
     }
 }
\ No newline at end of file