Clean up Mockito and Powermockito examples

mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorForPartialMocking.java

@@ -1,6 +1,7 @@
 package com.baeldung.powermockito.introduction;
 
 public class CollaboratorForPartialMocking {
+
     public static String staticMethod() {
         return "Hello Baeldung!";
     }

mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithFinalMethods.java

@@ -1,7 +1,9 @@
 package com.baeldung.powermockito.introduction;
 
 public class CollaboratorWithFinalMethods {
+
     public final String helloMethod() {
         return "Hello World!";
     }
+
 }

mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithStaticMethods.java

@@ -1,6 +1,7 @@
 package com.baeldung.powermockito.introduction;
 
 public class CollaboratorWithStaticMethods {
+
     public static String firstMethod(String name) {
         return "Hello " + name + " !";
     }

mockito/src/test/java/com/baeldung/powermockito/introduction/PowerMockitoTest.java

@@ -1,17 +1,18 @@
 package com.baeldung.powermockito.introduction;
 
-import static org.junit.Assert.assertEquals;
-import static org.powermock.api.mockito.PowerMockito.*;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
+import static org.junit.Assert.assertEquals;
+import static org.powermock.api.mockito.PowerMockito.*;
+
 @RunWith(PowerMockRunner.class)
 @PrepareForTest(fullyQualifiedNames = "com.baeldung.powermockito.introduction.*")
 public class PowerMockitoTest {
+
     @Test
     public void givenFinalMethods_whenUsingPowerMockito_thenCorrect() throws Exception {
         CollaboratorWithFinalMethods mock = mock(CollaboratorWithFinalMethods.class);

mockito/src/test/java/org/baeldung/mockito/MockitoAnnotationTest.java

@@ -1,20 +1,14 @@
 package org.baeldung.mockito;
 
-import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.*;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
+import static org.junit.Assert.assertEquals;
 
 //@RunWith(MockitoJUnitRunner.class)
 public class MockitoAnnotationTest {

mockito/src/test/java/org/baeldung/mockito/MockitoConfigExamplesTest.java

@@ -1,20 +1,17 @@
 package org.baeldung.mockito;
 
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.when;
-
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
+import static org.mockito.Mockito.*;
 
 public class MockitoConfigExamplesTest {
 

mockito/src/test/java/org/baeldung/mockito/MockitoSpyTest.java

@@ -1,16 +1,16 @@
 package org.baeldung.mockito;
 
-import static org.junit.Assert.assertEquals;
-
-import java.util.ArrayList;
-import java.util.List;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 import org.mockito.Spy;
 import org.mockito.runners.MockitoJUnitRunner;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
 @RunWith(MockitoJUnitRunner.class)
 public class MockitoSpyTest {
 

mockito/src/test/java/org/baeldung/mockito/MockitoVerifyExamplesTest.java

@@ -1,26 +1,18 @@
 package org.baeldung.mockito;
 
-import static org.hamcrest.Matchers.hasItem;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.atMost;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
-
-import java.util.List;
-
+import com.google.common.collect.Lists;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InOrder;
 import org.mockito.Mockito;
 import org.mockito.exceptions.verification.NoInteractionsWanted;
 
-import com.google.common.collect.Lists;
+import java.util.List;
+
+import static org.hamcrest.Matchers.hasItem;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.*;
 
 public class MockitoVerifyExamplesTest {
 
@@ -115,10 +107,10 @@ public class MockitoVerifyExamplesTest {
     @Test
     public final void whenVerifyingAnInteractionWithArgumentCapture_thenCorrect() {
         final List<String> mockedList = mock(MyList.class);
-        mockedList.addAll(Lists.<String> newArrayList("someElement"));
+        mockedList.addAll(Lists.<String>newArrayList("someElement"));
         final ArgumentCaptor<List> argumentCaptor = ArgumentCaptor.forClass(List.class);
         verify(mockedList).addAll(argumentCaptor.capture());
-        final List<String> capturedArgument = argumentCaptor.<List<String>> getValue();
+        final List<String> capturedArgument = argumentCaptor.<List<String>>getValue();
         assertThat(capturedArgument, hasItem("someElement"));
     }
 

mockito/src/test/java/org/baeldung/mockito/MyDictionary.java

@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class MyDictionary {
+
     Map<String, String> wordMap;
 
     public MyDictionary() {