From bf39b318554e0e0b8116502c6214f26a7c463ef7 Mon Sep 17 00:00:00 2001
From: lgcareer <18610854716@163.com>
Date: Fri, 27 Sep 2019 10:23:25 +0800
Subject: [PATCH] add unit test in UserMapper and WorkerGroupMapper (#907)
* rename from DatasourceUserMapper to DataSourceUserMapper
* add unit test in UserMapper and WorkerGroupMapper
---
.../java/cn/escheduler/dao/entity/Tenant.java | 7 +-
.../cn.escheduler.dao.mapper/UserMapper.xml | 17 +-
.../escheduler/dao/mapper/UserMapperTest.java | 270 +++++++++++++++---
.../dao/mapper/WorkerGroupMapperTest.java | 73 +++++
4 files changed, 318 insertions(+), 49 deletions(-)
diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Tenant.java b/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Tenant.java
index 7d56fec544..f4db4d6068 100644
--- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Tenant.java
+++ b/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Tenant.java
@@ -16,9 +16,6 @@
*/
package cn.escheduler.dao.entity;
-import cn.escheduler.common.enums.AlertStatus;
-import cn.escheduler.common.enums.AlertType;
-import cn.escheduler.common.enums.ShowType;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -26,8 +23,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
/**
* tenant
@@ -68,10 +63,10 @@ public class Tenant {
@TableField(exist = false)
private String queueName;
-
/**
* queue
*/
+ @TableField(exist = false)
private String queue;
/**
diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UserMapper.xml b/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UserMapper.xml
index 2baf8ad555..d8fecc85e6 100644
--- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UserMapper.xml
+++ b/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UserMapper.xml
@@ -16,25 +16,24 @@