Loading dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/CommandMapperTest.java +3 −1 Original line number Diff line number Diff line Loading @@ -262,4 +262,6 @@ public class CommandMapperTest { return command; } } No newline at end of file dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceUserMapperTest.java +0 −2 Original line number Diff line number Diff line Loading @@ -67,7 +67,6 @@ public class DataSourceUserMapperTest { dataSourceUser.setUpdateTime(new Date()); int update = dataSourceUserMapper.updateById(dataSourceUser); Assert.assertEquals(update, 1); dataSourceUserMapper.deleteById(dataSourceUser.getId()); } /** Loading @@ -90,7 +89,6 @@ public class DataSourceUserMapperTest { //query List<DatasourceUser> dataSources = dataSourceUserMapper.selectList(null); Assert.assertNotEquals(dataSources.size(), 0); dataSourceUserMapper.deleteById(dataSourceUser.getId()); } /** Loading dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapperTest.java +2 −5 Original line number Diff line number Diff line Loading @@ -72,7 +72,6 @@ public class ErrorCommandMapperTest { errorCommand.setUpdateTime(new Date()); int update = errorCommandMapper.updateById(errorCommand); Assert.assertEquals(1,update); errorCommandMapper.deleteById(errorCommand.getId()); } /** Loading Loading @@ -120,8 +119,6 @@ public class ErrorCommandMapperTest { projectIdArray ); errorCommandMapper.deleteById(errorCommand.getId()); processDefinitionMapper.deleteById(processDefinition.getId()); Assert.assertNotEquals(commandCounts.size(), 0); Assert.assertNotEquals(commandCounts2.size(), 0); } Loading dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapperTest.java +0 −12 Original line number Diff line number Diff line Loading @@ -82,7 +82,6 @@ public class ProcessDefinitionMapperTest { processDefinition.setUpdateTime(new Date()); int update = processDefinitionMapper.updateById(processDefinition); Assert.assertEquals(1, update); processDefinitionMapper.deleteById(processDefinition.getId()); } /** Loading @@ -104,7 +103,6 @@ public class ProcessDefinitionMapperTest { //query List<ProcessDefinition> dataSources = processDefinitionMapper.selectList(null); Assert.assertNotEquals(dataSources.size(), 0); processDefinitionMapper.deleteById(processDefinition.getId()); } /** Loading Loading @@ -147,11 +145,6 @@ public class ProcessDefinitionMapperTest { ProcessDefinition processDefinition1 = processDefinitionMapper.queryByDefineName(project.getId(), "def 1"); Assert.assertNotEquals(processDefinition1, null); processDefinitionMapper.deleteById(processDefinition.getId()); queueMapper.deleteById(queue.getId()); projectMapper.deleteById(project.getId()); tenantMapper.deleteById(tenant.getId()); userMapper.deleteById(user.getId()); } /** Loading @@ -163,7 +156,6 @@ public class ProcessDefinitionMapperTest { Page<ProcessDefinition> page = new Page(1,3); IPage<ProcessDefinition> processDefinitionIPage = processDefinitionMapper.queryDefineListPaging(page, "def", 101, 1010,true); Assert.assertNotEquals(processDefinitionIPage.getTotal(), 0); processDefinitionMapper.deleteById(processDefinition.getId()); } /** Loading @@ -174,7 +166,6 @@ public class ProcessDefinitionMapperTest { ProcessDefinition processDefinition = insertOne(); List<ProcessDefinition> processDefinitionIPage = processDefinitionMapper.queryAllDefinitionList(1010); Assert.assertNotEquals(processDefinitionIPage.size(), 0); processDefinitionMapper.deleteById(processDefinition.getId()); } /** Loading @@ -191,8 +182,6 @@ public class ProcessDefinitionMapperTest { array[1] = processDefinition1.getId(); List<ProcessDefinition> processDefinitions = processDefinitionMapper.queryDefinitionListByIdList(array); processDefinitionMapper.deleteById(processDefinition.getId()); processDefinitionMapper.deleteById(processDefinition1.getId()); Assert.assertEquals(2, processDefinitions.size()); } Loading Loading @@ -224,7 +213,6 @@ public class ProcessDefinitionMapperTest { projectIds, user.getUserType() == UserType.ADMIN_USER ); processDefinitionMapper.deleteById(processDefinition.getId()); Assert.assertNotEquals(processDefinitions.size(), 0); } } No newline at end of file dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapMapperTest.java +1 −22 Original line number Diff line number Diff line Loading @@ -65,7 +65,6 @@ public class ProcessInstanceMapMapperTest { processInstanceMap.setParentProcessInstanceId(1); int update = processInstanceMapMapper.updateById(processInstanceMap); Assert.assertEquals(1, update); processInstanceMapMapper.deleteById(processInstanceMap.getId()); } /** Loading @@ -87,7 +86,6 @@ public class ProcessInstanceMapMapperTest { //query List<ProcessInstanceMap> dataSources = processInstanceMapMapper.selectList(null); Assert.assertNotEquals(dataSources.size(), 0); processInstanceMapMapper.deleteById(processInstanceMap.getId()); } /** Loading @@ -99,30 +97,11 @@ public class ProcessInstanceMapMapperTest { processInstanceMap.setParentProcessInstanceId(100); processInstanceMapMapper.updateById(processInstanceMap); ProcessInstanceMap map = processInstanceMapMapper.queryByParentId(processInstanceMap.getParentProcessInstanceId(), processInstanceMap.getParentTaskInstanceId()); Assert.assertNotEquals(map, null); processInstanceMapMapper.deleteById(processInstanceMap.getId()); } /** * test query by sub process instance id */ @Test public void testQueryBySubProcessId() { ProcessInstanceMap processInstanceMap = insertOne(); processInstanceMap.setProcessInstanceId(100); processInstanceMapMapper.updateById(processInstanceMap); ProcessInstanceMap map = processInstanceMapMapper.queryBySubProcessId( processInstanceMap.getProcessInstanceId() ); Assert.assertNotEquals(map, null); processInstanceMapMapper.deleteById(processInstanceMap.getId()); } /** * test delete by parent process instance id Loading @@ -140,6 +119,7 @@ public class ProcessInstanceMapMapperTest { } /** * * test query sub ids by process instance parentId */ @Test Loading @@ -154,7 +134,6 @@ public class ProcessInstanceMapMapperTest { Assert.assertNotEquals(subIds.size(), 0); processInstanceMapMapper.deleteById(processInstanceMap.getId()); } } No newline at end of file Loading
dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/CommandMapperTest.java +3 −1 Original line number Diff line number Diff line Loading @@ -262,4 +262,6 @@ public class CommandMapperTest { return command; } } No newline at end of file
dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceUserMapperTest.java +0 −2 Original line number Diff line number Diff line Loading @@ -67,7 +67,6 @@ public class DataSourceUserMapperTest { dataSourceUser.setUpdateTime(new Date()); int update = dataSourceUserMapper.updateById(dataSourceUser); Assert.assertEquals(update, 1); dataSourceUserMapper.deleteById(dataSourceUser.getId()); } /** Loading @@ -90,7 +89,6 @@ public class DataSourceUserMapperTest { //query List<DatasourceUser> dataSources = dataSourceUserMapper.selectList(null); Assert.assertNotEquals(dataSources.size(), 0); dataSourceUserMapper.deleteById(dataSourceUser.getId()); } /** Loading
dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapperTest.java +2 −5 Original line number Diff line number Diff line Loading @@ -72,7 +72,6 @@ public class ErrorCommandMapperTest { errorCommand.setUpdateTime(new Date()); int update = errorCommandMapper.updateById(errorCommand); Assert.assertEquals(1,update); errorCommandMapper.deleteById(errorCommand.getId()); } /** Loading Loading @@ -120,8 +119,6 @@ public class ErrorCommandMapperTest { projectIdArray ); errorCommandMapper.deleteById(errorCommand.getId()); processDefinitionMapper.deleteById(processDefinition.getId()); Assert.assertNotEquals(commandCounts.size(), 0); Assert.assertNotEquals(commandCounts2.size(), 0); } Loading
dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapperTest.java +0 −12 Original line number Diff line number Diff line Loading @@ -82,7 +82,6 @@ public class ProcessDefinitionMapperTest { processDefinition.setUpdateTime(new Date()); int update = processDefinitionMapper.updateById(processDefinition); Assert.assertEquals(1, update); processDefinitionMapper.deleteById(processDefinition.getId()); } /** Loading @@ -104,7 +103,6 @@ public class ProcessDefinitionMapperTest { //query List<ProcessDefinition> dataSources = processDefinitionMapper.selectList(null); Assert.assertNotEquals(dataSources.size(), 0); processDefinitionMapper.deleteById(processDefinition.getId()); } /** Loading Loading @@ -147,11 +145,6 @@ public class ProcessDefinitionMapperTest { ProcessDefinition processDefinition1 = processDefinitionMapper.queryByDefineName(project.getId(), "def 1"); Assert.assertNotEquals(processDefinition1, null); processDefinitionMapper.deleteById(processDefinition.getId()); queueMapper.deleteById(queue.getId()); projectMapper.deleteById(project.getId()); tenantMapper.deleteById(tenant.getId()); userMapper.deleteById(user.getId()); } /** Loading @@ -163,7 +156,6 @@ public class ProcessDefinitionMapperTest { Page<ProcessDefinition> page = new Page(1,3); IPage<ProcessDefinition> processDefinitionIPage = processDefinitionMapper.queryDefineListPaging(page, "def", 101, 1010,true); Assert.assertNotEquals(processDefinitionIPage.getTotal(), 0); processDefinitionMapper.deleteById(processDefinition.getId()); } /** Loading @@ -174,7 +166,6 @@ public class ProcessDefinitionMapperTest { ProcessDefinition processDefinition = insertOne(); List<ProcessDefinition> processDefinitionIPage = processDefinitionMapper.queryAllDefinitionList(1010); Assert.assertNotEquals(processDefinitionIPage.size(), 0); processDefinitionMapper.deleteById(processDefinition.getId()); } /** Loading @@ -191,8 +182,6 @@ public class ProcessDefinitionMapperTest { array[1] = processDefinition1.getId(); List<ProcessDefinition> processDefinitions = processDefinitionMapper.queryDefinitionListByIdList(array); processDefinitionMapper.deleteById(processDefinition.getId()); processDefinitionMapper.deleteById(processDefinition1.getId()); Assert.assertEquals(2, processDefinitions.size()); } Loading Loading @@ -224,7 +213,6 @@ public class ProcessDefinitionMapperTest { projectIds, user.getUserType() == UserType.ADMIN_USER ); processDefinitionMapper.deleteById(processDefinition.getId()); Assert.assertNotEquals(processDefinitions.size(), 0); } } No newline at end of file
dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapMapperTest.java +1 −22 Original line number Diff line number Diff line Loading @@ -65,7 +65,6 @@ public class ProcessInstanceMapMapperTest { processInstanceMap.setParentProcessInstanceId(1); int update = processInstanceMapMapper.updateById(processInstanceMap); Assert.assertEquals(1, update); processInstanceMapMapper.deleteById(processInstanceMap.getId()); } /** Loading @@ -87,7 +86,6 @@ public class ProcessInstanceMapMapperTest { //query List<ProcessInstanceMap> dataSources = processInstanceMapMapper.selectList(null); Assert.assertNotEquals(dataSources.size(), 0); processInstanceMapMapper.deleteById(processInstanceMap.getId()); } /** Loading @@ -99,30 +97,11 @@ public class ProcessInstanceMapMapperTest { processInstanceMap.setParentProcessInstanceId(100); processInstanceMapMapper.updateById(processInstanceMap); ProcessInstanceMap map = processInstanceMapMapper.queryByParentId(processInstanceMap.getParentProcessInstanceId(), processInstanceMap.getParentTaskInstanceId()); Assert.assertNotEquals(map, null); processInstanceMapMapper.deleteById(processInstanceMap.getId()); } /** * test query by sub process instance id */ @Test public void testQueryBySubProcessId() { ProcessInstanceMap processInstanceMap = insertOne(); processInstanceMap.setProcessInstanceId(100); processInstanceMapMapper.updateById(processInstanceMap); ProcessInstanceMap map = processInstanceMapMapper.queryBySubProcessId( processInstanceMap.getProcessInstanceId() ); Assert.assertNotEquals(map, null); processInstanceMapMapper.deleteById(processInstanceMap.getId()); } /** * test delete by parent process instance id Loading @@ -140,6 +119,7 @@ public class ProcessInstanceMapMapperTest { } /** * * test query sub ids by process instance parentId */ @Test Loading @@ -154,7 +134,6 @@ public class ProcessInstanceMapMapperTest { Assert.assertNotEquals(subIds.size(), 0); processInstanceMapMapper.deleteById(processInstanceMap.getId()); } } No newline at end of file