This is an automated email from the ASF dual-hosted git repository.
terrymanu 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 f5518dc83bf Use import static org.hamcrest.Matchers.is (#39489)
f5518dc83bf is described below
commit f5518dc83bf0fa6ba85d324a03913f11224a1858
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Aug 16 23:26:07 2026 +0800
Use import static org.hamcrest.Matchers.is (#39489)
---
.../checker/MySQLDatabasePrivilegeCheckerTest.java | 8 ++--
...enGaussAuthenticationSCRAMSha256PacketTest.java | 4 +-
...littingContextManagerLifecycleListenerTest.java | 6 +--
...eyGenerateStrategyRuleChangedProcessorTest.java | 10 ++---
.../destroyer/DataSourcePoolDestroyerTest.java | 4 +-
.../database/DatabaseRuleOperatorFactoryTest.java | 4 +-
.../type/ExplainStatementConverterTest.java | 3 +-
.../DorisShowCreateRoutineLoadStatementAssert.java | 7 ++--
.../type/DorisUnsetVariableStatementAssert.java | 7 ++--
.../DorisAlterRoutineLoadStatementAssert.java | 9 +++--
.../doris/DorisBrokerLoadStatementAssert.java | 43 +++++++++++-----------
.../DorisCreateRoutineLoadStatementAssert.java | 19 +++++-----
.../DorisPauseRoutineLoadStatementAssert.java | 7 ++--
.../DorisResumeRoutineLoadStatementAssert.java | 7 ++--
.../doris/DorisStopRoutineLoadStatementAssert.java | 5 ++-
.../mysql/type/MySQLLoadDataStatementAssert.java | 21 ++++++-----
16 files changed, 87 insertions(+), 77 deletions(-)
diff --git
a/database/connector/dialect/mysql/src/test/java/org/apache/shardingsphere/database/connector/mysql/checker/MySQLDatabasePrivilegeCheckerTest.java
b/database/connector/dialect/mysql/src/test/java/org/apache/shardingsphere/database/connector/mysql/checker/MySQLDatabasePrivilegeCheckerTest.java
index 39b061937f5..a2785a48058 100644
---
a/database/connector/dialect/mysql/src/test/java/org/apache/shardingsphere/database/connector/mysql/checker/MySQLDatabasePrivilegeCheckerTest.java
+++
b/database/connector/dialect/mysql/src/test/java/org/apache/shardingsphere/database/connector/mysql/checker/MySQLDatabasePrivilegeCheckerTest.java
@@ -23,7 +23,6 @@ import
org.apache.shardingsphere.database.connector.core.exception.CheckDatabase
import
org.apache.shardingsphere.database.connector.core.exception.MissingRequiredPrivilegeException;
import
org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.hamcrest.CoreMatchers;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -41,8 +40,9 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.stream.Stream;
-import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
@@ -197,8 +197,8 @@ class MySQLDatabasePrivilegeCheckerTest {
SQLException expected = new SQLException("mocked close connection
failure");
doThrow(expected).when(connection).close();
MissingRequiredPrivilegeException actual =
assertThrows(MissingRequiredPrivilegeException.class, () ->
checker.check(dataSource, PrivilegeCheckType.PIPELINE));
- assertThat(actual.getSuppressed().length, CoreMatchers.is(1));
- assertThat(actual.getSuppressed()[0], CoreMatchers.is(expected));
+ assertThat(actual.getSuppressed().length, is(1));
+ assertThat(actual.getSuppressed()[0], is(expected));
}
@Test
diff --git
a/database/protocol/dialect/opengauss/src/test/java/org/apache/shardingsphere/database/protocol/opengauss/packet/authentication/OpenGaussAuthenticationSCRAMSha256PacketTest.java
b/database/protocol/dialect/opengauss/src/test/java/org/apache/shardingsphere/database/protocol/opengauss/packet/authentication/OpenGaussAuthenticationSCRAMSha256PacketTest.java
index f20e66a29b2..7429d33800c 100644
---
a/database/protocol/dialect/opengauss/src/test/java/org/apache/shardingsphere/database/protocol/opengauss/packet/authentication/OpenGaussAuthenticationSCRAMSha256PacketTest.java
+++
b/database/protocol/dialect/opengauss/src/test/java/org/apache/shardingsphere/database/protocol/opengauss/packet/authentication/OpenGaussAuthenticationSCRAMSha256PacketTest.java
@@ -21,7 +21,6 @@ import
org.apache.shardingsphere.database.protocol.opengauss.constant.OpenGaussP
import org.apache.shardingsphere.database.protocol.packet.DatabasePacket;
import
org.apache.shardingsphere.database.protocol.postgresql.packet.identifier.PostgreSQLMessagePacketType;
import
org.apache.shardingsphere.database.protocol.postgresql.payload.PostgreSQLPacketPayload;
-import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
@@ -30,6 +29,7 @@ import org.junit.jupiter.params.provider.MethodSource;
import java.util.stream.Stream;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@@ -56,7 +56,7 @@ class OpenGaussAuthenticationSCRAMSha256PacketTest {
@Test
void assertGetIdentifier() {
OpenGaussAuthenticationSCRAMSha256Packet packet = new
OpenGaussAuthenticationSCRAMSha256Packet(OpenGaussProtocolVersion.PROTOCOL_350.getVersion(),
2048, authHexData, "");
- assertThat(packet.getIdentifier(),
CoreMatchers.is(PostgreSQLMessagePacketType.AUTHENTICATION_REQUEST));
+ assertThat(packet.getIdentifier(),
is(PostgreSQLMessagePacketType.AUTHENTICATION_REQUEST));
}
private static Stream<Arguments> writeCases() {
diff --git
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/listener/ReadwriteSplittingContextManagerLifecycleListenerTest.java
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/listener/ReadwriteSplittingContextManagerLifecycleListenerTest.java
index e666e725962..1ea8a1ed69d 100644
---
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/listener/ReadwriteSplittingContextManagerLifecycleListenerTest.java
+++
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/listener/ReadwriteSplittingContextManagerLifecycleListenerTest.java
@@ -24,7 +24,6 @@ import
org.apache.shardingsphere.infra.rule.attribute.datasource.StaticDataSourc
import org.apache.shardingsphere.infra.state.datasource.DataSourceState;
import
org.apache.shardingsphere.infra.state.datasource.qualified.QualifiedDataSourceState;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
@@ -43,6 +42,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
@@ -68,8 +68,8 @@ class ReadwriteSplittingContextManagerLifecycleListenerTest {
ArgumentCaptor<QualifiedDataSource> qualifiedDataSourceCaptor =
ArgumentCaptor.forClass(QualifiedDataSource.class);
ArgumentCaptor<DataSourceState> stateCaptor =
ArgumentCaptor.forClass(DataSourceState.class);
verify(attribute,
times(expectedUpdateCount)).updateStatus(qualifiedDataSourceCaptor.capture(),
stateCaptor.capture());
-
assertThat(qualifiedDataSourceCaptor.getAllValues().stream().map(QualifiedDataSource::toString).collect(Collectors.toList()),
CoreMatchers.is(expectedQualifiedDataSources));
- assertThat(stateCaptor.getAllValues(),
CoreMatchers.is(expectedStates));
+
assertThat(qualifiedDataSourceCaptor.getAllValues().stream().map(QualifiedDataSource::toString).collect(Collectors.toList()),
is(expectedQualifiedDataSources));
+ assertThat(stateCaptor.getAllValues(), is(expectedStates));
}
private Collection<ShardingSphereDatabase> createDatabases(final
Collection<String> databaseNames, final StaticDataSourceRuleAttribute
attribute) {
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/changed/KeyGenerateStrategyRuleChangedProcessorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/changed/KeyGenerateStrategyRuleChangedProcessorTest.java
index 458997e4355..6446a995e95 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/changed/KeyGenerateStrategyRuleChangedProcessorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/changed/KeyGenerateStrategyRuleChangedProcessorTest.java
@@ -17,6 +17,8 @@
package org.apache.shardingsphere.sharding.rule.changed;
+import
org.apache.shardingsphere.infra.config.keygen.KeyGenerateStrategiesConfiguration;
+import
org.apache.shardingsphere.infra.config.keygen.impl.ColumnKeyGenerateStrategiesRuleConfiguration;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
@@ -24,17 +26,15 @@ import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.spi.rule.RuleChangedItemType;
import
org.apache.shardingsphere.mode.spi.rule.RuleItemConfigurationChangedProcessor;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
-import
org.apache.shardingsphere.infra.config.keygen.impl.ColumnKeyGenerateStrategiesRuleConfiguration;
-import
org.apache.shardingsphere.infra.config.keygen.KeyGenerateStrategiesConfiguration;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import
org.apache.shardingsphere.sharding.yaml.config.strategy.keygen.YamlKeyGenerateStrategyRuleConfiguration;
-import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
import java.util.Collections;
-import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isA;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -48,7 +48,7 @@ class KeyGenerateStrategyRuleChangedProcessorTest {
@Test
void assertSwapRuleItemConfiguration() {
KeyGenerateStrategiesConfiguration actual =
processor.swapRuleItemConfiguration(null, createYAMLContent());
- assertThat(actual,
CoreMatchers.isA(KeyGenerateStrategiesConfiguration.class));
+ assertThat(actual, isA(KeyGenerateStrategiesConfiguration.class));
assertThat(actual.getKeyGeneratorName(), is("foo_algo"));
assertThat(((ColumnKeyGenerateStrategiesRuleConfiguration)
actual).getLogicTable(), is("foo_tbl"));
assertThat(((ColumnKeyGenerateStrategiesRuleConfiguration)
actual).getKeyGenerateColumn(), is("foo_col"));
diff --git
a/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/destroyer/DataSourcePoolDestroyerTest.java
b/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/destroyer/DataSourcePoolDestroyerTest.java
index 62b308ed71c..5335783b630 100644
---
a/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/destroyer/DataSourcePoolDestroyerTest.java
+++
b/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/destroyer/DataSourcePoolDestroyerTest.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.infra.datasource.pool.destroyer;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -32,6 +31,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.stream.Stream;
+import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
@@ -96,7 +96,7 @@ class DataSourcePoolDestroyerTest {
verify(executor).shutdown();
verify(activeDetector,
times(expectedContainsActiveConnectionCount)).containsActiveConnection(dataSource);
verify(closeable).close();
- MatcherAssert.assertThat(Thread.currentThread().isInterrupted(),
CoreMatchers.is(interruptedBeforeDestroy));
+ MatcherAssert.assertThat(Thread.currentThread().isInterrupted(),
is(interruptedBeforeDestroy));
} finally {
Thread.interrupted();
}
diff --git
a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/DatabaseRuleOperatorFactoryTest.java
b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/DatabaseRuleOperatorFactoryTest.java
index edbae2d006f..651f9d3e48b 100644
---
a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/DatabaseRuleOperatorFactoryTest.java
+++
b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/DatabaseRuleOperatorFactoryTest.java
@@ -26,7 +26,6 @@ import
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.data
import
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleDropExecutor;
import
org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
@@ -35,6 +34,7 @@ import org.junit.jupiter.params.provider.MethodSource;
import java.util.stream.Stream;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.isA;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
@@ -55,7 +55,7 @@ class DatabaseRuleOperatorFactoryTest {
void assertNewInstanceWithUnsupportedExecutor() {
DatabaseRuleDefinitionExecutor executor =
mock(DatabaseRuleDefinitionExecutor.class);
String expectedMessage = String.format("Unsupported SQL operation:
Cannot support RDL executor type `%s`.", executor.getClass().getName());
- assertThat(assertThrows(UnsupportedSQLOperationException.class, () ->
DatabaseRuleOperatorFactory.newInstance(contextManager,
executor)).getMessage(), CoreMatchers.is(expectedMessage));
+ assertThat(assertThrows(UnsupportedSQLOperationException.class, () ->
DatabaseRuleOperatorFactory.newInstance(contextManager,
executor)).getMessage(), is(expectedMessage));
}
private static Stream<Arguments>
assertNewInstanceWithSupportedExecutorArguments() {
diff --git
a/kernel/sql-federation/compiler/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/sql/ast/converter/statement/type/ExplainStatementConverterTest.java
b/kernel/sql-federation/compiler/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/sql/ast/converter/statement/type/ExplainStatementConverterTest.java
index 472a8b53e35..50056eea4cc 100644
---
a/kernel/sql-federation/compiler/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/sql/ast/converter/statement/type/ExplainStatementConverterTest.java
+++
b/kernel/sql-federation/compiler/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/sql/ast/converter/statement/type/ExplainStatementConverterTest.java
@@ -45,6 +45,7 @@ import java.util.Collections;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.isA;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
class ExplainStatementConverterTest {
@@ -80,7 +81,7 @@ class ExplainStatementConverterTest {
@Test
void assertConvertUnsupportedSQLStatementThrowsException() {
- DCLStatement mockStatement = Mockito.mock(DCLStatement.class,
Mockito.withSettings().defaultAnswer(Mockito.CALLS_REAL_METHODS));
+ DCLStatement mockStatement = mock(DCLStatement.class,
Mockito.withSettings().defaultAnswer(Mockito.CALLS_REAL_METHODS));
Mockito.when(mockStatement.getDatabaseType()).thenReturn(databaseType);
ExplainStatement explainStatement = new ExplainStatement(databaseType,
mockStatement);
assertThrows(IllegalStateException.class, () -> new
ExplainStatementConverter().convert(explainStatement));
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/dialect/doris/type/DorisShowCreateRoutineLoadStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/dialect/doris/type/DorisShowCreateRoutineLoadStatementAssert.java
index 40974db2c61..8741fe47562 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/dialect/doris/type/DorisShowCreateRoutineLoadStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/dialect/doris/type/DorisShowCreateRoutineLoadStatementAssert.java
@@ -23,9 +23,10 @@ import
org.apache.shardingsphere.sql.parser.statement.doris.dal.DorisShowCreateR
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.database.DatabaseAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowCreateRoutineLoadStatementTestCase;
-import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
+import static org.hamcrest.Matchers.is;
+
/**
* Show create routine load statement assert for Doris.
*/
@@ -40,9 +41,9 @@ public final class DorisShowCreateRoutineLoadStatementAssert {
* @param expected expected show create routine load statement test case
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final DorisShowCreateRoutineLoadStatement actual, final
DorisShowCreateRoutineLoadStatementTestCase expected) {
- MatcherAssert.assertThat(assertContext.getText("All flag does not
match: "), actual.isAll(), CoreMatchers.is(expected.isAll()));
+ MatcherAssert.assertThat(assertContext.getText("All flag does not
match: "), actual.isAll(), is(expected.isAll()));
if (actual.getJobName().isPresent()) {
- MatcherAssert.assertThat(assertContext.getText("Job name does not
match: "), actual.getJobName().get().getIdentifier().getValue(),
CoreMatchers.is(expected.getJobName()));
+ MatcherAssert.assertThat(assertContext.getText("Job name does not
match: "), actual.getJobName().get().getIdentifier().getValue(),
is(expected.getJobName()));
if (null != expected.getDatabase()) {
DatabaseAssert.assertIs(assertContext,
actual.getJobName().get().getDatabase().orElse(null), expected.getDatabase());
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/dialect/doris/type/DorisUnsetVariableStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/dialect/doris/type/DorisUnsetVariableStatementAssert.java
index ff4a34dcd11..5d266562ddb 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/dialect/doris/type/DorisUnsetVariableStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/dialect/doris/type/DorisUnsetVariableStatementAssert.java
@@ -22,9 +22,10 @@ import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.dal.UnsetVariableStatement;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisUnsetVariableStatementTestCase;
-import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
+import static org.hamcrest.Matchers.is;
+
/**
* Unset variable statement assert for Doris.
*/
@@ -39,7 +40,7 @@ public final class DorisUnsetVariableStatementAssert {
* @param expected expected unset variable statement test case
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final UnsetVariableStatement actual, final DorisUnsetVariableStatementTestCase
expected) {
- MatcherAssert.assertThat(assertContext.getText("Unset variable scope
assertion error: "), actual.getScope(), CoreMatchers.is(expected.getScope()));
- MatcherAssert.assertThat(assertContext.getText("Unset variable name
assertion error: "), actual.getVariableName(),
CoreMatchers.is(expected.getVariableName()));
+ MatcherAssert.assertThat(assertContext.getText("Unset variable scope
assertion error: "), actual.getScope(), is(expected.getScope()));
+ MatcherAssert.assertThat(assertContext.getText("Unset variable name
assertion error: "), actual.getVariableName(), is(expected.getVariableName()));
}
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisAlterRoutineLoadStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisAlterRoutineLoadStatementAssert.java
index 55702a18860..86a1de6e518 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisAlterRoutineLoadStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisAlterRoutineLoadStatementAssert.java
@@ -29,6 +29,7 @@ import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.s
import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
+import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
@@ -53,7 +54,7 @@ public final class DorisAlterRoutineLoadStatementAssert {
private static void assertJobName(final SQLCaseAssertContext
assertContext, final DorisAlterRoutineLoadStatement actual, final
DorisAlterRoutineLoadStatementTestCase expected) {
if (actual.getJobName().isPresent()) {
- MatcherAssert.assertThat(assertContext.getText("Job name does not
match: "), actual.getJobName().get().getIdentifier().getValue(),
CoreMatchers.is(expected.getJobName()));
+ MatcherAssert.assertThat(assertContext.getText("Job name does not
match: "), actual.getJobName().get().getIdentifier().getValue(),
is(expected.getJobName()));
if (null != expected.getOwner()) {
OwnerAssert.assertIs(assertContext,
actual.getJobName().get().getOwner().orElse(null), expected.getOwner());
}
@@ -73,7 +74,7 @@ public final class DorisAlterRoutineLoadStatementAssert {
private static void assertDataSource(final SQLCaseAssertContext
assertContext, final DorisAlterRoutineLoadStatement actual, final
DorisAlterRoutineLoadStatementTestCase expected) {
if (null != expected.getDataSource()) {
- MatcherAssert.assertThat(assertContext.getText("Data source does
not match: "), actual.getDataSource().orElse(null),
CoreMatchers.is(expected.getDataSource()));
+ MatcherAssert.assertThat(assertContext.getText("Data source does
not match: "), actual.getDataSource().orElse(null),
is(expected.getDataSource()));
}
}
@@ -89,8 +90,8 @@ public final class DorisAlterRoutineLoadStatementAssert {
}
private static void assertProperty(final SQLCaseAssertContext
assertContext, final PropertySegment actual, final PropertyTestCase expected) {
- MatcherAssert.assertThat(assertContext.getText(String.format("Property
key '%s' assertion error: ", expected.getKey())), actual.getKey(),
CoreMatchers.is(expected.getKey()));
- MatcherAssert.assertThat(assertContext.getText(String.format("Property
value for key '%s' assertion error: ", expected.getKey())), actual.getValue(),
CoreMatchers.is(expected.getValue()));
+ MatcherAssert.assertThat(assertContext.getText(String.format("Property
key '%s' assertion error: ", expected.getKey())), actual.getKey(),
is(expected.getKey()));
+ MatcherAssert.assertThat(assertContext.getText(String.format("Property
value for key '%s' assertion error: ", expected.getKey())), actual.getValue(),
is(expected.getValue()));
SQLSegmentAssert.assertIs(assertContext, actual, expected);
}
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisBrokerLoadStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisBrokerLoadStatementAssert.java
index fb43abe6688..f42b1921cf6 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisBrokerLoadStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisBrokerLoadStatementAssert.java
@@ -43,6 +43,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
@@ -71,7 +72,7 @@ public final class DorisBrokerLoadStatementAssert {
private static void assertLoadLabel(final SQLCaseAssertContext
assertContext, final DorisBrokerLoadStatement actual, final
DorisBrokerLoadStatementTestCase expected) {
if (null != expected.getLoadLabel()) {
- MatcherAssert.assertThat(assertContext.getText("Load label does
not match: "), actual.getLoadLabel(), CoreMatchers.is(expected.getLoadLabel()));
+ MatcherAssert.assertThat(assertContext.getText("Load label does
not match: "), actual.getLoadLabel(), is(expected.getLoadLabel()));
}
}
@@ -79,7 +80,7 @@ public final class DorisBrokerLoadStatementAssert {
if (null != expected.getOwner()) {
DatabaseSegment database = actual.getDatabase().orElse(null);
assertNotNull(database, assertContext.getText("Database should not
be null"));
- MatcherAssert.assertThat(assertContext.getText("Database name does
not match: "), database.getIdentifier().getValue(),
CoreMatchers.is(expected.getOwner().getName()));
+ MatcherAssert.assertThat(assertContext.getText("Database name does
not match: "), database.getIdentifier().getValue(),
is(expected.getOwner().getName()));
SQLSegmentAssert.assertIs(assertContext, database,
expected.getOwner());
}
}
@@ -87,7 +88,7 @@ public final class DorisBrokerLoadStatementAssert {
private static void assertDataDescs(final SQLCaseAssertContext
assertContext, final DorisBrokerLoadStatement actual, final
DorisBrokerLoadStatementTestCase expected) {
if (!expected.getDataDescs().isEmpty()) {
List<BrokerLoadDataDescSegment> actualDescs = new
ArrayList<>(actual.getDataDescs());
- MatcherAssert.assertThat(assertContext.getText("Data descs size
does not match: "), actualDescs.size(),
CoreMatchers.is(expected.getDataDescs().size()));
+ MatcherAssert.assertThat(assertContext.getText("Data descs size
does not match: "), actualDescs.size(), is(expected.getDataDescs().size()));
for (int i = 0; i < expected.getDataDescs().size(); i++) {
assertDataDesc(assertContext, actualDescs.get(i),
expected.getDataDescs().get(i));
}
@@ -117,24 +118,24 @@ public final class DorisBrokerLoadStatementAssert {
private static void assertMergeType(final SQLCaseAssertContext
assertContext, final BrokerLoadDataDescSegment actual, final
BrokerLoadDataDescTestCase expected) {
if (null != expected.getMergeType()) {
- MatcherAssert.assertThat(assertContext.getText("Merge type does
not match: "), actual.getMergeType().orElse(null),
CoreMatchers.is(expected.getMergeType()));
+ MatcherAssert.assertThat(assertContext.getText("Merge type does
not match: "), actual.getMergeType().orElse(null), is(expected.getMergeType()));
}
}
private static void assertFilePaths(final SQLCaseAssertContext
assertContext, final BrokerLoadDataDescSegment actual, final
BrokerLoadDataDescTestCase expected) {
if (null != expected.getFilePaths()) {
List<String> expectedPaths =
Arrays.asList(expected.getFilePaths().split(","));
- MatcherAssert.assertThat(assertContext.getText("File paths size
does not match: "), actual.getFilePaths().size(),
CoreMatchers.is(expectedPaths.size()));
+ MatcherAssert.assertThat(assertContext.getText("File paths size
does not match: "), actual.getFilePaths().size(), is(expectedPaths.size()));
List<String> actualPaths = new ArrayList<>(actual.getFilePaths());
for (int i = 0; i < expectedPaths.size(); i++) {
- MatcherAssert.assertThat(assertContext.getText("File path does
not match: "), actualPaths.get(i),
CoreMatchers.is(expectedPaths.get(i).trim()));
+ MatcherAssert.assertThat(assertContext.getText("File path does
not match: "), actualPaths.get(i), is(expectedPaths.get(i).trim()));
}
}
}
private static void assertNegative(final SQLCaseAssertContext
assertContext, final BrokerLoadDataDescSegment actual, final
BrokerLoadDataDescTestCase expected) {
if (null != expected.getNegative()) {
- MatcherAssert.assertThat(assertContext.getText("Negative does not
match: "), actual.isNegative(), CoreMatchers.is(expected.getNegative()));
+ MatcherAssert.assertThat(assertContext.getText("Negative does not
match: "), actual.isNegative(), is(expected.getNegative()));
}
}
@@ -146,7 +147,7 @@ public final class DorisBrokerLoadStatementAssert {
private static void assertPartitions(final SQLCaseAssertContext
assertContext, final BrokerLoadDataDescSegment actual, final
BrokerLoadDataDescTestCase expected) {
if (!expected.getPartitions().isEmpty()) {
- MatcherAssert.assertThat(assertContext.getText("Partitions size
does not match: "), actual.getPartitions().size(),
CoreMatchers.is(expected.getPartitions().size()));
+ MatcherAssert.assertThat(assertContext.getText("Partitions size
does not match: "), actual.getPartitions().size(),
is(expected.getPartitions().size()));
int count = 0;
for (PartitionSegment each : actual.getPartitions()) {
PartitionAssert.assertIs(assertContext, each,
expected.getPartitions().get(count));
@@ -157,32 +158,32 @@ public final class DorisBrokerLoadStatementAssert {
private static void assertColumnSeparator(final SQLCaseAssertContext
assertContext, final BrokerLoadDataDescSegment actual, final
BrokerLoadDataDescTestCase expected) {
if (null != expected.getColumnSeparator()) {
- MatcherAssert.assertThat(assertContext.getText("Column separator
does not match: "), actual.getColumnSeparator().orElse(null),
CoreMatchers.is(expected.getColumnSeparator()));
+ MatcherAssert.assertThat(assertContext.getText("Column separator
does not match: "), actual.getColumnSeparator().orElse(null),
is(expected.getColumnSeparator()));
}
}
private static void assertLineDelimiter(final SQLCaseAssertContext
assertContext, final BrokerLoadDataDescSegment actual, final
BrokerLoadDataDescTestCase expected) {
if (null != expected.getLineDelimiter()) {
- MatcherAssert.assertThat(assertContext.getText("Line delimiter
does not match: "), actual.getLineDelimiter().orElse(null),
CoreMatchers.is(expected.getLineDelimiter()));
+ MatcherAssert.assertThat(assertContext.getText("Line delimiter
does not match: "), actual.getLineDelimiter().orElse(null),
is(expected.getLineDelimiter()));
}
}
private static void assertFormatType(final SQLCaseAssertContext
assertContext, final BrokerLoadDataDescSegment actual, final
BrokerLoadDataDescTestCase expected) {
if (null != expected.getFormatType()) {
- MatcherAssert.assertThat(assertContext.getText("Format type does
not match: "), actual.getFormatType().orElse(null),
CoreMatchers.is(expected.getFormatType()));
+ MatcherAssert.assertThat(assertContext.getText("Format type does
not match: "), actual.getFormatType().orElse(null),
is(expected.getFormatType()));
}
}
private static void assertCompressType(final SQLCaseAssertContext
assertContext, final BrokerLoadDataDescSegment actual, final
BrokerLoadDataDescTestCase expected) {
if (null != expected.getCompressType()) {
- MatcherAssert.assertThat(assertContext.getText("Compress type does
not match: "), actual.getCompressType().orElse(null),
CoreMatchers.is(expected.getCompressType()));
+ MatcherAssert.assertThat(assertContext.getText("Compress type does
not match: "), actual.getCompressType().orElse(null),
is(expected.getCompressType()));
}
}
private static void assertColumnList(final SQLCaseAssertContext
assertContext, final BrokerLoadDataDescSegment actual, final
BrokerLoadDataDescTestCase expected) {
if (!expected.getColumnList().isEmpty()) {
List<ColumnSegment> actualCols = new
ArrayList<>(actual.getColumnList());
- MatcherAssert.assertThat(assertContext.getText("Column list size
does not match: "), actualCols.size(),
CoreMatchers.is(expected.getColumnList().size()));
+ MatcherAssert.assertThat(assertContext.getText("Column list size
does not match: "), actualCols.size(), is(expected.getColumnList().size()));
for (int i = 0; i < expected.getColumnList().size(); i++) {
ColumnAssert.assertIs(assertContext, actualCols.get(i),
expected.getColumnList().get(i));
}
@@ -192,7 +193,7 @@ public final class DorisBrokerLoadStatementAssert {
private static void assertColumnsFromPath(final SQLCaseAssertContext
assertContext, final BrokerLoadDataDescSegment actual, final
BrokerLoadDataDescTestCase expected) {
if (!expected.getColumnsFromPath().isEmpty()) {
List<ColumnSegment> actualCols = new
ArrayList<>(actual.getColumnsFromPath());
- MatcherAssert.assertThat(assertContext.getText("Columns from path
size does not match: "), actualCols.size(),
CoreMatchers.is(expected.getColumnsFromPath().size()));
+ MatcherAssert.assertThat(assertContext.getText("Columns from path
size does not match: "), actualCols.size(),
is(expected.getColumnsFromPath().size()));
for (int i = 0; i < expected.getColumnsFromPath().size(); i++) {
ColumnAssert.assertIs(assertContext, actualCols.get(i),
expected.getColumnsFromPath().get(i));
}
@@ -202,7 +203,7 @@ public final class DorisBrokerLoadStatementAssert {
private static void assertSetAssignments(final SQLCaseAssertContext
assertContext, final BrokerLoadDataDescSegment actual, final
BrokerLoadDataDescTestCase expected) {
if (!expected.getSetAssignments().isEmpty()) {
List<ColumnAssignmentSegment> actualAssignments = new
ArrayList<>(actual.getSetAssignments());
- MatcherAssert.assertThat(assertContext.getText("Set assignments
size does not match: "), actualAssignments.size(),
CoreMatchers.is(expected.getSetAssignments().size()));
+ MatcherAssert.assertThat(assertContext.getText("Set assignments
size does not match: "), actualAssignments.size(),
is(expected.getSetAssignments().size()));
for (int i = 0; i < expected.getSetAssignments().size(); i++) {
AssignmentAssert.assertIs(assertContext,
actualAssignments.get(i), expected.getSetAssignments().get(i));
}
@@ -229,7 +230,7 @@ public final class DorisBrokerLoadStatementAssert {
private static void assertOrderByColumn(final SQLCaseAssertContext
assertContext, final BrokerLoadDataDescSegment actual, final
BrokerLoadDataDescTestCase expected) {
if (null != expected.getOrderByColumn()) {
- MatcherAssert.assertThat(assertContext.getText("Order by column
does not match: "), actual.getOrderByColumn().orElse(null),
CoreMatchers.is(expected.getOrderByColumn()));
+ MatcherAssert.assertThat(assertContext.getText("Order by column
does not match: "), actual.getOrderByColumn().orElse(null),
is(expected.getOrderByColumn()));
}
}
@@ -246,13 +247,13 @@ public final class DorisBrokerLoadStatementAssert {
private static void assertBrokerType(final SQLCaseAssertContext
assertContext, final DorisBrokerLoadStatement actual, final
DorisBrokerLoadStatementTestCase expected) {
if (null != expected.getBrokerType()) {
- MatcherAssert.assertThat(assertContext.getText("Broker type does
not match: "), actual.getBrokerType(),
CoreMatchers.is(expected.getBrokerType()));
+ MatcherAssert.assertThat(assertContext.getText("Broker type does
not match: "), actual.getBrokerType(), is(expected.getBrokerType()));
}
}
private static void assertBrokerName(final SQLCaseAssertContext
assertContext, final DorisBrokerLoadStatement actual, final
DorisBrokerLoadStatementTestCase expected) {
if (null != expected.getBrokerName()) {
- MatcherAssert.assertThat(assertContext.getText("Broker name does
not match: "), actual.getBrokerName().orElse(null),
CoreMatchers.is(expected.getBrokerName()));
+ MatcherAssert.assertThat(assertContext.getText("Broker name does
not match: "), actual.getBrokerName().orElse(null),
is(expected.getBrokerName()));
}
}
@@ -279,14 +280,14 @@ public final class DorisBrokerLoadStatementAssert {
}
private static void assertProperty(final SQLCaseAssertContext
assertContext, final PropertySegment actual, final PropertyTestCase expected) {
- MatcherAssert.assertThat(assertContext.getText(String.format("Property
key '%s' assertion error: ", expected.getKey())), actual.getKey(),
CoreMatchers.is(expected.getKey()));
- MatcherAssert.assertThat(assertContext.getText(String.format("Property
value for key '%s' assertion error: ", expected.getKey())), actual.getValue(),
CoreMatchers.is(expected.getValue()));
+ MatcherAssert.assertThat(assertContext.getText(String.format("Property
key '%s' assertion error: ", expected.getKey())), actual.getKey(),
is(expected.getKey()));
+ MatcherAssert.assertThat(assertContext.getText(String.format("Property
value for key '%s' assertion error: ", expected.getKey())), actual.getValue(),
is(expected.getValue()));
SQLSegmentAssert.assertIs(assertContext, actual, expected);
}
private static void assertComment(final SQLCaseAssertContext
assertContext, final DorisBrokerLoadStatement actual, final
DorisBrokerLoadStatementTestCase expected) {
if (null != expected.getComment()) {
- MatcherAssert.assertThat(assertContext.getText("Comment does not
match: "), actual.getComment().orElse(null),
CoreMatchers.is(expected.getComment()));
+ MatcherAssert.assertThat(assertContext.getText("Comment does not
match: "), actual.getComment().orElse(null), is(expected.getComment()));
}
}
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisCreateRoutineLoadStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisCreateRoutineLoadStatementAssert.java
index ae6a05c0bb4..b789b645206 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisCreateRoutineLoadStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisCreateRoutineLoadStatementAssert.java
@@ -38,6 +38,7 @@ import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.s
import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
+import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
@@ -72,7 +73,7 @@ public final class DorisCreateRoutineLoadStatementAssert {
private static void assertJobName(final SQLCaseAssertContext
assertContext, final DorisCreateRoutineLoadStatement actual, final
DorisCreateRoutineLoadStatementTestCase expected) {
if (actual.getJobName().isPresent()) {
- MatcherAssert.assertThat(assertContext.getText("Job name does not
match: "), actual.getJobName().get().getIdentifier().getValue(),
CoreMatchers.is(expected.getJobName()));
+ MatcherAssert.assertThat(assertContext.getText("Job name does not
match: "), actual.getJobName().get().getIdentifier().getValue(),
is(expected.getJobName()));
if (null != expected.getOwner()) {
OwnerAssert.assertIs(assertContext,
actual.getJobName().get().getOwner().orElse(null), expected.getOwner());
}
@@ -87,19 +88,19 @@ public final class DorisCreateRoutineLoadStatementAssert {
private static void assertMergeType(final SQLCaseAssertContext
assertContext, final DorisCreateRoutineLoadStatement actual, final
DorisCreateRoutineLoadStatementTestCase expected) {
if (null != expected.getMergeType()) {
- MatcherAssert.assertThat(assertContext.getText("Merge type does
not match: "), actual.getMergeType().orElse(null),
CoreMatchers.is(expected.getMergeType()));
+ MatcherAssert.assertThat(assertContext.getText("Merge type does
not match: "), actual.getMergeType().orElse(null), is(expected.getMergeType()));
}
}
private static void assertColumnSeparator(final SQLCaseAssertContext
assertContext, final DorisCreateRoutineLoadStatement actual, final
DorisCreateRoutineLoadStatementTestCase expected) {
if (null != expected.getColumnSeparator()) {
- MatcherAssert.assertThat(assertContext.getText("Column separator
does not match: "), actual.getColumnSeparator().orElse(null),
CoreMatchers.is(expected.getColumnSeparator()));
+ MatcherAssert.assertThat(assertContext.getText("Column separator
does not match: "), actual.getColumnSeparator().orElse(null),
is(expected.getColumnSeparator()));
}
}
private static void assertColumnMappings(final SQLCaseAssertContext
assertContext, final DorisCreateRoutineLoadStatement actual, final
DorisCreateRoutineLoadStatementTestCase expected) {
if (!expected.getColumnMappings().isEmpty()) {
- MatcherAssert.assertThat(assertContext.getText("Column mappings
size does not match: "), actual.getColumnMappings().size(),
CoreMatchers.is(expected.getColumnMappings().size()));
+ MatcherAssert.assertThat(assertContext.getText("Column mappings
size does not match: "), actual.getColumnMappings().size(),
is(expected.getColumnMappings().size()));
int count = 0;
for (ColumnMappingSegment each : actual.getColumnMappings()) {
assertColumnMapping(assertContext, each,
expected.getColumnMappings().get(count));
@@ -118,7 +119,7 @@ public final class DorisCreateRoutineLoadStatementAssert {
private static void assertPartitions(final SQLCaseAssertContext
assertContext, final DorisCreateRoutineLoadStatement actual, final
DorisCreateRoutineLoadStatementTestCase expected) {
if (!expected.getPartitions().isEmpty()) {
- MatcherAssert.assertThat(assertContext.getText("Partitions size
does not match: "), actual.getPartitions().size(),
CoreMatchers.is(expected.getPartitions().size()));
+ MatcherAssert.assertThat(assertContext.getText("Partitions size
does not match: "), actual.getPartitions().size(),
is(expected.getPartitions().size()));
int count = 0;
for (PartitionSegment each : actual.getPartitions()) {
PartitionAssert.assertIs(assertContext, each,
expected.getPartitions().get(count));
@@ -164,7 +165,7 @@ public final class DorisCreateRoutineLoadStatementAssert {
private static void assertDataSource(final SQLCaseAssertContext
assertContext, final DorisCreateRoutineLoadStatement actual, final
DorisCreateRoutineLoadStatementTestCase expected) {
if (null != expected.getDataSource()) {
- MatcherAssert.assertThat(assertContext.getText("Data source does
not match: "), actual.getDataSource().orElse(null),
CoreMatchers.is(expected.getDataSource()));
+ MatcherAssert.assertThat(assertContext.getText("Data source does
not match: "), actual.getDataSource().orElse(null),
is(expected.getDataSource()));
}
}
@@ -180,14 +181,14 @@ public final class DorisCreateRoutineLoadStatementAssert {
}
private static void assertProperty(final SQLCaseAssertContext
assertContext, final PropertySegment actual, final PropertyTestCase expected) {
- MatcherAssert.assertThat(assertContext.getText(String.format("Property
key '%s' assertion error: ", expected.getKey())), actual.getKey(),
CoreMatchers.is(expected.getKey()));
- MatcherAssert.assertThat(assertContext.getText(String.format("Property
value for key '%s' assertion error: ", expected.getKey())), actual.getValue(),
CoreMatchers.is(expected.getValue()));
+ MatcherAssert.assertThat(assertContext.getText(String.format("Property
key '%s' assertion error: ", expected.getKey())), actual.getKey(),
is(expected.getKey()));
+ MatcherAssert.assertThat(assertContext.getText(String.format("Property
value for key '%s' assertion error: ", expected.getKey())), actual.getValue(),
is(expected.getValue()));
SQLSegmentAssert.assertIs(assertContext, actual, expected);
}
private static void assertComment(final SQLCaseAssertContext
assertContext, final DorisCreateRoutineLoadStatement actual, final
DorisCreateRoutineLoadStatementTestCase expected) {
if (null != expected.getComment()) {
- MatcherAssert.assertThat(assertContext.getText("Comment does not
match: "), actual.getComment().orElse(null),
CoreMatchers.is(expected.getComment()));
+ MatcherAssert.assertThat(assertContext.getText("Comment does not
match: "), actual.getComment().orElse(null), is(expected.getComment()));
}
}
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisPauseRoutineLoadStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisPauseRoutineLoadStatementAssert.java
index af1108890f4..4eecade52c4 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisPauseRoutineLoadStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisPauseRoutineLoadStatementAssert.java
@@ -23,9 +23,10 @@ import
org.apache.shardingsphere.sql.parser.statement.doris.dml.DorisPauseRoutin
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
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.statement.dml.dialect.doris.DorisPauseRoutineLoadStatementTestCase;
-import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
+import static org.hamcrest.Matchers.is;
+
/**
* Pause routine load statement assert for Doris.
*/
@@ -40,9 +41,9 @@ public final class DorisPauseRoutineLoadStatementAssert {
* @param expected expected pause routine load statement test case
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final DorisPauseRoutineLoadStatement actual, final
DorisPauseRoutineLoadStatementTestCase expected) {
- MatcherAssert.assertThat(assertContext.getText("All flag does not
match: "), actual.isAll(), CoreMatchers.is(expected.isAll()));
+ MatcherAssert.assertThat(assertContext.getText("All flag does not
match: "), actual.isAll(), is(expected.isAll()));
if (!expected.isAll() && actual.getJobName().isPresent()) {
- MatcherAssert.assertThat(assertContext.getText("Job name does not
match: "), actual.getJobName().get().getIdentifier().getValue(),
CoreMatchers.is(expected.getJobName()));
+ MatcherAssert.assertThat(assertContext.getText("Job name does not
match: "), actual.getJobName().get().getIdentifier().getValue(),
is(expected.getJobName()));
if (null != expected.getOwner()) {
OwnerAssert.assertIs(assertContext,
actual.getJobName().get().getOwner().orElse(null), expected.getOwner());
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisResumeRoutineLoadStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisResumeRoutineLoadStatementAssert.java
index 5833c03cdaf..a4065ad2cda 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisResumeRoutineLoadStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisResumeRoutineLoadStatementAssert.java
@@ -23,9 +23,10 @@ import
org.apache.shardingsphere.sql.parser.statement.doris.dml.DorisResumeRouti
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
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.statement.dml.dialect.doris.DorisResumeRoutineLoadStatementTestCase;
-import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
+import static org.hamcrest.Matchers.is;
+
/**
* Resume routine load statement assert for Doris.
*/
@@ -40,9 +41,9 @@ public final class DorisResumeRoutineLoadStatementAssert {
* @param expected expected resume routine load statement test case
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final DorisResumeRoutineLoadStatement actual, final
DorisResumeRoutineLoadStatementTestCase expected) {
- MatcherAssert.assertThat(assertContext.getText("All flag does not
match: "), actual.isAll(), CoreMatchers.is(expected.isAll()));
+ MatcherAssert.assertThat(assertContext.getText("All flag does not
match: "), actual.isAll(), is(expected.isAll()));
if (!expected.isAll() && actual.getJobName().isPresent()) {
- MatcherAssert.assertThat(assertContext.getText("Job name does not
match: "), actual.getJobName().get().getIdentifier().getValue(),
CoreMatchers.is(expected.getJobName()));
+ MatcherAssert.assertThat(assertContext.getText("Job name does not
match: "), actual.getJobName().get().getIdentifier().getValue(),
is(expected.getJobName()));
if (null != expected.getOwner()) {
OwnerAssert.assertIs(assertContext,
actual.getJobName().get().getOwner().orElse(null), expected.getOwner());
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisStopRoutineLoadStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisStopRoutineLoadStatementAssert.java
index 79114022404..32c66f3ea6e 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisStopRoutineLoadStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/doris/DorisStopRoutineLoadStatementAssert.java
@@ -23,9 +23,10 @@ import
org.apache.shardingsphere.sql.parser.statement.doris.dml.DorisStopRoutine
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
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.statement.dml.dialect.doris.DorisStopRoutineLoadStatementTestCase;
-import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
+import static org.hamcrest.Matchers.is;
+
/**
* Stop routine load statement assert for Doris.
*/
@@ -41,7 +42,7 @@ public final class DorisStopRoutineLoadStatementAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final DorisStopRoutineLoadStatement actual, final
DorisStopRoutineLoadStatementTestCase expected) {
if (actual.getJobName().isPresent()) {
- MatcherAssert.assertThat(assertContext.getText("Job name does not
match: "), actual.getJobName().get().getIdentifier().getValue(),
CoreMatchers.is(expected.getJobName()));
+ MatcherAssert.assertThat(assertContext.getText("Job name does not
match: "), actual.getJobName().get().getIdentifier().getValue(),
is(expected.getJobName()));
if (null != expected.getOwner()) {
OwnerAssert.assertIs(assertContext,
actual.getJobName().get().getOwner().orElse(null), expected.getOwner());
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/mysql/type/MySQLLoadDataStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/mysql/type/MySQLLoadDataStatementAssert.java
index 5385f6408bd..b73c1da3c69 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/mysql/type/MySQLLoadDataStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dml/dialect/mysql/type/MySQLLoadDataStatementAssert.java
@@ -34,6 +34,7 @@ import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.s
import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
+import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -65,13 +66,13 @@ public final class MySQLLoadDataStatementAssert {
}
private static void assertLocal(final SQLCaseAssertContext assertContext,
final MySQLLoadDataStatement actual, final MySQLLoadDataStatementTestCase
expected) {
- MatcherAssert.assertThat(assertContext.getText("LOCAL flag does not
match: "), actual.isLocal(), CoreMatchers.is(null != expected.getLocal() &&
expected.getLocal()));
+ MatcherAssert.assertThat(assertContext.getText("LOCAL flag does not
match: "), actual.isLocal(), is(null != expected.getLocal() &&
expected.getLocal()));
}
private static void assertFileName(final SQLCaseAssertContext
assertContext, final MySQLLoadDataStatement actual, final
MySQLLoadDataStatementTestCase expected) {
if (null != expected.getFileName()) {
assertNotNull(actual.getFileName(), assertContext.getText("File
name segment should not be null"));
- MatcherAssert.assertThat(assertContext.getText("File name value
does not match: "), actual.getFileName().getValue(),
CoreMatchers.is(expected.getFileName().getValue()));
+ MatcherAssert.assertThat(assertContext.getText("File name value
does not match: "), actual.getFileName().getValue(),
is(expected.getFileName().getValue()));
SQLSegmentAssert.assertIs(assertContext, actual.getFileName(),
expected.getFileName());
}
}
@@ -86,7 +87,7 @@ public final class MySQLLoadDataStatementAssert {
private static void assertPartitions(final SQLCaseAssertContext
assertContext, final MySQLLoadDataStatement actual, final
MySQLLoadDataStatementTestCase expected) {
if (!expected.getPartitions().isEmpty()) {
- MatcherAssert.assertThat(assertContext.getText("Partitions size
does not match: "), actual.getPartitions().size(),
CoreMatchers.is(expected.getPartitions().size()));
+ MatcherAssert.assertThat(assertContext.getText("Partitions size
does not match: "), actual.getPartitions().size(),
is(expected.getPartitions().size()));
int count = 0;
for (PartitionSegment each : actual.getPartitions()) {
PartitionAssert.assertIs(assertContext, each,
expected.getPartitions().get(count));
@@ -116,19 +117,19 @@ public final class MySQLLoadDataStatementAssert {
private static void assertIgnoreLines(final SQLCaseAssertContext
assertContext, final MySQLLoadDataStatement actual, final
MySQLLoadDataStatementTestCase expected) {
if (null != expected.getIgnoreLines()) {
assertNotNull(actual.getIgnoreLines().orElse(null),
assertContext.getText("Ignore lines segment should not be null"));
- MatcherAssert.assertThat(assertContext.getText("Ignore lines
number does not match: "), actual.getIgnoreLines().get().getNumber(),
CoreMatchers.is(expected.getIgnoreLines().getNumber()));
- MatcherAssert.assertThat(assertContext.getText("Ignore lines unit
does not match: "), actual.getIgnoreLines().get().getUnit(),
CoreMatchers.is(expected.getIgnoreLines().getUnit()));
+ MatcherAssert.assertThat(assertContext.getText("Ignore lines
number does not match: "), actual.getIgnoreLines().get().getNumber(),
is(expected.getIgnoreLines().getNumber()));
+ MatcherAssert.assertThat(assertContext.getText("Ignore lines unit
does not match: "), actual.getIgnoreLines().get().getUnit(),
is(expected.getIgnoreLines().getUnit()));
SQLSegmentAssert.assertIs(assertContext,
actual.getIgnoreLines().get(), expected.getIgnoreLines());
}
}
private static void assertColumnList(final SQLCaseAssertContext
assertContext, final MySQLLoadDataStatement actual, final
MySQLLoadDataStatementTestCase expected) {
if (!expected.getColumns().isEmpty()) {
- MatcherAssert.assertThat(assertContext.getText("Column list size
does not match: "), actual.getColumnList().size(),
CoreMatchers.is(expected.getColumns().size()));
+ MatcherAssert.assertThat(assertContext.getText("Column list size
does not match: "), actual.getColumnList().size(),
is(expected.getColumns().size()));
int count = 0;
for (ColNameOrUserVarSegment each : actual.getColumnList()) {
ExpectedPartition exp = expected.getColumns().get(count);
- MatcherAssert.assertThat(assertContext.getText("Column name
does not match: "), each.getIdentifier().getValue(),
CoreMatchers.is(exp.getName()));
+ MatcherAssert.assertThat(assertContext.getText("Column name
does not match: "), each.getIdentifier().getValue(), is(exp.getName()));
SQLSegmentAssert.assertIs(assertContext, each, exp);
count++;
}
@@ -145,7 +146,7 @@ public final class MySQLLoadDataStatementAssert {
private static void assertProperties(final SQLCaseAssertContext
assertContext, final MySQLLoadDataStatement actual, final
MySQLLoadDataStatementTestCase expected) {
if (!expected.getProperties().isEmpty()) {
assertNotNull(actual.getProperties().orElse(null),
assertContext.getText("Actual properties should exist."));
- MatcherAssert.assertThat(assertContext.getText("Properties size
does not match: "), actual.getProperties().get().getProperties().size(),
CoreMatchers.is(expected.getProperties().size()));
+ MatcherAssert.assertThat(assertContext.getText("Properties size
does not match: "), actual.getProperties().get().getProperties().size(),
is(expected.getProperties().size()));
for (int i = 0; i < expected.getProperties().size(); i++) {
assertProperty(assertContext,
actual.getProperties().get().getProperties().get(i),
expected.getProperties().get(i));
}
@@ -155,8 +156,8 @@ public final class MySQLLoadDataStatementAssert {
}
private static void assertProperty(final SQLCaseAssertContext
assertContext, final PropertySegment actual, final PropertyTestCase expected) {
- MatcherAssert.assertThat(assertContext.getText(String.format("Property
key '%s' assertion error: ", expected.getKey())), actual.getKey(),
CoreMatchers.is(expected.getKey()));
- MatcherAssert.assertThat(assertContext.getText(String.format("Property
value for key '%s' assertion error: ", expected.getKey())), actual.getValue(),
CoreMatchers.is(expected.getValue()));
+ MatcherAssert.assertThat(assertContext.getText(String.format("Property
key '%s' assertion error: ", expected.getKey())), actual.getKey(),
is(expected.getKey()));
+ MatcherAssert.assertThat(assertContext.getText(String.format("Property
value for key '%s' assertion error: ", expected.getKey())), actual.getValue(),
is(expected.getValue()));
SQLSegmentAssert.assertIs(assertContext, actual, expected);
}
}
