This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 a7976cf3b77 Remove useless ExpectedDoParameters (#22288)
a7976cf3b77 is described below
commit a7976cf3b776f39b31a44c77c7c773e15c50c4f3
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Nov 20 16:25:37 2022 +0800
Remove useless ExpectedDoParameters (#22288)
---
.../statement/dml/impl/DoStatementAssert.java | 6 ++--
.../impl/dostatement/ExpectedDoParameters.java | 37 ----------------------
.../domain/statement/dml/DoStatementTestCase.java | 12 ++++---
3 files changed, 10 insertions(+), 45 deletions(-)
diff --git
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dml/impl/DoStatementAssert.java
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dml/impl/DoStatementAssert.java
index 8aeaba22fc9..b510e78a963 100644
---
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dml/impl/DoStatementAssert.java
+++
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dml/impl/DoStatementAssert.java
@@ -49,11 +49,11 @@ public final class DoStatementAssert {
public static void assertIs(final SQLCaseAssertContext assertContext,
final DoStatement actual, final DoStatementTestCase expected) {
if (actual instanceof MySQLDoStatement) {
MySQLDoStatement actualStatement = (MySQLDoStatement) actual;
- if (null != actualStatement.getParameters() && null !=
expected.getDoParameters()) {
- assertThat(assertContext.getText("Do parameters assertion
error: "), actualStatement.getParameters().size(),
is(expected.getDoParameters().getParameters().size()));
+ if (null != actualStatement.getParameters() &&
!expected.getDoParameters().isEmpty()) {
+ assertThat(assertContext.getText("Do parameters assertion
error: "), actualStatement.getParameters().size(),
is(expected.getDoParameters().size()));
int count = 0;
for (ExpressionSegment each : actualStatement.getParameters())
{
- assertParameter(assertContext, each,
expected.getDoParameters().getParameters().get(count));
+ assertParameter(assertContext, each,
expected.getDoParameters().get(count));
count++;
}
}
diff --git
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/dostatement/ExpectedDoParameters.java
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/dostatement/ExpectedDoParameters.java
deleted file mode 100644
index 4ae6719a439..00000000000
---
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/dostatement/ExpectedDoParameters.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package
org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.dostatement;
-
-import lombok.Getter;
-import lombok.Setter;
-import
org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.AbstractExpectedSQLSegment;
-
-import javax.xml.bind.annotation.XmlElement;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Expected do parameters.
- */
-@Getter
-@Setter
-public final class ExpectedDoParameters extends AbstractExpectedSQLSegment {
-
- @XmlElement(name = "parameter")
- private List<ExpectedDoParameter> parameters = new LinkedList<>();
-}
diff --git
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dml/DoStatementTestCase.java
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dml/DoStatementTestCase.java
index c9159bb3d73..808fffaa545 100644
---
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dml/DoStatementTestCase.java
+++
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dml/DoStatementTestCase.java
@@ -18,19 +18,21 @@
package
org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.statement.dml;
import lombok.Getter;
-import lombok.Setter;
-import
org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.dostatement.ExpectedDoParameters;
+import
org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.dostatement.ExpectedDoParameter;
import
org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.statement.SQLParserTestCase;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import java.util.LinkedList;
+import java.util.List;
/**
* Do statement test case.
*/
@Getter
-@Setter
public final class DoStatementTestCase extends SQLParserTestCase {
- @XmlElement(name = "parameters")
- private ExpectedDoParameters doParameters;
+ @XmlElementWrapper(name = "parameters")
+ @XmlElement(name = "parameter")
+ private final List<ExpectedDoParameter> doParameters = new LinkedList<>();
}
