Refactor jaxb entity of agent e2e test (#32208)

* Refactor MetricsPluginE2EIT * Refactor MetricsPluginE2EIT * Refactor MetricsPluginE2EIT * Refactor jaxb entity of agent e2e test * Refactor jaxb entity of agent e2e test * Refactor jaxb entity of agent e2e test
apache · Jul 20, 2024 · cb5ea2f · cb5ea2f
1 parent ac74d49
commit cb5ea2f
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 25 deletions.
diff --git a/...ile/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/cases/LogE2ETestCase.java b/...ile/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/cases/LogE2ETestCase.java
@@ -34,7 +34,7 @@
 @Setter
 public final class LogE2ETestCase implements AgentE2ETestCase {
 
-    @XmlAttribute(name = "log-regex")
+    @XmlAttribute(name = "log-regex", required = true)
     private String logRegex;
 
     @Override

diff --git a/...c/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/MetricE2ETestCase.java b/...c/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/MetricE2ETestCase.java
@@ -37,10 +37,10 @@
 @Setter
 public final class MetricE2ETestCase implements AgentE2ETestCase {
 
-    @XmlAttribute(name = "metric-name")
+    @XmlAttribute(name = "metric-name", required = true)
     private String metricName;
 
-    @XmlAttribute(name = "metric-type")
+    @XmlAttribute(name = "metric-type", required = true)
     private String metricType;
 
     @XmlElement(name = "query-assertion")

diff --git a/...c/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/asserts/JaegerSpanAssert.java b/...c/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/asserts/JaegerSpanAssert.java
@@ -51,7 +51,7 @@ public final class JaegerSpanAssert {
      */
     public static void assertIs(final String jaegerUrl, final JaegerE2ETestCase expected) {
         assertTagKey(jaegerUrl, expected);
-        expected.getTags().stream().filter(JaegerTagAssertion::isNeedAssertValue).forEach(each -> assertTagValue(jaegerUrl, expected, each));
+        expected.getTags().stream().filter(each -> null != each.getTagValue()).forEach(each -> assertTagValue(jaegerUrl, expected, each));
     }
 
     private static void assertTagKey(final String jaegerUrl, final JaegerE2ETestCase expected) {

diff --git a/...rc/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/JaegerE2ETestCase.java b/...rc/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/JaegerE2ETestCase.java
@@ -36,10 +36,10 @@
 @Setter
 public final class JaegerE2ETestCase implements AgentE2ETestCase {
 
-    @XmlAttribute(name = "service-name")
+    @XmlAttribute(name = "service-name", required = true)
     private String serviceName;
 
-    @XmlAttribute(name = "span-name")
+    @XmlAttribute(name = "span-name", required = true)
     private String spanName;
 
     @XmlElement(name = "tag")

diff --git a/...c/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/JaegerTagAssertion.java b/...c/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/JaegerTagAssertion.java
@@ -32,15 +32,12 @@
 @Setter
 public final class JaegerTagAssertion {
 
-    @XmlAttribute(name = "key")
+    @XmlAttribute(name = "key", required = true)
     private String tagKey;
 
     @XmlAttribute(name = "value")
     private String tagValue;
 
-    @XmlAttribute(name = "need-assert-value")
-    private boolean needAssertValue = true;
-
     @Override
     public String toString() {
         return String.format("%s -> %s", tagKey, tagValue);

diff --git a/test/e2e/agent/plugins/tracing/jaeger/src/test/resources/cases/jdbc/execute_sql.xml b/test/e2e/agent/plugins/tracing/jaeger/src/test/resources/cases/jdbc/execute_sql.xml
@@ -25,7 +25,7 @@
         <tag key="peer.port" value="3306" />
         <tag key="db.instance" value="ds_0" />
         <tag key="db.instance" value="ds_1" />
-        <tag key="db.bind_vars" need-assert-value="false" />
-        <tag key="db.statement" need-assert-value="false" />
+        <tag key="db.bind_vars" />
+        <tag key="db.statement" />
     </test-case>
 </e2e-test-cases>
diff --git a/test/e2e/agent/plugins/tracing/jaeger/src/test/resources/cases/proxy/execute_sql.xml b/test/e2e/agent/plugins/tracing/jaeger/src/test/resources/cases/proxy/execute_sql.xml
@@ -25,7 +25,7 @@
         <tag key="peer.port" value="3306" />
         <tag key="db.instance" value="ds_0" />
         <tag key="db.instance" value="ds_1" />
-        <tag key="db.bind_vars" need-assert-value="false" />
-        <tag key="db.statement" need-assert-value="false" />
+        <tag key="db.bind_vars" />
+        <tag key="db.statement" />
     </test-case>
 </e2e-test-cases>
diff --git a/...c/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/asserts/ZipkinSpanAssert.java b/...c/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/asserts/ZipkinSpanAssert.java
@@ -49,7 +49,7 @@ public final class ZipkinSpanAssert {
      */
     public static void assertIs(final String zipkinUrl, final ZipkinE2ETestCase expected) {
         assertTagKey(zipkinUrl, expected);
-        expected.getTags().stream().filter(ZipkinTagAssertion::isNeedAssertValue).forEach(each -> assertTagValue(zipkinUrl, expected, each));
+        expected.getTags().stream().filter(each -> null != each.getTagValue()).forEach(each -> assertTagValue(zipkinUrl, expected, each));
     }
 
     private static void assertTagKey(final String zipkinUrl, final ZipkinE2ETestCase expected) {

diff --git a/...rc/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/ZipkinE2ETestCase.java b/...rc/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/ZipkinE2ETestCase.java
@@ -36,10 +36,10 @@
 @Setter
 public final class ZipkinE2ETestCase implements AgentE2ETestCase {
 
-    @XmlAttribute(name = "service-name")
+    @XmlAttribute(name = "service-name", required = true)
     private String serviceName;
 
-    @XmlAttribute(name = "span-name")
+    @XmlAttribute(name = "span-name", required = true)
     private String spanName;
 
     @XmlElement(name = "tag")

diff --git a/...c/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/ZipkinTagAssertion.java b/...c/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/ZipkinTagAssertion.java
@@ -32,15 +32,12 @@
 @Setter
 public final class ZipkinTagAssertion {
 
-    @XmlAttribute(name = "key")
+    @XmlAttribute(name = "key", required = true)
     private String tagKey;
 
     @XmlAttribute(name = "value")
     private String tagValue;
 
-    @XmlAttribute(name = "need-assert-value")
-    private boolean needAssertValue = true;
-
     @Override
     public String toString() {
         return String.format("%s -> %s", tagKey, tagValue);

diff --git a/test/e2e/agent/plugins/tracing/zipkin/src/test/resources/cases/jdbc/execute_sql.xml b/test/e2e/agent/plugins/tracing/zipkin/src/test/resources/cases/jdbc/execute_sql.xml
@@ -25,7 +25,7 @@
         <tag key="peer.port" value="3306" />
         <tag key="db.instance" value="ds_0" />
         <tag key="db.instance" value="ds_1" />
-        <tag key="db.bind_vars" need-assert-value="false" />
-        <tag key="db.statement" need-assert-value="false" />
+        <tag key="db.bind_vars" />
+        <tag key="db.statement" />
     </test-case>
 </e2e-test-cases>
diff --git a/test/e2e/agent/plugins/tracing/zipkin/src/test/resources/cases/proxy/execute_sql.xml b/test/e2e/agent/plugins/tracing/zipkin/src/test/resources/cases/proxy/execute_sql.xml
@@ -25,7 +25,7 @@
         <tag key="peer.port" value="3306" />
         <tag key="db.instance" value="ds_0" />
         <tag key="db.instance" value="ds_1" />
-        <tag key="db.bind_vars" need-assert-value="false" />
-        <tag key="db.statement" need-assert-value="false" />
+        <tag key="db.bind_vars" />
+        <tag key="db.statement" />
     </test-case>
 </e2e-test-cases>