Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
cebfba84
M
metersphere
项目概览
MeterSphere
/
metersphere
上一次同步 大约 3 年
通知
25
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
metersphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cebfba84
编写于
4月 23, 2020
作者:
C
Captain.B
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
reporting
上级
7d99ac3e
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
24 addition
and
8 deletion
+24
-8
backend/src/main/java/io/metersphere/commons/constants/PerformanceTestStatus.java
.../metersphere/commons/constants/PerformanceTestStatus.java
+1
-1
backend/src/main/java/io/metersphere/service/ReportService.java
...d/src/main/java/io/metersphere/service/ReportService.java
+7
-1
backend/src/test/java/io/metersphere/JmxFileParseTest.java
backend/src/test/java/io/metersphere/JmxFileParseTest.java
+9
-6
frontend/src/business/components/performance/report/PerformanceReportView.vue
...s/components/performance/report/PerformanceReportView.vue
+1
-0
frontend/src/business/components/performance/report/PerformanceTestReport.vue
...s/components/performance/report/PerformanceTestReport.vue
+3
-0
frontend/src/business/components/performance/test/PerformanceTestPlan.vue
...iness/components/performance/test/PerformanceTestPlan.vue
+3
-0
未找到文件。
backend/src/main/java/io/metersphere/commons/constants/PerformanceTestStatus.java
浏览文件 @
cebfba84
package
io.metersphere.commons.constants
;
public
enum
PerformanceTestStatus
{
Saved
,
Starting
,
Running
,
Completed
,
Error
Saved
,
Starting
,
Running
,
Reporting
,
Completed
,
Error
}
backend/src/main/java/io/metersphere/service/ReportService.java
浏览文件 @
cebfba84
package
io.metersphere.service
;
import
io.metersphere.base.domain.*
;
import
io.metersphere.base.domain.LoadTestReport
;
import
io.metersphere.base.domain.LoadTestReportExample
;
import
io.metersphere.base.domain.LoadTestReportWithBLOBs
;
import
io.metersphere.base.domain.LoadTestWithBLOBs
;
import
io.metersphere.base.mapper.LoadTestMapper
;
import
io.metersphere.base.mapper.LoadTestReportMapper
;
import
io.metersphere.base.mapper.ext.ExtLoadTestReportMapper
;
...
...
@@ -16,6 +19,7 @@ import io.metersphere.report.base.*;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
javax.annotation.Resource
;
import
java.util.List
;
...
...
@@ -139,6 +143,8 @@ public class ReportService {
String
reportStatus
=
loadTestReport
.
getStatus
();
if
(
StringUtils
.
equals
(
PerformanceTestStatus
.
Running
.
name
(),
reportStatus
))
{
MSException
.
throwException
(
"Reporting in progress..."
);
}
else
if
(
StringUtils
.
equals
(
PerformanceTestStatus
.
Reporting
.
name
(),
reportStatus
))
{
MSException
.
throwException
(
"Reporting in progress..."
);
}
else
if
(
StringUtils
.
equals
(
PerformanceTestStatus
.
Error
.
name
(),
reportStatus
))
{
MSException
.
throwException
(
"Report generation error!"
);
}
...
...
backend/src/test/java/io/metersphere/JmxFileParseTest.java
浏览文件 @
cebfba84
package
io.metersphere
;
import
io.metersphere.config.KafkaProperties
;
import
org.apache.commons.io.FileUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
...
...
@@ -22,6 +23,7 @@ import javax.xml.transform.stream.StreamResult;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.io.StringWriter
;
import
java.nio.charset.StandardCharsets
;
@RunWith
(
SpringRunner
.
class
)
@SpringBootTest
(
webEnvironment
=
SpringBootTest
.
WebEnvironment
.
RANDOM_PORT
)
...
...
@@ -47,7 +49,7 @@ public class JmxFileParseTest {
@Test
public
void
parse
()
throws
Exception
{
File
file
=
new
File
(
"/Users/liuruibin/Downloads/blaze_meter_dev2.jmx"
);
file
=
new
File
(
"/Users/liuruibin/Desktop/
test-jmeter
.jmx"
);
file
=
new
File
(
"/Users/liuruibin/Desktop/
041301
.jmx"
);
final
FileInputStream
inputStream
=
new
FileInputStream
(
file
);
final
InputSource
inputSource
=
new
InputSource
(
inputStream
);
...
...
@@ -78,7 +80,8 @@ public class JmxFileParseTest {
TransformerFactory
tf
=
TransformerFactory
.
newInstance
();
Transformer
transformer
=
tf
.
newTransformer
();
transformer
.
transform
(
domSource
,
result
);
System
.
out
.
println
(
"XML IN String format is: \n"
+
writer
.
toString
());
// System.out.println("XML IN String format is: \n" + writer.toString());
FileUtils
.
writeStringToFile
(
new
File
(
"/tmp/test-jmeter.jmx"
),
writer
.
toString
(),
StandardCharsets
.
UTF_8
);
}
private
void
parseHashTree
(
Element
hashTree
)
{
...
...
@@ -112,13 +115,13 @@ public class JmxFileParseTest {
}
else
if
(
nodeNameEquals
(
ele
,
VARIABLE_THROUGHPUT_TIMER
))
{
}
else
if
(
nodeNameEquals
(
ele
,
BACKEND_LISTENER
))
{
processBackendListener
(
ele
);
//
processBackendListener(ele);
}
else
if
(
nodeNameEquals
(
ele
,
CONFIG_TEST_ELEMENT
))
{
processConfigTestElement
(
ele
);
//
processConfigTestElement(ele);
}
else
if
(
nodeNameEquals
(
ele
,
DNS_CACHE_MANAGER
))
{
processDnsCacheManager
(
ele
);
//
processDnsCacheManager(ele);
}
else
if
(
nodeNameEquals
(
ele
,
ARGUMENTS
))
{
processArguments
(
ele
);
//
processArguments(ele);
}
}
}
...
...
frontend/src/business/components/performance/report/PerformanceReportView.vue
浏览文件 @
cebfba84
...
...
@@ -138,6 +138,7 @@
});
break
;
case
'
Starting
'
:
case
'
Reporting
'
:
this
.
$message
({
type
:
'
info
'
,
message
:
"
报告生成中....
"
...
...
frontend/src/business/components/performance/report/PerformanceTestReport.vue
浏览文件 @
cebfba84
...
...
@@ -53,6 +53,9 @@
<el-tag
size=
"mini"
type=
"success"
v-else-if=
"row.status === 'Running'"
>
{{
row
.
status
}}
</el-tag>
<el-tag
size=
"mini"
type=
"success"
v-else-if=
"row.status === 'Reporting'"
>
{{
row
.
status
}}
</el-tag>
<el-tag
size=
"mini"
type=
"info"
v-else-if=
"row.status === 'Completed'"
>
{{
row
.
status
}}
</el-tag>
...
...
frontend/src/business/components/performance/test/PerformanceTestPlan.vue
浏览文件 @
cebfba84
...
...
@@ -55,6 +55,9 @@
<el-tag
size=
"mini"
type=
"success"
v-else-if=
"row.status === 'Running'"
>
{{
row
.
status
}}
</el-tag>
<el-tag
size=
"mini"
type=
"success"
v-else-if=
"row.status === 'Reporting'"
>
{{
row
.
status
}}
</el-tag>
<el-tag
size=
"mini"
type=
"info"
v-else-if=
"row.status === 'Completed'"
>
{{
row
.
status
}}
</el-tag>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录