diff --git a/pom.xml b/pom.xml index e3d2f91..75a9465 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ 1.3 2.9.9.20190727 3.0.2 - 4.12 + 5.5.1 1.18.6 2.25.1 3.11.0-rc0 @@ -462,6 +462,14 @@ pom import + + + org.junit + junit-bom + ${junit-bom.version} + pom + import + @@ -560,9 +568,20 @@ - junit - junit - ${junit.version} + org.junit.jupiter + junit-jupiter-api + test + + + + org.junit.jupiter + junit-jupiter-engine + test + + + + org.junit.jupiter + junit-jupiter-params test @@ -579,6 +598,13 @@ test + + org.mockito + mockito-junit-jupiter + ${mockito.version} + test + + io.projectreactor reactor-test diff --git a/src/test/java/org/springframework/session/data/mongo/AbstractMongoSessionConverterTest.java b/src/test/java/org/springframework/session/data/mongo/AbstractMongoSessionConverterTest.java index 4f5e143..4c07c9c 100644 --- a/src/test/java/org/springframework/session/data/mongo/AbstractMongoSessionConverterTest.java +++ b/src/test/java/org/springframework/session/data/mongo/AbstractMongoSessionConverterTest.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*; import java.time.Duration; import org.bson.Document; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.convert.TypeDescriptor; import org.springframework.lang.Nullable; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/src/test/java/org/springframework/session/data/mongo/AuthenticationParserTest.java b/src/test/java/org/springframework/session/data/mongo/AuthenticationParserTest.java index 21cc9ae..4aae170 100644 --- a/src/test/java/org/springframework/session/data/mongo/AuthenticationParserTest.java +++ b/src/test/java/org/springframework/session/data/mongo/AuthenticationParserTest.java @@ -17,7 +17,7 @@ package org.springframework.session.data.mongo; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextImpl; diff --git a/src/test/java/org/springframework/session/data/mongo/JacksonMongoSessionConverterTest.java b/src/test/java/org/springframework/session/data/mongo/JacksonMongoSessionConverterTest.java index 12d8dff..4d871b8 100644 --- a/src/test/java/org/springframework/session/data/mongo/JacksonMongoSessionConverterTest.java +++ b/src/test/java/org/springframework/session/data/mongo/JacksonMongoSessionConverterTest.java @@ -21,9 +21,10 @@ import java.lang.reflect.Field; import java.util.Date; import java.util.HashMap; +import org.assertj.core.api.Assertions; import org.bson.Document; import org.bson.types.ObjectId; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.mongodb.core.query.Query; import org.springframework.util.ReflectionUtils; @@ -84,10 +85,12 @@ public class JacksonMongoSessionConverterTest extends AbstractMongoSessionConver assertThat(converterMapper).isEqualTo(myMapper); } - @Test(expected = IllegalArgumentException.class) + @Test public void shouldNotAllowNullObjectMapperToBeInjected() { - new JacksonMongoSessionConverter((ObjectMapper) null); + Assertions.assertThatIllegalArgumentException().isThrownBy(() -> { + new JacksonMongoSessionConverter((ObjectMapper) null); + }); } @Test diff --git a/src/test/java/org/springframework/session/data/mongo/JdkMongoSessionConverterTest.java b/src/test/java/org/springframework/session/data/mongo/JdkMongoSessionConverterTest.java index d7932fe..2ebc39a 100644 --- a/src/test/java/org/springframework/session/data/mongo/JdkMongoSessionConverterTest.java +++ b/src/test/java/org/springframework/session/data/mongo/JdkMongoSessionConverterTest.java @@ -15,9 +15,11 @@ */ package org.springframework.session.data.mongo; +import static org.assertj.core.api.Assertions.*; + import java.time.Duration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.serializer.support.DeserializingConverter; import org.springframework.core.serializer.support.SerializingConverter; @@ -36,13 +38,17 @@ public class JdkMongoSessionConverterTest extends AbstractMongoSessionConverterT return this.mongoSessionConverter; } - @Test(expected = IllegalArgumentException.class) + @Test public void constructorNullSerializer() { - new JdkMongoSessionConverter(null, new DeserializingConverter(), inactiveInterval); + assertThatIllegalArgumentException().isThrownBy(() -> { + new JdkMongoSessionConverter(null, new DeserializingConverter(), inactiveInterval); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void constructorNullDeserializer() { - new JdkMongoSessionConverter(new SerializingConverter(), null, inactiveInterval); + assertThatIllegalArgumentException().isThrownBy(() -> { + new JdkMongoSessionConverter(new SerializingConverter(), null, inactiveInterval); + }); } } diff --git a/src/test/java/org/springframework/session/data/mongo/MongoOperationsSessionRepositoryTest.java b/src/test/java/org/springframework/session/data/mongo/MongoOperationsSessionRepositoryTest.java index 09866ea..c2a2530 100644 --- a/src/test/java/org/springframework/session/data/mongo/MongoOperationsSessionRepositoryTest.java +++ b/src/test/java/org/springframework/session/data/mongo/MongoOperationsSessionRepositoryTest.java @@ -29,11 +29,11 @@ import java.util.Map; import java.util.UUID; import org.bson.Document; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.core.convert.TypeDescriptor; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.query.Query; @@ -49,7 +49,7 @@ import com.mongodb.DBObject; * @author Vedran Pavic * @author Greg Turnquist */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class MongoOperationsSessionRepositoryTest { @Mock private AbstractMongoSessionConverter converter; @@ -58,7 +58,7 @@ public class MongoOperationsSessionRepositoryTest { private MongoOperationsSessionRepository repository; - @Before + @BeforeEach public void setUp() { this.repository = new MongoOperationsSessionRepository(this.mongoOperations); diff --git a/src/test/java/org/springframework/session/data/mongo/MongoSessionTest.java b/src/test/java/org/springframework/session/data/mongo/MongoSessionTest.java index 13aa232..4a3f05c 100644 --- a/src/test/java/org/springframework/session/data/mongo/MongoSessionTest.java +++ b/src/test/java/org/springframework/session/data/mongo/MongoSessionTest.java @@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.*; import java.time.Duration; import java.time.Instant; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Rob Winch diff --git a/src/test/java/org/springframework/session/data/mongo/ReactiveMongoOperationsSessionRepositoryTest.java b/src/test/java/org/springframework/session/data/mongo/ReactiveMongoOperationsSessionRepositoryTest.java index b87302e..9fda62e 100644 --- a/src/test/java/org/springframework/session/data/mongo/ReactiveMongoOperationsSessionRepositoryTest.java +++ b/src/test/java/org/springframework/session/data/mongo/ReactiveMongoOperationsSessionRepositoryTest.java @@ -27,11 +27,11 @@ import static org.mockito.Mockito.verify; import java.util.UUID; import org.bson.Document; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; import org.springframework.context.ApplicationEventPublisher; @@ -52,7 +52,7 @@ import com.mongodb.client.result.DeleteResult; * @author Vedran Pavic * @author Greg Turnquist */ -@RunWith(MockitoJUnitRunner.Silent.class) +@ExtendWith(MockitoExtension.class) public class ReactiveMongoOperationsSessionRepositoryTest { @Mock private AbstractMongoSessionConverter converter; @@ -63,7 +63,7 @@ public class ReactiveMongoOperationsSessionRepositoryTest { private ReactiveMongoOperationsSessionRepository repository; - @Before + @BeforeEach public void setUp() { this.repository = new ReactiveMongoOperationsSessionRepository(this.mongoOperations); diff --git a/src/test/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfigurationTest.java b/src/test/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfigurationTest.java index 0e1d580..b8b8bf3 100644 --- a/src/test/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfigurationTest.java +++ b/src/test/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfigurationTest.java @@ -21,10 +21,8 @@ import static org.mockito.BDDMockito.*; import java.net.UnknownHostException; -import org.junit.After; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.UnsatisfiedDependencyException; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; @@ -50,11 +48,9 @@ public class MongoHttpSessionConfigurationTest { private static final int MAX_INACTIVE_INTERVAL_IN_SECONDS = 600; - @Rule public final ExpectedException thrown = ExpectedException.none(); - private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); - @After + @AfterEach public void after() { if (this.context != null) { @@ -65,10 +61,9 @@ public class MongoHttpSessionConfigurationTest { @Test public void noMongoOperationsConfiguration() { - this.thrown.expect(UnsatisfiedDependencyException.class); - this.thrown.expectMessage("mongoSessionRepository"); - - registerAndRefresh(EmptyConfiguration.class); + assertThatExceptionOfType(UnsatisfiedDependencyException.class).isThrownBy(() -> { + registerAndRefresh(EmptyConfiguration.class); + }).withMessageContaining("mongoSessionRepository"); } @Test diff --git a/src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTest.java b/src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTest.java index dc25ace..0c29a0d 100644 --- a/src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTest.java +++ b/src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTest.java @@ -25,8 +25,8 @@ import static org.mockito.Mockito.mock; import java.lang.reflect.Field; import java.util.Collections; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.UnsatisfiedDependencyException; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; @@ -53,7 +53,7 @@ public class ReactiveMongoWebSessionConfigurationTest { private AnnotationConfigApplicationContext context; - @After + @AfterEach public void tearDown() { if (this.context != null) { diff --git a/src/test/java/org/springframework/session/data/mongo/integration/AbstractClassLoaderTest.java b/src/test/java/org/springframework/session/data/mongo/integration/AbstractClassLoaderTest.java index 783bc28..dde38bd 100644 --- a/src/test/java/org/springframework/session/data/mongo/integration/AbstractClassLoaderTest.java +++ b/src/test/java/org/springframework/session/data/mongo/integration/AbstractClassLoaderTest.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.*; import java.lang.reflect.Field; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.core.serializer.DefaultDeserializer; diff --git a/src/test/java/org/springframework/session/data/mongo/integration/AbstractITest.java b/src/test/java/org/springframework/session/data/mongo/integration/AbstractITest.java index 614571f..33e3c45 100644 --- a/src/test/java/org/springframework/session/data/mongo/integration/AbstractITest.java +++ b/src/test/java/org/springframework/session/data/mongo/integration/AbstractITest.java @@ -17,14 +17,14 @@ package org.springframework.session.data.mongo.integration; import java.util.UUID; -import org.junit.Before; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.web.WebAppConfiguration; /** @@ -32,7 +32,7 @@ import org.springframework.test.context.web.WebAppConfiguration; * * @author Jakub Kubrynski */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @WebAppConfiguration public abstract class AbstractITest { @@ -42,7 +42,7 @@ public abstract class AbstractITest { @Autowired(required = false) protected SessionEventRegistry registry; - @Before + @BeforeEach public void setup() { if (this.registry != null) { diff --git a/src/test/java/org/springframework/session/data/mongo/integration/AbstractMongoRepositoryITest.java b/src/test/java/org/springframework/session/data/mongo/integration/AbstractMongoRepositoryITest.java index c6104ba..e099499 100644 --- a/src/test/java/org/springframework/session/data/mongo/integration/AbstractMongoRepositoryITest.java +++ b/src/test/java/org/springframework/session/data/mongo/integration/AbstractMongoRepositoryITest.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.UUID; import de.flapdoodle.embed.mongo.MongodExecutable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.DependsOn; diff --git a/src/test/java/org/springframework/session/data/mongo/integration/MongoRepositoryJacksonITest.java b/src/test/java/org/springframework/session/data/mongo/integration/MongoRepositoryJacksonITest.java index e48d1c0..1fac557 100644 --- a/src/test/java/org/springframework/session/data/mongo/integration/MongoRepositoryJacksonITest.java +++ b/src/test/java/org/springframework/session/data/mongo/integration/MongoRepositoryJacksonITest.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.Map; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.geo.GeoModule; diff --git a/src/test/java/org/springframework/session/data/mongo/integration/MongoRepositoryJdkSerializationITest.java b/src/test/java/org/springframework/session/data/mongo/integration/MongoRepositoryJdkSerializationITest.java index fcab686..11c6329 100644 --- a/src/test/java/org/springframework/session/data/mongo/integration/MongoRepositoryJdkSerializationITest.java +++ b/src/test/java/org/springframework/session/data/mongo/integration/MongoRepositoryJdkSerializationITest.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*; import java.time.Duration; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.session.data.mongo.AbstractMongoSessionConverter;