From 9a3903d0884e8368fe9f0ef27cdb2886120b0a9e Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 4 Oct 2016 13:31:11 +0900 Subject: [PATCH] Fix inline comments in EnvironmentControllerTests --- .../server/environment/EnvironmentControllerTests.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 bed6062b..98fabb77 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 @@ -346,7 +346,7 @@ public class EnvironmentControllerTests { public void placeholdersNotResolvedInJsonFromSystemPropertiesWhenNotFlaggedWithDefault() throws Exception { whenPlaceholdersSystemPropsWithDefault(); String json = this.controller.jsonProperties("foo", "bar", false).getBody(); - // If there is a default value we do not prevent the placeholder being resolved + // If there is a default value we prevent the placeholder being resolved assertEquals("{\"a\":{\"b\":{\"c\":\"${foo:spam}\"}}}", json); } @@ -354,7 +354,7 @@ public class EnvironmentControllerTests { public void placeholdersResolvedInJsonFromSystemPropertiesWhenFlagged() throws Exception { whenPlaceholdersSystemPropsWithDefault(); String json = this.controller.jsonProperties("foo", "bar", true).getBody(); - // If there is a default value we prevent the placeholder being resolved + // If there is a default value we do not prevent the placeholder being resolved assertEquals("{\"a\":{\"b\":{\"c\":\"spam\"}}}", json); } @@ -408,7 +408,6 @@ public class EnvironmentControllerTests { mvc.perform(MockMvcRequestBuilders.get("/foo-bar.json")) .andExpect(MockMvcResultMatchers.content().contentType(MediaType.APPLICATION_JSON)) .andExpect(MockMvcResultMatchers.content().string("{}")); - ; } @Test