From 2b30ca7e320b2640c1bdefb8d8bfe1f7281b1620 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 26 Jun 2020 09:57:49 +0000 Subject: [PATCH] Bumping versions --- .../ResourceControllerIntegrationTests.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerIntegrationTests.java index 2ec91de7..6fbed72f 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerIntegrationTests.java @@ -100,11 +100,11 @@ public class ResourceControllerIntegrationTests { @Test public void resource() throws Exception { when(this.repository.findOne("foo", "default", "master", false)) - .thenReturn(new Environment("foo", "default", "master")); + .thenReturn(new Environment("foo", "default", "master")); when(this.resources.findOne("foo", "default", "master", "foo.txt")) - .thenReturn(new ClassPathResource("resource-controller/foo.txt")); + .thenReturn(new ClassPathResource("resource-controller/foo.txt")); this.mvc.perform(MockMvcRequestBuilders.get("/foo/default/master/foo.txt")) - .andExpect(MockMvcResultMatchers.status().isOk()); + .andExpect(MockMvcResultMatchers.status().isOk()); verify(this.repository).findOne("foo", "default", "master", false); verify(this.resources).findOne("foo", "default", "master", "foo.txt"); } @@ -112,12 +112,12 @@ public class ResourceControllerIntegrationTests { @Test public void resourceHttp() throws Exception { when(this.repository.findOne("foo", "default", "master", false)) - .thenReturn(new Environment("foo", "default", "master")); + .thenReturn(new Environment("foo", "default", "master")); when(this.resources.findOne("foo", "default", "master", "foo.txt")) - .thenReturn(new ClassPathResource("resource-controller/foo.txt")); + .thenReturn(new ClassPathResource("resource-controller/foo.txt")); - ResponseEntity response = new TestRestTemplate() - .getForEntity("http://localhost:" + port + "/foo/default/master/foo.txt", String.class); + ResponseEntity response = new TestRestTemplate().getForEntity( + "http://localhost:" + port + "/foo/default/master/foo.txt", String.class); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); verify(this.repository).findOne("foo", "default", "master", false); verify(this.resources).findOne("foo", "default", "master", "foo.txt"); @@ -141,12 +141,12 @@ public class ResourceControllerIntegrationTests { @Test public void resourceNoLabelHttp() throws Exception { when(this.repository.findOne("foo", "default", null, false)) - .thenReturn(new Environment("foo", "default", "master")); + .thenReturn(new Environment("foo", "default", "master")); when(this.resources.findOne("foo", "default", null, "foo.txt")) - .thenReturn(new ClassPathResource("resource-controller/foo.txt")); + .thenReturn(new ClassPathResource("resource-controller/foo.txt")); - ResponseEntity response = new TestRestTemplate() - .getForEntity("http://localhost:" + port + "/foo/default/master/foo.txt", String.class); + ResponseEntity response = new TestRestTemplate().getForEntity( + "http://localhost:" + port + "/foo/default/master/foo.txt", String.class); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); verify(this.repository).findOne("foo", "default", null, false); verify(this.resources).findOne("foo", "default", null, "foo.txt");