You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/09/18 04:12:14 UTC
[shardingsphere] branch master updated: Improve DataSourcePreparer unit test (#21044)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 023ba3157c6 Improve DataSourcePreparer unit test (#21044)
023ba3157c6 is described below
commit 023ba3157c698fb788a5ebc8f65ad08833650cfc
Author: Hongsheng Zhong <zh...@apache.org>
AuthorDate: Sun Sep 18 12:12:03 2022 +0800
Improve DataSourcePreparer unit test (#21044)
---
.../datasource/MySQLDataSourcePreparerTest.java | 112 ---------------------
.../datasource/AbstractDataSourcePreparerTest.java | 26 +++++
2 files changed, 26 insertions(+), 112 deletions(-)
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/prepare/datasource/MySQLDataSourcePreparerTest.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/prepare/datasource/MySQLDataSourcePreparerTest.java
deleted file mode 100644
index aa15b23e0c1..00000000000
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/prepare/datasource/MySQLDataSourcePreparerTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.data.pipeline.mysql.prepare.datasource;
-
-import org.apache.shardingsphere.data.pipeline.api.config.job.MigrationJobConfiguration;
-import org.apache.shardingsphere.data.pipeline.api.datasource.PipelineDataSourceManager;
-import org.apache.shardingsphere.data.pipeline.api.datasource.PipelineDataSourceWrapper;
-import org.apache.shardingsphere.data.pipeline.api.datasource.config.PipelineDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.api.datasource.config.PipelineDataSourceConfigurationFactory;
-import org.apache.shardingsphere.data.pipeline.api.datasource.config.impl.ShardingSpherePipelineDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.exception.job.SplitPipelineJobByUniqueKeyException;
-import org.apache.shardingsphere.data.pipeline.core.prepare.datasource.PrepareTargetTablesParameter;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockedStatic;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import java.sql.SQLException;
-
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.same;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockStatic;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-// TODO update after new impl ready
-@Ignore
-@RunWith(MockitoJUnitRunner.class)
-public final class MySQLDataSourcePreparerTest {
-
- @Mock
- private PrepareTargetTablesParameter prepareTargetTablesParameter;
-
- @Mock
- private MigrationJobConfiguration jobConfig;
-
- @Mock
- private PipelineDataSourceConfiguration sourcePipelineDataSourceConfig;
-
- @Mock
- private PipelineDataSourceConfiguration targetPipelineDataSourceConfig;
-
- @Mock
- private ShardingSpherePipelineDataSourceConfiguration sourceDataSourceConfig;
-
- @Mock
- private ShardingSpherePipelineDataSourceConfiguration targetDataSourceConfig;
-
- @Mock
- private PipelineDataSourceWrapper sourceDataSourceWrapper;
-
- @Mock
- private PipelineDataSourceWrapper targetDataSourceWrapper;
-
- @Before
- public void setUp() {
- PipelineDataSourceManager mockPipelineDataSourceManager = mock(PipelineDataSourceManager.class);
- when(mockPipelineDataSourceManager.getDataSource(same(sourceDataSourceConfig))).thenReturn(sourceDataSourceWrapper);
- when(mockPipelineDataSourceManager.getDataSource(same(targetDataSourceConfig))).thenReturn(targetDataSourceWrapper);
- when(prepareTargetTablesParameter.getDataSourceManager()).thenReturn(mockPipelineDataSourceManager);
- when(jobConfig.getSource()).thenReturn(sourcePipelineDataSourceConfig);
- when(jobConfig.getSource().getType()).thenReturn("ShardingSphereJDBC");
- when(jobConfig.getSource().getParameter()).thenReturn("source");
- when(jobConfig.getTarget()).thenReturn(targetPipelineDataSourceConfig);
- when(jobConfig.getTarget().getType()).thenReturn("ShardingSphereJDBC");
- when(jobConfig.getTarget().getParameter()).thenReturn("target");
- }
-
- @Test
- public void assertGetConnection() throws SQLException {
- try (MockedStatic<PipelineDataSourceConfigurationFactory> mockedStaticPipelineDataSourceConfigurationFactory = mockStatic(PipelineDataSourceConfigurationFactory.class)) {
- mockedStaticPipelineDataSourceConfigurationFactory.when(() -> PipelineDataSourceConfigurationFactory.newInstance(eq("ShardingSphereJDBC"), eq("source")))
- .thenReturn(sourceDataSourceConfig);
- mockedStaticPipelineDataSourceConfigurationFactory.when(() -> PipelineDataSourceConfigurationFactory.newInstance(eq("ShardingSphereJDBC"), eq("target")))
- .thenReturn(targetDataSourceConfig);
- new MySQLDataSourcePreparer().prepareTargetTables(prepareTargetTablesParameter);
- verify(sourceDataSourceWrapper).getConnection();
- verify(targetDataSourceWrapper).getConnection();
- }
- }
-
- @Test(expected = SplitPipelineJobByUniqueKeyException.class)
- public void assertThrowPrepareFailedException() throws SQLException {
- try (MockedStatic<PipelineDataSourceConfigurationFactory> mockedStaticPipelineDataSourceConfigurationFactory = mockStatic(PipelineDataSourceConfigurationFactory.class)) {
- mockedStaticPipelineDataSourceConfigurationFactory.when(() -> PipelineDataSourceConfigurationFactory.newInstance(eq("ShardingSphereJDBC"), eq("source")))
- .thenReturn(sourceDataSourceConfig);
- mockedStaticPipelineDataSourceConfigurationFactory.when(() -> PipelineDataSourceConfigurationFactory.newInstance(eq("ShardingSphereJDBC"), eq("target")))
- .thenReturn(targetDataSourceConfig);
- when(sourceDataSourceWrapper.getConnection()).thenThrow(SQLException.class);
- new MySQLDataSourcePreparer().prepareTargetTables(prepareTargetTablesParameter);
- }
- }
-}
diff --git a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparerTest.java b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparerTest.java
index 140fe9a3704..5ae0d06de3e 100644
--- a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparerTest.java
+++ b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparerTest.java
@@ -17,8 +17,13 @@
package org.apache.shardingsphere.data.pipeline.core.prepare.datasource;
+import org.apache.shardingsphere.data.pipeline.api.datasource.PipelineDataSourceManager;
+import org.apache.shardingsphere.data.pipeline.api.datasource.config.PipelineDataSourceConfiguration;
import org.junit.Test;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
import java.util.Arrays;
import java.util.Collection;
import java.util.regex.Pattern;
@@ -26,6 +31,9 @@ import java.util.regex.Pattern;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
public final class AbstractDataSourcePreparerTest {
@@ -38,6 +46,24 @@ public final class AbstractDataSourcePreparerTest {
}
};
+ @Test
+ public void assertGetCachedDataSource() {
+ PipelineDataSourceConfiguration dataSourceConfig = mock(PipelineDataSourceConfiguration.class);
+ PipelineDataSourceManager dataSourceManager = mock(PipelineDataSourceManager.class);
+ preparer.getCachedDataSource(dataSourceConfig, dataSourceManager);
+ verify(dataSourceManager).getDataSource(dataSourceConfig);
+ }
+
+ @Test
+ public void assertExecuteTargetTableSQL() throws SQLException {
+ Statement statement = mock(Statement.class);
+ Connection targetConnection = mock(Connection.class);
+ when(targetConnection.createStatement()).thenReturn(statement);
+ String sql = "CREATE TABLE t (id int)";
+ preparer.executeTargetTableSQL(targetConnection, sql);
+ verify(statement).execute(sql);
+ }
+
@Test
public void assertAddIfNotExistsForCreateTableSQL() {
Collection<String> createTableSQLs = Arrays.asList("CREATE TABLE IF NOT EXISTS t (id int)", "CREATE TABLE t (id int)",