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

Fix /configprops tests

Browse Source
This commit is contained in:
Dave Syer
2014-11-19 14:33:49 +00:00
parent 6ad626de49
commit 0757d24d91
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointSerializationTests.java
View File

@@ -166,7 +166,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests {
Map<String, Object> map = (Map<String, Object>) nestedProperties Map<String, Object> map = (Map<String, Object>) nestedProperties
.get("properties"); .get("properties");
assertNotNull(map); assertNotNull(map);
assertEquals(2, map.size()); assertEquals(3, map.size());
assertEquals(null, (map.get("map"))); assertEquals(null, (map.get("map")));
} }
@@ -206,7 +206,8 @@ public class ConfigurationPropertiesReportEndpointSerializationTests {
Map<String, Object> map = (Map<String, Object>) nestedProperties Map<String, Object> map = (Map<String, Object>) nestedProperties
.get("properties"); .get("properties");
assertNotNull(map); assertNotNull(map);
assertEquals(2, map.size()); // Only one property is mapped in metadata so the others are ignored
assertEquals(1, map.size());
assertEquals("foo", ((Map<String, Object>) map.get("map")).get("name")); assertEquals("foo", ((Map<String, Object>) map.get("map")).get("name"));
} }

2
spring-boot-actuator/src/test/resources/META-INF/test-spring-configuration-metadata.json
View File

@@ -1,10 +1,12 @@
{"properties": [ {"properties": [
{ {
"name": "bar.name", "name": "bar.name",
"type": "java.util.Map",
"dataType": "java.lang.String" "dataType": "java.lang.String"
}, },
{ {
"name": "spam.map.name", "name": "spam.map.name",
"type": "java.util.Map",
"dataType": "java.lang.String" "dataType": "java.lang.String"
} ]} } ]}