Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yanghaoyuan.sh
DolphinScheduler
提交
735034c7
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 搜索 >>
提交
735034c7
编写于
2月 12, 2020
作者:
一子三木
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
modify DataAnalysisServiceTest by mock
上级
4d643ee9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
197 addition
and
23 deletion
+197
-23
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataAnalysisService.java
...che/dolphinscheduler/api/service/DataAnalysisService.java
+6
-6
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java
...dolphinscheduler/api/service/DataAnalysisServiceTest.java
+190
-17
pom.xml
pom.xml
+1
-0
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataAnalysisService.java
浏览文件 @
735034c7
...
...
@@ -108,8 +108,8 @@ public class DataAnalysisService extends BaseService{
List
<
ExecuteStatusCount
>
taskInstanceStateCounts
=
taskInstanceMapper
.
countTaskInstanceStateByUser
(
start
,
end
,
projectIds
);
TaskCountDto
taskCountResult
=
new
TaskCountDto
(
taskInstanceStateCounts
);
if
(
taskInstanceStateCounts
!=
null
)
{
if
(
taskInstanceStateCounts
!=
null
&&
!
taskInstanceStateCounts
.
isEmpty
())
{
TaskCountDto
taskCountResult
=
new
TaskCountDto
(
taskInstanceStateCounts
);
result
.
put
(
Constants
.
DATA_LIST
,
taskCountResult
);
putMsg
(
result
,
Status
.
SUCCESS
);
}
else
{
...
...
@@ -155,8 +155,8 @@ public class DataAnalysisService extends BaseService{
processInstanceMapper
.
countInstanceStateByUser
(
start
,
end
,
projectIdArray
);
TaskCountDto
taskCountResult
=
new
TaskCountDto
(
processInstanceStateCounts
);
if
(
processInstanceStateCounts
!=
null
)
{
if
(
processInstanceStateCounts
!=
null
&&
!
processInstanceStateCounts
.
isEmpty
())
{
TaskCountDto
taskCountResult
=
new
TaskCountDto
(
processInstanceStateCounts
);
result
.
put
(
Constants
.
DATA_LIST
,
taskCountResult
);
putMsg
(
result
,
Status
.
SUCCESS
);
}
else
{
...
...
@@ -340,7 +340,7 @@ public class DataAnalysisService extends BaseService{
if
(
StringUtils
.
isNotEmpty
(
taskQueueStr
)){
String
[]
splits
=
taskQueueStr
.
split
(
"_"
);
if
(
splits
.
length
>=
4
){
tasksQueueIds
[
i
++]
=
Integer
.
parseInt
(
splits
[
3
]);
tasksQueueIds
[
i
++]
=
Integer
.
parseInt
(
splits
[
3
]);
}
}
}
...
...
@@ -350,7 +350,7 @@ public class DataAnalysisService extends BaseService{
if
(
StringUtils
.
isNotEmpty
(
taskKillStr
)){
String
[]
splits
=
taskKillStr
.
split
(
"-"
);
if
(
splits
.
length
==
2
){
tasksKillIds
[
i
++]
=
Integer
.
parseInt
(
splits
[
1
]);
tasksKillIds
[
i
++]
=
Integer
.
parseInt
(
splits
[
1
]);
}
}
}
...
...
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java
浏览文件 @
735034c7
...
...
@@ -16,36 +16,209 @@
*/
package
org.apache.dolphinscheduler.api.service
;
import
org.apache.dolphinscheduler.api.ApiApplicationServer
;
import
org.apache.dolphinscheduler.api.enums.Status
;
import
org.apache.dolphinscheduler.common.Constants
;
import
org.apache.dolphinscheduler.common.enums.CommandType
;
import
org.apache.dolphinscheduler.common.enums.ExecutionStatus
;
import
org.apache.dolphinscheduler.common.enums.UserType
;
import
org.apache.dolphinscheduler.common.queue.ITaskQueue
;
import
org.apache.dolphinscheduler.common.queue.TaskQueueFactory
;
import
org.apache.dolphinscheduler.common.utils.DateUtils
;
import
org.apache.dolphinscheduler.dao.ProcessDao
;
import
org.apache.dolphinscheduler.dao.entity.CommandCount
;
import
org.apache.dolphinscheduler.dao.entity.ExecuteStatusCount
;
import
org.apache.dolphinscheduler.dao.entity.Project
;
import
org.apache.dolphinscheduler.dao.entity.User
;
import
org.apache.dolphinscheduler.dao.mapper.*
;
import
org.junit.After
;
import
org.junit.Assert
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.test.context.junit4.SpringRunner
;
import
org.mockito.InjectMocks
;
import
org.mockito.Mock
;
import
org.mockito.Mockito
;
import
org.powermock.api.mockito.PowerMockito
;
import
org.powermock.core.classloader.annotations.PrepareForTest
;
import
org.powermock.modules.junit4.PowerMockRunner
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
@RunWith
(
Spring
Runner
.
class
)
@
SpringBootTest
(
classes
=
ApiApplicationServer
.
class
)
@RunWith
(
PowerMock
Runner
.
class
)
@
PrepareForTest
({
TaskQueueFactory
.
class
}
)
public
class
DataAnalysisServiceTest
{
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
DataAnalysisServiceTest
.
class
);
@Autowired
@InjectMocks
private
DataAnalysisService
dataAnalysisService
;
@Mock
ProjectMapper
projectMapper
;
@Mock
ProjectService
projectService
;
@Mock
ProcessInstanceMapper
processInstanceMapper
;
@Mock
ProcessDefinitionMapper
processDefinitionMapper
;
@Mock
CommandMapper
commandMapper
;
@Mock
ErrorCommandMapper
errorCommandMapper
;
@Mock
TaskInstanceMapper
taskInstanceMapper
;
@Mock
ITaskQueue
taskQueue
;
@Mock
ProcessDao
processDao
;
private
Project
project
;
private
Map
<
String
,
Object
>
resultMap
;
private
User
user
;
@Before
public
void
setUp
()
{
user
=
new
User
();
project
=
new
Project
();
project
.
setId
(
1
);
resultMap
=
new
HashMap
<>();
Mockito
.
when
(
projectMapper
.
selectById
(
1
)).
thenReturn
(
project
);
Mockito
.
when
(
projectService
.
hasProjectAndPerm
(
user
,
project
,
resultMap
)).
thenReturn
(
true
);
}
@After
public
void
after
(){
user
=
null
;
projectMapper
=
null
;
resultMap
=
null
;
}
@Test
public
void
countDefinitionByUser
(){
User
loginUser
=
new
User
();
loginUser
.
setId
(
27
);
loginUser
.
setUserType
(
UserType
.
GENERAL_USER
);
Map
<
String
,
Object
>
map
=
dataAnalysisService
.
countDefinitionByUser
(
loginUser
,
21
);
Assert
.
assertEquals
(
Status
.
SUCCESS
,
map
.
get
(
Constants
.
STATUS
));
public
void
testCountTaskStateByProject
(){
String
startDate
=
"2020-02-11 16:02:18"
;
String
endDate
=
"2020-02-11 16:03:18"
;
//checkProject false
Map
<
String
,
Object
>
result
=
dataAnalysisService
.
countTaskStateByProject
(
user
,
2
,
startDate
,
endDate
);
Assert
.
assertTrue
(
result
.
isEmpty
());
// task instance state count error
result
=
dataAnalysisService
.
countTaskStateByProject
(
user
,
1
,
startDate
,
endDate
);
Assert
.
assertEquals
(
Status
.
TASK_INSTANCE_STATE_COUNT_ERROR
,
result
.
get
(
Constants
.
STATUS
));
//SUCCESS
Mockito
.
when
(
taskInstanceMapper
.
countTaskInstanceStateByUser
(
DateUtils
.
getScheduleDate
(
startDate
),
DateUtils
.
getScheduleDate
(
endDate
),
new
Integer
[]{
1
})).
thenReturn
(
getTaskInstanceStateCounts
());
result
=
dataAnalysisService
.
countTaskStateByProject
(
user
,
1
,
startDate
,
endDate
);
Assert
.
assertEquals
(
Status
.
SUCCESS
,
result
.
get
(
Constants
.
STATUS
));
}
@Test
public
void
testCountProcessInstanceStateByProject
(){
String
startDate
=
"2020-02-11 16:02:18"
;
String
endDate
=
"2020-02-11 16:03:18"
;
//checkProject false
Map
<
String
,
Object
>
result
=
dataAnalysisService
.
countProcessInstanceStateByProject
(
user
,
2
,
startDate
,
endDate
);
Assert
.
assertTrue
(
result
.
isEmpty
());
//COUNT_PROCESS_INSTANCE_STATE_ERROR
result
=
dataAnalysisService
.
countProcessInstanceStateByProject
(
user
,
1
,
startDate
,
endDate
);
Assert
.
assertEquals
(
Status
.
COUNT_PROCESS_INSTANCE_STATE_ERROR
,
result
.
get
(
Constants
.
STATUS
));
//SUCCESS
Mockito
.
when
(
processInstanceMapper
.
countInstanceStateByUser
(
DateUtils
.
getScheduleDate
(
startDate
),
DateUtils
.
getScheduleDate
(
endDate
),
new
Integer
[]{
1
})).
thenReturn
(
getTaskInstanceStateCounts
());
result
=
dataAnalysisService
.
countProcessInstanceStateByProject
(
user
,
1
,
startDate
,
endDate
);
Assert
.
assertEquals
(
Status
.
SUCCESS
,
result
.
get
(
Constants
.
STATUS
));
}
@Test
public
void
testCountDefinitionByUser
(){
Map
<
String
,
Object
>
result
=
dataAnalysisService
.
countDefinitionByUser
(
user
,
1
);
Assert
.
assertEquals
(
Status
.
SUCCESS
,
result
.
get
(
Constants
.
STATUS
));
}
@Test
public
void
testCountCommandState
(){
String
startDate
=
"2020-02-11 16:02:18"
;
String
endDate
=
"2020-02-11 16:03:18"
;
//checkProject false
Map
<
String
,
Object
>
result
=
dataAnalysisService
.
countCommandState
(
user
,
2
,
startDate
,
endDate
);
Assert
.
assertTrue
(
result
.
isEmpty
());
List
<
CommandCount
>
commandCounts
=
new
ArrayList
<>(
1
);
CommandCount
commandCount
=
new
CommandCount
();
commandCount
.
setCommandType
(
CommandType
.
START_PROCESS
);
commandCounts
.
add
(
commandCount
);
Mockito
.
when
(
commandMapper
.
countCommandState
(
0
,
DateUtils
.
getScheduleDate
(
startDate
),
DateUtils
.
getScheduleDate
(
endDate
),
new
Integer
[]{
1
})).
thenReturn
(
commandCounts
);
Mockito
.
when
(
errorCommandMapper
.
countCommandState
(
DateUtils
.
getScheduleDate
(
startDate
),
DateUtils
.
getScheduleDate
(
endDate
),
new
Integer
[]{
1
})).
thenReturn
(
commandCounts
);
result
=
dataAnalysisService
.
countCommandState
(
user
,
1
,
startDate
,
endDate
);
Assert
.
assertEquals
(
Status
.
SUCCESS
,
result
.
get
(
Constants
.
STATUS
));
}
@Test
public
void
testCountQueueState
(){
PowerMockito
.
mockStatic
(
TaskQueueFactory
.
class
);
List
<
String
>
taskQueueList
=
new
ArrayList
<>(
1
);
taskQueueList
.
add
(
"1_0_1_1_-1"
);
List
<
String
>
taskKillList
=
new
ArrayList
<>(
1
);
taskKillList
.
add
(
"1-0"
);
PowerMockito
.
when
(
taskQueue
.
getAllTasks
(
Constants
.
DOLPHINSCHEDULER_TASKS_QUEUE
)).
thenReturn
(
taskQueueList
);
PowerMockito
.
when
(
taskQueue
.
getAllTasks
(
Constants
.
DOLPHINSCHEDULER_TASKS_KILL
)).
thenReturn
(
taskKillList
);
PowerMockito
.
when
(
TaskQueueFactory
.
getTaskQueueInstance
()).
thenReturn
(
taskQueue
);
//checkProject false
Map
<
String
,
Object
>
result
=
dataAnalysisService
.
countQueueState
(
user
,
2
);
Assert
.
assertTrue
(
result
.
isEmpty
());
result
=
dataAnalysisService
.
countQueueState
(
user
,
1
);
Assert
.
assertEquals
(
Status
.
SUCCESS
,
result
.
get
(
Constants
.
STATUS
));
//admin
user
.
setUserType
(
UserType
.
ADMIN_USER
);
result
=
dataAnalysisService
.
countQueueState
(
user
,
1
);
Assert
.
assertEquals
(
Status
.
SUCCESS
,
result
.
get
(
Constants
.
STATUS
));
}
/**
* get list
* @return
*/
private
List
<
ExecuteStatusCount
>
getTaskInstanceStateCounts
(){
List
<
ExecuteStatusCount
>
taskInstanceStateCounts
=
new
ArrayList
<>(
1
);
ExecuteStatusCount
executeStatusCount
=
new
ExecuteStatusCount
();
executeStatusCount
.
setExecutionStatus
(
ExecutionStatus
.
RUNNING_EXEUTION
);
taskInstanceStateCounts
.
add
(
executeStatusCount
);
return
taskInstanceStateCounts
;
}
}
\ No newline at end of file
pom.xml
浏览文件 @
735034c7
...
...
@@ -701,6 +701,7 @@
<include>
**/api/service/BaseServiceTest.java
</include>
<include>
**/api/service/BaseDAGServiceTest.java
</include>
<include>
**/api/service/LoggerServiceTest.java
</include>
<include>
**/api/service/DataAnalysisServiceTest.java
</include>
<include>
**/alert/utils/ExcelUtilsTest.java
</include>
<include>
**/alert/utils/FuncUtilsTest.java
</include>
<include>
**/alert/utils/JSONUtilsTest.java
</include>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录