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

fix compile error for boot 2.0

Browse Source
This commit is contained in:
Spencer Gibb
2017-03-17 20:14:04 -06:00
parent 94bd2a98b8
commit 2bc2abcfae
20 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java
View File

@@ -7,10 +7,9 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.context.embedded.EmbeddedWebApplicationContext;
import org.springframework.boot.context.embedded.LocalServerPort;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.cloud.config.server.test.ConfigServerTestUtils;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.test.context.junit4.SpringRunner;
@@ -43,8 +42,8 @@ public class ApplicationTests {
org.springframework.cloud.config.server.ConfigServerApplication.class,
"--server.port=" + configPort, "--spring.config.name=server",
"--spring.cloud.config.server.git.uri=" + repo);
configPort = ((EmbeddedWebApplicationContext) server)
.getEmbeddedServletContainer().getPort();
/*FIXME configPort = ((EmbeddedWebApplicationContext) server)
.getEmbeddedServletContainer().getPort();*/
System.setProperty("config.port", "" + configPort);
}

7
spring-cloud-config-sample/src/test/java/sample/ServerNativeApplicationTests.java
View File

@@ -8,9 +8,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.context.embedded.EmbeddedWebApplicationContext;
import org.springframework.boot.context.embedded.LocalServerPort;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.cloud.config.server.test.ConfigServerTestUtils;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.env.ConfigurableEnvironment;
@@ -41,8 +40,8 @@ public class ServerNativeApplicationTests {
org.springframework.cloud.config.server.ConfigServerApplication.class,
"--server.port=" + configPort, "--spring.config.name=server",
"--spring.cloud.config.server.git.uri=" + repo, "--spring.profiles.active=native");
configPort = ((EmbeddedWebApplicationContext) server)
.getEmbeddedServletContainer().getPort();
/*FIXME configPort = ((EmbeddedWebApplicationContext) server)
.getEmbeddedServletContainer().getPort();*/
System.setProperty("config.port", "" + configPort);
}