Skip to content

Commit 3ab2174

Browse files
committed
Use Jetty again in SseIntegrationTests
1 parent 3ffeec9 commit 3ab2174

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,13 @@
3232
import org.springframework.http.codec.SseEvent;
3333
import org.springframework.http.server.reactive.AbstractHttpHandlerIntegrationTests;
3434
import org.springframework.http.server.reactive.HttpHandler;
35-
import org.springframework.http.server.reactive.bootstrap.JettyHttpServer;
3635
import org.springframework.web.bind.annotation.RequestMapping;
3736
import org.springframework.web.bind.annotation.RestController;
3837
import org.springframework.web.client.reactive.WebClient;
3938
import org.springframework.web.reactive.DispatcherHandler;
4039
import org.springframework.web.reactive.config.WebReactiveConfiguration;
4140
import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
4241

43-
import static org.junit.Assume.assumeFalse;
4442
import static org.springframework.web.client.reactive.ClientWebRequestBuilders.get;
4543
import static org.springframework.web.client.reactive.ResponseExtractors.bodyStream;
4644

@@ -53,16 +51,14 @@ public class SseIntegrationTests extends AbstractHttpHandlerIntegrationTests {
5351

5452
private WebClient webClient;
5553

54+
5655
@Before
5756
public void setup() throws Exception {
5857
super.setup();
59-
60-
// See https://github.com/eclipse/jetty.project/issues/730
61-
assumeFalse(server instanceof JettyHttpServer);
62-
6358
this.webClient = new WebClient(new ReactorClientHttpConnector());
6459
}
6560

61+
6662
@Override
6763
protected HttpHandler createHttpHandler() {
6864
this.wac = new AnnotationConfigApplicationContext();

0 commit comments

Comments
 (0)