Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
holmes
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
QA
holmes
Commits
f8693228
Commit
f8693228
authored
Aug 17, 2021
by
黎博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
请求头和请求参数新增支持
parent
da4b8ff0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
AutoUtilsService.java
...main/java/cn/qg/holmes/service/auto/AutoUtilsService.java
+1
-1
AutoUtilsServiceImpl.java
.../cn/qg/holmes/service/auto/impl/AutoUtilsServiceImpl.java
+6
-1
SceneTestcaseServiceImpl.java
...qg/holmes/service/auto/impl/SceneTestcaseServiceImpl.java
+2
-2
No files found.
src/main/java/cn/qg/holmes/service/auto/AutoUtilsService.java
View file @
f8693228
...
...
@@ -12,7 +12,7 @@ public interface AutoUtilsService {
Map
<
String
,
String
>
replaceVariables
(
String
parameters
,
UUID
uuid
);
Map
<
String
,
String
>
replaceVariablesNew
(
String
parameters
,
Map
<
String
,
Object
>
globalMap
);
Map
<
String
,
String
>
replaceVariablesNew
(
String
namespace
,
String
parameters
,
Map
<
String
,
Object
>
globalMap
);
boolean
assertResponse
(
String
response
,
List
<
Map
>
validateList
);
...
...
src/main/java/cn/qg/holmes/service/auto/impl/AutoUtilsServiceImpl.java
View file @
f8693228
...
...
@@ -53,11 +53,16 @@ public class AutoUtilsServiceImpl implements AutoUtilsService {
* @return
*/
@Override
public
Map
<
String
,
String
>
replaceVariablesNew
(
String
parameters
,
Map
<
String
,
Object
>
globalMap
)
{
public
Map
<
String
,
String
>
replaceVariablesNew
(
String
namespace
,
String
parameters
,
Map
<
String
,
Object
>
globalMap
)
{
Map
<
String
,
String
>
parameterMap
=
JSON
.
parseObject
(
parameters
,
Map
.
class
);
log
.
info
(
"替换之前的参数:{}"
,
parameterMap
);
for
(
String
key:
parameterMap
.
keySet
())
{
String
value
=
parameterMap
.
get
(
key
);
// 新增${NAMESPACE}判断
if
(
value
.
contains
(
"${NAMESPACE}"
))
{
value
=
value
.
replace
(
"${NAMESPACE}"
,
namespace
);
parameterMap
.
put
(
key
,
value
);
}
if
(
value
.
startsWith
(
"$"
))
{
parameterMap
.
put
(
key
,
globalMap
.
get
(
value
.
substring
(
1
)).
toString
());
}
...
...
src/main/java/cn/qg/holmes/service/auto/impl/SceneTestcaseServiceImpl.java
View file @
f8693228
...
...
@@ -118,11 +118,11 @@ public class SceneTestcaseServiceImpl extends ServiceImpl<SceneTestcaseMapper, S
Map
<
String
,
String
>
headersMap
=
JSON
.
parseObject
(
headers
,
Map
.
class
);
if
(
headers
!=
null
&&
!
headers
.
isEmpty
())
{
// headersMap = autoUtilsService.replaceVariables(headers, uuid);
headersMap
=
autoUtilsService
.
replaceVariablesNew
(
headers
,
globalMap
);
headersMap
=
autoUtilsService
.
replaceVariablesNew
(
namespace
,
headers
,
globalMap
);
}
if
(
parameters
!=
null
&&
!
parameters
.
isEmpty
())
{
// parameterMap = autoUtilsService.replaceVariables(parameters, uuid);
parameterMap
=
autoUtilsService
.
replaceVariablesNew
(
parameters
,
globalMap
);
parameterMap
=
autoUtilsService
.
replaceVariablesNew
(
namespace
,
parameters
,
globalMap
);
}
// 创建断言列表
List
<
Map
>
validateList
=
new
ArrayList
<>();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment