Merge branch 'master' of https://github.com/eugenp/tutorials into
task/JAVA-13630 # Conflicts: # persistence-modules/fauna/pom.xml
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
package com.baeldung.app.api;
|
||||
|
||||
public class MessageApi {
|
||||
public class MessageDTO {
|
||||
private String from;
|
||||
private String to;
|
||||
private String text;
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.baeldung.app.rest;
|
||||
|
||||
import com.baeldung.app.api.MessageApi;
|
||||
import com.baeldung.app.api.MessageDTO;
|
||||
import com.baeldung.domain.model.Message;
|
||||
import com.baeldung.domain.service.MessageService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -21,7 +21,7 @@ public class MessageController {
|
||||
private MessageService messageService;
|
||||
|
||||
@PostMapping
|
||||
public Message createMessage (@RequestBody MessageApi messageDTO) {
|
||||
public Message createMessage (@RequestBody MessageDTO messageDTO) {
|
||||
Message message = new Message();
|
||||
message.setText(messageDTO.getText());
|
||||
message.setFrom(messageDTO.getFrom());
|
||||
|
||||
@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
import com.baeldung.app.api.MessageApi;
|
||||
import com.baeldung.app.api.MessageDTO;
|
||||
import com.baeldung.domain.model.Message;
|
||||
import com.baeldung.domain.service.MessageService;
|
||||
import com.baeldung.domain.util.MessageMatcher;
|
||||
@@ -19,32 +19,32 @@ import com.baeldung.domain.util.MessageMatcher;
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class MessageControllerUnitTest {
|
||||
|
||||
@InjectMocks
|
||||
private MessageController messageController;
|
||||
|
||||
@Mock
|
||||
private MessageService messageService;
|
||||
|
||||
@InjectMocks
|
||||
private MessageController messageController;
|
||||
|
||||
@Test
|
||||
public void givenMsg_whenVerifyUsingAnyMatcher_thenOk() {
|
||||
MessageApi messageApi = new MessageApi();
|
||||
messageApi.setFrom("me");
|
||||
messageApi.setTo("you");
|
||||
messageApi.setText("Hello, you!");
|
||||
MessageDTO messageDTO = new MessageDTO();
|
||||
messageDTO.setFrom("me");
|
||||
messageDTO.setTo("you");
|
||||
messageDTO.setText("Hello, you!");
|
||||
|
||||
messageController.createMessage(messageApi);
|
||||
messageController.createMessage(messageDTO);
|
||||
|
||||
verify(messageService, times(1)).deliverMessage(any(Message.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void givenMsg_whenVerifyUsingMessageMatcher_thenOk() {
|
||||
MessageApi messageApi = new MessageApi();
|
||||
messageApi.setFrom("me");
|
||||
messageApi.setTo("you");
|
||||
messageApi.setText("Hello, you!");
|
||||
MessageDTO messageDTO = new MessageDTO();
|
||||
messageDTO.setFrom("me");
|
||||
messageDTO.setTo("you");
|
||||
messageDTO.setText("Hello, you!");
|
||||
|
||||
messageController.createMessage(messageApi);
|
||||
messageController.createMessage(messageDTO);
|
||||
|
||||
Message message = new Message();
|
||||
message.setFrom("me");
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.baeldung.mockito;
|
||||
|
||||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.times;
|
||||
@@ -33,11 +33,10 @@ public class MockitoMockUnitTest {
|
||||
MyList listMock = mock(MyList.class, "myMock");
|
||||
when(listMock.add(anyString())).thenReturn(false);
|
||||
listMock.add(randomAlphabetic(6));
|
||||
|
||||
Throwable exceptionThrown = assertThrows(TooFewActualInvocations.class,
|
||||
() -> verify(listMock, times(2)).add(anyString()));
|
||||
|
||||
assertThat(exceptionThrown.getMessage()).contains("myMock.add");
|
||||
|
||||
assertThatThrownBy(() -> verify(listMock, times(2)).add(anyString()))
|
||||
.isInstanceOf(TooFewActualInvocations.class)
|
||||
.hasMessageContaining("myMock.add");
|
||||
}
|
||||
|
||||
private static class CustomAnswer implements Answer<Boolean> {
|
||||
|
||||
Reference in New Issue
Block a user