This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new cb5ea2f0531 Refactor jaxb entity of agent e2e test (#32208)
cb5ea2f0531 is described below
commit cb5ea2f05316f564f340d831885892ab03260bc8
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jul 20 22:59:56 2024 +0800
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
---
.../shardingsphere/test/e2e/agent/file/cases/LogE2ETestCase.java | 2 +-
.../test/e2e/agent/metrics/cases/MetricE2ETestCase.java | 4 ++--
.../test/e2e/agent/jaeger/asserts/JaegerSpanAssert.java | 2 +-
.../test/e2e/agent/jaeger/cases/JaegerE2ETestCase.java | 4 ++--
.../test/e2e/agent/jaeger/cases/JaegerTagAssertion.java | 5 +----
.../tracing/jaeger/src/test/resources/cases/jdbc/execute_sql.xml | 4 ++--
.../tracing/jaeger/src/test/resources/cases/proxy/execute_sql.xml | 4 ++--
.../test/e2e/agent/zipkin/asserts/ZipkinSpanAssert.java | 2 +-
.../test/e2e/agent/zipkin/cases/ZipkinE2ETestCase.java | 4 ++--
.../test/e2e/agent/zipkin/cases/ZipkinTagAssertion.java | 5 +----
.../tracing/zipkin/src/test/resources/cases/jdbc/execute_sql.xml | 4 ++--
.../tracing/zipkin/src/test/resources/cases/proxy/execute_sql.xml | 4 ++--
12 files changed, 19 insertions(+), 25 deletions(-)
diff --git
a/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/cases/LogE2ETestCase.java
b/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/cases/LogE2ETestCase.java
index 34329e6854f..5866de19957 100644
---
a/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/cases/LogE2ETestCase.java
+++
b/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/cases/LogE2ETestCase.java
@@ -34,7 +34,7 @@ import javax.xml.bind.annotation.XmlAttribute;
@Setter
public final class LogE2ETestCase implements AgentE2ETestCase {
- @XmlAttribute(name = "log-regex")
+ @XmlAttribute(name = "log-regex", required = true)
private String logRegex;
@Override
diff --git
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/MetricE2ETestCase.java
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/MetricE2ETestCase.java
index 288812d05b1..5319b23e3c3 100644
---
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/MetricE2ETestCase.java
+++
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/MetricE2ETestCase.java
@@ -37,10 +37,10 @@ import java.util.LinkedList;
@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/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/asserts/JaegerSpanAssert.java
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/asserts/JaegerSpanAssert.java
index 6292ba56514..9877eb2c13d 100644
---
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/asserts/JaegerSpanAssert.java
+++
b/test/e2e/agent/plugins/tracing/jaeger/src/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/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/JaegerE2ETestCase.java
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/JaegerE2ETestCase.java
index f2e8f9b9d0f..5b90ba3cfcb 100644
---
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/JaegerE2ETestCase.java
+++
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/JaegerE2ETestCase.java
@@ -36,10 +36,10 @@ import java.util.Collection;
@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/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/JaegerTagAssertion.java
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/JaegerTagAssertion.java
index b4527319f99..3ac03f6ed15 100644
---
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/JaegerTagAssertion.java
+++
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/JaegerTagAssertion.java
@@ -32,15 +32,12 @@ import javax.xml.bind.annotation.XmlAttribute;
@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
index 3b4e29aea87..661e45d8a49 100644
---
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
index 3b4e29aea87..661e45d8a49 100644
---
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/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/asserts/ZipkinSpanAssert.java
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/asserts/ZipkinSpanAssert.java
index f869e099407..f108f2a1e66 100644
---
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/asserts/ZipkinSpanAssert.java
+++
b/test/e2e/agent/plugins/tracing/zipkin/src/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/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/ZipkinE2ETestCase.java
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/ZipkinE2ETestCase.java
index eba3d6de532..4624a6a6059 100644
---
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/ZipkinE2ETestCase.java
+++
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/ZipkinE2ETestCase.java
@@ -36,10 +36,10 @@ import java.util.Collection;
@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/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/ZipkinTagAssertion.java
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/ZipkinTagAssertion.java
index 93258c436f3..3cf2acc0dc4 100644
---
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/ZipkinTagAssertion.java
+++
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/ZipkinTagAssertion.java
@@ -32,15 +32,12 @@ import javax.xml.bind.annotation.XmlAttribute;
@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
index 3b4e29aea87..661e45d8a49 100644
---
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
index 3b4e29aea87..661e45d8a49 100644
---
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>
