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 6cd7a6e656a Refactor ShardingTokenGenerateBuilderTest (#32880)
6cd7a6e656a is described below
commit 6cd7a6e656a5872087a113a1ed40bac7eaeb63f8
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Sep 15 15:20:16 2024 +0800
Refactor ShardingTokenGenerateBuilderTest (#32880)
* Refactor ShardingTokenGenerateBuilderTest
* Refactor SeataATShardingSphereTransactionManagerTest
* Refactor SeataATShardingSphereTransactionManagerTest
* Refactor SeataATShardingSphereTransactionManagerTest
* Refactor SeataATShardingSphereTransactionManagerTest
---
.../route/ReadwriteSplittingDataSourceRouterTest.java | 11 +++++++----
.../rewrite/token/ShardingTokenGenerateBuilderTest.java | 2 +-
.../seata/at/SeataATShardingSphereTransactionManagerTest.java | 10 +++++-----
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/route/ReadwriteSplittingDataSourceRouterTest.java
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/route/ReadwriteSplittingDataSourceRouterTest.java
index 2ca27d391b2..59db9cb0fda 100644
---
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/route/ReadwriteSplittingDataSourceRouterTest.java
+++
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/route/ReadwriteSplittingDataSourceRouterTest.java
@@ -54,24 +54,27 @@ class ReadwriteSplittingDataSourceRouterTest {
@Mock
private HintValueContext hintValueContext;
- @SneakyThrows(ReflectiveOperationException.class)
@Test
void assertRouteWithQualifiedRouters() {
ReadwriteSplittingDataSourceRouter router = new
ReadwriteSplittingDataSourceRouter(rule, mock(ConnectionContext.class));
QualifiedReadwriteSplittingDataSourceRouter qualifiedRouter =
mock(QualifiedReadwriteSplittingDataSourceRouter.class);
when(qualifiedRouter.isQualified(sqlStatementContext, rule,
hintValueContext)).thenReturn(true);
when(qualifiedRouter.route(rule)).thenReturn("qualified_ds");
-
Plugins.getMemberAccessor().set(ReadwriteSplittingDataSourceRouter.class.getDeclaredField("qualifiedRouters"),
router, qualifiedRouter);
+ setQualifiedRouters(router, qualifiedRouter);
assertThat(router.route(sqlStatementContext, hintValueContext),
is("qualified_ds"));
}
- @SneakyThrows(ReflectiveOperationException.class)
@Test
void assertRouteWithStandardRouters() {
when(rule.getLoadBalancer().getTargetName(any(),
any())).thenReturn("standard_ds");
ReadwriteSplittingDataSourceRouter router = new
ReadwriteSplittingDataSourceRouter(rule, mock(ConnectionContext.class));
-
Plugins.getMemberAccessor().set(ReadwriteSplittingDataSourceRouter.class.getDeclaredField("qualifiedRouters"),
router, mock(QualifiedReadwriteSplittingDataSourceRouter.class));
+ setQualifiedRouters(router,
mock(QualifiedReadwriteSplittingDataSourceRouter.class));
when(ShardingSphereServiceLoader.getServiceInstances(ReadDataSourcesFilter.class)).thenReturn(Collections.emptyList());
assertThat(router.route(sqlStatementContext, hintValueContext),
is("standard_ds"));
}
+
+ @SneakyThrows(ReflectiveOperationException.class)
+ private void setQualifiedRouters(final ReadwriteSplittingDataSourceRouter
router, final QualifiedReadwriteSplittingDataSourceRouter qualifiedRouter) {
+
Plugins.getMemberAccessor().set(ReadwriteSplittingDataSourceRouter.class.getDeclaredField("qualifiedRouters"),
router, Collections.singleton(qualifiedRouter));
+ }
}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilderTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilderTest.java
index fc0b087bdc2..b04a26c93a6 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilderTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilderTest.java
@@ -82,6 +82,6 @@ class ShardingTokenGenerateBuilderTest {
}
private void assertField(final SQLTokenGenerator sqlTokenGenerator, final
Object filedInstance, final String fieldName) throws Exception {
-
assertThat(Plugins.getMemberAccessor().get(SQLTokenGenerator.class.getDeclaredField(fieldName),
sqlTokenGenerator), is(filedInstance));
+
assertThat(Plugins.getMemberAccessor().get(sqlTokenGenerator.getClass().getDeclaredField(fieldName),
sqlTokenGenerator), is(filedInstance));
}
}
diff --git
a/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManagerTest.java
b/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManagerTest.java
index 8c68ebca2d3..5ca0caf94c6 100644
---
a/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManagerTest.java
+++
b/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManagerTest.java
@@ -191,7 +191,7 @@ class SeataATShardingSphereTransactionManagerTest {
@SneakyThrows(ReflectiveOperationException.class)
@SuppressWarnings("unchecked")
private Map<String, DataSource> getDataSourceMap() {
- return (Map<String, DataSource>)
Plugins.getMemberAccessor().get(SeataATShardingSphereTransactionManager.class.getDeclaredField("dataSourceMap"),
seataTransactionManager);
+ return (Map<String, DataSource>)
Plugins.getMemberAccessor().get(seataTransactionManager.getClass().getDeclaredField("dataSourceMap"),
seataTransactionManager);
}
@SneakyThrows(ReflectiveOperationException.class)
@@ -202,9 +202,9 @@ class SeataATShardingSphereTransactionManagerTest {
@SneakyThrows(ReflectiveOperationException.class)
private void releaseRpcClient() {
-
Plugins.getMemberAccessor().set(TmNettyRemotingClient.class.getDeclaredField("initialized"),
TmNettyRemotingClient.getInstance(), new AtomicBoolean(false));
-
Plugins.getMemberAccessor().set(TmNettyRemotingClient.class.getDeclaredField("instance"),
TmNettyRemotingClient.getInstance(), null);
-
Plugins.getMemberAccessor().set(TmNettyRemotingClient.class.getDeclaredField("initialized"),
RmNettyRemotingClient.getInstance(), new AtomicBoolean(false));
-
Plugins.getMemberAccessor().set(TmNettyRemotingClient.class.getDeclaredField("instance"),
RmNettyRemotingClient.getInstance(), null);
+
Plugins.getMemberAccessor().set(TmNettyRemotingClient.getInstance().getClass().getDeclaredField("initialized"),
TmNettyRemotingClient.getInstance(), new AtomicBoolean(false));
+
Plugins.getMemberAccessor().set(TmNettyRemotingClient.getInstance().getClass().getDeclaredField("instance"),
TmNettyRemotingClient.getInstance(), null);
+
Plugins.getMemberAccessor().set(RmNettyRemotingClient.getInstance().getClass().getDeclaredField("initialized"),
RmNettyRemotingClient.getInstance(), new AtomicBoolean(false));
+
Plugins.getMemberAccessor().set(RmNettyRemotingClient.getInstance().getClass().getDeclaredField("instance"),
RmNettyRemotingClient.getInstance(), null);
}
}
