From 5c2370399f8bb6614eebe673e9f35ef4ae0dbfc0 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 18 Oct 2019 12:44:04 +0200 Subject: [PATCH] DATAMONGO-2394 - Polishing. Move tests to JUnit Jupiter. Original pull request: #798. --- .../mongodb/core/convert/QueryMapperUnitTests.java | 14 +++++++------- .../query/MongoQueryCreatorUnitTests.java | 9 ++++----- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/QueryMapperUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/QueryMapperUnitTests.java index db14d6bc1..3f2ed4f53 100755 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/QueryMapperUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/QueryMapperUnitTests.java @@ -30,11 +30,11 @@ import java.util.Optional; import org.bson.types.Code; import org.bson.types.ObjectId; -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.data.annotation.Id; import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort.Direction; @@ -69,7 +69,7 @@ import com.mongodb.QueryBuilder; * @author Christoph Strobl * @author Mark Paluch */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class QueryMapperUnitTests { QueryMapper mapper; @@ -78,8 +78,8 @@ public class QueryMapperUnitTests { @Mock MongoDbFactory factory; - @Before - public void setUp() { + @BeforeEach + public void beforeEach() { this.context = new MongoMappingContext(); diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryCreatorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryCreatorUnitTests.java index 3b83348b2..986aa46f3 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryCreatorUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryCreatorUnitTests.java @@ -27,9 +27,8 @@ import java.util.regex.Pattern; import org.bson.Document; import org.bson.types.ObjectId; -import org.junit.Before; -import org.junit.Test; - +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.Range; import org.springframework.data.domain.Range.Bound; import org.springframework.data.geo.Distance; @@ -73,8 +72,8 @@ public class MongoQueryCreatorUnitTests { MappingContext, MongoPersistentProperty> context; MongoConverter converter; - @Before - public void setUp() { + @BeforeEach + public void beforeEach() { context = new MongoMappingContext();