BAEL-373: Improve/Upgrade existing Mockito articles to Mockito 2 (#2311)

* BAEL-373: Improve/Upgrade existing Mockito articles to Mockito 2

* Fix formatting issue with LoginControllerIntegrationTest

mocks/mock-comparisons/src/test/java/org/baeldung/mocks/mockito/LoginControllerIntegrationTest.java

@@ -7,7 +7,12 @@ import org.baeldung.mocks.testCase.UserForm;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.mockito.*;
+import org.mockito.ArgumentMatcher;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
 
 public class LoginControllerIntegrationTest {
 
@@ -41,50 +46,63 @@ public class LoginControllerIntegrationTest {
     public void assertTwoMethodsHaveBeenCalled() {
         UserForm userForm = new UserForm();
         userForm.username = "foo";
-        Mockito.when(loginService.login(userForm)).thenReturn(true);
+        Mockito.when(loginService.login(userForm))
+            .thenReturn(true);
 
         String login = loginController.login(userForm);
 
         Assert.assertEquals("OK", login);
-        Mockito.verify(loginService).login(userForm);
-        Mockito.verify(loginService).setCurrentUser("foo");
+        Mockito.verify(loginService)
+            .login(userForm);
+        Mockito.verify(loginService)
+            .setCurrentUser("foo");
     }
 
     @Test
     public void assertOnlyOneMethodHasBeenCalled() {
         UserForm userForm = new UserForm();
         userForm.username = "foo";
-        Mockito.when(loginService.login(userForm)).thenReturn(false);
+        Mockito.when(loginService.login(userForm))
+            .thenReturn(false);
 
         String login = loginController.login(userForm);
 
         Assert.assertEquals("KO", login);
-        Mockito.verify(loginService).login(userForm);
+        Mockito.verify(loginService)
+            .login(userForm);
         Mockito.verifyNoMoreInteractions(loginService);
     }
 
     @Test
     public void mockExceptionThrowing() {
         UserForm userForm = new UserForm();
-        Mockito.when(loginService.login(userForm)).thenThrow(IllegalArgumentException.class);
+        Mockito.when(loginService.login(userForm))
+            .thenThrow(IllegalArgumentException.class);
 
         String login = loginController.login(userForm);
 
         Assert.assertEquals("ERROR", login);
-        Mockito.verify(loginService).login(userForm);
+        Mockito.verify(loginService)
+            .login(userForm);
         Mockito.verifyZeroInteractions(loginService);
     }
 
     @Test
     public void mockAnObjectToPassAround() {
-        UserForm userForm = Mockito.when(Mockito.mock(UserForm.class).getUsername()).thenReturn("foo").getMock();
-        Mockito.when(loginService.login(userForm)).thenReturn(true);
+        UserForm userForm = Mockito.when(Mockito.mock(UserForm.class)
+            .getUsername())
+            .thenReturn("foo")
+            .getMock();
+        Mockito.when(loginService.login(userForm))
+            .thenReturn(true);
 
         String login = loginController.login(userForm);
 
         Assert.assertEquals("OK", login);
-        Mockito.verify(loginService).login(userForm);
-        Mockito.verify(loginService).setCurrentUser("foo");
+        Mockito.verify(loginService)
+            .login(userForm);
+        Mockito.verify(loginService)
+            .setCurrentUser("foo");
     }
 
     @Test
@@ -92,19 +110,22 @@ public class LoginControllerIntegrationTest {
         UserForm userForm = new UserForm();
         userForm.username = "foo";
         // default matcher
-        Mockito.when(loginService.login(Mockito.any(UserForm.class))).thenReturn(true);
+        Mockito.when(loginService.login(Mockito.any(UserForm.class)))
+            .thenReturn(true);
 
         String login = loginController.login(userForm);
 
         Assert.assertEquals("OK", login);
-        Mockito.verify(loginService).login(userForm);
+        Mockito.verify(loginService)
+            .login(userForm);
         // complex matcher
-        Mockito.verify(loginService).setCurrentUser(Mockito.argThat(new ArgumentMatcher<String>() {
-            @Override
-            public boolean matches(Object argument) {
-                return argument instanceof String && ((String) argument).startsWith("foo");
-            }
-        }));
+        Mockito.verify(loginService)
+            .setCurrentUser(Mockito.argThat(new ArgumentMatcher<String>() {
+                @Override
+                public boolean matches(String argument) {
+                    return argument.startsWith("foo");
+                }
+            }));
     }
 
     @Test
@@ -114,12 +135,14 @@ public class LoginControllerIntegrationTest {
         UserForm userForm = new UserForm();
         userForm.username = "foo";
         // let service's login use implementation so let's mock DAO call
-        Mockito.when(loginDao.login(userForm)).thenReturn(1);
+        Mockito.when(loginDao.login(userForm))
+            .thenReturn(1);
 
         String login = loginController.login(userForm);
 
         Assert.assertEquals("OK", login);
         // verify mocked call
-        Mockito.verify(spiedLoginService).setCurrentUser("foo");
+        Mockito.verify(spiedLoginService)
+            .setCurrentUser("foo");
     }
 }