You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/12/02 16:05:30 UTC
(shardingsphere) branch master updated: Add DatabaseRuleConfigurationManagerTest (#37261)
This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 6883b3db691 Add DatabaseRuleConfigurationManagerTest (#37261)
6883b3db691 is described below
commit 6883b3db6916d8b136772dafd4c7f2d76f4228d0
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Dec 3 00:05:23 2025 +0800
Add DatabaseRuleConfigurationManagerTest (#37261)
---
.../state/circuit/statement/CircuitBreakerStatement.java | 8 ++++----
.../manager/rule/DatabaseRuleConfigurationManagerTest.java | 12 ++++++------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/jdbc/src/main/java/org/apache/shardingsphere/driver/state/circuit/statement/CircuitBreakerStatement.java b/jdbc/src/main/java/org/apache/shardingsphere/driver/state/circuit/statement/CircuitBreakerStatement.java
index 64d79a04312..b777d128e7b 100644
--- a/jdbc/src/main/java/org/apache/shardingsphere/driver/state/circuit/statement/CircuitBreakerStatement.java
+++ b/jdbc/src/main/java/org/apache/shardingsphere/driver/state/circuit/statement/CircuitBreakerStatement.java
@@ -30,10 +30,6 @@ import java.sql.Statement;
*/
public final class CircuitBreakerStatement extends WrapperAdapter implements Statement {
- @Override
- public void close() {
- }
-
@Override
public int getMaxFieldSize() {
return 0;
@@ -225,4 +221,8 @@ public final class CircuitBreakerStatement extends WrapperAdapter implements Sta
public boolean isCloseOnCompletion() {
return false;
}
+
+ @Override
+ public void close() {
+ }
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleConfigurationManagerTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleConfigurationManagerTest.java
index a09f933ad43..aceaf34242e 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleConfigurationManagerTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleConfigurationManagerTest.java
@@ -95,7 +95,7 @@ class DatabaseRuleConfigurationManagerTest {
when(database.getRuleMetaData()).thenReturn(new RuleMetaData(Collections.singleton(partialRule)));
MetaDataContexts metaDataContexts = mock(MetaDataContexts.class, RETURNS_DEEP_STUBS);
when(metaDataContexts.getMetaData().getDatabase(DATABASE_NAME)).thenReturn(database);
- new DatabaseRuleConfigurationManager(metaDataContexts, mock(ComputeNodeInstanceContext.class), mock(MetaDataPersistFacade.class)).refresh(DATABASE_NAME, ruleConfig, true);
+ new DatabaseRuleConfigurationManager(metaDataContexts, mock(), mock()).refresh(DATABASE_NAME, ruleConfig, true);
verify((PartialRuleUpdateSupported) partialRule).updateConfiguration(ruleConfig);
verify(metaDataContexts, never()).update(any(MetaDataContexts.class));
}
@@ -115,7 +115,7 @@ class DatabaseRuleConfigurationManagerTest {
try (
MockedConstruction<MetaDataContextsFactory> ignored = mockConstruction(MetaDataContextsFactory.class,
(mock, context) -> when(mock.createByAlterRule(eq(DATABASE_NAME), eq(false), any(Collection.class), eq(metaDataContexts))).thenReturn(mock(MetaDataContexts.class)))) {
- new DatabaseRuleConfigurationManager(metaDataContexts, mock(ComputeNodeInstanceContext.class), mock(MetaDataPersistFacade.class)).refresh(DATABASE_NAME, ruleConfig, false);
+ new DatabaseRuleConfigurationManager(metaDataContexts, mock(), mock()).refresh(DATABASE_NAME, ruleConfig, false);
verify(metaDataContexts).update(any(MetaDataContexts.class));
verify(updater).updateConfiguration(ruleConfig);
}
@@ -134,7 +134,7 @@ class DatabaseRuleConfigurationManagerTest {
try (
MockedConstruction<MetaDataContextsFactory> ignored = mockConstruction(MetaDataContextsFactory.class,
(mock, context) -> when(mock.createByAlterRule(eq(DATABASE_NAME), eq(false), any(Collection.class), eq(metaDataContexts))).thenReturn(mock(MetaDataContexts.class)))) {
- new DatabaseRuleConfigurationManager(metaDataContexts, mock(ComputeNodeInstanceContext.class), mock(MetaDataPersistFacade.class)).refresh(DATABASE_NAME, ruleConfig, false);
+ new DatabaseRuleConfigurationManager(metaDataContexts, mock(), mock()).refresh(DATABASE_NAME, ruleConfig, false);
verify(metaDataContexts).update(any(MetaDataContexts.class));
}
}
@@ -154,7 +154,7 @@ class DatabaseRuleConfigurationManagerTest {
MockedConstruction<MetaDataContextsFactory> ignored = mockConstruction(MetaDataContextsFactory.class,
(mock, context) -> when(mock.createByAlterRule(eq(DATABASE_NAME), eq(false), any(Collection.class), eq(metaDataContexts))).thenReturn(mock(MetaDataContexts.class)))) {
when(DatabaseRulesBuilder.build(eq(DATABASE_NAME), any(), any(), eq(ruleConfig), any(), any())).thenReturn(rebuiltRule);
- new DatabaseRuleConfigurationManager(metaDataContexts, mock(ComputeNodeInstanceContext.class), mock(MetaDataPersistFacade.class)).refresh(DATABASE_NAME, ruleConfig, true);
+ new DatabaseRuleConfigurationManager(metaDataContexts, mock(), mock()).refresh(DATABASE_NAME, ruleConfig, true);
verify(metaDataContexts).update(any(MetaDataContexts.class));
}
}
@@ -173,7 +173,7 @@ class DatabaseRuleConfigurationManagerTest {
MockedConstruction<MetaDataContextsFactory> ignored = mockConstruction(MetaDataContextsFactory.class,
(mock, context) -> when(mock.createByAlterRule(eq(DATABASE_NAME), eq(false), any(Collection.class), eq(metaDataContexts))).thenThrow(new SQLException("failed")))) {
assertThrows(SQLException.class,
- () -> new DatabaseRuleConfigurationManager(metaDataContexts, mock(ComputeNodeInstanceContext.class), mock(MetaDataPersistFacade.class)).refresh(DATABASE_NAME, ruleConfig, false));
+ () -> new DatabaseRuleConfigurationManager(metaDataContexts, mock(), mock()).refresh(DATABASE_NAME, ruleConfig, false));
}
}
@@ -194,7 +194,7 @@ class DatabaseRuleConfigurationManagerTest {
MockedConstruction<MetaDataContextsFactory> ignored = mockConstruction(MetaDataContextsFactory.class,
(mock, context) -> when(mock.createByAlterRule(eq(DATABASE_NAME), eq(false), any(Collection.class), eq(metaDataContexts))).thenReturn(mock(MetaDataContexts.class)))) {
assertThrows(Exception.class,
- () -> new DatabaseRuleConfigurationManager(metaDataContexts, mock(ComputeNodeInstanceContext.class), mock(MetaDataPersistFacade.class)).refresh(DATABASE_NAME, ruleConfig, false));
+ () -> new DatabaseRuleConfigurationManager(metaDataContexts, mock(), mock()).refresh(DATABASE_NAME, ruleConfig, false));
}
}
}