|
18 | 18 | import org.mockito.Mockito; |
19 | 19 | import org.mockito.junit.jupiter.MockitoExtension; |
20 | 20 | import org.modelmapper.ModelMapper; |
| 21 | +import org.springframework.dao.DataIntegrityViolationException; |
21 | 22 |
|
22 | 23 | import ar.com.nanotaboada.java.samples.spring.boot.models.Player; |
23 | 24 | import ar.com.nanotaboada.java.samples.spring.boot.models.PlayerDTO; |
24 | 25 | import ar.com.nanotaboada.java.samples.spring.boot.repositories.PlayersRepository; |
25 | 26 | import ar.com.nanotaboada.java.samples.spring.boot.services.PlayersService; |
26 | 27 | import ar.com.nanotaboada.java.samples.spring.boot.test.PlayerDTOFakes; |
27 | 28 | import ar.com.nanotaboada.java.samples.spring.boot.test.PlayerFakes; |
28 | | -import org.springframework.dao.DataIntegrityViolationException; |
29 | 29 |
|
30 | 30 | @DisplayName("CRUD Operations on Service") |
31 | 31 | @ExtendWith(MockitoExtension.class) |
@@ -87,7 +87,10 @@ void create_noConflict_returnsPlayerDTO() { |
87 | 87 | void create_squadNumberExists_returnsNull() { |
88 | 88 | // Arrange |
89 | 89 | PlayerDTO playerDTO = PlayerDTOFakes.createOneValid(); |
90 | | - Player existingPlayer = PlayerFakes.createAll().get(4); // Squad number 5 already exists |
| 90 | + Player existingPlayer = PlayerFakes.createAll().stream() |
| 91 | + .filter(player -> player.getSquadNumber() == 10) |
| 92 | + .findFirst() |
| 93 | + .orElseThrow(); |
91 | 94 | Mockito |
92 | 95 | .when(playersRepositoryMock.findBySquadNumber(playerDTO.getSquadNumber())) |
93 | 96 | .thenReturn(Optional.of(existingPlayer)); |
@@ -264,8 +267,14 @@ void searchByLeague_noMatches_returnsEmptyList() { |
264 | 267 | @Test |
265 | 268 | void searchBySquadNumber_playerExists_returnsPlayerDTO() { |
266 | 269 | // Arrange |
267 | | - Player player = PlayerFakes.createAll().get(9); // Messi is at index 9 |
268 | | - PlayerDTO playerDTO = PlayerDTOFakes.createAll().get(9); |
| 270 | + Player player = PlayerFakes.createAll().stream() |
| 271 | + .filter(p -> p.getSquadNumber() == 10) |
| 272 | + .findFirst() |
| 273 | + .orElseThrow(); |
| 274 | + PlayerDTO playerDTO = PlayerDTOFakes.createAll().stream() |
| 275 | + .filter(p -> p.getSquadNumber() == 10) |
| 276 | + .findFirst() |
| 277 | + .orElseThrow(); |
269 | 278 | Mockito |
270 | 279 | .when(playersRepositoryMock.findBySquadNumber(10)) |
271 | 280 | .thenReturn(Optional.of(player)); |
|
0 commit comments