Merge branch 'master' into thombergs-patch-6

spring-mockito/pom.xml

@@ -21,7 +21,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>

spring-mockito/src/main/java/com/baeldung/app/api/Flower.java

@@ -0,0 +1,28 @@
+package com.baeldung.app.api;
+
+public class Flower {
+
+    private String name;
+    private Integer petals;
+
+    public Flower(String name, Integer petals) {
+        this.name = name;
+        this.petals = petals;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getPetals() {
+        return petals;
+    }
+
+    public void setPetals(Integer petals) {
+        this.petals = petals;
+    }
+}

spring-mockito/src/main/java/com/baeldung/app/api/MessageApi.java

@@ -0,0 +1,31 @@
+package com.baeldung.app.api;
+
+public class MessageApi {
+    private String from;
+    private String to;
+    private String text;
+
+    public String getFrom() {
+        return from;
+    }
+
+    public void setFrom(String from) {
+        this.from = from;
+    }
+
+    public String getTo() {
+        return to;
+    }
+
+    public void setTo(String to) {
+        this.to = to;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+}

spring-mockito/src/main/java/com/baeldung/app/rest/FlowerController.java

@@ -0,0 +1,27 @@
+package com.baeldung.app.rest;
+
+import com.baeldung.app.api.Flower;
+import com.baeldung.domain.service.FlowerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping("/flowers")
+public class FlowerController {
+
+    @Autowired
+    private FlowerService flowerService;
+
+    @PostMapping("/isAFlower")
+    public String isAFlower (@RequestBody String flower) {
+        return flowerService.analize(flower);
+    }
+
+    @PostMapping("/isABigFlower")
+    public Boolean isABigFlower (@RequestBody Flower flower) {
+        return flowerService.isABigFlower(flower.getName(), flower.getPetals());
+    }
+}

spring-mockito/src/main/java/com/baeldung/app/rest/MessageController.java

@@ -0,0 +1,34 @@
+package com.baeldung.app.rest;
+
+import com.baeldung.app.api.MessageApi;
+import com.baeldung.domain.model.Message;
+import com.baeldung.domain.service.MessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.time.Instant;
+import java.util.Date;
+import java.util.UUID;
+
+@Controller
+@RequestMapping("/message")
+public class MessageController {
+
+    @Autowired
+    private MessageService messageService;
+
+    @PostMapping
+    public Message createMessage (@RequestBody MessageApi messageDTO) {
+        Message message = new Message();
+        message.setText(messageDTO.getText());
+        message.setFrom(messageDTO.getFrom());
+        message.setTo(messageDTO.getTo());
+        message.setDate(Date.from(Instant.now()));
+        message.setId(UUID.randomUUID());
+
+        return messageService.deliverMessage(message);
+    }
+}

spring-mockito/src/main/java/com/baeldung/domain/model/Message.java

@@ -0,0 +1,53 @@
+package com.baeldung.domain.model;
+
+import java.util.Date;
+import java.util.UUID;
+
+public class Message {
+
+    private String from;
+    private String to;
+    private String text;
+    private Date date;
+    private UUID id;
+
+    public String getFrom() {
+        return from;
+    }
+
+    public void setFrom(String from) {
+        this.from = from;
+    }
+
+    public String getTo() {
+        return to;
+    }
+
+    public void setTo(String to) {
+        this.to = to;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+}

spring-mockito/src/main/java/com/baeldung/domain/service/FlowerService.java

@@ -0,0 +1,28 @@
+package com.baeldung.domain.service;
+
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Service
+public class FlowerService {
+
+    private List<String> flowers = Arrays.asList("Poppy", "Ageratum", "Carnation", "Diascia", "Lantana");
+
+    public String analize(String name) {
+        if(flowers.contains(name)) {
+            return "flower";
+        }
+        return null;
+    }
+
+    public boolean isABigFlower(String name, int petals) {
+        if(flowers.contains(name)) {
+            if(petals > 10) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

spring-mockito/src/main/java/com/baeldung/domain/service/MessageService.java

@@ -0,0 +1,13 @@
+package com.baeldung.domain.service;
+
+import com.baeldung.domain.model.Message;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MessageService {
+
+    public Message deliverMessage (Message message) {
+
+        return message;
+    }
+}

spring-mockito/src/main/java/com/baeldung/domain/util/MessageMatcher.java

@@ -0,0 +1,27 @@
+package com.baeldung.domain.util;
+
+import com.baeldung.domain.model.Message;
+import org.mockito.ArgumentMatcher;
+
+public class MessageMatcher extends ArgumentMatcher<Message> {
+
+    private Message left;
+
+    public MessageMatcher(Message message) {
+        this.left = message;
+    }
+
+    @Override
+    public boolean matches(Object object) {
+        if (object instanceof Message) {
+            Message right = (Message) object;
+            return left.getFrom().equals(right.getFrom()) &&
+                    left.getTo().equals(right.getTo()) &&
+                    left.getText().equals(right.getText()) &&
+                    right.getDate() != null &&
+                    right.getId() != null;
+        }
+
+        return false;
+    }
+}

spring-mockito/src/test/java/com/baeldung/UserServiceIntegrationTest.java → spring-mockito/src/test/java/com/baeldung/UserServiceIntegrationUnitTest.java

@@ -12,7 +12,7 @@
 @ActiveProfiles("test")
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = MocksApplication.class)
-public class UserServiceIntegrationTest {
+public class UserServiceIntegrationUnitTest {
 
     @Autowired
     private UserService userService;

spring-mockito/src/test/java/com/baeldung/app/rest/FlowerControllerUnitTest.java

@@ -0,0 +1,44 @@
+package com.baeldung.app.rest;
+
+import com.baeldung.app.api.Flower;
+import com.baeldung.domain.service.FlowerService;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class FlowerControllerUnitTest {
+
+    @Mock
+    private FlowerService flowerService;
+
+    @InjectMocks
+    private FlowerController flowerController;
+
+    @Test
+    public void isAFlower_withMockito_OK() {
+        when(flowerService.analize(eq("violetta"))).thenReturn("Flower");
+
+        String response = flowerController.isAFlower("violetta");
+
+        Assert.assertEquals("Flower", response);
+    }
+
+    @Test
+    public void isABigFlower_withMockito_OK() {
+        when(flowerService.isABigFlower(eq("violetta"), anyInt())).thenReturn(true);
+
+        Flower flower = new Flower("violetta", 15);
+
+        Boolean response = flowerController.isABigFlower(flower);
+
+        Assert.assertTrue(response);
+    }
+}

spring-mockito/src/test/java/com/baeldung/app/rest/MessageControllerUnitTest.java

@@ -0,0 +1,42 @@
+package com.baeldung.app.rest;
+
+import com.baeldung.app.api.MessageApi;
+import com.baeldung.domain.model.Message;
+import com.baeldung.domain.service.MessageService;
+import com.baeldung.domain.util.MessageMatcher;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Matchers;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static org.mockito.Mockito.times;
+
+@RunWith(MockitoJUnitRunner.class)
+public class MessageControllerUnitTest {
+
+    @Mock
+    private MessageService messageService;
+
+    @InjectMocks
+    private MessageController messageController;
+
+    @Test
+    public void createMessage_NewMessage_OK() {
+        MessageApi messageApi = new MessageApi();
+        messageApi.setFrom("me");
+        messageApi.setTo("you");
+        messageApi.setText("Hello, you!");
+
+        messageController.createMessage(messageApi);
+
+        Message message = new Message();
+        message.setFrom("me");
+        message.setTo("you");
+        message.setText("Hello, you!");
+
+        Mockito.verify(messageService, times(1)).deliverMessage(Matchers.argThat(new MessageMatcher(message)));
+    }
+}