github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

ut fix

pull/2/head
simon 4 years ago
parent
bb089288c4
commit
8bab8abcd2
2 changed files with 60 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/JSONUtilsTest.java
  2. 100
      dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/datax/DataxTaskTest.java

4
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/JSONUtilsTest.java
Unescape View File

@ -17,6 +17,7 @@
package org.apache.dolphinscheduler.common.utils; package org.apache.dolphinscheduler.common.utils;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.ObjectNode;
@ -188,6 +189,9 @@ public class JSONUtilsTest {
JSONUtils.toJsonString(map)); JSONUtils.toJsonString(map));
Assert.assertEquals(String.valueOf((Object) null), Assert.assertEquals(String.valueOf((Object) null),
JSONUtils.toJsonString(null)); JSONUtils.toJsonString(null));
Assert.assertEquals("{\"foo\":\"bar\"}",
JSONUtils.toJsonString(map, SerializationFeature.WRITE_NULL_MAP_VALUES));
} }
@Test @Test

100
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/datax/DataxTaskTest.java
Unescape View File

@ -26,6 +26,8 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.dolphinscheduler.common.enums.CommandType; import org.apache.dolphinscheduler.common.enums.CommandType;
import org.apache.dolphinscheduler.common.enums.DbType; import org.apache.dolphinscheduler.common.enums.DbType;
import org.apache.dolphinscheduler.common.task.datax.DataxParameters;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.dao.datasource.BaseDataSource; import org.apache.dolphinscheduler.dao.datasource.BaseDataSource;
import org.apache.dolphinscheduler.dao.datasource.DataSourceFactory; import org.apache.dolphinscheduler.dao.datasource.DataSourceFactory;
import org.apache.dolphinscheduler.dao.entity.DataSource; import org.apache.dolphinscheduler.dao.entity.DataSource;
@ -71,7 +73,12 @@ public class DataxTaskTest {
@Before @Before
public void before() public void before()
throws Exception { throws Exception {
setTaskParems(0);
}
private void setTaskParems(Integer customConfig) {
processService = Mockito.mock(ProcessService.class); processService = Mockito.mock(ProcessService.class);
shellCommandExecutor = Mockito.mock(ShellCommandExecutor.class); shellCommandExecutor = Mockito.mock(ShellCommandExecutor.class);
@ -88,8 +95,15 @@ public class DataxTaskTest {
props.setEnvFile(".dolphinscheduler_env.sh"); props.setEnvFile(".dolphinscheduler_env.sh");
props.setTaskStartTime(new Date()); props.setTaskStartTime(new Date());
props.setTaskTimeout(0); props.setTaskTimeout(0);
props.setTaskParams( if (customConfig == 1) {
"{\"targetTable\":\"test\",\"postStatements\":[],\"jobSpeedByte\":1024,\"jobSpeedRecord\":1000,\"dtType\":\"MYSQL\",\"datasource\":1,\"dsType\":\"MYSQL\",\"datatarget\":2,\"jobSpeedByte\":0,\"sql\":\"select 1 as test from dual\",\"preStatements\":[\"delete from test\"],\"postStatements\":[\"delete from test\"]}"); props.setTaskParams(
"{\"customConfig\":1, \"localParams\":[{\"prop\":\"test\",\"value\":\"38294729\"}],\"json\":\"{\\\"job\\\":{\\\"setting\\\":{\\\"speed\\\":{\\\"byte\\\":1048576},\\\"errorLimit\\\":{\\\"record\\\":0,\\\"percentage\\\":0.02}},\\\"content\\\":[{\\\"reader\\\":{\\\"name\\\":\\\"rdbmsreader\\\",\\\"parameter\\\":{\\\"username\\\":\\\"xxx\\\",\\\"password\\\":\\\"${test}\\\",\\\"column\\\":[\\\"id\\\",\\\"name\\\"],\\\"splitPk\\\":\\\"pk\\\",\\\"connection\\\":[{\\\"querySql\\\":[\\\"SELECT * from dual\\\"],\\\"jdbcUrl\\\":[\\\"jdbc:dm://ip:port/database\\\"]}],\\\"fetchSize\\\":1024,\\\"where\\\":\\\"1 = 1\\\"}},\\\"writer\\\":{\\\"name\\\":\\\"streamwriter\\\",\\\"parameter\\\":{\\\"print\\\":true}}}]}}\"}");
// "{\"customConfig\":1,\"json\":\"{\\\"job\\\":{\\\"setting\\\":{\\\"speed\\\":{\\\"byte\\\":1048576},\\\"errorLimit\\\":{\\\"record\\\":0,\\\"percentage\\\":0.02}},\\\"content\\\":[{\\\"reader\\\":{\\\"name\\\":\\\"rdbmsreader\\\",\\\"parameter\\\":{\\\"username\\\":\\\"xxx\\\",\\\"password\\\":\\\"xxx\\\",\\\"column\\\":[\\\"id\\\",\\\"name\\\"],\\\"splitPk\\\":\\\"pk\\\",\\\"connection\\\":[{\\\"querySql\\\":[\\\"SELECT * from dual\\\"],\\\"jdbcUrl\\\":[\\\"jdbc:dm://ip:port/database\\\"]}],\\\"fetchSize\\\":1024,\\\"where\\\":\\\"1 = 1\\\"}},\\\"writer\\\":{\\\"name\\\":\\\"streamwriter\\\",\\\"parameter\\\":{\\\"print\\\":true}}}]}}\"}");
} else {
props.setTaskParams(
"{\"customConfig\":0,\"targetTable\":\"test\",\"postStatements\":[],\"jobSpeedByte\":1024,\"jobSpeedRecord\":1000,\"dtType\":\"MYSQL\",\"dataSource\":1,\"dsType\":\"MYSQL\",\"dataTarget\":2,\"jobSpeedByte\":0,\"sql\":\"select 1 as test from dual\",\"preStatements\":[\"delete from test\"],\"postStatements\":[\"delete from test\"]}");
}
taskExecutionContext = Mockito.mock(TaskExecutionContext.class); taskExecutionContext = Mockito.mock(TaskExecutionContext.class);
Mockito.when(taskExecutionContext.getTaskParams()).thenReturn(props.getTaskParams()); Mockito.when(taskExecutionContext.getTaskParams()).thenReturn(props.getTaskParams());
@ -111,28 +125,20 @@ public class DataxTaskTest {
dataxTask = PowerMockito.spy(new DataxTask(taskExecutionContext, logger)); dataxTask = PowerMockito.spy(new DataxTask(taskExecutionContext, logger));
dataxTask.init(); dataxTask.init();
props.setCmdTypeIfComplement(START_PROCESS); props.setCmdTypeIfComplement(START_PROCESS);
setTaskParems(0);
Mockito.when(processService.findDataSourceById(1)).thenReturn(getDataSource()); Mockito.when(processService.findDataSourceById(1)).thenReturn(getDataSource());
Mockito.when(processService.findDataSourceById(2)).thenReturn(getDataSource()); Mockito.when(processService.findDataSourceById(2)).thenReturn(getDataSource());
Mockito.when(processService.findProcessInstanceByTaskId(1)).thenReturn(getProcessInstance()); Mockito.when(processService.findProcessInstanceByTaskId(1)).thenReturn(getProcessInstance());
String fileName = String.format("%s/%s_node.sh", props.getExecutePath(), props.getTaskAppId()); String fileName = String.format("%s/%s_node.sh", props.getExecutePath(), props.getTaskAppId());
Mockito.when(shellCommandExecutor.run(fileName)).thenReturn(null); try {
} Mockito.when(shellCommandExecutor.run(fileName)).thenReturn(null);
} catch (Exception e) {
private void setTaskParems(Integer customConfig) { e.printStackTrace();
if (customConfig == 1) {
props.setTaskParams(
"{\"customConfig\":1, \"localParams\":[{\"prop\":\"test\",\"value\":\"38294729\"}],\"json\":\"{\\\"job\\\":{\\\"setting\\\":{\\\"speed\\\":{\\\"byte\\\":1048576},\\\"errorLimit\\\":{\\\"record\\\":0,\\\"percentage\\\":0.02}},\\\"content\\\":[{\\\"reader\\\":{\\\"name\\\":\\\"rdbmsreader\\\",\\\"parameter\\\":{\\\"username\\\":\\\"xxx\\\",\\\"password\\\":\\\"${test}\\\",\\\"column\\\":[\\\"id\\\",\\\"name\\\"],\\\"splitPk\\\":\\\"pk\\\",\\\"connection\\\":[{\\\"querySql\\\":[\\\"SELECT * from dual\\\"],\\\"jdbcUrl\\\":[\\\"jdbc:dm://ip:port/database\\\"]}],\\\"fetchSize\\\":1024,\\\"where\\\":\\\"1 = 1\\\"}},\\\"writer\\\":{\\\"name\\\":\\\"streamwriter\\\",\\\"parameter\\\":{\\\"print\\\":true}}}]}}\"}");
// "{\"customConfig\":1,\"json\":\"{\\\"job\\\":{\\\"setting\\\":{\\\"speed\\\":{\\\"byte\\\":1048576},\\\"errorLimit\\\":{\\\"record\\\":0,\\\"percentage\\\":0.02}},\\\"content\\\":[{\\\"reader\\\":{\\\"name\\\":\\\"rdbmsreader\\\",\\\"parameter\\\":{\\\"username\\\":\\\"xxx\\\",\\\"password\\\":\\\"xxx\\\",\\\"column\\\":[\\\"id\\\",\\\"name\\\"],\\\"splitPk\\\":\\\"pk\\\",\\\"connection\\\":[{\\\"querySql\\\":[\\\"SELECT * from dual\\\"],\\\"jdbcUrl\\\":[\\\"jdbc:dm://ip:port/database\\\"]}],\\\"fetchSize\\\":1024,\\\"where\\\":\\\"1 = 1\\\"}},\\\"writer\\\":{\\\"name\\\":\\\"streamwriter\\\",\\\"parameter\\\":{\\\"print\\\":true}}}]}}\"}");
} else {
props.setTaskParams(
"{\"customConfig\":0,\"targetTable\":\"test\",\"postStatements\":[],\"jobSpeedByte\":1024,\"jobSpeedRecord\":1000,\"dtType\":\"MYSQL\",\"datasource\":1,\"dsType\":\"MYSQL\",\"datatarget\":2,\"jobSpeedByte\":0,\"sql\":\"select 1 as test from dual\",\"preStatements\":[\"delete from test\"],\"postStatements\":[\"delete from test\"]}");
} }
dataxTask = PowerMockito.spy(new DataxTask(taskExecutionContext, logger)); dataxTask = PowerMockito.spy(new DataxTask(taskExecutionContext, logger));
dataxTask.init(); dataxTask.init();
} }
@ -154,7 +160,8 @@ public class DataxTaskTest {
@After @After
public void after() public void after()
throws Exception {} throws Exception {
}
/** /**
* Method: DataxTask() * Method: DataxTask()
@ -210,7 +217,7 @@ public class DataxTaskTest {
*/ */
@Test @Test
public void testParsingSqlColumnNames() public void testParsingSqlColumnNames()
throws Exception { throws Exception {
try { try {
BaseDataSource dataSource = DataSourceFactory.getDatasource(getDataSource().getType(), BaseDataSource dataSource = DataSourceFactory.getDatasource(getDataSource().getType(),
getDataSource().getConnectionParams()); getDataSource().getConnectionParams());
@ -224,8 +231,7 @@ public class DataxTaskTest {
Assert.assertTrue(columns.length == 2); Assert.assertTrue(columns.length == 2);
Assert.assertEquals("[`a`, `table`]", Arrays.toString(columns)); Assert.assertEquals("[`a`, `table`]", Arrays.toString(columns));
} } catch (Exception e) {
catch (Exception e) {
Assert.fail(e.getMessage()); Assert.fail(e.getMessage());
} }
} }
@ -235,7 +241,7 @@ public class DataxTaskTest {
*/ */
@Test @Test
public void testTryGrammaticalAnalysisSqlColumnNames() public void testTryGrammaticalAnalysisSqlColumnNames()
throws Exception { throws Exception {
try { try {
Method method = DataxTask.class.getDeclaredMethod("tryGrammaticalAnalysisSqlColumnNames", DbType.class, String.class); Method method = DataxTask.class.getDeclaredMethod("tryGrammaticalAnalysisSqlColumnNames", DbType.class, String.class);
method.setAccessible(true); method.setAccessible(true);
@ -246,8 +252,7 @@ public class DataxTaskTest {
Assert.assertTrue(columns.length == 2); Assert.assertTrue(columns.length == 2);
Assert.assertEquals("[a, b]", Arrays.toString(columns)); Assert.assertEquals("[a, b]", Arrays.toString(columns));
} } catch (Exception e) {
catch (Exception e) {
Assert.fail(e.getMessage()); Assert.fail(e.getMessage());
} }
} }
@ -258,7 +263,7 @@ public class DataxTaskTest {
*/ */
@Test @Test
public void testTryExecuteSqlResolveColumnNames() public void testTryExecuteSqlResolveColumnNames()
throws Exception { throws Exception {
// TODO: Test goes here... // TODO: Test goes here...
} }
@ -270,19 +275,30 @@ public class DataxTaskTest {
throws Exception { throws Exception {
try { try {
setTaskParems(1); setTaskParems(1);
buildDataJson(); Method method = DataxTask.class.getDeclaredMethod("buildDataxJsonFile");
setTaskParems(0); method.setAccessible(true);
buildDataJson(); String filePath = (String) method.invoke(dataxTask, null);
Assert.assertNotNull(filePath);
} catch (Exception e) { } catch (Exception e) {
Assert.fail(e.getMessage()); Assert.fail(e.getMessage());
} }
} }
public void buildDataJson() throws Exception { /**
Method method = DataxTask.class.getDeclaredMethod("buildDataxJsonFile"); * Method: buildDataxJsonFile()
method.setAccessible(true); */
String filePath = (String) method.invoke(dataxTask, null); @Test
Assert.assertNotNull(filePath); public void testBuildDataxJsonFile0()
throws Exception {
try {
setTaskParems(0);
Method method = DataxTask.class.getDeclaredMethod("buildDataxJsonFile");
method.setAccessible(true);
String filePath = (String) method.invoke(dataxTask, null);
Assert.assertNotNull(filePath);
} catch (Exception e) {
Assert.fail(e.getMessage());
}
} }
/** /**
@ -309,8 +325,7 @@ public class DataxTaskTest {
String writerPluginName = writer.path("name").asText(); String writerPluginName = writer.path("name").asText();
Assert.assertEquals(DataxUtils.DATAX_WRITER_PLUGIN_MYSQL, writerPluginName); Assert.assertEquals(DataxUtils.DATAX_WRITER_PLUGIN_MYSQL, writerPluginName);
} } catch (Exception e) {
catch (Exception e) {
Assert.fail(e.getMessage()); Assert.fail(e.getMessage());
} }
} }
@ -320,7 +335,7 @@ public class DataxTaskTest {
*/ */
@Test @Test
public void testBuildDataxJobSettingJson() public void testBuildDataxJobSettingJson()
throws Exception { throws Exception {
try { try {
Method method = DataxTask.class.getDeclaredMethod("buildDataxJobSettingJson"); Method method = DataxTask.class.getDeclaredMethod("buildDataxJobSettingJson");
method.setAccessible(true); method.setAccessible(true);
@ -345,8 +360,7 @@ public class DataxTaskTest {
ObjectNode coreConfig = (ObjectNode) method.invoke(dataxTask, null); ObjectNode coreConfig = (ObjectNode) method.invoke(dataxTask, null);
Assert.assertNotNull(coreConfig); Assert.assertNotNull(coreConfig);
Assert.assertNotNull(coreConfig.get("transport")); Assert.assertNotNull(coreConfig.get("transport"));
} } catch (Exception e) {
catch (Exception e) {
Assert.fail(e.getMessage()); Assert.fail(e.getMessage());
} }
} }
@ -356,13 +370,12 @@ public class DataxTaskTest {
*/ */
@Test @Test
public void testBuildShellCommandFile() public void testBuildShellCommandFile()
throws Exception { throws Exception {
try { try {
Method method = DataxTask.class.getDeclaredMethod("buildShellCommandFile", String.class); Method method = DataxTask.class.getDeclaredMethod("buildShellCommandFile", String.class);
method.setAccessible(true); method.setAccessible(true);
Assert.assertNotNull(method.invoke(dataxTask, "test.json")); Assert.assertNotNull(method.invoke(dataxTask, "test.json"));
} } catch (Exception e) {
catch (Exception e) {
Assert.fail(e.getMessage()); Assert.fail(e.getMessage());
} }
} }
@ -381,13 +394,12 @@ public class DataxTaskTest {
*/ */
@Test @Test
public void testNotNull() public void testNotNull()
throws Exception { throws Exception {
try { try {
Method method = DataxTask.class.getDeclaredMethod("notNull", Object.class, String.class); Method method = DataxTask.class.getDeclaredMethod("notNull", Object.class, String.class);
method.setAccessible(true); method.setAccessible(true);
method.invoke(dataxTask, "abc", "test throw RuntimeException"); method.invoke(dataxTask, "abc", "test throw RuntimeException");
} } catch (Exception e) {
catch (Exception e) {
Assert.fail(e.getMessage()); Assert.fail(e.getMessage());
} }
} }

Write Preview
Loading…
Cancel
Save