Skip to content

Commit fad1834

Browse files
mp911demp911de
committed
DATAMONGO-2321 - Migrate tests to AssertJ.
1 parent 394efa8 commit fad1834

File tree

126 files changed

+2502
-3158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+2502
-3158
lines changed

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/MongoDatabaseUtilsUnitTests.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515
*/
1616
package org.springframework.data.mongodb;
1717

18-
import static org.assertj.core.api.Assertions.assertThat;
19-
import static org.junit.Assert.*;
20-
import static org.mockito.ArgumentMatchers.any;
18+
import static org.assertj.core.api.Assertions.*;
19+
import static org.mockito.ArgumentMatchers.*;
2120
import static org.mockito.Mockito.*;
2221

2322
import javax.transaction.Status;
@@ -29,6 +28,7 @@
2928
import org.junit.runner.RunWith;
3029
import org.mockito.Mock;
3130
import org.mockito.junit.MockitoJUnitRunner;
31+
3232
import org.springframework.transaction.TransactionStatus;
3333
import org.springframework.transaction.jta.JtaTransactionManager;
3434
import org.springframework.transaction.support.TransactionCallbackWithoutResult;
@@ -70,12 +70,12 @@ public void setUp() {
7070
@After
7171
public void verifyTransactionSynchronizationManagerState() {
7272

73-
assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
74-
assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
75-
assertNull(TransactionSynchronizationManager.getCurrentTransactionName());
76-
assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
77-
assertNull(TransactionSynchronizationManager.getCurrentTransactionIsolationLevel());
78-
assertFalse(TransactionSynchronizationManager.isActualTransactionActive());
73+
assertThat(TransactionSynchronizationManager.getResourceMap().isEmpty()).isTrue();
74+
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
75+
assertThat(TransactionSynchronizationManager.getCurrentTransactionName()).isNull();
76+
assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
77+
assertThat(TransactionSynchronizationManager.getCurrentTransactionIsolationLevel()).isNull();
78+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
7979
}
8080

8181
@Test // DATAMONGO-2130

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/MongoTransactionManagerUnitTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package org.springframework.data.mongodb;
1717

1818
import static org.assertj.core.api.Assertions.*;
19-
import static org.junit.Assert.*;
2019
import static org.mockito.Mockito.*;
2120

2221
import org.junit.After;
@@ -25,6 +24,7 @@
2524
import org.junit.runner.RunWith;
2625
import org.mockito.Mock;
2726
import org.mockito.junit.MockitoJUnitRunner;
27+
2828
import org.springframework.data.mongodb.core.MongoTemplate;
2929
import org.springframework.transaction.TransactionDefinition;
3030
import org.springframework.transaction.TransactionStatus;
@@ -72,8 +72,8 @@ public void setUp() {
7272
@After
7373
public void verifyTransactionSynchronizationManager() {
7474

75-
assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
76-
assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
75+
assertThat(TransactionSynchronizationManager.getResourceMap().isEmpty()).isTrue();
76+
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
7777
}
7878

7979
@Test // DATAMONGO-1920

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/ReactiveMongoTransactionManagerUnitTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.springframework.data.mongodb;
1717

18-
import static org.junit.Assert.*;
18+
import static org.assertj.core.api.Assertions.*;
1919
import static org.mockito.Mockito.*;
2020

2121
import reactor.core.publisher.Mono;
@@ -27,6 +27,7 @@
2727
import org.junit.runner.RunWith;
2828
import org.mockito.Mock;
2929
import org.mockito.junit.MockitoJUnitRunner;
30+
3031
import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
3132
import org.springframework.transaction.TransactionDefinition;
3233
import org.springframework.transaction.reactive.TransactionalOperator;
@@ -72,8 +73,8 @@ public void setUp() {
7273
@After
7374
public void verifyTransactionSynchronizationManager() {
7475

75-
assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
76-
assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
76+
assertThat(TransactionSynchronizationManager.getResourceMap().isEmpty()).isTrue();
77+
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
7778
}
7879

7980
@Test // DATAMONGO-2265

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractIntegrationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*/
1616
package org.springframework.data.mongodb.config;
1717

18-
import static org.hamcrest.CoreMatchers.*;
19-
import static org.junit.Assert.*;
18+
import static org.springframework.data.mongodb.test.util.Assertions.*;
2019

2120
import org.bson.Document;
2221
import org.junit.After;
2322
import org.junit.Before;
2423
import org.junit.runner.RunWith;
24+
2525
import org.springframework.beans.factory.annotation.Autowired;
2626
import org.springframework.context.annotation.Configuration;
2727
import org.springframework.dao.DataAccessException;
@@ -68,7 +68,7 @@ public void cleanUp() {
6868
@Override
6969
public Void doInCollection(MongoCollection<Document> collection) throws MongoException, DataAccessException {
7070
collection.deleteMany(new Document());
71-
assertThat(collection.find().iterator().hasNext(), is(false));
71+
assertThat(collection.find().iterator().hasNext()).isFalse();
7272
return null;
7373
}
7474
});

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractMongoConfigurationUnitTests.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
*/
1616
package org.springframework.data.mongodb.config;
1717

18-
import static org.hamcrest.Matchers.*;
19-
import static org.junit.Assert.*;
18+
import static org.assertj.core.api.Assertions.*;
2019

2120
import example.first.First;
2221
import example.second.Second;
@@ -29,6 +28,7 @@
2928
import org.junit.Rule;
3029
import org.junit.Test;
3130
import org.junit.rules.ExpectedException;
31+
3232
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
3333
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
3434
import org.springframework.context.annotation.Bean;
@@ -61,9 +61,9 @@ public class AbstractMongoConfigurationUnitTests {
6161
public void usesConfigClassPackageAsBaseMappingPackage() throws ClassNotFoundException {
6262

6363
AbstractMongoConfiguration configuration = new SampleMongoConfiguration();
64-
assertThat(configuration.getMappingBasePackage(), is(SampleMongoConfiguration.class.getPackage().getName()));
65-
assertThat(configuration.getInitialEntitySet(), hasSize(2));
66-
assertThat(configuration.getInitialEntitySet(), hasItem(Entity.class));
64+
assertThat(configuration.getMappingBasePackage()).isEqualTo(SampleMongoConfiguration.class.getPackage().getName());
65+
assertThat(configuration.getInitialEntitySet()).hasSize(2);
66+
assertThat(configuration.getInitialEntitySet()).contains(Entity.class);
6767
}
6868

6969
@Test // DATAMONGO-496
@@ -83,7 +83,7 @@ public void containsMongoDbFactoryButNoMongoBean() {
8383

8484
AbstractApplicationContext context = new AnnotationConfigApplicationContext(SampleMongoConfiguration.class);
8585

86-
assertThat(context.getBean(MongoDbFactory.class), is(notNullValue()));
86+
assertThat(context.getBean(MongoDbFactory.class)).isNotNull();
8787

8888
exception.expect(NoSuchBeanDefinitionException.class);
8989
context.getBean(MongoClient.class);
@@ -96,9 +96,9 @@ public void returnsUninitializedMappingContext() throws Exception {
9696
SampleMongoConfiguration configuration = new SampleMongoConfiguration();
9797
MongoMappingContext context = configuration.mongoMappingContext();
9898

99-
assertThat(context.getPersistentEntities(), is(emptyIterable()));
99+
assertThat(context.getPersistentEntities()).isEmpty();
100100
context.initialize();
101-
assertThat(context.getPersistentEntities(), is(not(emptyIterable())));
101+
assertThat(context.getPersistentEntities()).isNotEmpty();
102102
}
103103

104104
@Test // DATAMONGO-717
@@ -110,7 +110,7 @@ public void lifecycleCallbacksAreInvokedInAppropriateOrder() {
110110
EvaluationContextProvider provider = (EvaluationContextProvider) ReflectionTestUtils.getField(entity,
111111
"evaluationContextProvider");
112112

113-
assertThat(provider, is(instanceOf(ExtensionAwareEvaluationContextProvider.class)));
113+
assertThat(provider).isInstanceOf(ExtensionAwareEvaluationContextProvider.class);
114114
context.close();
115115
}
116116

@@ -121,8 +121,8 @@ public void shouldBeAbleToConfigureCustomTypeMapperViaJavaConfig() {
121121
MongoTypeMapper typeMapper = context.getBean(CustomMongoTypeMapper.class);
122122
MappingMongoConverter mmc = context.getBean(MappingMongoConverter.class);
123123

124-
assertThat(mmc, is(notNullValue()));
125-
assertThat(mmc.getTypeMapper(), is(typeMapper));
124+
assertThat(mmc).isNotNull();
125+
assertThat(mmc.getTypeMapper()).isEqualTo(typeMapper);
126126
context.close();
127127
}
128128

@@ -133,8 +133,8 @@ public void allowsMultipleEntityBasePackages() throws ClassNotFoundException {
133133
ConfigurationWithMultipleBasePackages config = new ConfigurationWithMultipleBasePackages();
134134
Set<Class<?>> entities = config.getInitialEntitySet();
135135

136-
assertThat(entities, hasSize(2));
137-
assertThat(entities, hasItems(First.class, Second.class));
136+
assertThat(entities).hasSize(2);
137+
assertThat(entities).contains(First.class, Second.class);
138138
}
139139

140140
private static void assertScanningDisabled(final String value) throws ClassNotFoundException {
@@ -146,8 +146,8 @@ protected Collection<String> getMappingBasePackages() {
146146
}
147147
};
148148

149-
assertThat(configuration.getMappingBasePackages(), hasItem(value));
150-
assertThat(configuration.getInitialEntitySet(), hasSize(0));
149+
assertThat(configuration.getMappingBasePackages()).contains(value);
150+
assertThat(configuration.getInitialEntitySet()).hasSize(0);
151151
}
152152

153153
@Configuration

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractReactiveMongoConfigurationUnitTests.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
*/
1616
package org.springframework.data.mongodb.config;
1717

18-
import static org.hamcrest.Matchers.*;
19-
import static org.junit.Assert.*;
18+
import static org.assertj.core.api.Assertions.*;
2019

2120
import example.first.First;
2221
import example.second.Second;
@@ -29,6 +28,7 @@
2928
import org.junit.Rule;
3029
import org.junit.Test;
3130
import org.junit.rules.ExpectedException;
31+
3232
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
3333
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
3434
import org.springframework.context.annotation.Bean;
@@ -61,9 +61,9 @@ public class AbstractReactiveMongoConfigurationUnitTests {
6161
public void usesConfigClassPackageAsBaseMappingPackage() throws ClassNotFoundException {
6262

6363
AbstractReactiveMongoConfiguration configuration = new SampleMongoConfiguration();
64-
assertThat(configuration.getMappingBasePackages(), hasItem(SampleMongoConfiguration.class.getPackage().getName()));
65-
assertThat(configuration.getInitialEntitySet(), hasSize(2));
66-
assertThat(configuration.getInitialEntitySet(), hasItem(Entity.class));
64+
assertThat(configuration.getMappingBasePackages()).contains(SampleMongoConfiguration.class.getPackage().getName());
65+
assertThat(configuration.getInitialEntitySet()).hasSize(2);
66+
assertThat(configuration.getInitialEntitySet()).contains(Entity.class);
6767
}
6868

6969
@Test // DATAMONGO-1444
@@ -83,7 +83,7 @@ public void containsMongoDbFactoryButNoMongoBean() {
8383

8484
AbstractApplicationContext context = new AnnotationConfigApplicationContext(SampleMongoConfiguration.class);
8585

86-
assertThat(context.getBean(SimpleReactiveMongoDatabaseFactory.class), is(notNullValue()));
86+
assertThat(context.getBean(SimpleReactiveMongoDatabaseFactory.class)).isNotNull();
8787

8888
exception.expect(NoSuchBeanDefinitionException.class);
8989

@@ -100,9 +100,9 @@ public void returnsUninitializedMappingContext() throws Exception {
100100
SampleMongoConfiguration configuration = new SampleMongoConfiguration();
101101
MongoMappingContext context = configuration.mongoMappingContext();
102102

103-
assertThat(context.getPersistentEntities(), is(emptyIterable()));
103+
assertThat(context.getPersistentEntities()).isEmpty();
104104
context.initialize();
105-
assertThat(context.getPersistentEntities(), is(not(emptyIterable())));
105+
assertThat(context.getPersistentEntities()).isNotEmpty();
106106
}
107107

108108
@Test // DATAMONGO-1444
@@ -114,7 +114,7 @@ public void lifecycleCallbacksAreInvokedInAppropriateOrder() {
114114
EvaluationContextProvider provider = (EvaluationContextProvider) ReflectionTestUtils.getField(entity,
115115
"evaluationContextProvider");
116116

117-
assertThat(provider, is(instanceOf(ExtensionAwareEvaluationContextProvider.class)));
117+
assertThat(provider).isInstanceOf(ExtensionAwareEvaluationContextProvider.class);
118118
context.close();
119119
}
120120

@@ -125,8 +125,8 @@ public void shouldBeAbleToConfigureCustomTypeMapperViaJavaConfig() {
125125
MongoTypeMapper typeMapper = context.getBean(CustomMongoTypeMapper.class);
126126
MappingMongoConverter mmc = context.getBean(MappingMongoConverter.class);
127127

128-
assertThat(mmc, is(notNullValue()));
129-
assertThat(mmc.getTypeMapper(), is(typeMapper));
128+
assertThat(mmc).isNotNull();
129+
assertThat(mmc.getTypeMapper()).isEqualTo(typeMapper);
130130
context.close();
131131
}
132132

@@ -137,8 +137,8 @@ public void allowsMultipleEntityBasePackages() throws ClassNotFoundException {
137137
ConfigurationWithMultipleBasePackages config = new ConfigurationWithMultipleBasePackages();
138138
Set<Class<?>> entities = config.getInitialEntitySet();
139139

140-
assertThat(entities, hasSize(2));
141-
assertThat(entities, hasItems(First.class, Second.class));
140+
assertThat(entities).hasSize(2);
141+
assertThat(entities).contains(First.class, Second.class);
142142
}
143143

144144
private static void assertScanningDisabled(final String value) throws ClassNotFoundException {
@@ -150,8 +150,8 @@ protected Collection<String> getMappingBasePackages() {
150150
}
151151
};
152152

153-
assertThat(configuration.getMappingBasePackages(), hasItem(value));
154-
assertThat(configuration.getInitialEntitySet(), hasSize(0));
153+
assertThat(configuration.getMappingBasePackages()).contains(value);
154+
assertThat(configuration.getInitialEntitySet()).hasSize(0);
155155
}
156156

157157
@Configuration

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingIntegrationTests.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*/
1616
package org.springframework.data.mongodb.config;
1717

18-
import static org.hamcrest.CoreMatchers.*;
19-
import static org.junit.Assert.*;
18+
import static org.assertj.core.api.Assertions.*;
2019

2120
import org.joda.time.DateTime;
2221
import org.junit.Test;
22+
2323
import org.springframework.context.support.AbstractApplicationContext;
2424
import org.springframework.context.support.ClassPathXmlApplicationContext;
2525
import org.springframework.data.annotation.CreatedDate;
@@ -50,16 +50,16 @@ public void enablesAuditingAndSetsPropertiesAccordingly() throws Exception {
5050
Entity entity = new Entity();
5151
entity = callbacks.callback(BeforeConvertCallback.class, entity, "collection-1");
5252

53-
assertThat(entity.created, is(notNullValue()));
54-
assertThat(entity.modified, is(entity.created));
53+
assertThat(entity.created).isNotNull();
54+
assertThat(entity.modified).isEqualTo(entity.created);
5555

5656
Thread.sleep(10);
5757
entity.id = 1L;
5858

5959
entity = callbacks.callback(BeforeConvertCallback.class, entity, "collection-1");
6060

61-
assertThat(entity.created, is(notNullValue()));
62-
assertThat(entity.modified, is(not(entity.created)));
61+
assertThat(entity.created).isNotNull();
62+
assertThat(entity.modified).isNotEqualTo(entity.created);
6363
context.close();
6464
}
6565

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingViaJavaConfigRepositoriesTests.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
*/
1616
package org.springframework.data.mongodb.config;
1717

18-
import static org.assertj.core.api.Assertions.assertThat;
19-
import static org.hamcrest.CoreMatchers.*;
20-
import static org.junit.Assert.assertThat;
18+
import static org.assertj.core.api.Assertions.*;
2119
import static org.mockito.Mockito.*;
2220

2321
import java.util.Collections;
@@ -27,6 +25,7 @@
2725
import org.junit.Before;
2826
import org.junit.Test;
2927
import org.junit.runner.RunWith;
28+
3029
import org.springframework.beans.factory.annotation.Autowired;
3130
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
3231
import org.springframework.context.annotation.Bean;
@@ -100,9 +99,9 @@ public void basicAuditing() {
10099

101100
AuditablePerson createdBy = savedUser.getCreatedBy();
102101

103-
assertThat(createdBy, is(notNullValue()));
104-
assertThat(createdBy.getFirstname(), is(this.auditor.getFirstname()));
105-
assertThat(savedUser.getCreatedAt(), is(notNullValue()));
102+
assertThat(createdBy).isNotNull();
103+
assertThat(createdBy.getFirstname()).isEqualTo(this.auditor.getFirstname());
104+
assertThat(savedUser.getCreatedAt()).isNotNull();
106105
}
107106

108107
@Test // DATAMONGO-843

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/GeoJsonConfigurationIntegrationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*/
1616
package org.springframework.data.mongodb.config;
1717

18-
import static org.hamcrest.CoreMatchers.*;
19-
import static org.junit.Assert.*;
18+
import static org.assertj.core.api.Assertions.*;
2019

2120
import org.junit.Test;
2221
import org.junit.runner.RunWith;
22+
2323
import org.springframework.beans.factory.annotation.Autowired;
2424
import org.springframework.context.annotation.Configuration;
2525
import org.springframework.data.mongodb.core.geo.GeoJsonModule;
@@ -44,6 +44,6 @@ static class Config {}
4444

4545
@Test // DATAMONGO-1181
4646
public void picksUpGeoJsonModuleConfigurationByDefault() {
47-
assertThat(geoJsonModule, is(notNullValue()));
47+
assertThat(geoJsonModule).isNotNull();
4848
}
4949
}

0 commit comments

Comments
 (0)