From a9c0015e6403b35ccf93c1d9dfeafa9c684b6a4a Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Mon, 11 Jul 2022 16:29:42 +0100
Subject: [PATCH] Moved spring-mockito to testing-modules (#12476)

Co-authored-by: panagiotiskakos <panagiotis.kakos@libra-is.com>
---
 pom.xml                                                         | 2 --
 testing-modules/pom.xml                                         | 1 +
 {spring-mockito => testing-modules/spring-mockito}/.gitignore   | 0
 {spring-mockito => testing-modules/spring-mockito}/README.md    | 0
 {spring-mockito => testing-modules/spring-mockito}/pom.xml      | 2 +-
 .../src/main/java/com/baeldung/MocksApplication.java            | 0
 .../spring-mockito}/src/main/java/com/baeldung/NameService.java | 0
 .../spring-mockito}/src/main/java/com/baeldung/UserService.java | 0
 .../src/main/java/com/baeldung/app/api/Flower.java              | 0
 .../src/main/java/com/baeldung/app/api/MessageApi.java          | 0
 .../src/main/java/com/baeldung/app/rest/FlowerController.java   | 0
 .../src/main/java/com/baeldung/app/rest/MessageController.java  | 0
 .../src/main/java/com/baeldung/domain/model/Message.java        | 0
 .../main/java/com/baeldung/domain/service/FlowerService.java    | 0
 .../main/java/com/baeldung/domain/service/MessageService.java   | 0
 .../src/main/java/com/baeldung/domain/util/MessageMatcher.java  | 0
 .../spring-mockito}/src/main/resources/application.properties   | 0
 .../spring-mockito}/src/main/resources/logback.xml              | 0
 .../test/java/com/baeldung/NameServiceTestConfiguration.java    | 0
 .../src/test/java/com/baeldung/UserServiceUnitTest.java         | 0
 .../java/com/baeldung/app/rest/FlowerControllerUnitTest.java    | 0
 .../java/com/baeldung/app/rest/MessageControllerUnitTest.java   | 0
 .../src/test/java/org/baeldung/SpringContextTest.java           | 0
 23 files changed, 2 insertions(+), 3 deletions(-)
 rename {spring-mockito => testing-modules/spring-mockito}/.gitignore (100%)
 rename {spring-mockito => testing-modules/spring-mockito}/README.md (100%)
 rename {spring-mockito => testing-modules/spring-mockito}/pom.xml (94%)
 rename {spring-mockito => testing-modules/spring-mockito}/src/main/java/com/baeldung/MocksApplication.java (100%)
 rename {spring-mockito => testing-modules/spring-mockito}/src/main/java/com/baeldung/NameService.java (100%)
 rename {spring-mockito => testing-modules/spring-mockito}/src/main/java/com/baeldung/UserService.java (100%)
 rename {spring-mockito => testing-modules/spring-mockito}/src/main/java/com/baeldung/app/api/Flower.java (100%)
 rename {spring-mockito => testing-modules/spring-mockito}/src/main/java/com/baeldung/app/api/MessageApi.java (100%)
 rename {spring-mockito => testing-modules/spring-mockito}/src/main/java/com/baeldung/app/rest/FlowerController.java (100%)
 rename {spring-mockito => testing-modules/spring-mockito}/src/main/java/com/baeldung/app/rest/MessageController.java (100%)
 rename {spring-mockito => testing-modules/spring-mockito}/src/main/java/com/baeldung/domain/model/Message.java (100%)
 rename {spring-mockito => testing-modules/spring-mockito}/src/main/java/com/baeldung/domain/service/FlowerService.java (100%)
 rename {spring-mockito => testing-modules/spring-mockito}/src/main/java/com/baeldung/domain/service/MessageService.java (100%)
 rename {spring-mockito => testing-modules/spring-mockito}/src/main/java/com/baeldung/domain/util/MessageMatcher.java (100%)
 rename {spring-mockito => testing-modules/spring-mockito}/src/main/resources/application.properties (100%)
 rename {spring-mockito => testing-modules/spring-mockito}/src/main/resources/logback.xml (100%)
 rename {spring-mockito => testing-modules/spring-mockito}/src/test/java/com/baeldung/NameServiceTestConfiguration.java (100%)
 rename {spring-mockito => testing-modules/spring-mockito}/src/test/java/com/baeldung/UserServiceUnitTest.java (100%)
 rename {spring-mockito => testing-modules/spring-mockito}/src/test/java/com/baeldung/app/rest/FlowerControllerUnitTest.java (100%)
 rename {spring-mockito => testing-modules/spring-mockito}/src/test/java/com/baeldung/app/rest/MessageControllerUnitTest.java (100%)
 rename {spring-mockito => testing-modules/spring-mockito}/src/test/java/org/baeldung/SpringContextTest.java (100%)

