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 3a151401e47 Use accurate assertion with error msg (#39930)
3a151401e47 is described below
commit 3a151401e47c60ef18f9c30bb1e353667f4115ef
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Sep 23 22:32:45 2026 +0800
Use accurate assertion with error msg (#39930)
---
.../shardingsphere/encrypt/config/EncryptRuleConfigurationTest.java | 3 +--
.../config/ReadwriteSplittingRuleConfigurationTest.java | 5 +++--
.../driver/jdbc/core/statement/ShardingSpherePreparedStatement.java | 6 ++----
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git
a/features/encrypt/api/src/test/java/org/apache/shardingsphere/encrypt/config/EncryptRuleConfigurationTest.java
b/features/encrypt/api/src/test/java/org/apache/shardingsphere/encrypt/config/EncryptRuleConfigurationTest.java
index 2439035ab56..ae8a651dc51 100644
---
a/features/encrypt/api/src/test/java/org/apache/shardingsphere/encrypt/config/EncryptRuleConfigurationTest.java
+++
b/features/encrypt/api/src/test/java/org/apache/shardingsphere/encrypt/config/EncryptRuleConfigurationTest.java
@@ -36,7 +36,6 @@ import java.util.Properties;
import java.util.stream.Stream;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -99,7 +98,7 @@ class EncryptRuleConfigurationTest {
EncryptRuleConfiguration ruleConfig = createRuleConfiguration(new
EncryptColumnRuleConfiguration(
"foo_col", new
EncryptColumnItemRuleConfiguration("foo_cipher", "bar_encryptor")));
InvalidRuleConfigurationException actual =
assertThrows(InvalidRuleConfigurationException.class, () ->
RuleConfigurationValidator.validate(ruleConfig));
- assertThat(actual.getMessage(), containsString("Property `tables`
references unconfigured encryptors `bar_encryptor`."));
+ assertThat(actual.getMessage(), is("Invalid 'EncryptRuleConfiguration'
rule, error message is: Property `tables` references unconfigured encryptors
`bar_encryptor`."));
}
private static Stream<Arguments> invalidRuleConfigurationArguments() {
diff --git
a/features/readwrite-splitting/api/src/test/java/org/apache/shardingsphere/readwritesplitting/config/ReadwriteSplittingRuleConfigurationTest.java
b/features/readwrite-splitting/api/src/test/java/org/apache/shardingsphere/readwritesplitting/config/ReadwriteSplittingRuleConfigurationTest.java
index 74f058f6bbc..8060ea9983c 100644
---
a/features/readwrite-splitting/api/src/test/java/org/apache/shardingsphere/readwritesplitting/config/ReadwriteSplittingRuleConfigurationTest.java
+++
b/features/readwrite-splitting/api/src/test/java/org/apache/shardingsphere/readwritesplitting/config/ReadwriteSplittingRuleConfigurationTest.java
@@ -33,7 +33,7 @@ import java.util.Properties;
import java.util.stream.Stream;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -71,7 +71,8 @@ class ReadwriteSplittingRuleConfigurationTest {
ReadwriteSplittingRuleConfiguration ruleConfig =
createRuleConfiguration(new ReadwriteSplittingDataSourceGroupRuleConfiguration(
"foo_group", "foo_write",
Collections.singletonList("foo_read"), "bar_load_balancer"));
InvalidRuleConfigurationException actual =
assertThrows(InvalidRuleConfigurationException.class, () ->
RuleConfigurationValidator.validate(ruleConfig));
- assertThat(actual.getMessage(), containsString("Property
`dataSourceGroups` references unconfigured loadBalancers
`bar_load_balancer`."));
+ assertThat(actual.getMessage(),
+ is("Invalid 'ReadwriteSplittingRuleConfiguration' rule, error
message is: Property `dataSourceGroups` references unconfigured loadBalancers
`bar_load_balancer`."));
}
private static Stream<Arguments> invalidRuleConfigurationArguments() {
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
index 3cdbc78dec3..8f0ddef4a37 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
@@ -235,8 +235,7 @@ public final class ShardingSpherePreparedStatement extends
AbstractPreparedState
return statements.iterator().next().execute();
}
clearPrevious();
- QueryContext queryContext = createQueryContext();
- this.queryContext = queryContext;
+ this.queryContext = createQueryContext();
handleAutoCommitBeforeExecution(queryContext.getSqlStatementContext().getSqlStatement(),
connection);
boolean result = driverExecutorFacade.execute(usedDatabase,
metaData, queryContext, (sql, statement) -> ((PreparedStatement)
statement).execute(),
(StatementAddCallback<PreparedStatement>)
this::addStatements, createReplayCallback());
@@ -337,8 +336,7 @@ public final class ShardingSpherePreparedStatement extends
AbstractPreparedState
hasBatchGeneratedValues = true;
}
currentResultSet = null;
- QueryContext queryContext = createQueryContext();
- this.queryContext = queryContext;
+ this.queryContext = createQueryContext();
executeBatchExecutor.addBatch(queryContext, usedDatabase);
findGeneratedKey().ifPresent(optional ->
generatedValues.addAll(optional.getGeneratedValues()));
clearParameters();
