tchekai704
/
src-spring-cloud-gateway
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Migrates to new OutputCaptureRule

pull/1120/head
Spencer Gibb 5 years ago
parent
c56c7e722d
commit
a47f232fb1
No known key found for this signature in database
GPG Key ID: 7788A47380690861
3 changed files with 6 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RetryGatewayFilterFactoryIntegrationTests.java
  2. 4
      spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMappingTests.java
  3. 4
      spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/handler/predicate/QueryRoutePredicateFactoryTests.java

10
spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RetryGatewayFilterFactoryIntegrationTests.java
Unescape View File

@ -27,7 +27,6 @@ import com.netflix.loadbalancer.ServerList;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.hamcrest.CoreMatchers; import org.hamcrest.CoreMatchers;
import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@ -37,7 +36,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.rule.OutputCapture; import org.springframework.boot.test.system.OutputCaptureRule;
import org.springframework.boot.web.server.LocalServerPort; import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.cloud.gateway.filter.GatewayFilter; import org.springframework.cloud.gateway.filter.GatewayFilter;
import org.springframework.cloud.gateway.filter.factory.RetryGatewayFilterFactory.RetryConfig; import org.springframework.cloud.gateway.filter.factory.RetryGatewayFilterFactory.RetryConfig;
@ -75,12 +74,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
public class RetryGatewayFilterFactoryIntegrationTests extends BaseWebClientTests { public class RetryGatewayFilterFactoryIntegrationTests extends BaseWebClientTests {
@Rule @Rule
public final OutputCapture capture = new OutputCapture(); public final OutputCaptureRule capture = new OutputCaptureRule();
@Before
public void before() {
capture.reset();
}
@Test @Test
public void retryFilterGet() { public void retryFilterGet() {

4
spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMappingTests.java
Unescape View File

@ -23,7 +23,7 @@ import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.test.StepVerifier; import reactor.test.StepVerifier;
import org.springframework.boot.test.rule.OutputCapture; import org.springframework.boot.test.system.OutputCaptureRule;
import org.springframework.cloud.gateway.config.GlobalCorsProperties; import org.springframework.cloud.gateway.config.GlobalCorsProperties;
import org.springframework.cloud.gateway.route.Route; import org.springframework.cloud.gateway.route.Route;
import org.springframework.cloud.gateway.route.RouteLocator; import org.springframework.cloud.gateway.route.RouteLocator;
@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.containsString;
public class RoutePredicateHandlerMappingTests { public class RoutePredicateHandlerMappingTests {
@Rule @Rule
public OutputCapture outputCapture = new OutputCapture(); public OutputCaptureRule outputCapture = new OutputCaptureRule();
@Test @Test
public void lookupRouteFromSyncPredicates() { public void lookupRouteFromSyncPredicates() {

4
spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/handler/predicate/QueryRoutePredicateFactoryTests.java
Unescape View File

@ -26,7 +26,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.rule.OutputCapture; import org.springframework.boot.test.system.OutputCaptureRule;
import org.springframework.cloud.gateway.handler.predicate.QueryRoutePredicateFactory.Config; import org.springframework.cloud.gateway.handler.predicate.QueryRoutePredicateFactory.Config;
import org.springframework.cloud.gateway.route.RouteLocator; import org.springframework.cloud.gateway.route.RouteLocator;
import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder; import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder;
@ -47,7 +47,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
public class QueryRoutePredicateFactoryTests extends BaseWebClientTests { public class QueryRoutePredicateFactoryTests extends BaseWebClientTests {
@Rule @Rule
public OutputCapture output = new OutputCapture(); public OutputCaptureRule output = new OutputCaptureRule();
@Test @Test
public void noQueryParamWorks() { public void noQueryParamWorks() {

Write Preview
Loading…
Cancel
Save