Spring/spring-data-mongodb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAMONGO-2390 - Polishing.

Browse Source 
Switch touched test files to JUnit Jupiter.

Original pull request: #800.
This commit is contained in:
Christoph Strobl
2019-10-24 10:43:39 +02:00
committed by Mark Paluch
parent bc1c6c9a64
commit 5308e6c37f
3 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoOperationsUnitTests.java
View File

@@ -22,11 +22,11 @@ import java.util.List;
import org.bson.Document;
import org.bson.conversions.Bson;
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.dao.DataAccessException;
import org.springframework.data.geo.Point;
import org.springframework.data.mapping.MappingException;
@@ -49,7 +49,7 @@ import com.mongodb.DBRef;
* @author Thomas Darimont
* @author Christoph Strobl
*/
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public abstract class MongoOperationsUnitTests {
@Mock CollectionCallback<Object> collectionCallback;
@@ -59,7 +59,7 @@ public abstract class MongoOperationsUnitTests {
Person person;
List<Person> persons;
@Before
@BeforeEach
public final void operationsSetUp() {
person = new Person("Oliver");

40
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java
View File

@@ -37,15 +37,15 @@ import org.assertj.core.api.Assertions;
import org.bson.Document;
import org.bson.conversions.Bson;
import org.bson.types.ObjectId;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatcher;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationListener;
@@ -122,7 +122,7 @@ import com.mongodb.client.result.UpdateResult;
* @author Mark Paluch
* @author Michael J. Simons
*/
@RunWith(MockitoJUnitRunner.class)
@MockitoSettings(strictness = Strictness.LENIENT)
public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
MongoTemplate template;
@@ -146,8 +146,8 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
MappingMongoConverter converter;
MongoMappingContext mappingContext;
@Before
public void setUp() {
@BeforeEach
public void beforeEach() {
when(findIterable.iterator()).thenReturn(cursor);
when(factory.getDb()).thenReturn(db);
@@ -209,34 +209,36 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
.isThrownBy(() -> new MongoTemplate((com.mongodb.client.MongoClient) null, "database"));
}
@Test(expected = IllegalArgumentException.class) // DATAMONGO-1870
public void removeHandlesMongoExceptionProperly() throws Exception {
@Test // DATAMONGO-1870
public void removeHandlesMongoExceptionProperly() {
MongoTemplate template = mockOutGetDb();
template.remove(null, "collection");
assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> template.remove(null, "collection"));
}
@Test
public void defaultsConverterToMappingMongoConverter() throws Exception {
public void defaultsConverterToMappingMongoConverter() {
MongoTemplate template = new MongoTemplate(mongo, "database");
assertThat(ReflectionTestUtils.getField(template, "mongoConverter") instanceof MappingMongoConverter).isTrue();
}
@Test(expected = InvalidDataAccessApiUsageException.class)
@Test
public void rejectsNotFoundMapReduceResource() {
GenericApplicationContext ctx = new GenericApplicationContext();
ctx.refresh();
template.setApplicationContext(ctx);
template.mapReduce("foo", "classpath:doesNotExist.js", "function() {}", Person.class);
assertThatExceptionOfType(InvalidDataAccessApiUsageException.class)
.isThrownBy(() -> template.mapReduce("foo", "classpath:doesNotExist.js", "function() {}", Person.class));
}
@Test(expected = InvalidDataAccessApiUsageException.class) // DATAMONGO-322
@Test // DATAMONGO-322
public void rejectsEntityWithNullIdIfNotSupportedIdType() {
Object entity = new NotAutogenerateableId();
template.save(entity);
assertThatExceptionOfType(InvalidDataAccessApiUsageException.class).isThrownBy(() -> template.save(entity));
}
@Test // DATAMONGO-322
@@ -466,7 +468,7 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
}
@Test // DATAMONGO-1334
@Ignore("TODO: mongo3 - a bit hard to tests with the immutable object stuff")
@Disabled("TODO: mongo3 - a bit hard to tests with the immutable object stuff")
public void mapReduceShouldUseZeroAsDefaultLimit() {
MongoCursor cursor = mock(MongoCursor.class);
@@ -1323,7 +1325,7 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
assertThat(options.getValue().getCollation().getLocale()).isEqualTo("de_AT");
}
@Test // DATAMONGO-18545
@Test // DATAMONGO-1854
public void findAndReplaceShouldUseCollationEvenIfDefaultCollationIsPresent() {
template.findAndReplace(new BasicQuery("{}").collation(Collation.of("fr")), new Sith());
@@ -1822,7 +1824,7 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
@Override
protected MongoOperations getOperationsForExceptionHandling() {
MongoTemplate template = spy(this.template);
when(template.getDb()).thenThrow(new MongoException("Error!"));
lenient().when(template.getDb()).thenThrow(new MongoException("Error!"));
return template;
}

23
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateUnitTests.java
View File

@@ -35,12 +35,14 @@ import org.assertj.core.api.Assertions;
import org.bson.Document;
import org.bson.conversions.Bson;
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.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
import org.reactivestreams.Publisher;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationContext;
@@ -91,7 +93,8 @@ import com.mongodb.reactivestreams.client.Success;
* @author Mark Paluch
* @author Christoph Strobl
*/
@RunWith(MockitoJUnitRunner.Silent.class)
@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.LENIENT)
public class ReactiveMongoTemplateUnitTests {
ReactiveMongoTemplate template;
@@ -114,8 +117,8 @@ public class ReactiveMongoTemplateUnitTests {
MappingMongoConverter converter;
MongoMappingContext mappingContext;
@Before
public void setUp() {
@BeforeEach
public void beforeEach() {
when(factory.getExceptionTranslator()).thenReturn(exceptionTranslator);
when(factory.getMongoDatabase()).thenReturn(db);
@@ -615,7 +618,7 @@ public class ReactiveMongoTemplateUnitTests {
verify(aggregatePublisher).maxTime(eq(10000L), eq(TimeUnit.MILLISECONDS));
}
@Test // DATAMONGO-18545
@Test // DATAMONGO-1854
public void findAndReplaceShouldUseCollationWhenPresent() {
template.findAndReplace(new BasicQuery("{}").collation(Collation.of("fr")), new Jedi()).subscribe();
@@ -626,7 +629,7 @@ public class ReactiveMongoTemplateUnitTests {
assertThat(options.getValue().getCollation().getLocale()).isEqualTo("fr");
}
@Test // DATAMONGO-18545
@Test // DATAMONGO-1854
public void findAndReplaceShouldUseDefaultCollationWhenPresent() {
template.findAndReplace(new BasicQuery("{}"), new Sith()).subscribe();
@@ -637,7 +640,7 @@ public class ReactiveMongoTemplateUnitTests {
assertThat(options.getValue().getCollation().getLocale()).isEqualTo("de_AT");
}
@Test // DATAMONGO-18545
@Test // DATAMONGO-1854
public void findAndReplaceShouldUseCollationEvenIfDefaultCollationIsPresent() {
template.findAndReplace(new BasicQuery("{}").collation(Collation.of("fr")), new MongoTemplateUnitTests.Sith())