From 390e2b5e4f4b5f168288f528d4386321e2c71d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Schmied?= Date: Thu, 1 Mar 2018 23:01:33 +0100 Subject: [PATCH] add placeholder support for {application} in EnvironmentController (#867) * add placeholder support for {application} in EnvironmentController * add tests --- .../environment/EnvironmentControllerTests.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/EnvironmentControllerTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/EnvironmentControllerTests.java index 1eb3a85f..7e1d92e5 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/EnvironmentControllerTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/EnvironmentControllerTests.java @@ -203,6 +203,20 @@ public class EnvironmentControllerTests { assertThat(environment.getPropertySources().get(1).getSource().entrySet(), hasSize(3)); } + + @Test + public void testNameWithSlash() { + this.controller.labelled("foo(_)spam", "bar", "two"); + + Mockito.verify(this.repository).findOne("foo/spam", "bar", "two"); + } + + @Test + public void testLabelWithSlash() { + this.controller.labelled("foo", "bar", "two(_)spam"); + + Mockito.verify(this.repository).findOne("foo", "bar", "two/spam"); + } @Test public void arrayOverridenInYaml() throws Exception {