Move uncategorized tests to their most appropriate boot/framework version test configuration folder.

Author: pway99

build.gradle.kts

@@ -207,18 +207,12 @@ dependencies {
     testImplementation("org.openrewrite:rewrite-java-11:${rewriteVersion}")
     testImplementation("org.openrewrite:rewrite-java-8:${rewriteVersion}")
 
-    testRuntimeOnly("org.springframework:spring-beans:latest.release")
-    testRuntimeOnly("org.springframework:spring-context:latest.release")
-    testRuntimeOnly("org.springframework:spring-web:latest.release")
-    testRuntimeOnly("org.springframework:spring-webmvc:latest.release")
-    testRuntimeOnly("org.springframework:spring-test:latest.release")
-    testRuntimeOnly("org.springframework.boot:spring-boot-test:latest.release")
-    testRuntimeOnly("org.springframework.boot:spring-boot-test-autoconfigure:latest.release")
-
     "testWithSpringBoot_1_5RuntimeOnly"("org.springframework:spring-web:4.+")
     "testWithSpringBoot_1_5RuntimeOnly"("org.springframework.boot:spring-boot:1.5.+")
     "testWithSpringBoot_1_5RuntimeOnly"("org.springframework.boot:spring-boot-autoconfigure:1.5.+")
     "testWithSpringBoot_1_5RuntimeOnly"("org.springframework.boot:spring-boot-test:1.5.+")
+    "testWithSpringBoot_1_5RuntimeOnly"("org.hamcrest:hamcrest:2.2")
+    "testWithSpringBoot_1_5RuntimeOnly"("junit:junit:latest.release")
 
     "testWithSpringBoot_2_1RuntimeOnly"("org.springframework:spring-web:5.1.+")
     "testWithSpringBoot_2_1RuntimeOnly"("org.springframework.boot:spring-boot:2.1.+")
@@ -227,7 +221,7 @@ dependencies {
     "testWithSpringBoot_2_2RuntimeOnly"("org.springframework.boot:spring-boot:2.2.+")
 
     "testWithSpringBoot_2_3RuntimeOnly"("org.openrewrite.recipe:rewrite-testing-frameworks:${rewriteVersion}")
-    "testWithSpringBoot_2_3RuntimeOnly"("org.springframework:spring-test:4.+")
+    "testWithSpringBoot_2_3RuntimeOnly"("org.springframework:spring-test:5.3.+")
     "testWithSpringBoot_2_3RuntimeOnly"("junit:junit:latest.release")
     "testWithSpringBoot_2_3RuntimeOnly"("org.hamcrest:hamcrest:2.2")
     "testWithSpringBoot_2_3RuntimeOnly"("org.springframework.boot:spring-boot-test:1.5.+")
@@ -246,9 +240,13 @@ dependencies {
     "testWithSpringBoot_2_4RuntimeOnly"("org.springframework:spring-context:5.3.+")
     "testWithSpringBoot_2_4RuntimeOnly"("org.springframework:spring-orm:5.3.+")
     "testWithSpringBoot_2_4RuntimeOnly"("org.springframework:spring-web:5.3.+")
+    "testWithSpringBoot_2_4RuntimeOnly"("org.springframework:spring-webmvc:5.3.+")
     "testWithSpringBoot_2_4RuntimeOnly"("jakarta.persistence:jakarta.persistence-api:2.2.3")
     "testWithSpringBoot_2_4RuntimeOnly"("org.springframework.data:spring-data-jpa:2.4.+")
     "testWithSpringBoot_2_4RuntimeOnly"("org.springframework.data:spring-data-jdbc:2.1.+")
+    "testWithSpringBoot_2_4RuntimeOnly"("org.springframework:spring-test:5.3.+")
+    "testWithSpringBoot_2_4RuntimeOnly"("org.springframework.boot:spring-boot-test:2.4.+")
+    "testWithSpringBoot_2_4RuntimeOnly"("org.springframework.boot:spring-boot-test-autoconfigure:2.4.+")
 
     "testWithSpringFramework_5_1RuntimeOnly"("org.springframework:spring-core:5.1.+")
 
@@ -259,6 +257,7 @@ dependencies {
     "testWithSpringFramework_5_3RuntimeOnly"("org.springframework:spring-beans:5.3.+")
     "testWithSpringFramework_5_3RuntimeOnly"("org.springframework:spring-tx:5.3.+")
     "testWithSpringFramework_5_3RuntimeOnly"("org.springframework:spring-jdbc:5.3.+")
+    "testWithSpringFramework_5_3RuntimeOnly"("org.springframework:spring-web:5.3.+")
 
     "testWithSpringBoot_2_5RuntimeOnly"("org.springframework.boot:spring-boot:2.5.+")
 

src/test/kotlin/org/openrewrite/java/spring/NoAutowiredOnConstructorTest.kt renamed to src/testWithSpringBoot_1_5/kotlin/org/openrewrite/java/spring/NoAutowiredOnConstructorTest.kt

@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openrewrite.java.spring.org.openrewrite.java.spring
+package org.openrewrite.java.spring
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.openrewrite.Recipe
 import org.openrewrite.Result
-import org.openrewrite.java.spring.SeparateApplicationYamlByProfile
 import org.openrewrite.yaml.YamlParser
 import org.openrewrite.yaml.YamlRecipeTest
 import java.nio.file.Paths

src/testWithSpringBoot_2_3/kotlin/org/openrewrite/java/spring/boot2/OutputCaptureExtensionTest.kt renamed to src/testWithSpringBoot_1_5/kotlin/org/openrewrite/java/spring/boot2/OutputCaptureExtensionTest.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openrewrite.java.spring.org.openrewrite.java.spring.boot2.search
+package org.openrewrite.java.spring.boot2.search
 
 import org.junit.jupiter.api.Test
 import org.openrewrite.java.JavaParser

src/test/kotlin/org/openrewrite/java/spring/BeanMethodsNotPublicTest.kt renamed to src/testWithSpringBoot_2_1/kotlin/org/openrewrite/java/spring/BeanMethodsNotPublicTest.kt

@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openrewrite.java.spring.org.openrewrite.java.spring.boot2.search
+package org.openrewrite.java.spring.boot2.search
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.openrewrite.Recipe
 import org.openrewrite.java.JavaParser
-import org.openrewrite.java.spring.boot2.search.LoggingShutdownHooks
 import org.openrewrite.maven.MavenParser
 import org.openrewrite.maven.MavenRecipeTest
 

src/test/kotlin/org/openrewrite/java/spring/ExpandPropertiesTest.kt renamed to src/testWithSpringBoot_2_1/kotlin/org/openrewrite/java/spring/ExpandPropertiesTest.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openrewrite.java.spring.org.openrewrite.java.spring.cve
+package org.openrewrite.java.spring.cve
 
 import org.junit.jupiter.api.Test
 import org.openrewrite.Recipe
@@ -25,7 +25,7 @@ class Spring4ShellTest : JavaRecipeTest {
     override val parser: JavaParser
         get() = JavaParser.fromJavaVersion()
             .logCompilationWarningsAndErrors(true)
-            .classpath("spring-beans", "spring-boot", "spring-context")
+            .classpath("spring-beans", "spring-boot", "spring-context","spring-web", "spring-webmvc","spring-boot-autoconfigure")
             .build()
 
     override val recipe: Recipe

src/test/kotlin/org/openrewrite/java/spring/ImplicitWebAnnotationNamesTest.kt renamed to src/testWithSpringBoot_2_1/kotlin/org/openrewrite/java/spring/ImplicitWebAnnotationNamesTest.kt

@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openrewrite.java.spring.org.openrewrite.java.spring
+package org.openrewrite.java.spring
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.openrewrite.Recipe
 import org.openrewrite.java.JavaParser
 import org.openrewrite.java.JavaRecipeTest
-import org.openrewrite.java.spring.UpdateApiManifest
 import java.nio.file.Paths
 
 class UpdateApiManifestTest : JavaRecipeTest {

src/test/kotlin/org/openrewrite/java/spring/NoRequestMappingAnnotationTest.kt renamed to src/testWithSpringBoot_2_1/kotlin/org/openrewrite/java/spring/NoRequestMappingAnnotationTest.kt

@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openrewrite.java.spring.org.openrewrite.java.spring
+package org.openrewrite.java.spring
 
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
 import org.openrewrite.Recipe
-import org.openrewrite.java.spring.YamlPropertiesToKebabCase
 import org.openrewrite.yaml.YamlRecipeTest
 import java.nio.file.Path