Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
b5193ee4
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
705
Star
9572
Fork
3514
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
b5193ee4
编写于
10月 22, 2022
作者:
W
Wenjun Ruan
提交者:
GitHub
10月 22, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove equals in User to fix UT (#12487)
上级
1436ad65
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
15 addition
and
96 deletion
+15
-96
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java
...apache/dolphinscheduler/api/service/UsersServiceTest.java
+11
-18
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/User.java
...ain/java/org/apache/dolphinscheduler/dao/entity/User.java
+0
-69
dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserMapperTest.java
...rg/apache/dolphinscheduler/dao/mapper/UserMapperTest.java
+4
-9
未找到文件。
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java
浏览文件 @
b5193ee4
...
...
@@ -297,27 +297,20 @@ public class UsersServiceTest {
}
@Test
public
void
testUpdateUser
()
{
public
void
testUpdateUser
()
throws
IOException
{
String
userName
=
"userTest0001"
;
String
userPassword
=
"userTest0001"
;
try
{
// user not exist
Map
<
String
,
Object
>
result
=
usersService
.
updateUser
(
getLoginUser
(),
0
,
userName
,
userPassword
,
"3443@qq.com"
,
1
,
"13457864543"
,
"queue"
,
1
,
"Asia/Shanghai"
);
Assertions
.
assertEquals
(
Status
.
USER_NOT_EXIST
,
result
.
get
(
Constants
.
STATUS
));
logger
.
info
(
result
.
toString
());
// user not exist
Map
<
String
,
Object
>
result
=
usersService
.
updateUser
(
getLoginUser
(),
0
,
userName
,
userPassword
,
"3443@qq.com"
,
1
,
"13457864543"
,
"queue"
,
1
,
"Asia/Shanghai"
);
Assertions
.
assertEquals
(
Status
.
USER_NOT_EXIST
,
result
.
get
(
Constants
.
STATUS
));
// success
when
(
userMapper
.
selectById
(
1
)).
thenReturn
(
getUser
());
when
(
userMapper
.
updateById
(
getUser
())).
thenReturn
(
1
);
result
=
usersService
.
updateUser
(
getLoginUser
(),
1
,
userName
,
userPassword
,
"32222s@qq.com"
,
1
,
"13457864543"
,
"queue"
,
1
,
"Asia/Shanghai"
);
logger
.
info
(
result
.
toString
());
Assertions
.
assertEquals
(
Status
.
SUCCESS
,
result
.
get
(
Constants
.
STATUS
));
}
catch
(
Exception
e
)
{
logger
.
error
(
"update user error"
,
e
);
Assertions
.
fail
();
}
// success
when
(
userMapper
.
selectById
(
1
)).
thenReturn
(
getUser
());
when
(
userMapper
.
updateById
(
any
())).
thenReturn
(
1
);
result
=
usersService
.
updateUser
(
getLoginUser
(),
1
,
userName
,
userPassword
,
"32222s@qq.com"
,
1
,
"13457864543"
,
"queue"
,
1
,
"Asia/Shanghai"
);
Assertions
.
assertEquals
(
Status
.
SUCCESS
,
result
.
get
(
Constants
.
STATUS
));
}
@Test
...
...
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/User.java
浏览文件 @
b5193ee4
...
...
@@ -32,107 +32,38 @@ import com.baomidou.mybatisplus.annotation.TableName;
@TableName
(
"t_ds_user"
)
public
class
User
{
/**
* id
*/
@TableId
(
value
=
"id"
,
type
=
IdType
.
AUTO
)
private
Integer
id
;
/**
* user name
*/
private
String
userName
;
/**
* user password
*/
private
String
userPassword
;
/**
* mail
*/
private
String
email
;
/**
* phone
*/
private
String
phone
;
/**
* user type
*/
private
UserType
userType
;
/**
* tenant id
*/
private
int
tenantId
;
/**
* user state
*/
private
int
state
;
/**
* tenant code
*/
@TableField
(
exist
=
false
)
private
String
tenantCode
;
/**
* queue name
*/
@TableField
(
exist
=
false
)
private
String
queueName
;
/**
* alert group
*/
@TableField
(
exist
=
false
)
private
String
alertGroup
;
/**
* user specified queue
*/
private
String
queue
;
/**
* time zone
*/
private
String
timeZone
;
/**
* create time
*/
private
Date
createTime
;
/**
* update time
*/
private
Date
updateTime
;
@Override
public
boolean
equals
(
Object
o
)
{
if
(
this
==
o
)
{
return
true
;
}
if
(
o
==
null
||
getClass
()
!=
o
.
getClass
())
{
return
false
;
}
User
user
=
(
User
)
o
;
if
(
id
!=
user
.
id
)
{
return
false
;
}
return
userName
.
equals
(
user
.
userName
);
}
@Override
public
int
hashCode
()
{
int
result
=
id
==
null
?
0
:
id
;
result
=
31
*
result
+
userName
.
hashCode
();
return
result
;
}
}
dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserMapperTest.java
浏览文件 @
b5193ee4
...
...
@@ -74,13 +74,7 @@ public class UserMapperTest extends BaseDaoTest {
return
user
;
}
/**
* insert one user
*
* @param tenant tenant
* @return User
*/
private
User
insertOne
(
Tenant
tenant
)
{
private
User
insertOneUser
(
Tenant
tenant
)
{
User
user
=
new
User
();
user
.
setUserName
(
"user1"
);
user
.
setUserPassword
(
"1"
);
...
...
@@ -88,6 +82,7 @@ public class UserMapperTest extends BaseDaoTest {
user
.
setUserType
(
UserType
.
GENERAL_USER
);
user
.
setCreateTime
(
new
Date
());
user
.
setTenantId
(
tenant
.
getId
());
user
.
setTenantCode
(
tenant
.
getTenantCode
());
user
.
setUpdateTime
(
new
Date
());
userMapper
.
insert
(
user
);
return
user
;
...
...
@@ -287,7 +282,7 @@ public class UserMapperTest extends BaseDaoTest {
// insertOneTenant
Tenant
tenant
=
insertOneTenant
();
// insertOne
User
user
=
insertOne
(
tenant
);
User
user
=
insertOne
User
(
tenant
);
// queryTenantCodeByUserId
User
queryUser
=
userMapper
.
queryTenantCodeByUserId
(
user
.
getId
());
Assertions
.
assertEquals
(
queryUser
,
user
);
...
...
@@ -304,7 +299,7 @@ public class UserMapperTest extends BaseDaoTest {
AccessToken
accessToken
=
insertOneAccessToken
(
user
);
// queryUserByToken
User
userToken
=
userMapper
.
queryUserByToken
(
accessToken
.
getToken
(),
new
Date
());
Assertions
.
assertEquals
(
userToken
,
user
);
Assertions
.
assertEquals
(
userToken
.
getId
(),
user
.
getId
()
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录