diff --git a/pom.xml b/pom.xml index ff8336d890..1fe42bd734 100644 --- a/pom.xml +++ b/pom.xml @@ -621,7 +621,6 @@ spring-katharsis spring-mobile - spring-mockito spring-native spring-protobuf spring-quartz @@ -1050,7 +1049,6 @@ spring-katharsis spring-mobile - spring-mockito spring-native spring-protobuf spring-quartz 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 @@ rest-assured rest-testing selenium-junit-testng + spring-mockito spring-testing-2 spring-testing test-containers 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 @@ com.baeldung parent-boot-2 0.0.1-SNAPSHOT - ../parent-boot-2 + ../../parent-boot-2 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