SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removes duplicate bean definition in ResourceControllerIntegrationTests (#2286)

Browse Source
This commit is contained in:
Kaveh Shamsi
2023-06-14 14:34:19 +02:00
committed by GitHub
parent 25366e8d3d
commit 1b748ca048
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerIntegrationTests.java
View File

@@ -122,10 +122,10 @@ public class ResourceControllerIntegrationTests {
@Test
public void resourceHttpDoesNotExist() throws Exception {
when(this.resources.findOne("foo", "default", "master", "doesNotExist.txt"))
.thenThrow(new NoSuchResourceException("Does not exist"));
.thenThrow(new NoSuchResourceException("Does not exist"));
ResponseEntity<String> response = new TestRestTemplate()
.getForEntity("http://localhost:" + port + "/foo/default/master/doesNotExist.txt", String.class);
.getForEntity("http://localhost:" + port + "/foo/default/master/doesNotExist.txt", String.class);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
verify(this.resources).findOne("foo", "default", "master", "doesNotExist.txt");
}
@@ -195,11 +195,6 @@ public class ResourceControllerIntegrationTests {
return repository;
}
@Bean
public ResourceControllerAdvice resourceControllerAdvice() {
return new ResourceControllerAdvice();
}
@Bean
public EnvironmentController environmentController() {
return new EnvironmentController(environmentRepository());