Add .properties and .yml endpoint

2014-10-21 13:34:42 -07:00
parent 0b6be00fee
commit 5bb361e806
2 changed files with 283 additions and 8 deletions
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EnvironmentControllerTests.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EnvironmentControllerTests.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2013-2014 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.cloud.config.server;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.mockito.Mockito;
+import org.springframework.cloud.config.Environment;
+import org.springframework.cloud.config.PropertySource;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+
+/**
+ * @author Dave Syer
+ *
+ */
+public class EnvironmentControllerTests {
+	
+	@Rule
+	public ExpectedException expected = ExpectedException.none();
+
+	private EnvironmentRepository repository = Mockito.mock(EnvironmentRepository.class);
+
+	private EnvironmentController controller = new EnvironmentController(repository,
+			new EncryptionController());
+
+	private Environment environment = new Environment("foo", "master");
+
+	@Test
+	public void vanillaYaml() throws Exception {
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("a.b.c", "d");
+		environment.add(new PropertySource("one", map));
+		Mockito.when(repository.findOne("foo", "bar", "master")).thenReturn(environment);
+		String yaml = controller.yaml("foo", "bar").getBody();
+		assertEquals("a:\n  b:\n    c: d\n", yaml);
+	}
+
+	@Test
+	public void arrayInYaml() throws Exception {
+		Map<String, Object> map = new LinkedHashMap<String, Object>();
+		map.put("a.b[0]", "c");
+		map.put("a.b[1]", "d");
+		environment.add(new PropertySource("one", map));
+		Mockito.when(repository.findOne("foo", "bar", "master")).thenReturn(environment);
+		String yaml = controller.yaml("foo", "bar").getBody();
+		assertEquals("a:\n  b:\n  - c\n  - d\n", yaml);
+	}
+
+	@Test
+	public void mappingForEnvironment() throws Exception {
+		Mockito.when(repository.findOne("foo", "bar", "master")).thenReturn(environment);
+		MockMvc mvc = MockMvcBuilders.standaloneSetup(controller).build();
+		mvc.perform(MockMvcRequestBuilders.get("/foo/bar")).andExpect(
+				MockMvcResultMatchers.status().isOk());
+	}
+
+	@Test
+	public void mappingForLabelledEnvironment() throws Exception {
+		Mockito.when(repository.findOne("foo", "bar", "other")).thenReturn(environment);
+		MockMvc mvc = MockMvcBuilders.standaloneSetup(controller).build();
+		mvc.perform(MockMvcRequestBuilders.get("/foo/bar/other")).andExpect(
+				MockMvcResultMatchers.status().isOk());
+	}
+
+	@Test
+	public void mappingForYaml() throws Exception {
+		Mockito.when(repository.findOne("foo", "bar", "master")).thenReturn(environment);
+		MockMvc mvc = MockMvcBuilders.standaloneSetup(controller).build();
+		mvc.perform(MockMvcRequestBuilders.get("/foo-bar.yml")).andExpect(
+				MockMvcResultMatchers.content().contentType(MediaType.TEXT_PLAIN));
+	}
+
+	@Test
+	public void mappingForLabelledYaml() throws Exception {
+		Mockito.when(repository.findOne("foo", "bar", "other")).thenReturn(environment);
+		MockMvc mvc = MockMvcBuilders.standaloneSetup(controller).build();
+		mvc.perform(MockMvcRequestBuilders.get("/other/foo-bar.yml")).andExpect(
+				MockMvcResultMatchers.content().contentType(MediaType.TEXT_PLAIN));
+	}
+
+	@Test
+	public void mappingForLabelledProperties() throws Exception {
+		Mockito.when(repository.findOne("foo", "bar", "other")).thenReturn(environment);
+		MockMvc mvc = MockMvcBuilders.standaloneSetup(controller).build();
+		mvc.perform(MockMvcRequestBuilders.get("/other/foo-bar.properties")).andExpect(
+				MockMvcResultMatchers.content().contentType(MediaType.TEXT_PLAIN));
+	}
+
+	@Test
+	public void mappingForProperties() throws Exception {
+		Mockito.when(repository.findOne("foo", "bar", "master")).thenReturn(environment);
+		MockMvc mvc = MockMvcBuilders.standaloneSetup(controller).build();
+		mvc.perform(MockMvcRequestBuilders.get("/foo-bar.properties")).andExpect(
+				MockMvcResultMatchers.content().contentType(MediaType.TEXT_PLAIN));
+	}
+
+	@Test
+	public void mappingForLabelledYamlWithHyphen() throws Exception {
+		Mockito.when(repository.findOne("foo", "bar-spam", "other")).thenReturn(environment);
+		MockMvc mvc = MockMvcBuilders.standaloneSetup(controller).build();
+		mvc.perform(MockMvcRequestBuilders.get("/other/foo-bar-spam.yml")).andExpect(
+				MockMvcResultMatchers.status().isBadRequest());
+	}
+}