diff --git a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/User.java b/testing-modules/mockito-2/src/main/java/com/baeldung/junit5/User.java similarity index 95% rename from testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/User.java rename to testing-modules/mockito-2/src/main/java/com/baeldung/junit5/User.java index 4457d59b0262..801da040675a 100644 --- a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/User.java +++ b/testing-modules/mockito-2/src/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 new file mode 100644 index 000000000000..369cc4077844 --- /dev/null +++ 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/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/repository/SettingRepository.java b/testing-modules/mockito-2/src/main/java/com/baeldung/junit5/repository/SettingRepository.java similarity index 67% rename from testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/repository/SettingRepository.java rename to testing-modules/mockito-2/src/main/java/com/baeldung/junit5/repository/SettingRepository.java index 094be12770de..492d343b507f 100644 --- a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/repository/SettingRepository.java +++ b/testing-modules/mockito-2/src/main/java/com/baeldung/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/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/repository/UserRepository.java b/testing-modules/mockito-2/src/main/java/com/baeldung/junit5/repository/UserRepository.java similarity index 58% rename from testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/repository/UserRepository.java rename to testing-modules/mockito-2/src/main/java/com/baeldung/junit5/repository/UserRepository.java index 9bc1b0d38cfb..9d56a963680b 100644 --- a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/repository/UserRepository.java +++ b/testing-modules/mockito-2/src/main/java/com/baeldung/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/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/service/DefaultUserService.java b/testing-modules/mockito-2/src/main/java/com/baeldung/junit5/service/DefaultUserService.java similarity index 82% rename from testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/service/DefaultUserService.java rename to testing-modules/mockito-2/src/main/java/com/baeldung/junit5/service/DefaultUserService.java index bad4e466825b..fa45e74d21c1 100644 --- a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/service/DefaultUserService.java +++ b/testing-modules/mockito-2/src/main/java/com/baeldung/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/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/service/Errors.java b/testing-modules/mockito-2/src/main/java/com/baeldung/junit5/service/Errors.java similarity index 87% rename from testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/service/Errors.java rename to testing-modules/mockito-2/src/main/java/com/baeldung/junit5/service/Errors.java index 8a6882124a91..f4131daf0fd2 100644 --- a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/service/Errors.java +++ b/testing-modules/mockito-2/src/main/java/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 new file mode 100644 index 000000000000..ba8f8dc6b7b5 --- /dev/null +++ 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/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/exceptions/MockitoExceptionUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/exceptions/MockitoExceptionUnitTest.java similarity index 96% rename from testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/exceptions/MockitoExceptionUnitTest.java rename to testing-modules/mockito-2/src/test/java/com/baeldung/exceptions/MockitoExceptionUnitTest.java index 112a6fd7b643..3997802b305f 100644 --- a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/exceptions/MockitoExceptionUnitTest.java +++ b/testing-modules/mockito-2/src/test/java/com/baeldung/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 new file mode 100644 index 000000000000..45a17db9f965 --- /dev/null +++ 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 wordMap; + + public MyDictionary() { + wordMap = new HashMap<>(); + } + + public MyDictionary(Map 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/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/junit5/UserServiceUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/junit5/UserServiceUnitTest.java similarity index 90% rename from testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/junit5/UserServiceUnitTest.java rename to testing-modules/mockito-2/src/test/java/com/baeldung/junit5/UserServiceUnitTest.java index 45eb42a00fa4..ebc88f16de19 100644 --- a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/junit5/UserServiceUnitTest.java +++ b/testing-modules/mockito-2/src/test/java/com/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/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/voidmethods/MockitoVoidMethodsUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/voidmethods/MockitoVoidMethodsUnitTest.java similarity index 86% rename from testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/voidmethods/MockitoVoidMethodsUnitTest.java rename to testing-modules/mockito-2/src/test/java/com/baeldung/voidmethods/MockitoVoidMethodsUnitTest.java index fb1cfd4437bc..c48486244bc5 100644 --- a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/voidmethods/MockitoVoidMethodsUnitTest.java +++ b/testing-modules/mockito-2/src/test/java/com/baeldung/voidmethods/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 new file mode 100644 index 000000000000..835f891d223f --- /dev/null +++ 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 { + + @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/src/test/java/com/baeldung/mockito/FinalList.java b/testing-modules/mockito-4/src/test/java/com/baeldung/mockfinal/FinalList.java similarity index 77% rename from testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/FinalList.java rename to testing-modules/mockito-4/src/test/java/com/baeldung/mockfinal/FinalList.java index c81e0bb79bbb..8cf13f09ff53 100644 --- a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/FinalList.java +++ b/testing-modules/mockito-4/src/test/java/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/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/mockfinal/MockFinalsUnitTest.java b/testing-modules/mockito-4/src/test/java/com/baeldung/mockfinal/MockFinalsUnitTest.java similarity index 76% rename from testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/mockfinal/MockFinalsUnitTest.java rename to testing-modules/mockito-4/src/test/java/com/baeldung/mockfinal/MockFinalsUnitTest.java index 705f2ac7adce..e7185b55170e 100644 --- a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/mockfinal/MockFinalsUnitTest.java +++ b/testing-modules/mockito-4/src/test/java/com/baeldung/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 new file mode 100644 index 000000000000..4444a3f2fbb8 --- /dev/null +++ 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 { + + @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 index 2d4fe278a1e9..cb8b44bb509f 100644 --- a/testing-modules/mockito-simple/pom.xml +++ b/testing-modules/mockito-simple/pom.xml @@ -13,21 +13,6 @@ - - org.springframework - spring-web - ${spring-framework.version} - - - org.springframework - spring-core - ${spring-framework.version} - - - org.springframework - spring-context - ${spring-framework.version} - org.apache.commons @@ -58,8 +43,4 @@ - - 6.0.8 - - \ No newline at end of file diff --git a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/repository/MailClient.java b/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/repository/MailClient.java deleted file mode 100644 index 258de77cd51b..000000000000 --- a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/repository/MailClient.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.baeldung.mockito.junit5.repository; - -import com.baeldung.mockito.junit5.User; - -public interface MailClient { - - void sendUserRegistrationMail(User user); - -} diff --git a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/service/UserService.java b/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/service/UserService.java deleted file mode 100644 index fe1fbe4f13cf..000000000000 --- a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/junit5/service/UserService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.baeldung.mockito.junit5.service; - -import com.baeldung.mockito.junit5.User; - -public interface UserService { - - User register(User user); - -} diff --git a/testing-modules/mockito/pom.xml b/testing-modules/mockito/pom.xml index 8c1b4bb7c2c7..dd68d569e2fb 100644 --- a/testing-modules/mockito/pom.xml +++ b/testing-modules/mockito/pom.xml @@ -15,6 +15,21 @@ + + org.springframework + spring-web + ${spring-framework.version} + + + org.springframework + spring-core + ${spring-framework.version} + + + org.springframework + spring-context + ${spring-framework.version} + com.fasterxml.jackson.core jackson-databind @@ -28,4 +43,8 @@ + + 6.0.8 + + \ No newline at end of file diff --git a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentcaptor/AuthenticationStatus.java b/testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentcaptor/AuthenticationStatus.java similarity index 100% rename from testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentcaptor/AuthenticationStatus.java rename to testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentcaptor/AuthenticationStatus.java diff --git a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentcaptor/Credentials.java b/testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentcaptor/Credentials.java similarity index 100% rename from testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentcaptor/Credentials.java rename to testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentcaptor/Credentials.java diff --git a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentcaptor/DeliveryPlatform.java b/testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentcaptor/DeliveryPlatform.java similarity index 100% rename from testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentcaptor/DeliveryPlatform.java rename to testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentcaptor/DeliveryPlatform.java diff --git a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentcaptor/Email.java b/testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentcaptor/Email.java similarity index 100% rename from testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentcaptor/Email.java rename to testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentcaptor/Email.java diff --git a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentcaptor/EmailService.java b/testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentcaptor/EmailService.java similarity index 100% rename from testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentcaptor/EmailService.java rename to testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentcaptor/EmailService.java diff --git a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentcaptor/Format.java b/testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentcaptor/Format.java similarity index 100% rename from testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentcaptor/Format.java rename to testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentcaptor/Format.java diff --git a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentcaptor/ServiceStatus.java b/testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentcaptor/ServiceStatus.java similarity index 100% rename from testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentcaptor/ServiceStatus.java rename to testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentcaptor/ServiceStatus.java diff --git a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentmatchers/Flower.java b/testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentmatchers/Flower.java similarity index 100% rename from testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentmatchers/Flower.java rename to testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentmatchers/Flower.java diff --git a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentmatchers/Message.java b/testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentmatchers/Message.java similarity index 100% rename from testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentmatchers/Message.java rename to testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentmatchers/Message.java diff --git a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentmatchers/MessageDTO.java b/testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentmatchers/MessageDTO.java similarity index 100% rename from testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentmatchers/MessageDTO.java rename to testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentmatchers/MessageDTO.java diff --git a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentmatchers/controller/FlowerController.java b/testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentmatchers/controller/FlowerController.java similarity index 100% rename from testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentmatchers/controller/FlowerController.java rename to testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentmatchers/controller/FlowerController.java diff --git a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentmatchers/controller/MessageController.java b/testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentmatchers/controller/MessageController.java similarity index 100% rename from testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentmatchers/controller/MessageController.java rename to testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentmatchers/controller/MessageController.java index 4a6cb3f5d6f4..be5eba7dd4a0 100644 --- a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentmatchers/controller/MessageController.java +++ b/testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentmatchers/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/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentmatchers/service/FlowerService.java b/testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentmatchers/service/FlowerService.java similarity index 100% rename from testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentmatchers/service/FlowerService.java rename to testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentmatchers/service/FlowerService.java index f654638fd3fa..db13c15ff245 100644 --- a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentmatchers/service/FlowerService.java +++ b/testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentmatchers/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/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentmatchers/service/MessageService.java b/testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentmatchers/service/MessageService.java similarity index 100% rename from testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/argumentmatchers/service/MessageService.java rename to testing-modules/mockito/src/main/java/com/baeldung/mockito/argumentmatchers/service/MessageService.java diff --git a/testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/mockedstatic/StaticUtils.java b/testing-modules/mockito/src/main/java/com/baeldung/mockito/mockedstatic/StaticUtils.java similarity index 100% rename from testing-modules/mockito-simple/src/main/java/com/baeldung/mockito/mockedstatic/StaticUtils.java rename to testing-modules/mockito/src/main/java/com/baeldung/mockito/mockedstatic/StaticUtils.java diff --git a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/argumentcaptor/EmailServiceUnitTest.java b/testing-modules/mockito/src/test/java/com/baeldung/mockito/argumentcaptor/EmailServiceUnitTest.java similarity index 100% rename from testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/argumentcaptor/EmailServiceUnitTest.java rename to testing-modules/mockito/src/test/java/com/baeldung/mockito/argumentcaptor/EmailServiceUnitTest.java diff --git a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/argumentmatchers/FlowerControllerUnitTest.java b/testing-modules/mockito/src/test/java/com/baeldung/mockito/argumentmatchers/FlowerControllerUnitTest.java similarity index 100% rename from testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/argumentmatchers/FlowerControllerUnitTest.java rename to testing-modules/mockito/src/test/java/com/baeldung/mockito/argumentmatchers/FlowerControllerUnitTest.java diff --git a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/argumentmatchers/MessageControllerUnitTest.java b/testing-modules/mockito/src/test/java/com/baeldung/mockito/argumentmatchers/MessageControllerUnitTest.java similarity index 100% rename from testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/argumentmatchers/MessageControllerUnitTest.java rename to testing-modules/mockito/src/test/java/com/baeldung/mockito/argumentmatchers/MessageControllerUnitTest.java diff --git a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/argumentmatchers/MessageMatcher.java b/testing-modules/mockito/src/test/java/com/baeldung/mockito/argumentmatchers/MessageMatcher.java similarity index 100% rename from testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/argumentmatchers/MessageMatcher.java rename to testing-modules/mockito/src/test/java/com/baeldung/mockito/argumentmatchers/MessageMatcher.java diff --git a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/mockstatic/MockStaticUnitTest.java b/testing-modules/mockito/src/test/java/com/baeldung/mockito/mockstatic/MockStaticUnitTest.java similarity index 95% rename from testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/mockstatic/MockStaticUnitTest.java rename to testing-modules/mockito/src/test/java/com/baeldung/mockito/mockstatic/MockStaticUnitTest.java index b9268f3c6a7c..f6a13b09fa7c 100644 --- a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/mockstatic/MockStaticUnitTest.java +++ b/testing-modules/mockito/src/test/java/com/baeldung/mockito/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/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/mockstatic/StaticMockRegistrationUnitTest.java b/testing-modules/mockito/src/test/java/com/baeldung/mockito/mockstatic/StaticMockRegistrationUnitTest.java similarity index 99% rename from testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/mockstatic/StaticMockRegistrationUnitTest.java rename to testing-modules/mockito/src/test/java/com/baeldung/mockito/mockstatic/StaticMockRegistrationUnitTest.java index af4d657a585a..5ac4b5271ce7 100644 --- a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/mockstatic/StaticMockRegistrationUnitTest.java +++ b/testing-modules/mockito/src/test/java/com/baeldung/mockito/mockstatic/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/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/spy/MockitoMisusingMockOrSpyUnitTest.java b/testing-modules/mockito/src/test/java/com/baeldung/mockito/spy/MockitoMisusingMockOrSpyUnitTest.java similarity index 100% rename from testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/spy/MockitoMisusingMockOrSpyUnitTest.java rename to testing-modules/mockito/src/test/java/com/baeldung/mockito/spy/MockitoMisusingMockOrSpyUnitTest.java diff --git a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/spy/MockitoSpyUnitTest.java b/testing-modules/mockito/src/test/java/com/baeldung/mockito/spy/MockitoSpyUnitTest.java similarity index 100% rename from testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/spy/MockitoSpyUnitTest.java rename to testing-modules/mockito/src/test/java/com/baeldung/mockito/spy/MockitoSpyUnitTest.java