[JAVA-40681] Move code between spring-testing and spring-testing-2 modules (#18221)

Author: Bipinkumar27

testing-modules/spring-testing-2/README.md

@@ -1,9 +1,8 @@
 ## Relevant Articles:
-
-- [Guide to @DynamicPropertySource in Spring](https://www.baeldung.com/spring-dynamicpropertysource)
 - [Concurrent Test Execution in Spring](https://www.baeldung.com/spring-5-concurrent-tests)
 - [Spring Testing with @EnabledIf Annotation](https://www.baeldung.com/spring-5-enabledif)
 - [The Spring TestExecutionListener](https://www.baeldung.com/spring-testexecutionlistener)
-- [Execute Tests Based on Active Profile With JUnit 5](https://www.baeldung.com/spring-boot-junit-5-testing-active-profile)
 - [A Guide to @‌MockBeans](https://www.baeldung.com/java-spring-mockbeans)
 - [Mock @Value in Spring Boot Test](https://www.baeldung.com/java-spring-boot-test-mock-value)
+- [How to Test the @Scheduled Annotation](https://www.baeldung.com/spring-testing-scheduled-annotation)
+- [Using SpringJUnit4ClassRunner with Parameterized](https://www.baeldung.com/springjunit4classrunner-parameterized)

testing-modules/spring-testing-2/pom.xml

@@ -39,6 +39,16 @@
             <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>

testing-modules/spring-testing-2/src/main/java/com/baeldung/config/ScheduledConfig.java

@@ -0,0 +1,11 @@
+package com.baeldung.config;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@Configuration
+@EnableScheduling
+@ComponentScan("com.baeldung.scheduled")
+public class ScheduledConfig {
+}

testing-modules/spring-testing-2/src/main/java/com/baeldung/config/WebConfig.java

@@ -0,0 +1,17 @@
+package com.baeldung.config;
+
+import javax.servlet.ServletContext;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+
+@EnableWebMvc
+@Configuration
+@ComponentScan(basePackages = {"com.baeldung.controller.parameterized"})
+public class WebConfig {
+
+    @Autowired
+    private ServletContext ctx;
+}

testing-modules/spring-testing/src/main/java/com/baeldung/controller/parameterized/EmployeeRoleController.java renamed to testing-modules/spring-testing-2/src/main/java/com/baeldung/controller/parameterized/EmployeeRoleController.java

@@ -1,7 +1,7 @@
 package com.baeldung.scheduled;
 
 import com.baeldung.config.ScheduledConfig;
-import org.awaitility.Duration;
+import org.awaitility.Durations;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -18,7 +18,7 @@ public class ScheduledAwaitilityIntegrationTest {
     @Test
     public void whenWaitOneSecond_thenScheduledIsCalledAtLeastTenTimes() {
         await()
-          .atMost(Duration.ONE_SECOND)
+          .atMost(Durations.ONE_SECOND)
           .untilAsserted(() -> verify(counter, atLeast(10)).scheduled());
     }
 }