This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 68b32f74545 Fix sonar issue of Replace randomly generated values with
fixed ones (#25826)
68b32f74545 is described below
commit 68b32f745455319a5934489348ef8c73f0366c89
Author: Liang Zhang <[email protected]>
AuthorDate: Sun May 21 19:44:21 2023 +0800
Fix sonar issue of Replace randomly generated values with fixed ones
(#25826)
---
.../infra/executor/sql/process/ProcessEngineTest.java | 2 +-
.../standalone/StandaloneContextManagerBuilderTest.java | 15 ++++++++-------
.../e2e/data/pipeline/cases/task/E2EIncrementalTask.java | 3 ++-
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git
a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessEngineTest.java
b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessEngineTest.java
index 3b5fffc32d3..1ddcefc66a8 100644
---
a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessEngineTest.java
+++
b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessEngineTest.java
@@ -65,7 +65,7 @@ class ProcessEngineTest {
private ExecutionGroupContext<? extends SQLExecutionUnit>
mockExecutionGroupContext() {
ExecutionGroupContext<? extends SQLExecutionUnit> result =
mock(ExecutionGroupContext.class);
ExecutionGroupReportContext reportContext =
mock(ExecutionGroupReportContext.class);
-
when(reportContext.getProcessId()).thenReturn(UUID.randomUUID().toString());
+
when(reportContext.getProcessId()).thenReturn(UUID.fromString("00000000-000-0000-0000-000000000001").toString());
when(result.getReportContext()).thenReturn(reportContext);
return result;
}
diff --git
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTest.java
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTest.java
index 9dd44f66c22..9345e5462d0 100644
---
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTest.java
+++
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTest.java
@@ -46,12 +46,13 @@ class StandaloneContextManagerBuilderTest {
@Test
void assertBuild() throws SQLException {
- ContextManager actual = new
StandaloneContextManagerBuilder().build(createContextManagerBuilderParameter());
-
assertNotNull(actual.getMetaDataContexts().getMetaData().getDatabase("foo_db"));
- PersistRepository repository =
actual.getMetaDataContexts().getPersistService().getRepository();
- assertNotNull(repository.getDirectly(GlobalNode.getGlobalRuleNode()));
-
assertNotNull(repository.getDirectly(DatabaseMetaDataNode.getMetaDataDataSourcePath("foo_db",
"0")));
-
assertNotNull(repository.getDirectly(DatabaseMetaDataNode.getRulePath("foo_db",
"0")));
+ try (ContextManager actual = new
StandaloneContextManagerBuilder().build(createContextManagerBuilderParameter()))
{
+
assertNotNull(actual.getMetaDataContexts().getMetaData().getDatabase("foo_db"));
+ PersistRepository repository =
actual.getMetaDataContexts().getPersistService().getRepository();
+
assertNotNull(repository.getDirectly(GlobalNode.getGlobalRuleNode()));
+
assertNotNull(repository.getDirectly(DatabaseMetaDataNode.getMetaDataDataSourcePath("foo_db",
"0")));
+
assertNotNull(repository.getDirectly(DatabaseMetaDataNode.getRulePath("foo_db",
"0")));
+ }
}
private ContextManagerBuilderParameter
createContextManagerBuilderParameter() {
@@ -59,7 +60,7 @@ class StandaloneContextManagerBuilderTest {
Map<String, DatabaseConfiguration> databaseConfigs =
Collections.singletonMap(
"foo_db", new
DataSourceProvidedDatabaseConfiguration(Collections.singletonMap("foo_ds", new
MockedDataSource()), Collections.singleton(mock(RuleConfiguration.class))));
Collection<RuleConfiguration> globalRuleConfigs =
Collections.singleton(mock(RuleConfiguration.class));
- InstanceMetaData instanceMetaData = new
ProxyInstanceMetaData(UUID.randomUUID().toString(), 3307);
+ InstanceMetaData instanceMetaData = new
ProxyInstanceMetaData(UUID.fromString("00000000-000-0000-0000-000000000001").toString(),
3307);
return new ContextManagerBuilderParameter(modeConfig, databaseConfigs,
globalRuleConfigs, new Properties(), Collections.emptyList(), instanceMetaData,
false);
}
}
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/E2EIncrementalTask.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/E2EIncrementalTask.java
index 72049d85340..42235de2b07 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/E2EIncrementalTask.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/E2EIncrementalTask.java
@@ -134,7 +134,8 @@ public final class E2EIncrementalTask extends
BaseIncrementTask {
Object[] parameters = {"中文测试", randomInt, random.nextInt(-999,
999), PipelineCaseHelper.generateFloat(), PipelineCaseHelper.generateDouble(),
BigDecimal.valueOf(10000),
random.nextBoolean(), "update-char", "update-text",
"update-bytea".getBytes(), now.toLocalDate().plusDays(1),
now.toLocalTime().plusHours(6), "2023-03-01", now,
OffsetDateTime.now(), "1 years 1 mons 1 days 1 hours 1
mins 1 secs", "{4, 5, 6}", PipelineCaseHelper.generateJsonString(1, true),
PipelineCaseHelper.generateJsonString(1, false),
- UUID.randomUUID().toString(),
DigestUtils.md5Hex(now.toString()), null, "1111", "[1,10000)", "2 years 2 mons
2 days 06:00:00", "2023-01-01 00:00:00+00", "(2.0,2.0)",
+
UUID.fromString("00000000-000-0000-0000-000000000001").toString(),
+ DigestUtils.md5Hex(now.toString()), null, "1111",
"[1,10000)", "2 years 2 mons 2 days 06:00:00", "2023-01-01 00:00:00+00",
"(2.0,2.0)",
"[(0.0,0.0),(3.0,3.0)]", "(1.0,1.0),(3.0,3.0)",
"<(5.0,5.0),1.0>", "1010", "192.168.0.0/24", "192.168.1.1",
"08:00:3b:01:02:03", null, orderId};
log.info("update sql: {}, params: {}", sql, parameters);
DataSourceExecuteUtils.execute(dataSource, sql, parameters);
