Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yanghaoyuan.sh
DolphinScheduler
提交
813c44b2
DolphinScheduler
项目概览
yanghaoyuan.sh
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
0
Fork
0
代码
文件
提交
分支
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 搜索 >>
未验证
提交
813c44b2
编写于
11月 14, 2022
作者:
R
rickchengx
提交者:
GitHub
11月 14, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Improvement-12838][UT] Improve the ut of datasource (#12839)
上级
e3cf72cb
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
73 addition
and
56 deletion
+73
-56
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataSourceServiceImpl.java
...phinscheduler/api/service/impl/DataSourceServiceImpl.java
+1
-1
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java
...e/dolphinscheduler/api/service/DataSourceServiceTest.java
+72
-55
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataSourceServiceImpl.java
浏览文件 @
813c44b2
...
...
@@ -182,7 +182,7 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
}
// check name can use or not
if
(!
dataSource
.
getName
().
trim
().
equals
(
dataSource
.
getName
())
&&
checkName
(
dataSource
.
getName
()))
{
if
(!
dataSource
Param
.
getName
().
trim
().
equals
(
dataSource
.
getName
())
&&
checkName
(
dataSourceParam
.
getName
()))
{
logger
.
warn
(
"Datasource with the same name already exists, name:{}."
,
dataSource
.
getName
());
putMsg
(
result
,
Status
.
DATASOURCE_EXIST
);
return
result
;
...
...
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java
浏览文件 @
813c44b2
...
...
@@ -17,8 +17,6 @@
package
org.apache.dolphinscheduler.api.service
;
import
static
org
.
apache
.
dolphinscheduler
.
api
.
constants
.
ApiFuncIdentificationConstant
.
DATASOURCE_DELETE
;
import
org.apache.dolphinscheduler.api.enums.Status
;
import
org.apache.dolphinscheduler.api.permission.ResourcePermissionCheckService
;
import
org.apache.dolphinscheduler.api.service.impl.BaseServiceImpl
;
...
...
@@ -55,6 +53,7 @@ import java.util.HashSet;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.concurrent.ExecutionException
;
import
org.junit.jupiter.api.Assertions
;
import
org.junit.jupiter.api.Test
;
...
...
@@ -89,7 +88,15 @@ public class DataSourceServiceTest {
@Mock
private
ResourcePermissionCheckService
resourcePermissionCheckService
;
public
void
createDataSourceTest
()
{
private
void
passResourcePermissionCheckService
()
{
Mockito
.
when
(
resourcePermissionCheckService
.
operationPermissionCheck
(
Mockito
.
any
(),
Mockito
.
anyInt
(),
Mockito
.
anyString
(),
Mockito
.
any
())).
thenReturn
(
true
);
Mockito
.
when
(
resourcePermissionCheckService
.
resourcePermissionCheck
(
Mockito
.
any
(),
Mockito
.
any
(),
Mockito
.
anyInt
(),
Mockito
.
any
())).
thenReturn
(
true
);
}
@Test
public
void
createDataSourceTest
()
throws
ExecutionException
{
User
loginUser
=
getAdminUser
();
String
dataSourceName
=
"dataSource01"
;
String
dataSourceDesc
=
"test dataSource"
;
...
...
@@ -102,47 +109,51 @@ public class DataSourceServiceTest {
postgreSqlDatasourceParam
.
setDatabase
(
"dolphinscheduler"
);
postgreSqlDatasourceParam
.
setUserName
(
"postgres"
);
postgreSqlDatasourceParam
.
setPassword
(
""
);
postgreSqlDatasourceParam
.
setName
(
dataSourceName
);
// USER_NO_OPERATION_PERM
Result
result
=
dataSourceService
.
createDataSource
(
loginUser
,
postgreSqlDatasourceParam
);
Assertions
.
assertEquals
(
Status
.
USER_NO_OPERATION_PERM
.
getCode
(),
result
.
getCode
().
intValue
());
//
data source exits
//
DATASOURCE_EXIST
List
<
DataSource
>
dataSourceList
=
new
ArrayList
<>();
DataSource
dataSource
=
new
DataSource
();
dataSource
.
setName
(
dataSourceName
);
dataSourceList
.
add
(
dataSource
);
Mockito
.
when
(
dataSourceMapper
.
queryDataSourceByName
(
dataSourceName
.
trim
())).
thenReturn
(
dataSourceList
);
passResourcePermissionCheckService
();
Result
dataSourceExitsResult
=
dataSourceService
.
createDataSource
(
loginUser
,
postgreSqlDatasourceParam
);
Assertions
.
assertEquals
(
Status
.
DATASOURCE_EXIST
.
getCode
(),
dataSourceExitsResult
.
getCode
().
intValue
());
ConnectionParam
connectionParam
=
DataSourceUtils
.
buildConnectionParams
(
postgreSqlDatasourceParam
);
DbType
dataSourceType
=
postgreSqlDatasourceParam
.
getType
();
// data source exits
Mockito
.
when
(
dataSourceMapper
.
queryDataSourceByName
(
dataSourceName
.
trim
())).
thenReturn
(
null
);
Result
connectionResult
=
new
Result
(
Status
.
DATASOURCE_CONNECT_FAILED
.
getCode
(),
Status
.
DATASOURCE_CONNECT_FAILED
.
getMsg
());
Mockito
.
doReturn
(
connectionResult
).
when
(
dataSourceService
).
checkConnection
(
dataSourceType
,
connectionParam
);
Result
connectFailedResult
=
dataSourceService
.
createDataSource
(
loginUser
,
postgreSqlDatasourceParam
);
Assertions
.
assertEquals
(
Status
.
DATASOURCE_CONNECT_FAILED
.
getCode
(),
connectFailedResult
.
getCode
().
intValue
());
// data source exits
Mockito
.
when
(
dataSourceMapper
.
queryDataSourceByName
(
dataSourceName
.
trim
())).
thenReturn
(
null
);
connectionResult
=
new
Result
(
Status
.
SUCCESS
.
getCode
(),
Status
.
SUCCESS
.
getMsg
());
Mockito
.
when
(
dataSourceService
.
checkConnection
(
dataSourceType
,
connectionParam
)).
thenReturn
(
connectionResult
);
Result
notValidError
=
dataSourceService
.
createDataSource
(
loginUser
,
postgreSqlDatasourceParam
);
Assertions
.
assertEquals
(
Status
.
REQUEST_PARAMS_NOT_VALID_ERROR
.
getCode
(),
notValidError
.
getCode
().
intValue
());
try
(
MockedStatic
<
DataSourceClientProvider
>
mockedStaticDataSourceClientProvider
=
Mockito
.
mockStatic
(
DataSourceClientProvider
.
class
))
{
// DATASOURCE_CONNECT_FAILED
DataSourceClientProvider
clientProvider
=
Mockito
.
mock
(
DataSourceClientProvider
.
class
);
mockedStaticDataSourceClientProvider
.
when
(
DataSourceClientProvider:
:
getInstance
).
thenReturn
(
clientProvider
);
// success
Mockito
.
when
(
dataSourceMapper
.
queryDataSourceByName
(
dataSourceName
.
trim
())).
thenReturn
(
null
);
Mockito
.
when
(
dataSourceService
.
checkConnection
(
dataSourceType
,
connectionParam
)).
thenReturn
(
connectionResult
);
Result
success
=
dataSourceService
.
createDataSource
(
loginUser
,
postgreSqlDatasourceParam
);
Assertions
.
assertEquals
(
Status
.
SUCCESS
.
getCode
(),
success
.
getCode
().
intValue
());
Mockito
.
when
(
dataSourceMapper
.
queryDataSourceByName
(
dataSourceName
.
trim
())).
thenReturn
(
null
);
Mockito
.
when
(
clientProvider
.
getConnection
(
Mockito
.
any
(),
Mockito
.
any
())).
thenReturn
(
null
);
Result
connectFailedResult
=
dataSourceService
.
createDataSource
(
loginUser
,
postgreSqlDatasourceParam
);
Assertions
.
assertEquals
(
Status
.
DATASOURCE_CONNECT_FAILED
.
getCode
(),
connectFailedResult
.
getCode
().
intValue
());
// SUCCESS
Connection
connection
=
Mockito
.
mock
(
Connection
.
class
);
Mockito
.
when
(
clientProvider
.
getConnection
(
Mockito
.
any
(),
Mockito
.
any
())).
thenReturn
(
connection
);
Result
success
=
dataSourceService
.
createDataSource
(
loginUser
,
postgreSqlDatasourceParam
);
Assertions
.
assertEquals
(
Status
.
SUCCESS
.
getCode
(),
success
.
getCode
().
intValue
());
}
}
public
void
updateDataSourceTest
()
{
@Test
public
void
updateDataSourceTest
()
throws
ExecutionException
{
User
loginUser
=
getAdminUser
();
int
dataSourceId
=
12
;
String
dataSourceName
=
"dataSource01"
;
String
dataSourceDesc
=
"test dataSource"
;
String
dataSourceUpdateName
=
"dataSource01-update"
;
PostgreSQLDataSourceParamDTO
postgreSqlDatasourceParam
=
new
PostgreSQLDataSourceParamDTO
();
postgreSqlDatasourceParam
.
setDatabase
(
dataSourceName
);
...
...
@@ -152,13 +163,15 @@ public class DataSourceServiceTest {
postgreSqlDatasourceParam
.
setDatabase
(
"dolphinscheduler"
);
postgreSqlDatasourceParam
.
setUserName
(
"postgres"
);
postgreSqlDatasourceParam
.
setPassword
(
""
);
postgreSqlDatasourceParam
.
setName
(
dataSourceUpdateName
);
//
data source not exits
//
RESOURCE_NOT_EXIST
Mockito
.
when
(
dataSourceMapper
.
selectById
(
dataSourceId
)).
thenReturn
(
null
);
Result
resourceNotExits
=
dataSourceService
.
updateDataSource
(
dataSourceId
,
loginUser
,
postgreSqlDatasourceParam
);
Assertions
.
assertEquals
(
Status
.
RESOURCE_NOT_EXIST
.
getCode
(),
resourceNotExits
.
getCode
().
intValue
());
// user no operation perm
// USER_NO_OPERATION_PERM
DataSource
dataSource
=
new
DataSource
();
dataSource
.
setUserId
(
0
);
Mockito
.
when
(
dataSourceMapper
.
selectById
(
dataSourceId
)).
thenReturn
(
dataSource
);
...
...
@@ -166,35 +179,43 @@ public class DataSourceServiceTest {
dataSourceService
.
updateDataSource
(
dataSourceId
,
loginUser
,
postgreSqlDatasourceParam
);
Assertions
.
assertEquals
(
Status
.
USER_NO_OPERATION_PERM
.
getCode
(),
userNoOperationPerm
.
getCode
().
intValue
());
// data source name exits
dataSource
.
setUserId
(-
1
);
// DATASOURCE_EXIST
dataSource
.
setName
(
dataSourceName
);
dataSource
.
setType
(
DbType
.
POSTGRESQL
);
dataSource
.
setConnectionParams
(
JSONUtils
.
toJsonString
(
DataSourceUtils
.
buildConnectionParams
(
postgreSqlDatasourceParam
)));
DataSource
anotherDataSource
=
new
DataSource
();
anotherDataSource
.
setName
(
dataSourceUpdateName
);
List
<
DataSource
>
dataSourceList
=
new
ArrayList
<>();
dataSourceList
.
add
(
d
ataSource
);
dataSourceList
.
add
(
anotherD
ataSource
);
Mockito
.
when
(
dataSourceMapper
.
selectById
(
dataSourceId
)).
thenReturn
(
dataSource
);
Mockito
.
when
(
dataSourceMapper
.
queryDataSourceByName
(
dataSourceName
)).
thenReturn
(
dataSourceList
);
Mockito
.
when
(
dataSourceMapper
.
queryDataSourceByName
(
postgreSqlDatasourceParam
.
getName
()))
.
thenReturn
(
dataSourceList
);
passResourcePermissionCheckService
();
Result
dataSourceNameExist
=
dataSourceService
.
updateDataSource
(
dataSourceId
,
loginUser
,
postgreSqlDatasourceParam
);
Assertions
.
assertEquals
(
Status
.
DATASOURCE_EXIST
.
getCode
(),
dataSourceNameExist
.
getCode
().
intValue
());
// data source connect failed
DbType
dataSourceType
=
postgreSqlDatasourceParam
.
getType
();
ConnectionParam
connectionParam
=
DataSourceUtils
.
buildConnectionParams
(
postgreSqlDatasourceParam
);
Mockito
.
when
(
dataSourceMapper
.
selectById
(
dataSourceId
)).
thenReturn
(
dataSource
);
Mockito
.
when
(
dataSourceMapper
.
queryDataSourceByName
(
dataSourceName
)).
thenReturn
(
null
);
Result
connectionResult
=
new
Result
(
Status
.
SUCCESS
.
getCode
(),
Status
.
SUCCESS
.
getMsg
());
Mockito
.
when
(
dataSourceService
.
checkConnection
(
dataSourceType
,
connectionParam
)).
thenReturn
(
connectionResult
);
Result
connectFailed
=
dataSourceService
.
updateDataSource
(
dataSourceId
,
loginUser
,
postgreSqlDatasourceParam
);
Assertions
.
assertEquals
(
Status
.
DATASOURCE_CONNECT_FAILED
.
getCode
(),
connectFailed
.
getCode
().
intValue
());
try
(
MockedStatic
<
DataSourceClientProvider
>
mockedStaticDataSourceClientProvider
=
Mockito
.
mockStatic
(
DataSourceClientProvider
.
class
))
{
// DATASOURCE_CONNECT_FAILED
DataSourceClientProvider
clientProvider
=
Mockito
.
mock
(
DataSourceClientProvider
.
class
);
mockedStaticDataSourceClientProvider
.
when
(
DataSourceClientProvider:
:
getInstance
).
thenReturn
(
clientProvider
);
// success
Mockito
.
when
(
dataSourceMapper
.
selectById
(
dataSourceId
)).
thenReturn
(
dataSource
);
Mockito
.
when
(
dataSourceMapper
.
queryDataSourceByName
(
dataSourceName
)).
thenReturn
(
null
);
connectionResult
=
new
Result
(
Status
.
DATASOURCE_CONNECT_FAILED
.
getCode
(),
Status
.
DATASOURCE_CONNECT_FAILED
.
getMsg
());
Mockito
.
when
(
dataSourceService
.
checkConnection
(
dataSourceType
,
connectionParam
)).
thenReturn
(
connectionResult
);
Result
success
=
dataSourceService
.
updateDataSource
(
dataSourceId
,
loginUser
,
postgreSqlDatasourceParam
);
Assertions
.
assertEquals
(
Status
.
SUCCESS
.
getCode
(),
success
.
getCode
().
intValue
());
Mockito
.
when
(
clientProvider
.
getConnection
(
Mockito
.
any
(),
Mockito
.
any
())).
thenReturn
(
null
);
Mockito
.
when
(
dataSourceMapper
.
queryDataSourceByName
(
postgreSqlDatasourceParam
.
getName
())).
thenReturn
(
null
);
Result
connectFailed
=
dataSourceService
.
updateDataSource
(
dataSourceId
,
loginUser
,
postgreSqlDatasourceParam
);
Assertions
.
assertEquals
(
Status
.
CONNECTION_TEST_FAILURE
.
getCode
(),
connectFailed
.
getCode
().
intValue
());
// SUCCESS
Connection
connection
=
Mockito
.
mock
(
Connection
.
class
);
Mockito
.
when
(
clientProvider
.
getConnection
(
Mockito
.
any
(),
Mockito
.
any
())).
thenReturn
(
connection
);
Result
success
=
dataSourceService
.
updateDataSource
(
dataSourceId
,
loginUser
,
postgreSqlDatasourceParam
);
Assertions
.
assertEquals
(
Status
.
SUCCESS
.
getCode
(),
success
.
getCode
().
intValue
());
}
}
@Test
...
...
@@ -239,10 +260,7 @@ public class DataSourceServiceTest {
loginUser
.
setUserType
(
UserType
.
ADMIN_USER
);
loginUser
.
setId
(
1
);
dataSource
.
setId
(
22
);
Mockito
.
when
(
resourcePermissionCheckService
.
operationPermissionCheck
(
AuthorizationType
.
DATASOURCE
,
loginUser
.
getId
(),
DATASOURCE_DELETE
,
baseServiceLogger
)).
thenReturn
(
true
);
Mockito
.
when
(
resourcePermissionCheckService
.
resourcePermissionCheck
(
AuthorizationType
.
DATASOURCE
,
new
Object
[]{
dataSource
.
getId
()},
0
,
baseServiceLogger
)).
thenReturn
(
true
);
passResourcePermissionCheckService
();
Mockito
.
when
(
dataSourceMapper
.
selectById
(
dataSourceId
)).
thenReturn
(
dataSource
);
Assertions
.
assertEquals
(
result
.
getCode
(),
dataSourceService
.
delete
(
loginUser
,
dataSourceId
).
getCode
());
...
...
@@ -486,7 +504,6 @@ public class DataSourceServiceTest {
MockedStatic
<
DataSourceClientProvider
>
mockedStaticDataSourceClientProvider
=
Mockito
.
mockStatic
(
DataSourceClientProvider
.
class
))
{
DataSourceClientProvider
clientProvider
=
Mockito
.
mock
(
DataSourceClientProvider
.
class
);
Mockito
.
when
(
DataSourceClientProvider
.
getInstance
()).
thenReturn
(
clientProvider
);
mockedStaticDataSourceClientProvider
.
when
(
DataSourceClientProvider:
:
getInstance
).
thenReturn
(
clientProvider
);
Result
result
=
dataSourceService
.
checkConnection
(
dataSourceType
,
connectionParam
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录