Skip to content

Commit 6be9eba

Browse files
tchlyahtchlyah
committed
♻️ Use assertJ assertions
1 parent 9d53515 commit 6be9eba

7 files changed

Lines changed: 85 additions & 83 deletions

File tree

‎src/test/java/com/github/couchmove/CouchmoveIT.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ public void should_migrate_successfully() {
126126
// And successfully executed
127127

128128
// Users inserted
129-
assertEquals(new User("user", "titi", "01/09/1998"), userRepository.findOne("user::titi"));
130-
assertEquals(new User("user", "toto", "10/01/1991"), userRepository.findOne("user::toto"));
129+
assertThat(userRepository.findOne("user::titi")).isEqualTo(new User("user", "titi", "01/09/1998"));
130+
assertThat(userRepository.findOne("user::toto")).isEqualTo(new User("user", "toto", "10/01/1991"));
131131

132132
// Index inserted
133133
Optional<QueryIndex> userIndexInfo = getCluster().queryIndexes().getAllIndexes(getBucket().name()).stream()
@@ -178,7 +178,7 @@ public void should_migration_fail_on_exception() {
178178
// Then new ChangeLog is executed
179179
assertLike(changeLogRepository.findOne(PREFIX_ID + "1"), "1", 1, "insert users", N1QL, "V1__insert_users.n1ql", "a4b082eb19477034060ba02f60a7d40f39588e8d6fa6618b26b94cc6916d6cc3", EXECUTED);
180180

181-
assertEquals(new User("admin", "Administrator", "01/09/1998"), userRepository.findOne("user::Administrator"));
181+
assertThat(userRepository.findOne("user::Administrator")).isEqualTo(new User("admin", "Administrator", "01/09/1998"));
182182

183183
// And the ChangeLog marked as failed
184184
assertLike(changeLogRepository.findOne(PREFIX_ID + "2"), "2", null, "invalid request", N1QL, "V2__invalid_request.n1ql", "890c7bac55666a3073059c57f34e358f817e275eb68932e946ca35e9dcd428fe", FAILED);
@@ -204,7 +204,7 @@ public void should_fixed_failed_migration_pass() {
204204
assertLike(changeLogRepository.findOne(PREFIX_ID + "2"), "2", 2, "invalid request", N1QL, "V2__invalid_request.n1ql",
205205
"8fd2066ea5ad4e4151cc5b1262542455f41e7bcefe447cbcfbc004c6fe3bac12", EXECUTED);
206206

207-
assertEquals(new User("user", "toto", "06/03/1997"), userRepository.findOne("user::toto"));
207+
assertThat(userRepository.findOne("user::toto")).isEqualTo(new User("user", "toto", "06/03/1997"));
208208
}
209209

210210
@Test
@@ -397,8 +397,8 @@ public void should_insert_collections() {
397397

398398
// Users inserted
399399
CouchbaseRepositoryImpl<User> userCollectionRepository = userRepository.withCollection(TEST_SCOPE, "user");
400-
assertEquals(new User("user", "titi", "01/09/1998"), userCollectionRepository.findOne("titi"));
401-
assertEquals(new User("user", "toto", "10/01/1991"), userCollectionRepository.findOne("toto"));
400+
assertThat(userCollectionRepository.findOne("titi")).isEqualTo(new User("user", "titi", "01/09/1998"));
401+
assertThat(userCollectionRepository.findOne("toto")).isEqualTo(new User("user", "toto", "10/01/1991"));
402402
}
403403

404404
@Test
@@ -434,23 +434,23 @@ public void should_insert_changelogs_into_collection() {
434434

435435
// Users inserted in the right collection
436436
CouchbaseRepositoryImpl<User> userCollectionRepository = userRepository.withCollection(TEST_SCOPE, "user");
437-
assertEquals(new User("user", "titi", "01/09/1998"), userCollectionRepository.findOne("titi"));
438-
assertEquals(new User("user", "toto", "10/01/1991"), userCollectionRepository.findOne("toto"));
437+
assertThat(userCollectionRepository.findOne("titi")).isEqualTo(new User("user", "titi", "01/09/1998"));
438+
assertThat(userCollectionRepository.findOne("toto")).isEqualTo(new User("user", "toto", "10/01/1991"));
439439
}
440440

441441
private static void assertLike(ChangeLog changeLog, String version, Integer order, String description, Type type, String script, String checksum, Status status) {
442-
assertNotNull("ChangeLog", changeLog);
443-
assertEquals("version", version, changeLog.getVersion());
444-
assertEquals("order", order, changeLog.getOrder());
445-
assertEquals("description", description, changeLog.getDescription());
446-
assertEquals("type", type, changeLog.getType());
447-
assertEquals("script", script, changeLog.getScript());
448-
assertEquals(checksum, changeLog.getChecksum());
449-
assertEquals(status, changeLog.getStatus());
442+
assertThat(changeLog).as("ChangeLog").isNotNull();
443+
assertThat(changeLog.getVersion()).as("version").isEqualTo(version);
444+
assertThat(changeLog.getOrder()).as("order").isEqualTo(order);
445+
assertThat(changeLog.getDescription()).as("description").isEqualTo(description);
446+
assertThat(changeLog.getType()).as("type").isEqualTo(type);
447+
assertThat(changeLog.getScript()).as("script").isEqualTo(script);
448+
assertThat(changeLog.getChecksum()).as("checksum").isEqualTo(checksum);
449+
assertThat(changeLog.getStatus()).as("status").isEqualTo(status);
450450
if (changeLog.getStatus() != SKIPPED) {
451-
assertNotNull("runner", changeLog.getRunner());
452-
assertNotNull("timestamp", changeLog.getTimestamp());
453-
assertNotNull("duration", changeLog.getDuration());
451+
assertThat(changeLog.getRunner()).as("runner").isNotNull();
452+
assertThat(changeLog.getTimestamp()).as("timestamp").isNotNull();
453+
assertThat(changeLog.getDuration()).as("duration").isNotNull();
454454
}
455455
}
456456

‎src/test/java/com/github/couchmove/CouchmoveTest.java‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.github.couchmove.exception.CouchmoveException;
55
import com.github.couchmove.pojo.ChangeLog;
66
import com.github.couchmove.service.*;
7+
import org.assertj.core.api.Assertions;
78
import org.junit.Assert;
89
import org.junit.jupiter.api.Test;
910
import org.junit.jupiter.api.extension.ExtendWith;
@@ -19,6 +20,7 @@
1920
import static com.github.couchmove.utils.TestUtils.getRandomChangeLog;
2021
import static com.google.common.collect.Lists.newArrayList;
2122
import static java.util.Collections.emptyList;
23+
import static org.assertj.core.api.Assertions.assertThat;
2224
import static org.junit.jupiter.api.Assertions.assertThrows;
2325
import static org.mockito.Mockito.*;
2426

@@ -104,7 +106,7 @@ public void should_migration_skip_changeLog_with_old_version() {
104106
.build();
105107
couchmove.executeMigration(newArrayList(changeLogToSkip, executedChangeLog));
106108
verify(dbServiceMock).save(changeLogToSkip);
107-
Assert.assertEquals(SKIPPED, changeLogToSkip.getStatus());
109+
assertThat(changeLogToSkip.getStatus()).isEqualTo(SKIPPED);
108110
}
109111

110112
@Test
@@ -124,7 +126,7 @@ public void should_execute_migrations() {
124126
.build();
125127
doNothing().when(couchmove).doExecute(changeLog);
126128
couchmove.executeMigration(newArrayList(executedChangeLog, changeLog));
127-
Assert.assertEquals((Integer) 2, changeLog.getOrder());
129+
assertThat(changeLog.getOrder()).isEqualTo((Integer) 2);
128130
}
129131

130132
@Test
@@ -147,10 +149,10 @@ public void should_update_changeLog_on_migration_success() {
147149
.build();
148150
couchmove.executeMigration(changeLog, 1);
149151
verify(dbServiceMock).save(changeLog);
150-
Assert.assertNotNull(changeLog.getTimestamp());
151-
Assert.assertNotNull(changeLog.getDuration());
152-
Assert.assertNotNull(changeLog.getRunner());
153-
Assert.assertEquals(EXECUTED, changeLog.getStatus());
152+
assertThat(changeLog.getTimestamp()).isNotNull();
153+
assertThat(changeLog.getDuration()).isNotNull();
154+
assertThat(changeLog.getRunner()).isNotNull();
155+
assertThat(changeLog.getStatus()).isEqualTo(EXECUTED);
154156
}
155157

156158
@Test
@@ -163,10 +165,10 @@ public void should_update_changeLog_on_migration_failure() {
163165
doThrow(CouchmoveException.class).when(dbServiceMock).importDocuments(any());
164166
assertThrows(CouchmoveException.class, () -> couchmove.executeMigration(changeLog, 1));
165167
verify(dbServiceMock).save(changeLog);
166-
Assert.assertNotNull(changeLog.getTimestamp());
167-
Assert.assertNotNull(changeLog.getDuration());
168-
Assert.assertNotNull(changeLog.getRunner());
169-
Assert.assertEquals(FAILED, changeLog.getStatus());
168+
assertThat(changeLog.getTimestamp()).isNotNull();
169+
assertThat(changeLog.getDuration()).isNotNull();
170+
assertThat(changeLog.getRunner()).isNotNull();
171+
assertThat(changeLog.getStatus()).isEqualTo(FAILED);
170172
}
171173

172174
@Test
@@ -177,8 +179,8 @@ public void should_execute_failed_changeLog_if_updated() {
177179
.status(FAILED).build();
178180
doNothing().when(couchmove).doExecute(changeLog);
179181
couchmove.executeMigration(newArrayList(changeLog));
180-
Assert.assertEquals((Integer) 1, changeLog.getOrder());
181-
Assert.assertEquals(EXECUTED, changeLog.getStatus());
182+
assertThat(changeLog.getOrder()).isEqualTo((Integer) 1);
183+
assertThat(changeLog.getStatus()).isEqualTo(EXECUTED);
182184
}
183185

184186
private static Bucket mockBucket() {

‎src/test/java/com/github/couchmove/repository/CouchbaseRepositoryIT.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,17 @@ public void should_save_and_get_entity(String description, CouchbaseRepository<C
6464
ChangeLog savedChangeLog = repository.save(id, changeLog);
6565

6666
// Then inserted one should have a cas
67-
Assert.assertNotNull(savedChangeLog.getCas());
67+
assertThat(savedChangeLog.getCas()).isNotNull();
6868

6969
// And we should get it by this id
7070
ChangeLog result = repository.findOne(id);
7171

72-
Assert.assertNotNull(result);
73-
Assert.assertEquals(changeLog, result);
72+
assertThat(result).isNotNull();
73+
assertThat(result).isEqualTo(changeLog);
7474

7575
// And it should have the same cas
76-
Assert.assertNotNull(result.getCas());
77-
Assert.assertEquals(savedChangeLog.getCas(), result.getCas());
76+
assertThat(result.getCas()).isNotNull();
77+
assertThat(result.getCas()).isEqualTo(savedChangeLog.getCas());
7878
}
7979

8080
@ParameterizedTest(name = "{0}")
@@ -85,13 +85,13 @@ public void should_delete_entity(String description, CouchbaseRepository<ChangeL
8585

8686
String id = getRandomString();
8787
repository.save(id, changeLog);
88-
Assert.assertNotNull(repository.findOne(id));
88+
assertThat(repository.findOne(id)).isNotNull();
8989

9090
// When we delete it
9191
repository.delete(id);
9292

9393
// Then we no longer should get it
94-
Assert.assertNull(repository.findOne(id));
94+
assertThat(repository.findOne(id)).isNull();
9595
}
9696

9797
@ParameterizedTest(name = "{0}")
@@ -119,7 +119,7 @@ public void should_not_insert_entity_with_different_cas(String description, Couc
119119

120120
// Then it should have a cas
121121
ChangeLog savedChangeLog = repository.findOne(id);
122-
Assert.assertNotNull(savedChangeLog.getCas());
122+
assertThat(savedChangeLog.getCas()).isNotNull();
123123

124124
// When we change this cas
125125
savedChangeLog.setCas(new Random().nextLong());
@@ -146,7 +146,7 @@ public void should_import_design_doc(String description, CouchbaseRepository<Cha
146146

147147
// Then it should be saved
148148
DesignDocument designDocument = getBucket().viewIndexes().getDesignDocument(name, DesignDocumentNamespace.PRODUCTION);
149-
Assert.assertNotNull(designDocument);
149+
assertThat(designDocument).isNotNull();
150150
}
151151

152152
@ParameterizedTest(name = "{0}")
@@ -183,7 +183,7 @@ public void should_check_fts_index_not_exists(String description, CouchbaseRepos
183183
public void should_inject_bucket_name(String description, CouchbaseRepository<ChangeLog> repository) {
184184
String format = "SELECT * FROM `%s`";
185185
String statement = format(format, "${bucket}");
186-
Assert.assertEquals(format(format, getBucket().name()), ((CouchbaseRepositoryImpl) repository).injectParameters(statement));
186+
assertThat(((CouchbaseRepositoryImpl) repository).injectParameters(statement)).isEqualTo(format(format, getBucket().name()));
187187
}
188188

189189
@ParameterizedTest(name = "{0}")
@@ -199,10 +199,10 @@ public void should_execute_n1ql(String description, CouchbaseRepository<ChangeLo
199199
List<QueryIndex> indexInfos = getCluster().queryIndexes().getAllIndexes(getBucket().name()).stream()
200200
.filter(indexInfo -> indexInfo.name().equals(INDEX_NAME))
201201
.collect(Collectors.toList());
202-
Assert.assertEquals(1, indexInfos.size());
202+
assertThat(indexInfos.size()).isEqualTo(1);
203203
QueryIndex indexInfo = indexInfos.get(0);
204-
Assert.assertEquals(INDEX_NAME, indexInfo.name());
205-
Assert.assertEquals(format("`%s`", INDEX_NAME), indexInfo.indexKey().get(0));
204+
assertThat(indexInfo.name()).isEqualTo(INDEX_NAME);
205+
assertThat(indexInfo.indexKey().get(0)).isEqualTo(format("`%s`", INDEX_NAME));
206206

207207
// Clean
208208
getCluster().queryIndexes().dropIndex(getBucket().name(), INDEX_NAME);
@@ -243,10 +243,10 @@ public void should_save_json_document(String description, CouchbaseRepository<Ch
243243

244244
// Then we should be bale to get it
245245
ChangeLog changeLog = repository.findOne("change::1");
246-
Assert.assertNotNull(changeLog);
247-
Assert.assertEquals("1", changeLog.getVersion());
248-
Assert.assertEquals("insert users", changeLog.getDescription());
249-
Assert.assertEquals(Type.N1QL, changeLog.getType());
246+
assertThat(changeLog).isNotNull();
247+
assertThat(changeLog.getVersion()).isEqualTo("1");
248+
assertThat(changeLog.getDescription()).isEqualTo("insert users");
249+
assertThat(changeLog.getType()).isEqualTo(Type.N1QL);
250250
}
251251

252252
}

‎src/test/java/com/github/couchmove/service/ChangeLogDBServiceTest.java‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static com.github.couchmove.service.ChangeLogDBService.PREFIX_ID;
2121
import static com.github.couchmove.service.ChangeLogDBService.extractRequests;
2222
import static com.github.couchmove.utils.TestUtils.*;
23+
import static org.assertj.core.api.Assertions.assertThat;
2324
import static org.junit.jupiter.api.Assertions.assertThrows;
2425
import static org.mockito.Mockito.lenient;
2526
import static org.mockito.Mockito.when;
@@ -52,7 +53,7 @@ public void should_fetch_return_same_changeLogs_when_absent() {
5253
List<ChangeLog> result = service.fetchAndCompare(changeLogs);
5354

5455
// Then we should return the same
55-
Assert.assertEquals(changeLogs, result);
56+
assertThat(result).isEqualTo(changeLogs);
5657
}
5758

5859
@Test
@@ -70,9 +71,9 @@ public void should_fetch_return_unchanged_changeLogs() {
7071
List<ChangeLog> result = service.fetchAndCompare(changeLogs);
7172

7273
// Then nothing should be returned
73-
Assert.assertEquals(changeLogs, result);
74-
Assert.assertNotNull(changeLogs.get(0).getCas());
75-
Assert.assertNotNull(changeLogs.get(1).getCas());
74+
assertThat(result).isEqualTo(changeLogs);
75+
assertThat(changeLogs.get(0).getCas()).isNotNull();
76+
assertThat(changeLogs.get(1).getCas()).isNotNull();
7677
}
7778

7879
@Test
@@ -108,8 +109,8 @@ public void should_return_updated_changeLog_checksum_with_cas_reset_if_checksum_
108109
List<ChangeLog> result = service.fetchAndCompare(changeLogs);
109110

110111
// Then it should be same
111-
Assert.assertEquals(changeLogs, result);
112-
Assert.assertNull(changeLog.getCas());
112+
assertThat(result).isEqualTo(changeLogs);
113+
assertThat(changeLog.getCas()).isNull();
113114
}
114115

115116
@Test
@@ -130,15 +131,15 @@ public void should_return_failed_changeLog_with_cas_reset_if_checksum_reset() {
130131
List<ChangeLog> results = service.fetchAndCompare(Lists.newArrayList(changeLog));
131132

132133
// Then it should be returned with status reset
133-
Assertions.assertThat(results).hasSize(1);
134+
assertThat(results).hasSize(1);
134135
ChangeLog result = results.get(0);
135-
Assert.assertNull("status", result.getStatus());
136-
Assert.assertNotNull("cas", result.getCas());
137-
Assert.assertEquals("description", dbChangeLog.getDescription(), result.getDescription());
138-
Assert.assertEquals("version", dbChangeLog.getVersion(), result.getVersion());
139-
Assert.assertEquals("type", dbChangeLog.getType(), result.getType());
140-
Assert.assertEquals("script", dbChangeLog.getScript(), result.getScript());
141-
Assert.assertEquals("checksum", newChecksum, result.getChecksum());
136+
assertThat(result.getStatus()).as("status").isNull();
137+
assertThat(result.getCas()).as("cas").isNotNull();
138+
assertThat(result.getDescription()).as("description").isEqualTo(dbChangeLog.getDescription());
139+
assertThat(result.getVersion()).as( "version").isEqualTo(dbChangeLog.getVersion());
140+
assertThat(result.getType()).as("type").isEqualTo(dbChangeLog.getType());
141+
assertThat(result.getScript()).as("script").isEqualTo( dbChangeLog.getScript());
142+
assertThat(newChecksum).as("checksum").isEqualTo(result.getChecksum());
142143
}
143144

144145
@Test
@@ -159,8 +160,8 @@ public void should_return_updated_changeLog_with_cas_reset_if_description_change
159160
List<ChangeLog> result = service.fetchAndCompare(changeLogs);
160161

161162
// Then it should be same
162-
Assert.assertEquals(changeLogs, result);
163-
Assert.assertNull(changeLog.getCas());
163+
assertThat(result).isEqualTo(changeLogs);
164+
assertThat(changeLog.getCas()).isNull();
164165
}
165166

166167
@Test
@@ -174,6 +175,6 @@ public void should_skip_n1ql_blank_and_comment_lines() {
174175
"/*insert new users*/\n" +
175176
request2 + "; ";
176177

177-
Assertions.assertThat(extractRequests(sql)).containsExactly(request1, request2);
178+
assertThat(extractRequests(sql)).containsExactly(request1, request2);
178179
}
179180
}

‎src/test/java/com/github/couchmove/service/ChangeLogFileServiceTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@ public void should_fail_if_path_is_not_directory() throws Exception {
4545
@Test
4646
public void should_get_right_type_from_file() {
4747
// For folder
48-
Assert.assertEquals(Type.DOCUMENTS, ChangeLogFileService.getChangeLogType(FileUtils.getTempDirectory().toPath()));
48+
assertThat(ChangeLogFileService.getChangeLogType(FileUtils.getTempDirectory().toPath())).isEqualTo(Type.DOCUMENTS);
4949
// For JSON file
50-
Assert.assertEquals(Type.DESIGN_DOC, ChangeLogFileService.getChangeLogType(Paths.get("toto.json")));
51-
Assert.assertEquals(Type.DESIGN_DOC, ChangeLogFileService.getChangeLogType(Paths.get("toto.JSON")));
50+
assertThat(ChangeLogFileService.getChangeLogType(Paths.get("toto.json"))).isEqualTo(Type.DESIGN_DOC);
51+
assertThat(ChangeLogFileService.getChangeLogType(Paths.get("toto.JSON"))).isEqualTo(Type.DESIGN_DOC);
5252
// For N1QL files
53-
Assert.assertEquals(Type.N1QL, ChangeLogFileService.getChangeLogType(Paths.get("toto.n1ql")));
54-
Assert.assertEquals(Type.N1QL, ChangeLogFileService.getChangeLogType(Paths.get("toto.N1QL")));
53+
assertThat(ChangeLogFileService.getChangeLogType(Paths.get("toto.n1ql"))).isEqualTo(Type.N1QL);
54+
assertThat(ChangeLogFileService.getChangeLogType(Paths.get("toto.N1QL"))).isEqualTo(Type.N1QL);
5555
// For FTS files
56-
Assert.assertEquals(Type.FTS, ChangeLogFileService.getChangeLogType(Paths.get("toto.fts")));
57-
Assert.assertEquals(Type.FTS, ChangeLogFileService.getChangeLogType(Paths.get("toto.FtS")));
56+
assertThat(ChangeLogFileService.getChangeLogType(Paths.get("toto.fts"))).isEqualTo(Type.FTS);
57+
assertThat(ChangeLogFileService.getChangeLogType(Paths.get("toto.FtS"))).isEqualTo(Type.FTS);
5858
}
5959

6060
@Test
@@ -94,7 +94,7 @@ public void should_fetch_changeLogs() throws IOException {
9494
.checksum("6ef9c3cc661804f7f0eb489e678971619a81b5457cff9355e28db9dbf835ea0a")
9595
.build())
9696
.collect(Collectors.toList());
97-
Assert.assertEquals(changeLogs, new ChangeLogFileService("db/migration/success").fetch());
97+
assertThat(new ChangeLogFileService("db/migration/success").fetch()).isEqualTo(changeLogs);
9898
}
9999

100100
@Test

0 commit comments

Comments
 (0)