From 55d15037c0825efd94e48048a8d1889bdbbf4563 Mon Sep 17 00:00:00 2001
From: developerDiv <divyeshdabhi21@gmail.com>
Date: Sun, 26 Jul 2020 17:08:44 +0100
Subject: [PATCH] Rename DeliveryPlatform send method to 'deliver' to aid
 readability and avoiding confusion with EmailService.send method

Re-arrange order of mocks and inject mocks

Rename argument matcher and captor tests
---
 .../mockito/argumentcaptor/DeliveryPlatform.java   |  2 +-
 .../mockito/argumentcaptor/EmailService.java       |  2 +-
 .../argumentcaptor/EmailServiceUnitTest.java       | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/argumentcaptor/DeliveryPlatform.java b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/argumentcaptor/DeliveryPlatform.java
index dbad1e1bcf..6cbaf7b97c 100644
--- a/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/argumentcaptor/DeliveryPlatform.java
+++ b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/argumentcaptor/DeliveryPlatform.java
@@ -2,7 +2,7 @@ package com.baeldung.mockito.argumentcaptor;
 
 public interface DeliveryPlatform {
 
-    void send(Email email);
+    void deliver(Email email);
 
     String getServiceStatus();
 
diff --git a/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/argumentcaptor/EmailService.java b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/argumentcaptor/EmailService.java
index c368f41d2f..d22feaf8a4 100644
--- a/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/argumentcaptor/EmailService.java
+++ b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/argumentcaptor/EmailService.java
@@ -15,7 +15,7 @@ public class EmailService {
         }
         Email email = new Email(to, subject, body);
         email.setFormat(format);
-        platform.send(email);
+        platform.deliver(email);
     }
 
     public ServiceStatus checkServiceStatus() {
diff --git a/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/argumentcaptor/EmailServiceUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/argumentcaptor/EmailServiceUnitTest.java
index 9d18957b2e..5ed7be7d6e 100644
--- a/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/argumentcaptor/EmailServiceUnitTest.java
+++ b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/argumentcaptor/EmailServiceUnitTest.java
@@ -10,12 +10,12 @@ import static org.junit.Assert.*;
 @RunWith(MockitoJUnitRunner.class)
 public class EmailServiceUnitTest {
 
-    @InjectMocks
-    EmailService emailService;
-
     @Mock
     DeliveryPlatform platform;
 
+    @InjectMocks
+    EmailService emailService;
+
     @Captor
     ArgumentCaptor<Email> emailCaptor;
 
@@ -30,7 +30,7 @@ public class EmailServiceUnitTest {
 
         emailService.send(to, subject, body, false);
 
-        Mockito.verify(platform).send(emailCaptor.capture());
+        Mockito.verify(platform).deliver(emailCaptor.capture());
         Email emailCaptorValue = emailCaptor.getValue();
         assertEquals(Format.TEXT_ONLY, emailCaptorValue.getFormat());
     }
@@ -43,7 +43,7 @@ public class EmailServiceUnitTest {
 
         emailService.send(to, subject, body, true);
 
-        Mockito.verify(platform).send(emailCaptor.capture());
+        Mockito.verify(platform).deliver(emailCaptor.capture());
         Email value = emailCaptor.getValue();
         assertEquals(Format.HTML, value.getFormat());
     }
@@ -67,7 +67,7 @@ public class EmailServiceUnitTest {
     }
 
     @Test
-    public void usingArgumentMatcher_whenAuthenticatedWithValidCredentials_expectTrue() {
+    public void whenUsingArgumentMatcherForValidCredentials_expectTrue() {
         Credentials credentials = new Credentials("baeldung", "correct_password", "correct_key");
         Mockito.when(platform.authenticate(Mockito.eq(credentials))).thenReturn(AuthenticationStatus.AUTHENTICATED);
 
@@ -75,7 +75,7 @@ public class EmailServiceUnitTest {
     }
 
     @Test
-    public void usingArgumentCaptor_whenAuthenticatedWithValidCredentials_expectTrue() {
+    public void whenUsingArgumentCaptorForValidCredentials_expectTrue() {
         Credentials credentials = new Credentials("baeldung", "correct_password", "correct_key");
         Mockito.when(platform.authenticate(credentialsCaptor.capture())).thenReturn(AuthenticationStatus.AUTHENTICATED);