eugenp · panos-kakos · Jul 25, 2025 · Jul 25, 2025 · Jul 25, 2025
diff --git a/...ava/com/baeldung/mockito/junit5/User.java → ...c/main/java/com/baeldung/junit5/User.java b/...ava/com/baeldung/mockito/junit5/User.java → ...c/main/java/com/baeldung/junit5/User.java
@@ -1,4 +1,4 @@
-package com.baeldung.mockito.junit5;
+package com.baeldung.junit5;
 
 public class User {
 

diff --git a/testing-modules/mockito-2/src/main/java/com/baeldung/junit5/repository/MailClient.java b/testing-modules/mockito-2/src/main/java/com/baeldung/junit5/repository/MailClient.java
@@ -0,0 +1,9 @@
+package com.baeldung.junit5.repository;
+
+import com.baeldung.junit5.User;
+
+public interface MailClient {
+
+    void sendUserRegistrationMail(User user);
+
+}
diff --git a/.../junit5/repository/SettingRepository.java → .../junit5/repository/SettingRepository.java b/.../junit5/repository/SettingRepository.java → .../junit5/repository/SettingRepository.java
@@ -1,4 +1,4 @@
-package com.baeldung.mockito.junit5.repository;
+package com.baeldung.junit5.repository;
 
 public interface SettingRepository {
 

diff --git a/...ito/junit5/repository/UserRepository.java → ...ung/junit5/repository/UserRepository.java b/...ito/junit5/repository/UserRepository.java → ...ung/junit5/repository/UserRepository.java
@@ -1,6 +1,6 @@
-package com.baeldung.mockito.junit5.repository;
+package com.baeldung.junit5.repository;
 
-import com.baeldung.mockito.junit5.User;
+import com.baeldung.junit5.User;
 
 public interface UserRepository {
 

diff --git a/...to/junit5/service/DefaultUserService.java → ...ng/junit5/service/DefaultUserService.java b/...to/junit5/service/DefaultUserService.java → ...ng/junit5/service/DefaultUserService.java
@@ -1,9 +1,9 @@
-package com.baeldung.mockito.junit5.service;
+package com.baeldung.junit5.service;
 
-import com.baeldung.mockito.junit5.User;
-import com.baeldung.mockito.junit5.repository.MailClient;
-import com.baeldung.mockito.junit5.repository.SettingRepository;
-import com.baeldung.mockito.junit5.repository.UserRepository;
+import com.baeldung.junit5.User;
+import com.baeldung.junit5.repository.MailClient;
+import com.baeldung.junit5.repository.SettingRepository;
+import com.baeldung.junit5.repository.UserRepository;
 
 public class DefaultUserService implements UserService {
 

diff --git a/...eldung/mockito/junit5/service/Errors.java → ...a/com/baeldung/junit5/service/Errors.java b/...eldung/mockito/junit5/service/Errors.java → ...a/com/baeldung/junit5/service/Errors.java
@@ -1,4 +1,4 @@
-package com.baeldung.mockito.junit5.service;
+package com.baeldung.junit5.service;
 
 public class Errors {
 

diff --git a/testing-modules/mockito-2/src/main/java/com/baeldung/junit5/service/UserService.java b/testing-modules/mockito-2/src/main/java/com/baeldung/junit5/service/UserService.java
@@ -0,0 +1,9 @@
+package com.baeldung.junit5.service;
+
+import com.baeldung.junit5.User;
+
+public interface UserService {
+
+    User register(User user);
+
+}
diff --git a/.../exceptions/MockitoExceptionUnitTest.java → .../exceptions/MockitoExceptionUnitTest.java b/.../exceptions/MockitoExceptionUnitTest.java → .../exceptions/MockitoExceptionUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.mockito.exceptions;
+package com.baeldung.exceptions;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -9,8 +9,6 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
-import com.baeldung.mockito.MyDictionary;
-
 class MockitoExceptionUnitTest {
 
     @Test

diff --git a/testing-modules/mockito-2/src/test/java/com/baeldung/exceptions/MyDictionary.java b/testing-modules/mockito-2/src/test/java/com/baeldung/exceptions/MyDictionary.java
@@ -0,0 +1,25 @@
+package com.baeldung.exceptions;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class MyDictionary {
+
+    private Map<String, String> wordMap;
+
+    public MyDictionary() {
+        wordMap = new HashMap<>();
+    }
+
+    public MyDictionary(Map<String, String> wordMap) {
+        this.wordMap = wordMap;
+    }
+
+    public void add(final String word, final String meaning) {
+        wordMap.put(word, meaning);
+    }
+
+    public String getMeaning(final String word) {
+        return wordMap.get(word);
+    }
+}
diff --git a/...g/mockito/junit5/UserServiceUnitTest.java → .../baeldung/junit5/UserServiceUnitTest.java b/...g/mockito/junit5/UserServiceUnitTest.java → .../baeldung/junit5/UserServiceUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.mockito.junit5;
+package com.baeldung.junit5;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -18,12 +18,12 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.stubbing.Answer;
 
-import com.baeldung.mockito.junit5.repository.MailClient;
-import com.baeldung.mockito.junit5.repository.SettingRepository;
-import com.baeldung.mockito.junit5.repository.UserRepository;
-import com.baeldung.mockito.junit5.service.DefaultUserService;
-import com.baeldung.mockito.junit5.service.Errors;
-import com.baeldung.mockito.junit5.service.UserService;
+import com.baeldung.junit5.repository.MailClient;
+import com.baeldung.junit5.repository.SettingRepository;
+import com.baeldung.junit5.repository.UserRepository;
+import com.baeldung.junit5.service.DefaultUserService;
+import com.baeldung.junit5.service.Errors;
+import com.baeldung.junit5.service.UserService;
 
 @ExtendWith(MockitoExtension.class)
 class UserServiceUnitTest {

diff --git a/...idmethods/MockitoVoidMethodsUnitTest.java → ...idmethods/MockitoVoidMethodsUnitTest.java b/...idmethods/MockitoVoidMethodsUnitTest.java → ...idmethods/MockitoVoidMethodsUnitTest.java
@@ -1,17 +1,26 @@
-package com.baeldung.mockito.voidmethods;
+package com.baeldung.voidmethods;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doCallRealMethod;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.time.Instant;
 
-import com.baeldung.mockito.MyList;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.time.Instant;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
 
 class MockitoVoidMethodsUnitTest {
 

diff --git a/testing-modules/mockito-2/src/test/java/com/baeldung/voidmethods/MyList.java b/testing-modules/mockito-2/src/test/java/com/baeldung/voidmethods/MyList.java
@@ -0,0 +1,25 @@
+package com.baeldung.voidmethods;
+
+import java.util.AbstractList;
+
+public class MyList extends AbstractList<String> {
+
+    @Override
+    public String get(final int index) {
+        return null;
+    }
+
+    @Override
+    public int size() {
+        return 1;
+    }
+
+    @Override
+    public void add(int index, String element) {
+        // no-op
+    }
+
+    final public int finalMethod() {
+        return 0;
+    }
+}
diff --git a/.../java/com/baeldung/mockito/FinalList.java → ...ava/com/baeldung/mockfinal/FinalList.java b/.../java/com/baeldung/mockito/FinalList.java → ...ava/com/baeldung/mockfinal/FinalList.java
@@ -1,4 +1,4 @@
-package com.baeldung.mockito;
+package com.baeldung.mockfinal;
 
 public final class FinalList extends MyList {
 

diff --git a/...mockito/mockfinal/MockFinalsUnitTest.java → ...aeldung/mockfinal/MockFinalsUnitTest.java b/...mockito/mockfinal/MockFinalsUnitTest.java → ...aeldung/mockfinal/MockFinalsUnitTest.java
@@ -1,13 +1,11 @@
-package com.baeldung.mockito.mockfinal;
+package com.baeldung.mockfinal;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import org.junit.jupiter.api.Test;
 
-import com.baeldung.mockito.FinalList;
-import com.baeldung.mockito.MyList;
 
 class MockFinalsUnitTest {
 

diff --git a/testing-modules/mockito-4/src/test/java/com/baeldung/mockfinal/MyList.java b/testing-modules/mockito-4/src/test/java/com/baeldung/mockfinal/MyList.java
@@ -0,0 +1,25 @@
+package com.baeldung.mockfinal;
+
+import java.util.AbstractList;
+
+public class MyList extends AbstractList<String> {
+
+    @Override
+    public String get(final int index) {
+        return null;
+    }
+
+    @Override
+    public int size() {
+        return 1;
+    }
+
+    @Override
+    public void add(int index, String element) {
+        // no-op
+    }
+
+    final public int finalMethod() {
+        return 0;
+    }
+}
diff --git a/testing-modules/mockito-simple/pom.xml b/testing-modules/mockito-simple/pom.xml
@@ -13,21 +13,6 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${spring-framework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${spring-framework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring-framework.version}</version>
-        </dependency>
         <!-- utils -->
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -58,8 +43,4 @@
         </resources>
     </build>
 
-    <properties>
-        <spring-framework.version>6.0.8</spring-framework.version>
-    </properties>
-
 </project>
diff --git a/...dules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/repository/MailClient.java b/...dules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/repository/MailClient.java
diff --git a/...modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/service/UserService.java b/...modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/service/UserService.java
diff --git a/testing-modules/mockito/pom.xml b/testing-modules/mockito/pom.xml
@@ -15,6 +15,21 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${spring-framework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${spring-framework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring-framework.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -28,4 +43,8 @@
         </dependency>
     </dependencies>
 
+    <properties>
+        <spring-framework.version>6.0.8</spring-framework.version>
+    </properties>
+
 </project>
diff --git a/.../argumentcaptor/AuthenticationStatus.java → .../argumentcaptor/AuthenticationStatus.java b/.../argumentcaptor/AuthenticationStatus.java → .../argumentcaptor/AuthenticationStatus.java
diff --git a/...g/mockito/argumentcaptor/Credentials.java → ...g/mockito/argumentcaptor/Credentials.java b/...g/mockito/argumentcaptor/Credentials.java → ...g/mockito/argumentcaptor/Credentials.java
diff --git a/...kito/argumentcaptor/DeliveryPlatform.java → ...kito/argumentcaptor/DeliveryPlatform.java b/...kito/argumentcaptor/DeliveryPlatform.java → ...kito/argumentcaptor/DeliveryPlatform.java
diff --git a/...aeldung/mockito/argumentcaptor/Email.java → ...aeldung/mockito/argumentcaptor/Email.java b/...aeldung/mockito/argumentcaptor/Email.java → ...aeldung/mockito/argumentcaptor/Email.java
diff --git a/.../mockito/argumentcaptor/EmailService.java → .../mockito/argumentcaptor/EmailService.java b/.../mockito/argumentcaptor/EmailService.java → .../mockito/argumentcaptor/EmailService.java
diff --git a/...eldung/mockito/argumentcaptor/Format.java → ...eldung/mockito/argumentcaptor/Format.java b/...eldung/mockito/argumentcaptor/Format.java → ...eldung/mockito/argumentcaptor/Format.java
diff --git a/...mockito/argumentcaptor/ServiceStatus.java → ...mockito/argumentcaptor/ServiceStatus.java b/...mockito/argumentcaptor/ServiceStatus.java → ...mockito/argumentcaptor/ServiceStatus.java
diff --git a/...dung/mockito/argumentmatchers/Flower.java → ...dung/mockito/argumentmatchers/Flower.java b/...dung/mockito/argumentmatchers/Flower.java → ...dung/mockito/argumentmatchers/Flower.java
diff --git a/...ung/mockito/argumentmatchers/Message.java → ...ung/mockito/argumentmatchers/Message.java b/...ung/mockito/argumentmatchers/Message.java → ...ung/mockito/argumentmatchers/Message.java
diff --git a/.../mockito/argumentmatchers/MessageDTO.java → .../mockito/argumentmatchers/MessageDTO.java b/.../mockito/argumentmatchers/MessageDTO.java → .../mockito/argumentmatchers/MessageDTO.java
diff --git a/...matchers/controller/FlowerController.java → ...matchers/controller/FlowerController.java b/...matchers/controller/FlowerController.java → ...matchers/controller/FlowerController.java
diff --git a/...atchers/controller/MessageController.java → ...atchers/controller/MessageController.java b/...atchers/controller/MessageController.java → ...atchers/controller/MessageController.java
@@ -1,5 +1,9 @@
 package com.baeldung.mockito.argumentmatchers.controller;
 
+import java.time.Instant;
+import java.util.Date;
+import java.util.UUID;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -10,10 +14,6 @@
 import com.baeldung.mockito.argumentmatchers.MessageDTO;
 import com.baeldung.mockito.argumentmatchers.service.MessageService;
 
-import java.time.Instant;
-import java.util.Date;
-import java.util.UUID;
-
 @Controller
 @RequestMapping("/message")
 public class MessageController {

diff --git a/...gumentmatchers/service/FlowerService.java → ...gumentmatchers/service/FlowerService.java b/...gumentmatchers/service/FlowerService.java → ...gumentmatchers/service/FlowerService.java
@@ -1,10 +1,10 @@
 package com.baeldung.mockito.argumentmatchers.service;
 
-import org.springframework.stereotype.Service;
-
 import java.util.Arrays;
 import java.util.List;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public class FlowerService {
 

diff --git a/...umentmatchers/service/MessageService.java → ...umentmatchers/service/MessageService.java b/...umentmatchers/service/MessageService.java → ...umentmatchers/service/MessageService.java
diff --git a/...ung/mockito/mockedstatic/StaticUtils.java → ...ung/mockito/mockedstatic/StaticUtils.java b/...ung/mockito/mockedstatic/StaticUtils.java → ...ung/mockito/mockedstatic/StaticUtils.java
diff --git a/.../argumentcaptor/EmailServiceUnitTest.java → .../argumentcaptor/EmailServiceUnitTest.java b/.../argumentcaptor/EmailServiceUnitTest.java → .../argumentcaptor/EmailServiceUnitTest.java
diff --git a/...entmatchers/FlowerControllerUnitTest.java → ...entmatchers/FlowerControllerUnitTest.java b/...entmatchers/FlowerControllerUnitTest.java → ...entmatchers/FlowerControllerUnitTest.java
diff --git a/...ntmatchers/MessageControllerUnitTest.java → ...ntmatchers/MessageControllerUnitTest.java b/...ntmatchers/MessageControllerUnitTest.java → ...ntmatchers/MessageControllerUnitTest.java
diff --git a/...kito/argumentmatchers/MessageMatcher.java → ...kito/argumentmatchers/MessageMatcher.java b/...kito/argumentmatchers/MessageMatcher.java → ...kito/argumentmatchers/MessageMatcher.java
diff --git a/...ockito/mockstatic/MockStaticUnitTest.java → ...ockito/mockstatic/MockStaticUnitTest.java b/...ockito/mockstatic/MockStaticUnitTest.java → ...ockito/mockstatic/MockStaticUnitTest.java
@@ -1,15 +1,15 @@
 package com.baeldung.mockito.mockstatic;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mockStatic;
+
+import java.util.Arrays;
+
 import org.junit.jupiter.api.Test;
 import org.mockito.MockedStatic;
 
 import com.baeldung.mockito.mockedstatic.StaticUtils;
 
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.mockStatic;
-
-import java.util.Arrays;
-
 class MockStaticUnitTest {
 
     @Test

diff --git a/...tatic/StaticMockRegistrationUnitTest.java → ...tatic/StaticMockRegistrationUnitTest.java b/...tatic/StaticMockRegistrationUnitTest.java → ...tatic/StaticMockRegistrationUnitTest.java
@@ -1,14 +1,15 @@
 package com.baeldung.mockito.mockstatic;
 
-import com.baeldung.mockito.mockedstatic.StaticUtils;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mockStatic;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mockStatic;
+import com.baeldung.mockito.mockedstatic.StaticUtils;
 
 public class StaticMockRegistrationUnitTest {
 

diff --git a/...spy/MockitoMisusingMockOrSpyUnitTest.java → ...spy/MockitoMisusingMockOrSpyUnitTest.java b/...spy/MockitoMisusingMockOrSpyUnitTest.java → ...spy/MockitoMisusingMockOrSpyUnitTest.java
diff --git a/...ldung/mockito/spy/MockitoSpyUnitTest.java → ...ldung/mockito/spy/MockitoSpyUnitTest.java b/...ldung/mockito/spy/MockitoSpyUnitTest.java → ...ldung/mockito/spy/MockitoSpyUnitTest.java