(shardingsphere) branch master updated: Refactor DataSetColumn.assertion type from string to boolean (#32151)

[zhaojinchao]

This is an automated email from the ASF dual-hosted git repository.

zhaojinchao 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 c460c4f1cff Refactor DataSetColumn.assertion type from string to 
boolean (#32151)
c460c4f1cff is described below

commit c460c4f1cffd90aba15e01becf49462007e32b19
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Wed Jul 17 18:13:59 2024 +0800

    Refactor DataSetColumn.assertion type from string to boolean (#32151)
    
    * Refactor GeneralDQLE2EIT
    
    * Refactor DataSetColumn.assertion type from string to boolean
---
 .../test/e2e/cases/dataset/metadata/DataSetColumn.java            | 4 ++--
 .../org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java  | 2 +-
 .../shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java     | 2 +-
 .../shardingsphere/test/e2e/engine/type/dql/GeneralDQLE2EIT.java  | 8 ++++++++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetColumn.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetColumn.java
index fb5028777d6..c7fedc68287 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetColumn.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetColumn.java
@@ -25,9 +25,9 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 
+@XmlAccessorType(XmlAccessType.FIELD)
 @Getter
 @Setter
-@XmlAccessorType(XmlAccessType.FIELD)
 @EqualsAndHashCode
 public final class DataSetColumn {
     
@@ -35,7 +35,7 @@ public final class DataSetColumn {
     private String name;
     
     @XmlAttribute
-    private String assertion;
+    private boolean assertion = true;
     
     @XmlAttribute
     private String type;
diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
index ee210eaaa13..cde3c0f4f92 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
@@ -146,7 +146,7 @@ class RALE2EIT {
     private Collection<String> getNotAssertionColumns(final 
SingleE2EContainerComposer containerComposer) {
         Collection<String> result = new LinkedList<>();
         for (DataSetMetaData each : 
containerComposer.getDataSet().getMetaDataList()) {
-            result.addAll(each.getColumns().stream().filter(column -> 
"false".equals(column.getAssertion())).map(DataSetColumn::getName).collect(Collectors.toList()));
+            result.addAll(each.getColumns().stream().filter(column -> 
!column.isAssertion()).map(DataSetColumn::getName).collect(Collectors.toList()));
         }
         return result;
     }
diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java
index 2fc178521a7..e653fd3697c 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java
@@ -114,7 +114,7 @@ public abstract class BaseDQLE2EIT {
     private Collection<String> getNotAssertionColumns(final 
SingleE2EContainerComposer containerComposer) {
         Collection<String> result = new LinkedList<>();
         for (DataSetMetaData each : 
containerComposer.getDataSet().getMetaDataList()) {
-            result.addAll(each.getColumns().stream().filter(column -> 
"false".equals(column.getAssertion())).map(DataSetColumn::getName).collect(Collectors.toList()));
+            result.addAll(each.getColumns().stream().filter(column -> 
!column.isAssertion()).map(DataSetColumn::getName).collect(Collectors.toList()));
         }
         return result;
     }
diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/GeneralDQLE2EIT.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/GeneralDQLE2EIT.java
index eace11a53b8..4c22dcb289e 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/GeneralDQLE2EIT.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/GeneralDQLE2EIT.java
@@ -52,6 +52,10 @@ class GeneralDQLE2EIT extends BaseDQLE2EIT {
         }
         SingleE2EContainerComposer containerComposer = new 
SingleE2EContainerComposer(testParam);
         init(testParam, containerComposer);
+        assertExecuteQuery(testParam, containerComposer);
+    }
+    
+    private void assertExecuteQuery(final AssertionTestParameter testParam, 
final SingleE2EContainerComposer containerComposer) throws SQLException {
         if (isUseXMLAsExpectedDataset()) {
             assertExecuteQueryWithXmlExpected(testParam, containerComposer);
         } else {
@@ -123,6 +127,10 @@ class GeneralDQLE2EIT extends BaseDQLE2EIT {
         }
         SingleE2EContainerComposer containerComposer = new 
SingleE2EContainerComposer(testParam);
         init(testParam, containerComposer);
+        assertExecute(testParam, containerComposer);
+    }
+    
+    private void assertExecute(final AssertionTestParameter testParam, final 
SingleE2EContainerComposer containerComposer) throws SQLException {
         if (isUseXMLAsExpectedDataset()) {
             assertExecuteWithXmlExpected(testParam, containerComposer);
         } else {