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

Revert "Trying a plain RestTemplate in an attempt to fix intermittent test failures."

Browse Source 
This reverts commit f552426304.
This commit is contained in:
Ryan Baxter
2017-06-08 15:34:57 -04:00
parent f552426304
commit 4e25e2eb81
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/RetryableZuulProxyApplicationTests.java
View File

@@ -10,7 +10,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.context.embedded.LocalServerPort;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.cloud.netflix.ribbon.RibbonClient;
import org.springframework.cloud.netflix.ribbon.StaticServerList;
import org.springframework.cloud.netflix.zuul.filters.discovery.DiscoveryClientRouteLocator;
@@ -30,7 +30,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;
import com.netflix.loadbalancer.Server;
import com.netflix.loadbalancer.ServerList;
@@ -48,7 +47,8 @@ import com.netflix.zuul.context.RequestContext;
@DirtiesContext
public class RetryableZuulProxyApplicationTests {
private RestTemplate testRestTemplate;
@Autowired
private TestRestTemplate testRestTemplate;
@Autowired
@SuppressWarnings("unused")
@@ -58,14 +58,10 @@ public class RetryableZuulProxyApplicationTests {
@SuppressWarnings("unused")
private RoutesEndpoint endpoint;
@LocalServerPort
private int port;
@Before
public void setTestRequestContext() {
RequestContext context = new RequestContext();
RequestContext.testSetCurrentContext(context);
testRestTemplate = new RestTemplateBuilder().build();
}
@Test
@@ -75,7 +71,7 @@ public class RetryableZuulProxyApplicationTests {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
ResponseEntity<String> result = testRestTemplate.exchange(
"http://localhost:" + port + "/simple", HttpMethod.POST,
"/simple", HttpMethod.POST,
new HttpEntity<>(form, headers), String.class);
assertEquals(HttpStatus.OK, result.getStatusCode());
assertEquals("Posted! {foo=[bar]}", result.getBody());