Browse Source

Fix /configprops tests

pull/1958/head
Dave Syer 11 years ago
parent
commit
0757d24d91
  1. 5
      spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointSerializationTests.java
  2. 2
      spring-boot-actuator/src/test/resources/META-INF/test-spring-configuration-metadata.json

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

@ -166,7 +166,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { @@ -166,7 +166,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests {
Map<String, Object> map = (Map<String, Object>) nestedProperties
.get("properties");
assertNotNull(map);
assertEquals(2, map.size());
assertEquals(3, map.size());
assertEquals(null, (map.get("map")));
}
@ -206,7 +206,8 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { @@ -206,7 +206,8 @@ public class ConfigurationPropertiesReportEndpointSerializationTests {
Map<String, Object> map = (Map<String, Object>) nestedProperties
.get("properties");
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"));
}

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

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

Loading…
Cancel
Save