From 85ee36b385b7e57dab2ab307fcd7a9b085c33477 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Mon, 30 Apr 2018 19:47:14 -0400 Subject: [PATCH] Uncomment tests that now work --- .../reactive/ErrorHandlerIntegrationTests.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java index 94ecdfeca1..74e50001ca 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,12 +24,10 @@ import reactor.core.publisher.Mono; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; -import org.springframework.http.server.reactive.bootstrap.ReactorHttpServer; import org.springframework.web.client.ResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import static org.junit.Assert.assertEquals; -import static org.junit.Assume.assumeFalse; +import static org.junit.Assert.*; /** * @author Arjen Poutsma @@ -45,9 +43,6 @@ public class ErrorHandlerIntegrationTests extends AbstractHttpHandlerIntegration @Test public void responseBodyError() throws Exception { - // TODO: fix Reactor - assumeFalse(server instanceof ReactorHttpServer); - RestTemplate restTemplate = new RestTemplate(); restTemplate.setErrorHandler(NO_OP_ERROR_HANDLER); @@ -59,9 +54,6 @@ public class ErrorHandlerIntegrationTests extends AbstractHttpHandlerIntegration @Test public void handlingError() throws Exception { - // TODO: fix Reactor - assumeFalse(server instanceof ReactorHttpServer); - RestTemplate restTemplate = new RestTemplate(); restTemplate.setErrorHandler(NO_OP_ERROR_HANDLER);