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

Update to Spring Boot 1.4 test APIs

Browse Source
This commit is contained in:
Dave Syer
2016-09-15 10:18:19 +01:00
parent 3f72c9e476
commit dc4b4a84f6
42 changed files with 251 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
feign-eureka/src/test/java/demo/HelloClientApplicationTests.java
View File

@@ -1,25 +1,24 @@
package demo;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.TestRestTemplate;
import org.springframework.boot.test.WebIntegrationTest;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = HelloClientApplication.class)
//We disable Hystrix because we are not concerned about testing circuit breakers in this test
//and it eliminates hystrix timeouts from messing with the request
@WebIntegrationTest(randomPort = true, value="feign.hystrix.enabled=false")
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringRunner;
// We disable Hystrix because we are not concerned about testing circuit breakers in this
// test and it eliminates hystrix timeouts from messing with the request
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "feign.hystrix.enabled=false")
@DirtiesContext
public class HelloClientApplicationTests {
@@ -28,7 +27,8 @@ public class HelloClientApplicationTests {
@Test
public void clientConnects() {
ResponseEntity<String> response = new TestRestTemplate().getForEntity("http://localhost:" + port, String.class);
ResponseEntity<String> response = new TestRestTemplate()
.getForEntity("http://localhost:" + port, String.class);
assertNotNull("response was null", response);
assertEquals("Wrong status code", HttpStatus.OK, response.getStatusCode());
assertTrue(response.getBody().contains("<html"));

18
feign-eureka/src/test/java/demo/NoWebApplicationTests.java
View File

@@ -1,20 +1,19 @@
package demo;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.WebIntegrationTest;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.client.discovery.noop.NoopDiscoveryClient;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit4.SpringRunner;
import static org.junit.Assert.assertTrue;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = HelloClientApplication.class)
@WebIntegrationTest(value = "eureka.client.enabled=false", randomPort = true)
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "eureka.client.enabled=false")
@DirtiesContext
public class NoWebApplicationTests {
@@ -23,7 +22,8 @@ public class NoWebApplicationTests {
@Test
public void testDiscoveryClientIsNoop() {
assertTrue("discoveryClient is wrong instance type", discoveryClient instanceof NoopDiscoveryClient);
assertTrue("discoveryClient is wrong instance type",
discoveryClient instanceof NoopDiscoveryClient);
}
}