diff --git a/pom.xml b/pom.xml
index ff8336d890..1fe42bd734 100644
--- a/pom.xml
+++ b/pom.xml
@@ -621,7 +621,6 @@
                 <module>spring-katharsis</module>
 
                 <module>spring-mobile</module>
-                <module>spring-mockito</module>
                 <module>spring-native</module>
                 <module>spring-protobuf</module>
                 <module>spring-quartz</module>
@@ -1050,7 +1049,6 @@
                 <module>spring-katharsis</module>
 
                 <module>spring-mobile</module>
-                <module>spring-mockito</module>
                 <module>spring-native</module>
                 <module>spring-protobuf</module>
                 <module>spring-quartz</module>
diff --git a/testing-modules/pom.xml b/testing-modules/pom.xml
index 3d5db76827..8213637631 100644
--- a/testing-modules/pom.xml
+++ b/testing-modules/pom.xml
@@ -39,6 +39,7 @@
         <module>rest-assured</module>
         <module>rest-testing</module>
         <module>selenium-junit-testng</module>
+        <module>spring-mockito</module>
         <module>spring-testing-2</module>
         <module>spring-testing</module>
         <module>test-containers</module>
diff --git a/spring-mockito/.gitignore b/testing-modules/spring-mockito/.gitignore
similarity index 100%
rename from spring-mockito/.gitignore
rename to testing-modules/spring-mockito/.gitignore
diff --git a/spring-mockito/README.md b/testing-modules/spring-mockito/README.md
similarity index 100%
rename from spring-mockito/README.md
rename to testing-modules/spring-mockito/README.md
diff --git a/spring-mockito/pom.xml b/testing-modules/spring-mockito/pom.xml
similarity index 94%
rename from spring-mockito/pom.xml
rename to testing-modules/spring-mockito/pom.xml
index e0d7bee6f3..117da9478e 100644
--- a/spring-mockito/pom.xml
+++ b/testing-modules/spring-mockito/pom.xml
@@ -13,7 +13,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
diff --git a/spring-mockito/src/main/java/com/baeldung/MocksApplication.java b/testing-modules/spring-mockito/src/main/java/com/baeldung/MocksApplication.java
similarity index 100%
rename from spring-mockito/src/main/java/com/baeldung/MocksApplication.java
rename to testing-modules/spring-mockito/src/main/java/com/baeldung/MocksApplication.java
diff --git a/spring-mockito/src/main/java/com/baeldung/NameService.java b/testing-modules/spring-mockito/src/main/java/com/baeldung/NameService.java
similarity index 100%
rename from spring-mockito/src/main/java/com/baeldung/NameService.java
rename to testing-modules/spring-mockito/src/main/java/com/baeldung/NameService.java
diff --git a/spring-mockito/src/main/java/com/baeldung/UserService.java b/testing-modules/spring-mockito/src/main/java/com/baeldung/UserService.java
similarity index 100%
rename from spring-mockito/src/main/java/com/baeldung/UserService.java
rename to testing-modules/spring-mockito/src/main/java/com/baeldung/UserService.java
diff --git a/spring-mockito/src/main/java/com/baeldung/app/api/Flower.java b/testing-modules/spring-mockito/src/main/java/com/baeldung/app/api/Flower.java
similarity index 100%
rename from spring-mockito/src/main/java/com/baeldung/app/api/Flower.java
rename to testing-modules/spring-mockito/src/main/java/com/baeldung/app/api/Flower.java
diff --git a/spring-mockito/src/main/java/com/baeldung/app/api/MessageApi.java b/testing-modules/spring-mockito/src/main/java/com/baeldung/app/api/MessageApi.java
similarity index 100%
rename from spring-mockito/src/main/java/com/baeldung/app/api/MessageApi.java
rename to testing-modules/spring-mockito/src/main/java/com/baeldung/app/api/MessageApi.java
diff --git a/spring-mockito/src/main/java/com/baeldung/app/rest/FlowerController.java b/testing-modules/spring-mockito/src/main/java/com/baeldung/app/rest/FlowerController.java
similarity index 100%
rename from spring-mockito/src/main/java/com/baeldung/app/rest/FlowerController.java
rename to testing-modules/spring-mockito/src/main/java/com/baeldung/app/rest/FlowerController.java
diff --git a/spring-mockito/src/main/java/com/baeldung/app/rest/MessageController.java b/testing-modules/spring-mockito/src/main/java/com/baeldung/app/rest/MessageController.java
similarity index 100%
rename from spring-mockito/src/main/java/com/baeldung/app/rest/MessageController.java
rename to testing-modules/spring-mockito/src/main/java/com/baeldung/app/rest/MessageController.java
diff --git a/spring-mockito/src/main/java/com/baeldung/domain/model/Message.java b/testing-modules/spring-mockito/src/main/java/com/baeldung/domain/model/Message.java
similarity index 100%
rename from spring-mockito/src/main/java/com/baeldung/domain/model/Message.java
rename to testing-modules/spring-mockito/src/main/java/com/baeldung/domain/model/Message.java
diff --git a/spring-mockito/src/main/java/com/baeldung/domain/service/FlowerService.java b/testing-modules/spring-mockito/src/main/java/com/baeldung/domain/service/FlowerService.java
similarity index 100%
rename from spring-mockito/src/main/java/com/baeldung/domain/service/FlowerService.java
rename to testing-modules/spring-mockito/src/main/java/com/baeldung/domain/service/FlowerService.java
diff --git a/spring-mockito/src/main/java/com/baeldung/domain/service/MessageService.java b/testing-modules/spring-mockito/src/main/java/com/baeldung/domain/service/MessageService.java
similarity index 100%
rename from spring-mockito/src/main/java/com/baeldung/domain/service/MessageService.java
rename to testing-modules/spring-mockito/src/main/java/com/baeldung/domain/service/MessageService.java
diff --git a/spring-mockito/src/main/java/com/baeldung/domain/util/MessageMatcher.java b/testing-modules/spring-mockito/src/main/java/com/baeldung/domain/util/MessageMatcher.java
similarity index 100%
rename from spring-mockito/src/main/java/com/baeldung/domain/util/MessageMatcher.java
rename to testing-modules/spring-mockito/src/main/java/com/baeldung/domain/util/MessageMatcher.java
diff --git a/spring-mockito/src/main/resources/application.properties b/testing-modules/spring-mockito/src/main/resources/application.properties
similarity index 100%
rename from spring-mockito/src/main/resources/application.properties
rename to testing-modules/spring-mockito/src/main/resources/application.properties
diff --git a/spring-mockito/src/main/resources/logback.xml b/testing-modules/spring-mockito/src/main/resources/logback.xml
similarity index 100%
rename from spring-mockito/src/main/resources/logback.xml
rename to testing-modules/spring-mockito/src/main/resources/logback.xml
diff --git a/spring-mockito/src/test/java/com/baeldung/NameServiceTestConfiguration.java b/testing-modules/spring-mockito/src/test/java/com/baeldung/NameServiceTestConfiguration.java
similarity index 100%
rename from spring-mockito/src/test/java/com/baeldung/NameServiceTestConfiguration.java
rename to testing-modules/spring-mockito/src/test/java/com/baeldung/NameServiceTestConfiguration.java
diff --git a/spring-mockito/src/test/java/com/baeldung/UserServiceUnitTest.java b/testing-modules/spring-mockito/src/test/java/com/baeldung/UserServiceUnitTest.java
similarity index 100%
rename from spring-mockito/src/test/java/com/baeldung/UserServiceUnitTest.java
rename to testing-modules/spring-mockito/src/test/java/com/baeldung/UserServiceUnitTest.java
diff --git a/spring-mockito/src/test/java/com/baeldung/app/rest/FlowerControllerUnitTest.java b/testing-modules/spring-mockito/src/test/java/com/baeldung/app/rest/FlowerControllerUnitTest.java
similarity index 100%
rename from spring-mockito/src/test/java/com/baeldung/app/rest/FlowerControllerUnitTest.java
rename to testing-modules/spring-mockito/src/test/java/com/baeldung/app/rest/FlowerControllerUnitTest.java
diff --git a/spring-mockito/src/test/java/com/baeldung/app/rest/MessageControllerUnitTest.java b/testing-modules/spring-mockito/src/test/java/com/baeldung/app/rest/MessageControllerUnitTest.java
similarity index 100%
rename from spring-mockito/src/test/java/com/baeldung/app/rest/MessageControllerUnitTest.java
rename to testing-modules/spring-mockito/src/test/java/com/baeldung/app/rest/MessageControllerUnitTest.java
diff --git a/spring-mockito/src/test/java/org/baeldung/SpringContextTest.java b/testing-modules/spring-mockito/src/test/java/org/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-mockito/src/test/java/org/baeldung/SpringContextTest.java
rename to testing-modules/spring-mockito/src/test/java/org/baeldung/SpringContextTest.java