From 47f5f1776de90a7162b6486db3e4cd9359407df3 Mon Sep 17 00:00:00 2001
From: anuragkumawat <anuragkumawat7@gmail.com>
Date: Fri, 23 Jun 2023 14:03:16 +0530
Subject: [PATCH] JAVA-21298 Fix failing tests in spring-boot-testing module
 (#14289)

---
 spring-boot-modules/pom.xml                   |   1 +
 .../spring-boot-testing-spock/README.md       |   7 ++
 .../spring-boot-testing-spock/pom.xml         | 103 ++++++++++++++++++
 .../java/com/baeldung/boot/Application.java   |  14 +++
 .../boot/controller/rest/WebController.java   |   0
 .../src/main/resources/application.properties |   2 +
 .../com/baeldung/boot/LoadContextTest.groovy  |   0
 .../baeldung/boot/WebControllerTest.groovy    |   0
 .../boot/WebControllerTest.groovy alias       | Bin
 .../com/baeldung/boot/SpringContextTest.java  |  15 +++
 .../resources/application-test.properties     |   2 +
 .../src/test/resources/logback-test.xml       |  12 ++
 .../spring-boot-testing/README.md             |   1 -
 .../spring-boot-testing/pom.xml               |  30 +----
 .../resources/property-validation.properties  |   4 +
 15 files changed, 161 insertions(+), 30 deletions(-)
 create mode 100644 spring-boot-modules/spring-boot-testing-spock/README.md
 create mode 100644 spring-boot-modules/spring-boot-testing-spock/pom.xml
 create mode 100644 spring-boot-modules/spring-boot-testing-spock/src/main/java/com/baeldung/boot/Application.java
 rename spring-boot-modules/{spring-boot-testing => spring-boot-testing-spock}/src/main/java/com/baeldung/boot/controller/rest/WebController.java (100%)
 create mode 100644 spring-boot-modules/spring-boot-testing-spock/src/main/resources/application.properties
 rename spring-boot-modules/{spring-boot-testing => spring-boot-testing-spock}/src/test/groovy/com/baeldung/boot/LoadContextTest.groovy (100%)
 rename spring-boot-modules/{spring-boot-testing => spring-boot-testing-spock}/src/test/groovy/com/baeldung/boot/WebControllerTest.groovy (100%)
 rename spring-boot-modules/{spring-boot-testing => spring-boot-testing-spock}/src/test/groovy/com/baeldung/boot/WebControllerTest.groovy alias (100%)
 create mode 100644 spring-boot-modules/spring-boot-testing-spock/src/test/java/com/baeldung/boot/SpringContextTest.java
 create mode 100644 spring-boot-modules/spring-boot-testing-spock/src/test/resources/application-test.properties
 create mode 100644 spring-boot-modules/spring-boot-testing-spock/src/test/resources/logback-test.xml
 create mode 100644 spring-boot-modules/spring-boot-testing/src/test/resources/property-validation.properties

diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml
index 2c82fa1611..36a25b0005 100644
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@@ -75,6 +75,7 @@
         <module>spring-boot-swagger-keycloak</module>
         <module>spring-boot-testing</module>
         <module>spring-boot-testing-2</module>
+	<module>spring-boot-testing-spock</module>
         <module>spring-boot-vue</module>
         <module>spring-boot-actuator</module>
         <module>spring-boot-data-2</module>
diff --git a/spring-boot-modules/spring-boot-testing-spock/README.md b/spring-boot-modules/spring-boot-testing-spock/README.md
new file mode 100644
index 0000000000..ab8193ab4e
--- /dev/null
+++ b/spring-boot-modules/spring-boot-testing-spock/README.md
@@ -0,0 +1,7 @@
+## Spring Boot Testing
+
+This module contains articles about Spring Boot testing with Spock framework
+
+### Relevant Articles:
+
+- [Testing with Spring and Spock](https://www.baeldung.com/spring-spock-testing)
diff --git a/spring-boot-modules/spring-boot-testing-spock/pom.xml b/spring-boot-modules/spring-boot-testing-spock/pom.xml
new file mode 100644
index 0000000000..c82d88ccfb
--- /dev/null
+++ b/spring-boot-modules/spring-boot-testing-spock/pom.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>spring-boot-testing-spock</artifactId>
+    <name>spring-boot-testing-spock</name>
+    <packaging>war</packaging>
+    <description>This is simple boot application for demonstrating spock framework testing features.</description>
+
+    <parent>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-bom</artifactId>
+                <version>${log4j2.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- Spock & Spring -->
+        <dependency>
+            <groupId>org.spockframework</groupId>
+            <artifactId>spock-core</artifactId>
+            <version>${spock.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.spockframework</groupId>
+            <artifactId>spock-spring</artifactId>
+            <version>${spock.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>spring-boot-testing-spock</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.gmavenplus</groupId>
+                <artifactId>gmavenplus-plugin</artifactId>
+                <version>${gmavenplus-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>compileTests</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <targetBytecode>17</targetBytecode>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <!-- The main class to start by executing java -jar -->
+        <start-class>com.baeldung.boot.Application</start-class>
+        <spock.version>2.4-M1-groovy-4.0</spock.version>
+        <gmavenplus-plugin.version>3.0.0</gmavenplus-plugin.version>
+        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
+        <log4j2.version>2.17.1</log4j2.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-testing-spock/src/main/java/com/baeldung/boot/Application.java b/spring-boot-modules/spring-boot-testing-spock/src/main/java/com/baeldung/boot/Application.java
new file mode 100644
index 0000000000..cb0d0c1532
--- /dev/null
+++ b/spring-boot-modules/spring-boot-testing-spock/src/main/java/com/baeldung/boot/Application.java
@@ -0,0 +1,14 @@
+package com.baeldung.boot;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContext;
+
+@SpringBootApplication
+public class Application {
+    private static ApplicationContext applicationContext;
+
+    public static void main(String[] args) {
+        applicationContext = SpringApplication.run(Application.class, args);
+    }
+}
diff --git a/spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/boot/controller/rest/WebController.java b/spring-boot-modules/spring-boot-testing-spock/src/main/java/com/baeldung/boot/controller/rest/WebController.java
similarity index 100%
rename from spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/boot/controller/rest/WebController.java
rename to spring-boot-modules/spring-boot-testing-spock/src/main/java/com/baeldung/boot/controller/rest/WebController.java
diff --git a/spring-boot-modules/spring-boot-testing-spock/src/main/resources/application.properties b/spring-boot-modules/spring-boot-testing-spock/src/main/resources/application.properties
new file mode 100644
index 0000000000..139597f9cb
--- /dev/null
+++ b/spring-boot-modules/spring-boot-testing-spock/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+
+
diff --git a/spring-boot-modules/spring-boot-testing/src/test/groovy/com/baeldung/boot/LoadContextTest.groovy b/spring-boot-modules/spring-boot-testing-spock/src/test/groovy/com/baeldung/boot/LoadContextTest.groovy
similarity index 100%
rename from spring-boot-modules/spring-boot-testing/src/test/groovy/com/baeldung/boot/LoadContextTest.groovy
rename to spring-boot-modules/spring-boot-testing-spock/src/test/groovy/com/baeldung/boot/LoadContextTest.groovy
diff --git a/spring-boot-modules/spring-boot-testing/src/test/groovy/com/baeldung/boot/WebControllerTest.groovy b/spring-boot-modules/spring-boot-testing-spock/src/test/groovy/com/baeldung/boot/WebControllerTest.groovy
similarity index 100%
rename from spring-boot-modules/spring-boot-testing/src/test/groovy/com/baeldung/boot/WebControllerTest.groovy
rename to spring-boot-modules/spring-boot-testing-spock/src/test/groovy/com/baeldung/boot/WebControllerTest.groovy
diff --git a/spring-boot-modules/spring-boot-testing/src/test/groovy/com/baeldung/boot/WebControllerTest.groovy alias b/spring-boot-modules/spring-boot-testing-spock/src/test/groovy/com/baeldung/boot/WebControllerTest.groovy alias
similarity index 100%
rename from spring-boot-modules/spring-boot-testing/src/test/groovy/com/baeldung/boot/WebControllerTest.groovy alias
rename to spring-boot-modules/spring-boot-testing-spock/src/test/groovy/com/baeldung/boot/WebControllerTest.groovy alias
diff --git a/spring-boot-modules/spring-boot-testing-spock/src/test/java/com/baeldung/boot/SpringContextTest.java b/spring-boot-modules/spring-boot-testing-spock/src/test/java/com/baeldung/boot/SpringContextTest.java
new file mode 100644
index 0000000000..f3c8b9a954
--- /dev/null
+++ b/spring-boot-modules/spring-boot-testing-spock/src/test/java/com/baeldung/boot/SpringContextTest.java
@@ -0,0 +1,15 @@
+package com.baeldung.boot;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-boot-modules/spring-boot-testing-spock/src/test/resources/application-test.properties b/spring-boot-modules/spring-boot-testing-spock/src/test/resources/application-test.properties
new file mode 100644
index 0000000000..a2c9b6d480
--- /dev/null
+++ b/spring-boot-modules/spring-boot-testing-spock/src/test/resources/application-test.properties
@@ -0,0 +1,2 @@
+# test properties
+spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-testing-spock/src/test/resources/logback-test.xml b/spring-boot-modules/spring-boot-testing-spock/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..9553dcad41
--- /dev/null
+++ b/spring-boot-modules/spring-boot-testing-spock/src/test/resources/logback-test.xml
@@ -0,0 +1,12 @@
+<configuration>
+    <include resource="/org/springframework/boot/logging/logback/base.xml"/>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+    <root level="error">
+        <appender-ref ref="STDOUT"/>
+    </root>
+</configuration>
diff --git a/spring-boot-modules/spring-boot-testing/README.md b/spring-boot-modules/spring-boot-testing/README.md
index 19f5ca0f59..407cc410e7 100644
--- a/spring-boot-modules/spring-boot-testing/README.md
+++ b/spring-boot-modules/spring-boot-testing/README.md
@@ -8,7 +8,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles:
 
-- [Testing with Spring and Spock](https://www.baeldung.com/spring-spock-testing)
 - [Exclude Auto-Configuration Classes in Spring Boot Tests](https://www.baeldung.com/spring-boot-exclude-auto-configuration-test)
 - [Embedded Redis Server with Spring Boot Test](https://www.baeldung.com/spring-embedded-redis)
 - [Testing Spring Boot @ConfigurationProperties](https://www.baeldung.com/spring-boot-testing-configurationproperties)
diff --git a/spring-boot-modules/spring-boot-testing/pom.xml b/spring-boot-modules/spring-boot-testing/pom.xml
index ace6307761..2098ac767d 100644
--- a/spring-boot-modules/spring-boot-testing/pom.xml
+++ b/spring-boot-modules/spring-boot-testing/pom.xml
@@ -67,19 +67,6 @@
             <version>${redis.version}</version>
             <scope>test</scope>
         </dependency>
-        <!-- Spock & Spring -->
-        <dependency>
-            <groupId>org.spockframework</groupId>
-            <artifactId>spock-core</artifactId>
-            <version>${spock.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.spockframework</groupId>
-            <artifactId>spock-spring</artifactId>
-            <version>${spock.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -120,21 +107,6 @@
                     <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.gmavenplus</groupId>
-                <artifactId>gmavenplus-plugin</artifactId>
-                <version>${gmavenplus-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>compileTests</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <targetBytecode>17</targetBytecode>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -148,7 +120,7 @@
         <start-class>com.baeldung.boot.Application</start-class>
         <git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
         <spock.version>2.4-M1-groovy-4.0</spock.version>
-        <gmavenplus-plugin.version>2.1.0</gmavenplus-plugin.version>
+        <gmavenplus-plugin.version>3.0.0</gmavenplus-plugin.version>
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
         <redis.version>0.7.2</redis.version>
         <spring-boot.version>2.5.0</spring-boot.version>
diff --git a/spring-boot-modules/spring-boot-testing/src/test/resources/property-validation.properties b/spring-boot-modules/spring-boot-testing/src/test/resources/property-validation.properties
new file mode 100644
index 0000000000..6b4c881dc0
--- /dev/null
+++ b/spring-boot-modules/spring-boot-testing/src/test/resources/property-validation.properties
@@ -0,0 +1,4 @@
+validate.propertiesMap.first=prop1
+validate.propertiesMap.second=prop2
+
+validate.mail_config.address=user1@test
\ No newline at end of file