Merge remote-tracking branch 'origin/2.2.x'

This commit is contained in:
Olga Maciaszek-Sharma
2020-05-18 16:36:19 +02:00

View File

@@ -439,7 +439,7 @@ public class EnvironmentControllerTests {
String text = this.controller.properties("foo", "bar", true).getBody();
Properties properties = new Properties();
properties.load(new StringReader(text));
assertThat(properties).containsExactly(entry("a.b.c", "bar"),
assertThat(properties).containsOnly(entry("a.b.c", "bar"),
entry("foo", "bar"));
}
@@ -449,7 +449,7 @@ public class EnvironmentControllerTests {
String text = this.controller.properties("foo", "bar", false).getBody();
Properties properties = new Properties();
properties.load(new StringReader(text));
assertThat(properties).containsExactly(entry("a.b.c", "${foo}"),
assertThat(properties).containsOnly(entry("a.b.c", "${foo}"),
entry("foo", "bar"));
}