From 0e37c722e2febe031b94c22a87a65f69cba0554c Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Mon, 8 Jun 2020 16:14:34 -0400 Subject: [PATCH] Revert "Temporarily ignore RSocket integration tests" This reverts commit d5eeec0ae693c1fd31b9dd54058ecb72fef7e686. Fixes gh-8643 --- .../security/config/annotation/rsocket/HelloRSocketITests.java | 2 -- .../rsocket/RSocketMessageHandlerConnectionITests.java | 2 -- .../config/annotation/rsocket/RSocketMessageHandlerITests.java | 2 -- .../java/sample/HelloRSocketApplicationITests.java | 2 -- 4 files changed, 8 deletions(-) diff --git a/config/src/test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java b/config/src/test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java index 2f06ce7bec..876e22d2a5 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java @@ -22,7 +22,6 @@ import io.rsocket.transport.netty.server.CloseableChannel; import io.rsocket.transport.netty.server.TcpServerTransport; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -53,7 +52,6 @@ import static org.assertj.core.api.Assertions.assertThatCode; */ @ContextConfiguration @RunWith(SpringRunner.class) -@Ignore public class HelloRSocketITests { @Autowired RSocketMessageHandler handler; diff --git a/config/src/test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java b/config/src/test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java index 4ce7b75ff1..269bcbb951 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java @@ -22,7 +22,6 @@ import io.rsocket.transport.netty.server.CloseableChannel; import io.rsocket.transport.netty.server.TcpServerTransport; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -59,7 +58,6 @@ import static org.assertj.core.api.Assertions.assertThatCode; */ @ContextConfiguration @RunWith(SpringRunner.class) -@Ignore public class RSocketMessageHandlerConnectionITests { @Autowired RSocketMessageHandler handler; diff --git a/config/src/test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java b/config/src/test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java index d9886c3e79..19f5e1010c 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java @@ -23,7 +23,6 @@ import io.rsocket.transport.netty.server.CloseableChannel; import io.rsocket.transport.netty.server.TcpServerTransport; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -59,7 +58,6 @@ import static org.assertj.core.api.Assertions.assertThatCode; */ @ContextConfiguration @RunWith(SpringRunner.class) -@Ignore public class RSocketMessageHandlerITests { @Autowired RSocketMessageHandler handler; diff --git a/samples/boot/hellorsocket/src/integration-test/java/sample/HelloRSocketApplicationITests.java b/samples/boot/hellorsocket/src/integration-test/java/sample/HelloRSocketApplicationITests.java index 912c1be300..420588c356 100644 --- a/samples/boot/hellorsocket/src/integration-test/java/sample/HelloRSocketApplicationITests.java +++ b/samples/boot/hellorsocket/src/integration-test/java/sample/HelloRSocketApplicationITests.java @@ -15,7 +15,6 @@ */ package sample; -import org.junit.Ignore; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.rsocket.context.LocalRSocketServerPort; import org.springframework.boot.test.context.SpringBootTest; @@ -41,7 +40,6 @@ import static org.springframework.security.rsocket.metadata.UsernamePasswordMeta @RunWith(SpringRunner.class) @TestPropertySource(properties = "spring.rsocket.server.port=0") @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -@Ignore public class HelloRSocketApplicationITests { @Autowired