Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2019-01-22 09:22:17 +00:00
parent f23a0a5969 acf9e8ac13
commit 2cb147af7c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2018 the original author or authors.
* Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -97,7 +97,7 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
if (expected instanceof Resource) {
return isEqualToJson((Resource) expected);
}
failWithMessage("Unsupport type for JSON assert {}", expected.getClass());
failWithMessage("Unsupported type for JSON assert {}", expected.getClass());
return null;
}
@@ -434,7 +434,7 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
if (expected instanceof Resource) {
return isNotEqualToJson((Resource) expected);
}
failWithMessage("Unsupported type for JSON assert {]", expected.getClass());
failWithMessage("Unsupported type for JSON assert {}", expected.getClass());
return null;
}