ut fix (8bab8abc) · Commits · SUMMER2020 / students / proj-2002251

dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/JSONUtilsTest.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package org.apache.dolphinscheduler.common.utils;

		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.JsonNodeFactory;
		import com.fasterxml.jackson.databind.node.ObjectNode;
		@@ -188,6 +189,9 @@ public class JSONUtilsTest {
		JSONUtils.toJsonString(map));
		Assert.assertEquals(String.valueOf((Object) null),
		JSONUtils.toJsonString(null));

		Assert.assertEquals("{\"foo\":\"bar\"}",
		JSONUtils.toJsonString(map, SerializationFeature.WRITE_NULL_MAP_VALUES));
		}

		@Test

dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/datax/DataxTaskTest.java

+56 −44

Original line number	Diff line number	Diff line
		@@ -26,6 +26,8 @@ import com.fasterxml.jackson.databind.JsonNode;
		import com.fasterxml.jackson.databind.node.ObjectNode;
		import org.apache.dolphinscheduler.common.enums.CommandType;
		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.DataSourceFactory;
		import org.apache.dolphinscheduler.dao.entity.DataSource;
		@@ -72,6 +74,11 @@ public class DataxTaskTest {
		@Before
		public void before()
		throws Exception {
		setTaskParems(0);
		}

		private void setTaskParems(Integer customConfig) {

		processService = Mockito.mock(ProcessService.class);
		shellCommandExecutor = Mockito.mock(ShellCommandExecutor.class);

		@@ -88,8 +95,15 @@ public class DataxTaskTest {
		props.setEnvFile(".dolphinscheduler_env.sh");
		props.setTaskStartTime(new Date());
		props.setTaskTimeout(0);
		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(
		"{\"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\"]}");
		"{\"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);
		Mockito.when(taskExecutionContext.getTaskParams()).thenReturn(props.getTaskParams());
		@@ -111,27 +125,19 @@ public class DataxTaskTest {
		dataxTask = PowerMockito.spy(new DataxTask(taskExecutionContext, logger));
		dataxTask.init();
		props.setCmdTypeIfComplement(START_PROCESS);
		setTaskParems(0);


		Mockito.when(processService.findDataSourceById(1)).thenReturn(getDataSource());
		Mockito.when(processService.findDataSourceById(2)).thenReturn(getDataSource());
		Mockito.when(processService.findProcessInstanceByTaskId(1)).thenReturn(getProcessInstance());

		String fileName = String.format("%s/%s_node.sh", props.getExecutePath(), props.getTaskAppId());
		try {
		Mockito.when(shellCommandExecutor.run(fileName)).thenReturn(null);
		} catch (Exception e) {
		e.printStackTrace();
		}

		private void setTaskParems(Integer customConfig) {
		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.init();
		@@ -154,7 +160,8 @@ public class DataxTaskTest {

		@After
		public void after()
		throws Exception {}
		throws Exception {
		}

		/**
		* Method: DataxTask()
		@@ -224,8 +231,7 @@ public class DataxTaskTest {
		Assert.assertTrue(columns.length == 2);

		Assert.assertEquals("[`a`, `table`]", Arrays.toString(columns));
		}
		catch (Exception e) {
		} catch (Exception e) {
		Assert.fail(e.getMessage());
		}
		}
		@@ -246,8 +252,7 @@ public class DataxTaskTest {
		Assert.assertTrue(columns.length == 2);

		Assert.assertEquals("[a, b]", Arrays.toString(columns));
		}
		catch (Exception e) {
		} catch (Exception e) {
		Assert.fail(e.getMessage());
		}
		}
		@@ -270,19 +275,30 @@ public class DataxTaskTest {
		throws Exception {
		try {
		setTaskParems(1);
		buildDataJson();
		setTaskParems(0);
		buildDataJson();
		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());
		}
		}

		public void buildDataJson() throws Exception {
		/**
		* Method: buildDataxJsonFile()
		*/
		@Test
		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();
		Assert.assertEquals(DataxUtils.DATAX_WRITER_PLUGIN_MYSQL, writerPluginName);
		}
		catch (Exception e) {
		} catch (Exception e) {
		Assert.fail(e.getMessage());
		}
		}
		@@ -345,8 +360,7 @@ public class DataxTaskTest {
		ObjectNode coreConfig = (ObjectNode) method.invoke(dataxTask, null);
		Assert.assertNotNull(coreConfig);
		Assert.assertNotNull(coreConfig.get("transport"));
		}
		catch (Exception e) {
		} catch (Exception e) {
		Assert.fail(e.getMessage());
		}
		}
		@@ -361,8 +375,7 @@ public class DataxTaskTest {
		Method method = DataxTask.class.getDeclaredMethod("buildShellCommandFile", String.class);
		method.setAccessible(true);
		Assert.assertNotNull(method.invoke(dataxTask, "test.json"));
		}
		catch (Exception e) {
		} catch (Exception e) {
		Assert.fail(e.getMessage());
		}
		}
		@@ -386,8 +399,7 @@ public class DataxTaskTest {
		Method method = DataxTask.class.getDeclaredMethod("notNull", Object.class, String.class);
		method.setAccessible(true);
		method.invoke(dataxTask, "abc", "test throw RuntimeException");
		}
		catch (Exception e) {
		} catch (Exception e) {
		Assert.fail(e.getMessage());
		}
		}