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

Tweak assertions a bit

Browse Source
This commit is contained in:
Dave Syer
2017-06-09 11:11:15 +01:00
parent 195c3fd75d
commit 40e72ddb8c
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-netflix-hystrix-contract/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix</artifactId>
<version>1.3.1.BUILD-SNAPSHOT</version>
<version>1.4.0.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath> <!-- lookup parent from repository -->
</parent>
<artifactId>spring-cloud-netflix-hystrix-contract</artifactId>

10
spring-cloud-netflix-hystrix-contract/src/main/java/org/springframework/cloud/netflix/hystrix/contract/HystrixContractUtils.java
View File

@@ -45,17 +45,15 @@ public class HystrixContractUtils {
assertThat(origin.get("host")).isNotNull();
assertThat(origin.get("port")).isNotNull();
assertThat(origin.get("serviceId")).isEqualTo("application");
// TODO: should be server.port?
// TODO: should be server.port (but in a test it's a random port so -1)?
assertThat(origin.get("id")).isEqualTo("application:-1");
}
public static void checkData(Map<String, Object> data) {
public static void checkData(Map<String, Object> data, String group, String name) {
assertThat(data.get("type")).isEqualTo("HystrixCommand");
// TODO: should be application.hello
assertThat(data.get("name")).asString().startsWith("application.");
assertThat(data.get("name")).asString().isEqualTo(name);
assertThat(data.get("group")).isNotNull();
// TODO: should be TestApplication
// assertThat(data.get("group")).isEqualTo(TestApplication.class.getSimpleName());
assertThat(data.get("group")).isEqualTo(group);
assertThat(data.get("errorCount")).isEqualTo(0);
assertThat(data.get("errorPercentage")).isEqualTo(0);
assertThat(data.get("requestCount")).isInstanceOf(java.lang.Integer.class);

10
spring-cloud-netflix-hystrix-stream/src/test/java/org/springframework/cloud/netflix/hystrix/stream/StreamSourceTestBase.java
View File

@@ -30,7 +30,7 @@ import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier;
import org.springframework.cloud.netflix.hystrix.contract.HystrixContractUtils;
import org.springframework.cloud.netflix.hystrix.stream.StreamSourceTestBase.TestApplication;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -41,7 +41,7 @@ import org.springframework.web.bind.annotation.RestController;
*
* @author Marius Bogoevici
*/
@RunWith(SpringJUnit4ClassRunner.class)
@RunWith(SpringRunner.class)
@SpringBootTest(classes = TestApplication.class)
@AutoConfigureMessageVerifier
public abstract class StreamSourceTestBase {
@@ -54,16 +54,18 @@ public abstract class StreamSourceTestBase {
}
public void assertOrigin(Object input) {
System.err.println(input);
@SuppressWarnings("unchecked")
Map<String, Object> origin = (Map<String, Object>) input;
HystrixContractUtils.checkOrigin(origin);
}
public void assertData(Object input) {
System.err.println(input);
// System.err.println(input);
@SuppressWarnings("unchecked")
Map<String, Object> data = (Map<String, Object>) input;
HystrixContractUtils.checkData(data);
HystrixContractUtils.checkData(data, TestApplication.class.getSimpleName(),
"application.hello");
}
@EnableAutoConfiguration

4
spring-cloud-netflix-turbine-stream/src/test/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamTests.java
View File

@@ -146,6 +146,10 @@ public class TurbineStreamTests {
.headers(response.getHeaders()).body(builder.toString());
}
/**
* Special interceptor that prevents the response from being closed and allows us to
* assert on the contents of an event stream.
*/
private class NonClosingInterceptor implements ClientHttpRequestInterceptor {
private class NonClosingResponse implements ClientHttpResponse {