This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 cf2afaf10de Add test cases for NullsOrderType (#33233)
cf2afaf10de is described below
commit cf2afaf10de078d362783d564973e9f8667d827c
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Oct 13 23:21:21 2024 +0800
Add test cases for NullsOrderType (#33233)
---
.../infra/database/core/type/enums/NullsOrderTypeTest.java | 11 ++++++-----
.../asserts/segment/insert/InsertExecClauseAssert.java | 6 +++---
.../asserts/statement/dml/impl/MergeStatementAssert.java | 6 +++---
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/enums/NullsOrderTypeTest.java
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/enums/NullsOrderTypeTest.java
index 778305bf3d5..db0539857a4 100644
---
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/enums/NullsOrderTypeTest.java
+++
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/enums/NullsOrderTypeTest.java
@@ -18,18 +18,19 @@
package org.apache.shardingsphere.infra.database.core.type.enums;
import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.NullsOrderType;
-import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
+import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
class NullsOrderTypeTest {
@Test
void assertGetResolvedOrderType() {
- assertThat(NullsOrderType.HIGH.getResolvedOrderType("DESC"),
CoreMatchers.is(NullsOrderType.FIRST));
- assertThat(NullsOrderType.HIGH.getResolvedOrderType("ASC"),
CoreMatchers.is(NullsOrderType.LAST));
- assertThat(NullsOrderType.LOW.getResolvedOrderType("DESC"),
CoreMatchers.is(NullsOrderType.LAST));
- assertThat(NullsOrderType.LOW.getResolvedOrderType("ASC"),
CoreMatchers.is(NullsOrderType.FIRST));
+ assertThat(NullsOrderType.HIGH.getResolvedOrderType("DESC"),
is(NullsOrderType.FIRST));
+ assertThat(NullsOrderType.HIGH.getResolvedOrderType("ASC"),
is(NullsOrderType.LAST));
+ assertThat(NullsOrderType.LOW.getResolvedOrderType("DESC"),
is(NullsOrderType.LAST));
+ assertThat(NullsOrderType.LOW.getResolvedOrderType("ASC"),
is(NullsOrderType.FIRST));
+ assertThat(NullsOrderType.FIRST.getResolvedOrderType("ASC"),
is(NullsOrderType.FIRST));
}
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/insert/InsertExecClauseAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/insert/InsertExecClauseAssert.java
index 73c85e0eadf..b15a61a7369 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/insert/InsertExecClauseAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/insert/InsertExecClauseAssert.java
@@ -26,8 +26,8 @@ import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.SQL
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.expression.ExpressionAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.owner.OwnerAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.exec.ExpectedExecClause;
-import org.hamcrest.CoreMatchers;
+import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -46,7 +46,7 @@ public final class InsertExecClauseAssert {
* @param expected expected execute clause
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final ExecSegment actual, final ExpectedExecClause expected) {
- assertThat(assertContext.getText("exec procedure name assertion error:
"), actual.getProcedureName().getIdentifier().getValue(),
CoreMatchers.is(expected.getName()));
+ assertThat(assertContext.getText("exec procedure name assertion error:
"), actual.getProcedureName().getIdentifier().getValue(),
is(expected.getName()));
if (null == expected.getOwner()) {
assertFalse(actual.getProcedureName().getOwner().isPresent(),
assertContext.getText("Actual owner should not exist."));
} else {
@@ -54,7 +54,7 @@ public final class InsertExecClauseAssert {
OwnerAssert.assertIs(assertContext,
actual.getProcedureName().getOwner().get(), expected.getOwner());
}
if (null == expected.getParameters()) {
- assertThat(assertContext.getText("exec procedure parameters
assertion error: "), actual.getExpressionSegments().size(),
CoreMatchers.is(expected.getParameters().size()));
+ assertThat(assertContext.getText("exec procedure parameters
assertion error: "), actual.getExpressionSegments().size(),
is(expected.getParameters().size()));
} else {
int count = 0;
for (ExpressionSegment expressionSegment :
actual.getExpressionSegments()) {
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/impl/MergeStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/impl/MergeStatementAssert.java
index 49548744395..fb67a58397c 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/impl/MergeStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/impl/MergeStatementAssert.java
@@ -37,11 +37,11 @@ import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.whe
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.with.WithClauseAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.expr.ExpectedMergeWhenAndThenSegment;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dml.MergeStatementTestCase;
-import org.hamcrest.CoreMatchers;
import java.util.Collection;
import java.util.Optional;
+import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -104,7 +104,7 @@ public final class MergeStatementAssert {
private static void assertWhenAndThenSegments(final SQLCaseAssertContext
assertContext, final MergeStatement actual, final MergeStatementTestCase
expected) {
Collection<MergeWhenAndThenSegment> mergeWhenAndThenSegments =
actual.getWhenAndThenSegments();
- assertThat(assertContext.getText("merge when and then segment
assertion error: "), mergeWhenAndThenSegments.size(),
CoreMatchers.is(expected.getMergeWhenAndThenSegments().size()));
+ assertThat(assertContext.getText("merge when and then segment
assertion error: "), mergeWhenAndThenSegments.size(),
is(expected.getMergeWhenAndThenSegments().size()));
int count = 0;
for (MergeWhenAndThenSegment each : mergeWhenAndThenSegments) {
asserMergeWhenAndTheSegment(assertContext, each,
expected.getMergeWhenAndThenSegments().get(count));
@@ -132,7 +132,7 @@ public final class MergeStatementAssert {
private static void assertIndexes(final SQLCaseAssertContext
assertContext, final MergeStatement actual, final MergeStatementTestCase
expected) {
Collection<IndexSegment> indexes = actual.getIndexes();
- assertThat(assertContext.getText("index segment assertion error: "),
indexes.size(), CoreMatchers.is(expected.getIndexs().size()));
+ assertThat(assertContext.getText("index segment assertion error: "),
indexes.size(), is(expected.getIndexs().size()));
int count = 0;
for (IndexSegment each : indexes) {
IndexAssert.assertIs(assertContext, each,
expected.getIndexs().get(count));
