[shardingsphere] branch master updated: Refactor InventoryTaskSplitterTest (#9438)

[pa...@apache.org]

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 313c3c4  Refactor InventoryTaskSplitterTest (#9438)
313c3c4 is described below

commit 313c3c41df8ed430aad79ad4d1254ad8f36653c4
Author: 邱鹿 Lucas <lu...@163.com>
AuthorDate: Fri Feb 19 18:37:42 2021 +0800

    Refactor InventoryTaskSplitterTest (#9438)
    
    Co-authored-by: qiulu3 <Lucas209910>
---
 .../splitter/InventoryTaskSplitterTest.java        | 40 +++++-----------------
 1 file changed, 9 insertions(+), 31 deletions(-)

diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/splitter/InventoryTaskSplitterTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/splitter/InventoryTaskSplitterTest.java
index db89ead..518e7b7 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/splitter/InventoryTaskSplitterTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/splitter/InventoryTaskSplitterTest.java
@@ -19,9 +19,7 @@ package org.apache.shardingsphere.scaling.core.job.preparer.splitter;
 
 import org.apache.shardingsphere.scaling.core.common.datasource.DataSourceManager;
 import org.apache.shardingsphere.scaling.core.config.DumperConfiguration;
-import org.apache.shardingsphere.scaling.core.config.ImporterConfiguration;
 import org.apache.shardingsphere.scaling.core.config.TaskConfiguration;
-import org.apache.shardingsphere.scaling.core.config.datasource.StandardJDBCDataSourceConfiguration;
 import org.apache.shardingsphere.scaling.core.job.JobContext;
 import org.apache.shardingsphere.scaling.core.job.position.PrimaryKeyPosition;
 import org.apache.shardingsphere.scaling.core.job.task.inventory.InventoryTask;
@@ -34,9 +32,7 @@ import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertNotNull;
@@ -44,12 +40,6 @@ import static org.junit.Assert.assertThat;
 
 public final class InventoryTaskSplitterTest {
     
-    private static final String DATA_SOURCE_URL = "jdbc:h2:mem:test_db;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL";
-    
-    private static final String USERNAME = "root";
-    
-    private static final String PASSWORD = "password";
-    
     private JobContext jobContext;
     
     private TaskConfiguration taskConfig;
@@ -60,16 +50,11 @@ public final class InventoryTaskSplitterTest {
     
     @Before
     public void setUp() {
-        jobContext = mockJobContext();
+        initJobContext();
         dataSourceManager = new DataSourceManager();
         inventoryTaskSplitter = new InventoryTaskSplitter();
     }
     
-    @After
-    public void tearDown() {
-        dataSourceManager.close();
-    }
-    
     @Test
     public void assertSplitInventoryDataWithIntPrimary() throws SQLException {
         taskConfig.getHandleConfig().setShardingSize(10);
@@ -105,6 +90,11 @@ public final class InventoryTaskSplitterTest {
         assertThat(actual.size(), is(1));
     }
     
+    @After
+    public void tearDown() {
+        dataSourceManager.close();
+    }
+    
     private void initIntPrimaryEnvironment(final DumperConfiguration dumperConfig) throws SQLException {
         DataSource dataSource = dataSourceManager.getDataSource(dumperConfig.getDataSourceConfig());
         try (Connection connection = dataSource.getConnection();
@@ -147,20 +137,8 @@ public final class InventoryTaskSplitterTest {
         }
     }
     
-    private JobContext mockJobContext() {
-        JobContext result = new JobContext(ResourceUtil.mockJobConfig());
-        result.getJobConfig().getHandleConfig().setDatabaseType("H2");
-        result.getJobConfig().getHandleConfig().setShardingSize(10);
-        taskConfig = new TaskConfiguration(result.getJobConfig().getHandleConfig(), mockDumperConfig(), new ImporterConfiguration());
-        return result;
-    }
-    
-    private DumperConfiguration mockDumperConfig() {
-        DumperConfiguration result = new DumperConfiguration();
-        result.setDataSourceConfig(new StandardJDBCDataSourceConfiguration(DATA_SOURCE_URL, USERNAME, PASSWORD));
-        Map<String, String> tableMap = new HashMap<>(1, 1);
-        tableMap.put("t_order", "t_order");
-        result.setTableNameMap(tableMap);
-        return result;
+    private void initJobContext() {
+        jobContext = new JobContext(ResourceUtil.mockJobConfig());
+        taskConfig = jobContext.getTaskConfigs().iterator().next();
     }
 }