From 68f5566732711eae68f815a40aae645a33bd7117 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Thu, 9 Mar 2023 11:22:54 -0500 Subject: [PATCH] Fixing tests --- .../server/CompositeIntegrationTests.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/CompositeIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/CompositeIntegrationTests.java index ff5a86bb..4ce4c08a 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/CompositeIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/CompositeIntegrationTests.java @@ -104,7 +104,7 @@ public class CompositeIntegrationTests { @LocalServerPort private int port; - @BeforeClass + @BeforeAll public static void init() throws Exception { // mock Git configuration to make tests independent of local Git configuration SystemReader.setInstance(new MockSystemReader()); @@ -114,20 +114,6 @@ public class CompositeIntegrationTests { "target/repos/svn-config-repo"); } - @Test - public void contextLoads() { - ResponseEntity response = new TestRestTemplate().exchange( - "http://localhost:" + this.port + "/foo/development/", HttpMethod.GET, getV2AcceptEntity(), - Environment.class); - Environment environment = response.getBody(); - assertThat(3).isEqualTo(environment.getPropertySources().size()); - assertThat("overrides").isEqualTo(environment.getPropertySources().get(0).getName()); - assertThat(environment.getPropertySources().get(1).getName().contains("config-repo") - && !environment.getPropertySources().get(1).getName().contains("svn-config-repo")).isTrue(); - assertThat(environment.getPropertySources().get(2).getName().contains("svn-config-repo")).isTrue(); - ConfigServerTestUtils.assertConfigEnabled(environment); - } - @Test public void resourceEndpointsWork() { // This request will get the file from the Git Repo because its order is first @@ -143,7 +129,6 @@ public class CompositeIntegrationTests { } - @RunWith(SpringRunner.class) @SpringBootTest(classes = TestConfigServerApplication.class, properties = { "spring.config.name:compositeconfigserver", "spring.cloud.config.server.composite[0].uri:file:./target/repos/config-repo",