From 9de9f18c0819f05e3ef39bbd7f6a60fa5da8e9c0 Mon Sep 17 00:00:00 2001 From: qiaozhanwei Date: Fri, 10 Apr 2020 08:52:39 +0800 Subject: [PATCH] update UT in pom.xml --- .../dao/mapper/CommandMapperTest.java | 4 +- .../dao/mapper/DataSourceUserMapperTest.java | 2 - .../dao/mapper/ErrorCommandMapperTest.java | 7 +- .../mapper/ProcessDefinitionMapperTest.java | 12 -- .../mapper/ProcessInstanceMapMapperTest.java | 23 +-- .../dao/mapper/ProcessInstanceMapperTest.java | 4 +- .../dao/mapper/ProjectMapperTest.java | 12 -- .../dao/mapper/ProjectUserMapperTest.java | 3 - .../dao/mapper/QueueMapperTest.java | 6 +- .../dao/mapper/ResourceMapperTest.java | 15 +- .../dao/mapper/ResourceUserMapperTest.java | 2 - .../dao/mapper/ScheduleMapperTest.java | 16 +- .../dao/mapper/SessionMapperTest.java | 5 +- .../dao/mapper/TenantMapperTest.java | 6 - .../dao/mapper/UDFUserMapperTest.java | 10 -- .../dao/mapper/UdfFuncMapperTest.java | 15 -- .../dao/mapper/UserAlertGroupMapperTest.java | 9 -- .../dao/mapper/UserMapperTest.java | 17 --- .../dao/mapper/WorkerGroupMapperTest.java | 139 ------------------ pom.xml | 21 +++ 20 files changed, 37 insertions(+), 291 deletions(-) delete mode 100644 dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapperTest.java diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/CommandMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/CommandMapperTest.java index e96f688f52..468824bf6e 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/CommandMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/CommandMapperTest.java @@ -170,7 +170,7 @@ public class CommandMapperTest { List actualCommandCounts = commandMapper.countCommandState(0, startTime, endTime, projectIdArray); - assertThat(actualCommandCounts.size(), greaterThanOrEqualTo(1)); + assertThat(actualCommandCounts.size(),greaterThanOrEqualTo(1)); } @@ -262,4 +262,6 @@ public class CommandMapperTest { return command; } + + } \ No newline at end of file diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceUserMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceUserMapperTest.java index 61d9f01cc8..3a449ee8a3 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceUserMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceUserMapperTest.java @@ -67,7 +67,6 @@ public class DataSourceUserMapperTest { dataSourceUser.setUpdateTime(new Date()); int update = dataSourceUserMapper.updateById(dataSourceUser); Assert.assertEquals(update, 1); - dataSourceUserMapper.deleteById(dataSourceUser.getId()); } /** @@ -90,7 +89,6 @@ public class DataSourceUserMapperTest { //query List dataSources = dataSourceUserMapper.selectList(null); Assert.assertNotEquals(dataSources.size(), 0); - dataSourceUserMapper.deleteById(dataSourceUser.getId()); } /** diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapperTest.java index 2b630861a7..2f5e586e00 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapperTest.java @@ -72,7 +72,6 @@ public class ErrorCommandMapperTest { errorCommand.setUpdateTime(new Date()); int update = errorCommandMapper.updateById(errorCommand); Assert.assertEquals(1,update); - errorCommandMapper.deleteById(errorCommand.getId()); } /** @@ -107,8 +106,8 @@ public class ErrorCommandMapperTest { List commandCounts = errorCommandMapper.countCommandState( null, - null, - new Integer[0] + null, + new Integer[0] ); Integer[] projectIdArray = new Integer[2]; @@ -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); } diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapperTest.java index 46e0239add..d467979ed2 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapperTest.java @@ -82,7 +82,6 @@ public class ProcessDefinitionMapperTest { processDefinition.setUpdateTime(new Date()); int update = processDefinitionMapper.updateById(processDefinition); Assert.assertEquals(1, update); - processDefinitionMapper.deleteById(processDefinition.getId()); } /** @@ -104,7 +103,6 @@ public class ProcessDefinitionMapperTest { //query List dataSources = processDefinitionMapper.selectList(null); Assert.assertNotEquals(dataSources.size(), 0); - processDefinitionMapper.deleteById(processDefinition.getId()); } /** @@ -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()); } /** @@ -163,7 +156,6 @@ public class ProcessDefinitionMapperTest { Page page = new Page(1,3); IPage processDefinitionIPage = processDefinitionMapper.queryDefineListPaging(page, "def", 101, 1010,true); Assert.assertNotEquals(processDefinitionIPage.getTotal(), 0); - processDefinitionMapper.deleteById(processDefinition.getId()); } /** @@ -174,7 +166,6 @@ public class ProcessDefinitionMapperTest { ProcessDefinition processDefinition = insertOne(); List processDefinitionIPage = processDefinitionMapper.queryAllDefinitionList(1010); Assert.assertNotEquals(processDefinitionIPage.size(), 0); - processDefinitionMapper.deleteById(processDefinition.getId()); } /** @@ -191,8 +182,6 @@ public class ProcessDefinitionMapperTest { array[1] = processDefinition1.getId(); List processDefinitions = processDefinitionMapper.queryDefinitionListByIdList(array); - processDefinitionMapper.deleteById(processDefinition.getId()); - processDefinitionMapper.deleteById(processDefinition1.getId()); Assert.assertEquals(2, processDefinitions.size()); } @@ -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 diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapMapperTest.java index e3cf9006e0..08b30ce76c 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapMapperTest.java @@ -65,7 +65,6 @@ public class ProcessInstanceMapMapperTest { processInstanceMap.setParentProcessInstanceId(1); int update = processInstanceMapMapper.updateById(processInstanceMap); Assert.assertEquals(1, update); - processInstanceMapMapper.deleteById(processInstanceMap.getId()); } /** @@ -87,7 +86,6 @@ public class ProcessInstanceMapMapperTest { //query List dataSources = processInstanceMapMapper.selectList(null); Assert.assertNotEquals(dataSources.size(), 0); - processInstanceMapMapper.deleteById(processInstanceMap.getId()); } /** @@ -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 @@ -140,6 +119,7 @@ public class ProcessInstanceMapMapperTest { } /** + * * test query sub ids by process instance parentId */ @Test @@ -154,7 +134,6 @@ public class ProcessInstanceMapMapperTest { Assert.assertNotEquals(subIds.size(), 0); - processInstanceMapMapper.deleteById(processInstanceMap.getId()); } } \ No newline at end of file diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java index 2a9fe8cf87..3da6e69cce 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java @@ -318,12 +318,12 @@ public class ProcessInstanceMapperTest { Date start = new Date(2019-1900, 1-1, 01, 0, 0, 0); Date end = new Date(2019-1900, 1-1, 01, 5, 0, 0); ProcessInstance processInstance1 = processInstanceMapper.queryLastManualProcess(processInstance.getProcessDefinitionId(),start, end - ); + ); Assert.assertEquals(processInstance1.getId(), processInstance.getId()); start = new Date(2019-1900, 1-1, 01, 1, 0, 0); processInstance1 = processInstanceMapper.queryLastManualProcess(processInstance.getProcessDefinitionId(),start, end - ); + ); Assert.assertNull(processInstance1); processInstanceMapper.deleteById(processInstance.getId()); diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapperTest.java index a0d7e439a0..43f601ec01 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapperTest.java @@ -70,7 +70,6 @@ public class ProjectMapperTest { //update int update = projectMapper.updateById(project); Assert.assertEquals(update, 1); - projectMapper.deleteById(project.getId()); } /** @@ -92,7 +91,6 @@ public class ProjectMapperTest { //query List projects = projectMapper.selectList(null); Assert.assertNotEquals(projects.size(), 0); - projectMapper.deleteById(project.getId()); } /** @@ -110,8 +108,6 @@ public class ProjectMapperTest { projectMapper.updateById(project); Project project1 = projectMapper.queryDetailById(project.getId()); - userMapper.deleteById(user.getId()); - projectMapper.deleteById(project.getId()); Assert.assertNotEquals(project1, null); Assert.assertEquals(project1.getUserName(), user.getUserName()); } @@ -130,8 +126,6 @@ public class ProjectMapperTest { projectMapper.updateById(project); Project project1 = projectMapper.queryByName(project.getName()); - userMapper.deleteById(user.getId()); - projectMapper.deleteById(project.getId()); Assert.assertNotEquals(project1, null); Assert.assertEquals(project1.getUserName(), user.getUserName()); } @@ -161,9 +155,6 @@ public class ProjectMapperTest { project.getUserId(), project.getName() ); - projectMapper.deleteById(project.getId()); - projectMapper.deleteById(project1.getId()); - userMapper.deleteById(user.getId()); Assert.assertNotEquals(projectIPage.getTotal(), 0); Assert.assertNotEquals(projectIPage1.getTotal(), 0); } @@ -177,7 +168,6 @@ public class ProjectMapperTest { List projects = projectMapper.queryProjectCreatedByUser(project.getUserId()); - projectMapper.deleteById(project.getId()); Assert.assertNotEquals(projects.size(), 0); } @@ -191,7 +181,6 @@ public class ProjectMapperTest { List projects = projectMapper.queryProjectCreatedByUser(project.getUserId()); - projectMapper.deleteById(project.getId()); Assert.assertNotEquals(projects.size(), 0); } @@ -206,7 +195,6 @@ public class ProjectMapperTest { 100000 ); - projectMapper.deleteById(project.getId()); Assert.assertNotEquals(projects.size(), 0); } } \ No newline at end of file diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapperTest.java index 8e385e705b..b76bd4eed9 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapperTest.java @@ -64,7 +64,6 @@ public class ProjectUserMapperTest { //update int update = projectUserMapper.updateById(projectUser); Assert.assertEquals(update, 1); - projectUserMapper.deleteById(projectUser.getId()); } /** @@ -86,7 +85,6 @@ public class ProjectUserMapperTest { //query List projectUsers = projectUserMapper.selectList(null); Assert.assertNotEquals(projectUsers.size(), 0); - projectUserMapper.deleteById(projectUser.getId()); } /** @@ -111,6 +109,5 @@ public class ProjectUserMapperTest { ProjectUser projectUser1 = projectUserMapper.queryProjectRelation(projectUser.getProjectId(), projectUser.getUserId()); Assert.assertNotEquals(projectUser1, null); - projectUserMapper.deleteById(projectUser.getId()); } } \ No newline at end of file diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/QueueMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/QueueMapperTest.java index 20f6b2bff7..a1e1fdaf7a 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/QueueMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/QueueMapperTest.java @@ -38,7 +38,7 @@ import java.util.List; @Rollback(true) public class QueueMapperTest { - + @Autowired QueueMapper queueMapper; @@ -69,7 +69,6 @@ public class QueueMapperTest { //update int update = queueMapper.updateById(queue); Assert.assertEquals(1, update); - queueMapper.deleteById(queue.getId()); } /** @@ -91,7 +90,6 @@ public class QueueMapperTest { //query List queues = queueMapper.selectList(null); Assert.assertNotEquals(queues.size(), 0); - queueMapper.deleteById(queue.getId()); } /** @@ -110,7 +108,6 @@ public class QueueMapperTest { queueIPage= queueMapper.queryQueuePaging(page, queue.getQueueName()); Assert.assertNotEquals(queueIPage.getTotal(), 0); - queueMapper.deleteById(queue.getId()); } /** @@ -125,6 +122,5 @@ public class QueueMapperTest { queues = queueMapper.queryAllQueueList(null, queue.getQueueName()); Assert.assertNotEquals(queues.size(), 0); - queueMapper.deleteById(queue.getId()); } } \ No newline at end of file diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapperTest.java index 6a2aea5ad2..82380e4b3a 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapperTest.java @@ -159,7 +159,6 @@ public class ResourceMapperTest { //update int update = resourceMapper.updateById(resource); Assert.assertEquals(1, update); - resourceMapper.deleteById(resource.getId()); } /** @@ -181,7 +180,6 @@ public class ResourceMapperTest { //query List resources = resourceMapper.selectList(null); Assert.assertNotEquals(resources.size(), 0); - resourceMapper.deleteById(resource.getId()); } /** @@ -196,13 +194,12 @@ public class ResourceMapperTest { int userId = resource.getUserId(); int type = resource.getType().ordinal(); List resources = resourceMapper.queryResourceList( - alias, - userId, - type + alias, + userId, + type ); Assert.assertNotEquals(resources.size(), 0); - resourceMapper.deleteById(resource.getId()); } /** @@ -232,8 +229,6 @@ public class ResourceMapperTest { resource.getType().ordinal(), "" ); - resourceMapper.deleteById(resource.getId()); - resourceUserMapper.deleteById(resourcesUser.getId()); Assert.assertNotEquals(resourceIPage.getTotal(), 0); Assert.assertNotEquals(resourceIPage1.getTotal(), 0); @@ -256,8 +251,6 @@ public class ResourceMapperTest { List resources1 = resourceMapper.queryAuthorizedResourceList(1110); - resourceUserMapper.deleteById(resourcesUser.getId()); - resourceMapper.deleteById(resource.getId()); Assert.assertEquals(0, resources.size()); Assert.assertNotEquals(0, resources1.size()); @@ -286,7 +279,6 @@ public class ResourceMapperTest { 11111 ); Assert.assertNotEquals(resources.size(), 0); - resourceMapper.deleteById(resource.getId()); } /** @@ -316,7 +308,6 @@ public class ResourceMapperTest { Assert.assertEquals("ut tenant code for resource", resource1); - resourceMapper.deleteById(resource.getId()); } diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceUserMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceUserMapperTest.java index 886d878122..9244c9e13d 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceUserMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceUserMapperTest.java @@ -67,7 +67,6 @@ public class ResourceUserMapperTest { //update int update = resourceUserMapper.updateById(queue); Assert.assertEquals(1, update); - resourceUserMapper.deleteById(queue.getId()); } /** @@ -89,7 +88,6 @@ public class ResourceUserMapperTest { //query List queues = resourceUserMapper.selectList(null); Assert.assertNotEquals(queues.size(), 0); - resourceUserMapper.deleteById(queue.getId()); } /** diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ScheduleMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ScheduleMapperTest.java index f709af91c9..e7dafccc73 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ScheduleMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ScheduleMapperTest.java @@ -44,7 +44,7 @@ import java.util.List; @Rollback(true) public class ScheduleMapperTest { - + @Autowired ScheduleMapper scheduleMapper; @@ -87,7 +87,6 @@ public class ScheduleMapperTest { //update int update = scheduleMapper.updateById(schedule); Assert.assertEquals(update, 1); - scheduleMapper.deleteById(schedule.getId()); } /** @@ -109,7 +108,6 @@ public class ScheduleMapperTest { //query List schedules = scheduleMapper.selectList(null); Assert.assertNotEquals(schedules.size(), 0); - scheduleMapper.deleteById(schedule.getId()); } /** @@ -141,14 +139,10 @@ public class ScheduleMapperTest { Page page = new Page(1,3); IPage scheduleIPage = scheduleMapper.queryByProcessDefineIdPaging(page, processDefinition.getId(), "" - ); + ); Assert.assertNotEquals(scheduleIPage.getSize(), 0); - projectMapper.deleteById(project.getId()); - processDefinitionMapper.deleteById(processDefinition.getId()); - userMapper.deleteById(user.getId()); - scheduleMapper.deleteById(schedule.getId()); } /** @@ -182,10 +176,6 @@ public class ScheduleMapperTest { List schedules = scheduleMapper.querySchedulerListByProjectName( project.getName() ); - projectMapper.deleteById(project.getId()); - processDefinitionMapper.deleteById(processDefinition.getId()); - userMapper.deleteById(user.getId()); - scheduleMapper.deleteById(schedule.getId()); Assert.assertNotEquals(schedules.size(), 0); } @@ -202,7 +192,6 @@ public class ScheduleMapperTest { scheduleMapper.updateById(schedule); List schedules= scheduleMapper.selectAllByProcessDefineArray(new int[] {schedule.getProcessDefinitionId()}); - scheduleMapper.deleteById(schedule.getId()); Assert.assertNotEquals(schedules.size(), 0); } @@ -216,7 +205,6 @@ public class ScheduleMapperTest { scheduleMapper.updateById(schedule); List schedules= scheduleMapper.queryByProcessDefinitionId(schedule.getProcessDefinitionId()); - scheduleMapper.deleteById(schedule.getId()); Assert.assertNotEquals(schedules.size(), 0); } } \ No newline at end of file diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/SessionMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/SessionMapperTest.java index 2c471aa11b..df16177b43 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/SessionMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/SessionMapperTest.java @@ -29,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; +import java.util.UUID; @RunWith(SpringRunner.class) @SpringBootTest @@ -46,6 +47,7 @@ public class SessionMapperTest { private Session insertOne(){ //insertOne Session session = new Session(); + session.setId(UUID.randomUUID().toString()); session.setLastLoginTime(new Date()); session.setUserId(11111); sessionMapper.insert(session); @@ -63,7 +65,6 @@ public class SessionMapperTest { //update int update = sessionMapper.updateById(session); Assert.assertEquals(update, 1); - sessionMapper.deleteById(session.getId()); } /** @@ -85,7 +86,6 @@ public class SessionMapperTest { //query List sessions = sessionMapper.selectList(null); Assert.assertNotEquals(sessions.size(), 0); - sessionMapper.deleteById(session.getId()); } /** @@ -97,6 +97,5 @@ public class SessionMapperTest { List sessions = sessionMapper.queryByUserId(session.getUserId()); Assert.assertNotEquals(sessions.size(), 0); - sessionMapper.deleteById(session.getId()); } } \ No newline at end of file diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TenantMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TenantMapperTest.java index 5951278ac4..493e85b39c 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TenantMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TenantMapperTest.java @@ -69,7 +69,6 @@ public class TenantMapperTest { //update int update = tenantMapper.updateById(tenant); Assert.assertEquals(1, update); - tenantMapper.deleteById(tenant.getId()); } /** @@ -91,7 +90,6 @@ public class TenantMapperTest { //query List tenants = tenantMapper.selectList(null); Assert.assertNotEquals(tenants.size(), 0); - tenantMapper.deleteById(tenant.getId()); } /** @@ -112,7 +110,6 @@ public class TenantMapperTest { Tenant tenant1 = tenantMapper.queryById(tenant.getId()); - tenantMapper.deleteById(tenant.getId()); Assert.assertNotEquals(tenant1, null); } @@ -125,7 +122,6 @@ public class TenantMapperTest { Tenant tenant = insertOne(); tenant.setTenantCode("ut code"); tenantMapper.updateById(tenant); - tenantMapper.deleteById(tenant.getId()); } /** @@ -148,8 +144,6 @@ public class TenantMapperTest { IPage tenantIPage = tenantMapper.queryTenantPaging(page, tenant.getTenantName()); - queueMapper.deleteById(queue.getId()); - tenantMapper.deleteById(tenant.getId()); Assert.assertNotEquals(tenantIPage.getTotal(), 0); } } \ No newline at end of file diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UDFUserMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UDFUserMapperTest.java index 9b18c747c2..178369c36e 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UDFUserMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UDFUserMapperTest.java @@ -130,9 +130,6 @@ public class UDFUserMapperTest { udfUser.setUdfId(2); int update = udfUserMapper.updateById(udfUser); Assert.assertEquals(update, 1); - udfUserMapper.deleteById(udfUser.getId()); - udfFuncMapper.deleteById(udfFunc.getId()); - userMapper.deleteById(user.getId()); } @@ -149,8 +146,6 @@ public class UDFUserMapperTest { UDFUser udfUser = insertOne(user, udfFunc); int delete = udfUserMapper.deleteById(udfUser.getId()); Assert.assertEquals(delete, 1); - userMapper.deleteById(user.getId()); - udfFuncMapper.deleteById(udfFunc.getId()); } /** @@ -163,7 +158,6 @@ public class UDFUserMapperTest { //query List udfUserList = udfUserMapper.selectList(null); Assert.assertNotEquals(udfUserList.size(), 0); - userMapper.deleteById(udfUser.getId()); } /** @@ -179,8 +173,6 @@ public class UDFUserMapperTest { UDFUser udfUser = insertOne(user, udfFunc); int delete = udfUserMapper.deleteByUserId(user.getId()); Assert.assertEquals(delete, 1); - userMapper.deleteById(user.getId()); - udfFuncMapper.deleteById(udfFunc.getId()); } @@ -197,7 +189,5 @@ public class UDFUserMapperTest { UDFUser udfUser = insertOne(user, udfFunc); int delete = udfUserMapper.deleteByUdfFuncId(udfFunc.getId()); Assert.assertEquals(delete, 1); - userMapper.deleteById(user.getId()); - udfFuncMapper.deleteById(udfFunc.getId()); } } \ No newline at end of file diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapperTest.java index 0dd06484d8..47d8d89b40 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapperTest.java @@ -170,7 +170,6 @@ public class UdfFuncMapperTest { udfFunc.setUpdateTime(new Date()); //update int update = udfFuncMapper.updateById(udfFunc); - udfFuncMapper.deleteById(udfFunc.getId()); Assert.assertEquals(update, 1); } @@ -197,7 +196,6 @@ public class UdfFuncMapperTest { //query List udfFuncList = udfFuncMapper.selectList(null); Assert.assertNotEquals(udfFuncList.size(), 0); - udfFuncMapper.deleteById(udfFunc.getId()); } /** @@ -213,8 +211,6 @@ public class UdfFuncMapperTest { //queryUdfByIdStr List udfFuncList = udfFuncMapper.queryUdfByIdStr(idArray,""); Assert.assertNotEquals(udfFuncList.size(), 0); - udfFuncMapper.deleteById(udfFunc.getId()); - udfFuncMapper.deleteById(udfFunc1.getId()); } /** @@ -229,8 +225,6 @@ public class UdfFuncMapperTest { //queryUdfFuncPaging Page page = new Page(1,3); IPage udfFuncIPage = udfFuncMapper.queryUdfFuncPaging(page,user.getId(),""); - userMapper.deleteById(user.getId()); - udfFuncMapper.deleteById(udfFunc.getId()); Assert.assertNotEquals(udfFuncIPage.getTotal(), 0); } @@ -246,8 +240,6 @@ public class UdfFuncMapperTest { UdfFunc udfFunc = insertOne(user); //getUdfFuncByType List udfFuncList = udfFuncMapper.getUdfFuncByType(user.getId(), udfFunc.getType().ordinal()); - userMapper.deleteById(user.getId()); - udfFuncMapper.deleteById(udfFunc.getId()); Assert.assertNotEquals(udfFuncList.size(), 0); } @@ -264,10 +256,6 @@ public class UdfFuncMapperTest { UdfFunc udfFunc1 = insertOne(user1); UdfFunc udfFunc2 = insertOne(user2); List udfFuncList = udfFuncMapper.queryUdfFuncExceptUserId(user1.getId()); - userMapper.deleteById(user1.getId()); - userMapper.deleteById(user2.getId()); - udfFuncMapper.deleteById(udfFunc1.getId()); - udfFuncMapper.deleteById(udfFunc2.getId()); Assert.assertNotEquals(udfFuncList.size(), 0); } @@ -287,9 +275,6 @@ public class UdfFuncMapperTest { UDFUser udfUser = insertOneUDFUser(user, udfFunc); //queryAuthedUdfFunc List udfFuncList = udfFuncMapper.queryAuthedUdfFunc(user.getId()); - userMapper.deleteById(user.getId()); - udfFuncMapper.deleteById(udfFunc.getId()); - udfUserMapper.deleteById(udfUser.getId()); Assert.assertNotEquals(udfFuncList.size(), 0); } diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapperTest.java index 402805f44f..2c5024f2ee 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapperTest.java @@ -135,9 +135,6 @@ public class UserAlertGroupMapperTest { int update = userAlertGroupMapper.updateById(userAlertGroup); Assert.assertEquals(update, 1); - userAlertGroupMapper.deleteById(userAlertGroup.getId()); - userMapper.deleteById(user.getId()); - alertGroupMapper.deleteById(alertGroup.getId()); } /** @@ -162,7 +159,6 @@ public class UserAlertGroupMapperTest { //query List userAlertGroupList = userAlertGroupMapper.selectList(null); Assert.assertNotEquals(userAlertGroupList.size(), 0); - userAlertGroupMapper.deleteById(userAlertGroup.getId()); } /** @@ -179,8 +175,6 @@ public class UserAlertGroupMapperTest { UserAlertGroup userAlertGroup = insertOne(user,alertGroup); int delete = userAlertGroupMapper.deleteByAlertgroupId(alertGroup.getId()); Assert.assertEquals(delete, 1); - userMapper.deleteById(user.getId()); - alertGroupMapper.deleteById(alertGroup.getId()); } /** @@ -198,8 +192,5 @@ public class UserAlertGroupMapperTest { List userList = userAlertGroupMapper.listUserByAlertgroupId(alertGroup.getId()); Assert.assertNotEquals(userList.size(), 0); - userAlertGroupMapper.deleteByAlertgroupId(alertGroup.getId()); - userMapper.deleteById(user.getId()); - alertGroupMapper.deleteById(alertGroup.getId()); } } \ No newline at end of file diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserMapperTest.java index b14cf7dc67..29de0280e9 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserMapperTest.java @@ -206,7 +206,6 @@ public class UserMapperTest { user.setUserType(UserType.ADMIN_USER); int update = userMapper.updateById(user); Assert.assertEquals(update, 1); - userMapper.deleteById(user.getId()); } /** @@ -219,7 +218,6 @@ public class UserMapperTest { //delete int delete = userMapper.deleteById(user.getId()); Assert.assertEquals(delete, 1); - userMapper.deleteById(user.getId()); } /** @@ -232,7 +230,6 @@ public class UserMapperTest { //query List userList = userMapper.selectList(null); Assert.assertNotEquals(userList.size(), 0); - userMapper.deleteById(user.getId()); } /** @@ -245,7 +242,6 @@ public class UserMapperTest { //queryAllGeneralUser List userList = userMapper.queryAllGeneralUser(); Assert.assertNotEquals(userList.size(), 0); - userMapper.deleteById(user.getId()); } /** @@ -258,7 +254,6 @@ public class UserMapperTest { //queryByUserNameAccurately User queryUser = userMapper.queryByUserNameAccurately(user.getUserName()); Assert.assertEquals(queryUser.getUserName(), user.getUserName()); - userMapper.deleteById(user.getId()); } /** @@ -272,7 +267,6 @@ public class UserMapperTest { User queryUser = userMapper.queryUserByNamePassword(user.getUserName(),user.getUserPassword()); Assert.assertEquals(queryUser.getUserName(),user.getUserName()); Assert.assertEquals(queryUser.getUserPassword(),user.getUserPassword()); - userMapper.deleteById(user.getId()); } /** @@ -290,9 +284,6 @@ public class UserMapperTest { Page page = new Page(1,3); IPage userIPage = userMapper.queryUserPaging(page, user.getUserName()); Assert.assertNotEquals(userIPage.getTotal(), 0); - queueMapper.deleteById(queue.getId()); - tenantMapper.deleteById(tenant.getId()); - userMapper.deleteById(user.getId()); } /** @@ -305,7 +296,6 @@ public class UserMapperTest { //queryDetailsById User queryUser = userMapper.queryDetailsById(user.getId()); Assert.assertEquals(queryUser,user); - userMapper.deleteById(user.getId()); } /** @@ -322,9 +312,6 @@ public class UserMapperTest { //queryUserListByAlertGroupId List userList = userMapper.queryUserListByAlertGroupId(userAlertGroup.getAlertgroupId()); Assert.assertNotEquals(userList.size(), 0); - userMapper.deleteById(user.getId()); - alertGroupMapper.deleteById(alertGroup.getId()); - userAlertGroupMapper.deleteById(userAlertGroup.getAlertgroupId()); } @@ -340,8 +327,6 @@ public class UserMapperTest { //queryTenantCodeByUserId User queryUser = userMapper.queryTenantCodeByUserId(user.getId()); Assert.assertEquals(queryUser,user); - userMapper.deleteById(user.getId()); - tenantMapper.deleteById(tenant.getId()); } /** @@ -356,8 +341,6 @@ public class UserMapperTest { //queryUserByToken User userToken = userMapper.queryUserByToken(accessToken.getToken()); Assert.assertEquals(userToken,user); - userMapper.deleteById(user.getId()); - accessTokenMapper.deleteById(accessToken.getId()); } } diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapperTest.java deleted file mode 100644 index ee7c848fc0..0000000000 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapperTest.java +++ /dev/null @@ -1,139 +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.dolphinscheduler.dao.mapper; - - -import org.apache.dolphinscheduler.dao.entity.WorkerGroup; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.annotation.Rollback; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; - -@RunWith(SpringRunner.class) -@SpringBootTest -@Transactional -@Rollback(true) -public class WorkerGroupMapperTest { - @Autowired - WorkerGroupMapper workerGroupMapper; - - /** - * insert - * @return WorkerGroup - */ - private WorkerGroup insertOne(){ - //insertOne - WorkerGroup workerGroup = new WorkerGroup(); - - String name = "workerGroup3"; - workerGroup.setName(name); - workerGroup.setIpList("192.168.220.154,192.168.220.188"); - workerGroup.setCreateTime(new Date()); - workerGroup.setUpdateTime(new Date()); - workerGroupMapper.insert(workerGroup); - return workerGroup; - } - - - /** - * test update - */ - @Test - public void testUpdate(){ - //insertOne - WorkerGroup workerGroup = insertOne(); - //update - workerGroup.setName("workerGroup11"); - int update = workerGroupMapper.updateById(workerGroup); - workerGroupMapper.deleteById(workerGroup.getId()); - Assert.assertEquals(1, update); - } - - /** - * test delete - */ - @Test - public void testDelete(){ - //insertOne - WorkerGroup workerGroup = insertOne(); - //delete - int delete = workerGroupMapper.deleteById(workerGroup.getId()); - Assert.assertEquals(1, delete); - } - - /** - * test query - */ - @Test - public void testQuery() { - //insertOne - WorkerGroup workerGroup = insertOne(); - //query - List workerGroupList = workerGroupMapper.selectList(null); - Assert.assertNotEquals(workerGroupList.size(), 0); - workerGroupMapper.deleteById(workerGroup.getId()); - } - - /** - * test query all worker group - */ - @Test - public void testQueryAllWorkerGroup() { - //insertOne - WorkerGroup workerGroup = insertOne(); - //queryAllWorkerGroup - List workerGroupList = workerGroupMapper.queryAllWorkerGroup(); - Assert.assertNotEquals(workerGroupList.size(), 0); - workerGroupMapper.deleteById(workerGroup.getId()); - } - - /** - * test query work group by name - */ - @Test - public void testQueryWorkerGroupByName() { - //insertOne - WorkerGroup workerGroup = insertOne(); - //queryWorkerGroupByName - List workerGroupList = workerGroupMapper.queryWorkerGroupByName(workerGroup.getName()); - Assert.assertNotEquals(workerGroupList.size(), 0); - workerGroupMapper.deleteById(workerGroup.getId()); - } - - /** - * test page - */ - @Test - public void testQueryListPaging() { - //insertOne - WorkerGroup workerGroup = insertOne(); - //queryListPaging - Page page = new Page(1,3); - IPage workerGroupIPage = workerGroupMapper.queryListPaging(page, workerGroup.getName()); - Assert.assertNotEquals(workerGroupIPage.getTotal(), 0); - workerGroupMapper.deleteById(workerGroup.getId()); - } -} \ No newline at end of file diff --git a/pom.xml b/pom.xml index d54a1c7915..1c4687aa4b 100644 --- a/pom.xml +++ b/pom.xml @@ -800,6 +800,27 @@ **/service/zk/DefaultEnsembleProviderTest.java **/service/zk/ZKServerTest.java **/service/queue/TaskUpdateQueueTest.java + + **/dao/mapper/DataSourceUserMapperTest.java + **/dao/mapper/ErrorCommandMapperTest.java + **/dao/mapper/ProcessDefinitionMapperTest.java + **/dao/mapper/ProcessInstanceMapMapperTest.java + **/dao/mapper/ProcessInstanceMapperTest.java + **/dao/mapper/ProjectMapperTest.java + **/dao/mapper/ProjectUserMapperTest.java + **/dao/mapper/QueueMapperTest.java + **/dao/mapper/ResourceMapperTest.java + **/dao/mapper/ResourceUserMapperTest.java + **/dao/mapper/ScheduleMapperTest.java + **/dao/mapper/SessionMapperTest.java + **/dao/mapper/TaskInstanceMapperTest.java + **/dao/mapper/TenantMapperTest.java + **/dao/mapper/UdfFuncMapperTest.java + **/dao/mapper/UDFUserMapperTest.java + **/dao/mapper/UserAlertGroupMapperTest.java + **/dao/mapper/UserMapperTest.java + **/dao/utils/DagHelperTest.java + **/dao/AlertDaoTest.java