Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
.-Smile-.
spring-framework
提交
1d60a6a6
S
spring-framework
项目概览
.-Smile-.
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1d60a6a6
编写于
10月 23, 2015
作者:
H
Hronom
提交者:
Sebastien Deleuze
10月 29, 2015
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added strict compare mode for Json
Issue: SPR-13607
上级
9334fabe
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
91 addition
and
13 deletion
+91
-13
spring-test/src/main/java/org/springframework/test/util/JsonExpectationsHelper.java
...org/springframework/test/util/JsonExpectationsHelper.java
+49
-4
spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
...mework/test/web/servlet/result/ContentResultMatchers.java
+27
-5
spring-test/src/test/java/org/springframework/test/web/servlet/result/ContentResultMatchersTests.java
...k/test/web/servlet/result/ContentResultMatchersTests.java
+15
-4
未找到文件。
spring-test/src/main/java/org/springframework/test/util/JsonExpectationsHelper.java
浏览文件 @
1d60a6a6
...
...
@@ -32,26 +32,71 @@ public class JsonExpectationsHelper {
/**
* Parse the expected and actual strings as JSON and assert the two
* are "similar" - i.e. they contain the same attribute-value pairs
* regardless of order and formatting.
* regardless of formatting with a lenient checking (extensible, and non-strict
* array ordering).
*
* @param expected the expected JSON content
* @param actual the actual JSON content
* @since 4.1
* @see #assertJsonEqual(String, String, boolean)
*/
public
void
assertJsonEqual
(
String
expected
,
String
actual
)
throws
Exception
{
JSONAssert
.
assertEquals
(
expected
,
actual
,
false
);
assertJsonEqual
(
expected
,
actual
,
false
);
}
/**
* Parse the expected and actual strings as JSON and assert the two
* are "similar" - i.e. they contain the same attribute-value pairs
* regardless of formatting.
*
* <p>Can compare in two modes, depending on {@code strict} parameter value:
* <ul>
* <li>{@code true}: strict checking. Not extensible, and strict array ordering.</li>
* <li>{@code false}: lenient checking. Extensible, and non-strict array ordering.</li>
* </ul>
*
* @param expected the expected JSON content
* @param actual the actual JSON content
* @param strict enables strict checking
* @since 4.2
*/
public
void
assertJsonEqual
(
String
expected
,
String
actual
,
boolean
strict
)
throws
Exception
{
JSONAssert
.
assertEquals
(
expected
,
actual
,
strict
);
}
/**
* Parse the expected and actual strings as JSON and assert the two
* are "not similar" - i.e. they contain different attribute-value pairs
* regardless of order and formatting.
* regardless of formatting with a lenient checking (extensible, and non-strict
* array ordering).
*
* @param expected the expected JSON content
* @param actual the actual JSON content
* @since 4.1
* @see #assertJsonNotEqual(String, String, boolean)
*/
public
void
assertJsonNotEqual
(
String
expected
,
String
actual
)
throws
Exception
{
JSONAssert
.
assertNotEquals
(
expected
,
actual
,
false
);
assertJsonNotEqual
(
expected
,
actual
,
false
);
}
/**
* Parse the expected and actual strings as JSON and assert the two
* are "not similar" - i.e. they contain different attribute-value pairs
* regardless of formatting.
*
* <p>Can compare in two modes, depending on {@code strict} parameter value:
* <ul>
* <li>{@code true}: strict checking. Not extensible, and strict array ordering.</li>
* <li>{@code false}: lenient checking. Extensible, and non-strict array ordering.</li>
* </ul>
*
* @param expected the expected JSON content
* @param actual the actual JSON content
* @param strict enables strict checking
* @since 4.2
*/
public
void
assertJsonNotEqual
(
String
expected
,
String
actual
,
boolean
strict
)
throws
Exception
{
JSONAssert
.
assertNotEquals
(
expected
,
actual
,
strict
);
}
}
spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
浏览文件 @
1d60a6a6
...
...
@@ -212,21 +212,43 @@ public class ContentResultMatchers {
};
}
/**
* Parse the expected and actual strings as JSON and assert the two
* are "similar" - i.e. they contain the same attribute-value pairs
* regardless of formatting with a lenient checking (extensible, and non-strict array
* ordering).
*
* @param jsonContent the expected JSON content
* @since 4.1
*/
public
ResultMatcher
json
(
final
String
jsonContent
)
{
return
json
(
jsonContent
,
false
);
}
/**
* Parse the response content and the given string as JSON and assert the two
* are "similar" — i.e. they contain the same attribute-value pairs
* regardless of order and formatting.
* are "similar" - i.e. they contain the same attribute-value pairs
* regardless of formatting.
*
* <p>Can compare in two modes, depending on {@code strict} parameter value:
* <ul>
* <li>{@code true}: strict checking. Not extensible, and strict array ordering.</li>
* <li>{@code false}: lenient checking. Extensible, and non-strict array ordering.</li>
* </ul>
*
* <p>Use of this matcher requires the <a
* href="http://jsonassert.skyscreamer.org/">JSONassert<a/> library.
*
* @param jsonContent the expected JSON content
* @since 4.1
* @param strict enables strict checking
* @since 4.2
*/
public
ResultMatcher
json
(
final
String
jsonContent
)
{
public
ResultMatcher
json
(
final
String
jsonContent
,
final
boolean
strict
)
{
return
new
ResultMatcher
()
{
@Override
public
void
match
(
MvcResult
result
)
throws
Exception
{
String
content
=
result
.
getResponse
().
getContentAsString
();
jsonHelper
.
assertJsonEqual
(
jsonContent
,
content
);
jsonHelper
.
assertJsonEqual
(
jsonContent
,
content
,
strict
);
}
};
}
...
...
spring-test/src/test/java/org/springframework/test/web/servlet/result/ContentResultMatchersTests.java
浏览文件 @
1d60a6a6
...
...
@@ -79,17 +79,28 @@ public class ContentResultMatchersTests {
}
@Test
public
void
json
()
throws
Exception
{
new
ContentResultMatchers
().
json
(
"{\n \"foo\" : \"bar\" \n}"
).
match
(
getStubMvcResult
());
public
void
jsonLenientMatch
()
throws
Exception
{
new
ContentResultMatchers
().
json
(
"{\n \"foo\" : \"bar\" \n}"
).
match
(
getStubMvcResult
());
new
ContentResultMatchers
().
json
(
"{\n \"foo\" : \"bar\" \n}"
,
false
).
match
(
getStubMvcResult
());
}
@Test
public
void
jsonStrictMatch
()
throws
Exception
{
new
ContentResultMatchers
().
json
(
"{\n \"foo\":\"bar\", \"foo array\":[\"foo\",\"bar\"] \n}"
,
true
).
match
(
getStubMvcResult
());
new
ContentResultMatchers
().
json
(
"{\n \"foo array\":[\"foo\",\"bar\"], \"foo\":\"bar\" \n}"
,
true
).
match
(
getStubMvcResult
());
}
@Test
(
expected
=
AssertionError
.
class
)
public
void
jsonNoMatch
()
throws
Exception
{
public
void
json
Lenient
NoMatch
()
throws
Exception
{
new
ContentResultMatchers
().
json
(
"{\n\"fooo\":\"bar\"\n}"
).
match
(
getStubMvcResult
());
}
@Test
(
expected
=
AssertionError
.
class
)
public
void
jsonStrictNoMatch
()
throws
Exception
{
new
ContentResultMatchers
().
json
(
"{\"foo\":\"bar\", \"foo array\":[\"bar\",\"foo\"]}"
,
true
).
match
(
getStubMvcResult
());
}
private
static
final
String
CONTENT
=
"{\"foo\":\"bar\"}"
;
private
static
final
String
CONTENT
=
"{\"foo\":\"bar\"
,\"foo array\":[\"foo\",\"bar\"]
}"
;
private
StubMvcResult
getStubMvcResult
()
throws
Exception
{
MockHttpServletResponse
response
=
new
MockHttpServletResponse
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录