Move TestCompiler and related classes to core.test.tools package

Closes gh-29175

spring-core-test/src/main/java/org/springframework/aot/test/generate/file/package-info.java

@@ -1,9 +0,0 @@
-/**
- * Support classes for running assertions on generated files.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.aot.test.generate.file;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;

spring-core-test/src/main/java/org/springframework/core/test/tools/ClassFile.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import java.io.IOException;
 

spring-core-test/src/main/java/org/springframework/core/test/tools/ClassFiles.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import java.util.Arrays;
 import java.util.Collections;

spring-core-test/src/main/java/org/springframework/core/test/tools/CompilationException.java

@@ -14,12 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
-
-import org.springframework.aot.test.generate.file.ResourceFile;
-import org.springframework.aot.test.generate.file.ResourceFiles;
-import org.springframework.aot.test.generate.file.SourceFile;
-import org.springframework.aot.test.generate.file.SourceFiles;
+package org.springframework.core.test.tools;
 
 /**
  * Exception thrown when code cannot compile.

spring-core-test/src/main/java/org/springframework/core/test/tools/CompileWithForkedClassLoader.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-core-test/src/main/java/org/springframework/core/test/tools/CompileWithForkedClassLoaderClassLoader.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.io.IOException;
 import java.io.InputStream;

spring-core-test/src/main/java/org/springframework/core/test/tools/CompileWithForkedClassLoaderExtension.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.lang.reflect.Method;
 

spring-core-test/src/main/java/org/springframework/core/test/tools/Compiled.java

@@ -14,17 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.springframework.aot.test.generate.file.ResourceFile;
-import org.springframework.aot.test.generate.file.ResourceFiles;
-import org.springframework.aot.test.generate.file.SourceFile;
-import org.springframework.aot.test.generate.file.SourceFiles;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 

spring-core-test/src/main/java/org/springframework/core/test/tools/DynamicClassFileObject.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

spring-core-test/src/main/java/org/springframework/core/test/tools/DynamicClassLoader.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -29,10 +29,6 @@ import java.util.Map;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import org.springframework.aot.test.generate.file.ClassFile;
-import org.springframework.aot.test.generate.file.ClassFiles;
-import org.springframework.aot.test.generate.file.ResourceFile;
-import org.springframework.aot.test.generate.file.ResourceFiles;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ReflectionUtils;
 

spring-core-test/src/main/java/org/springframework/core/test/tools/DynamicFile.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;

spring-core-test/src/main/java/org/springframework/core/test/tools/DynamicFileAssert.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import org.assertj.core.api.AbstractAssert;
 

spring-core-test/src/main/java/org/springframework/core/test/tools/DynamicFiles.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import java.util.Arrays;
 import java.util.Collections;

spring-core-test/src/main/java/org/springframework/core/test/tools/DynamicJavaFileManager.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -30,10 +30,6 @@ import javax.tools.JavaFileManager;
 import javax.tools.JavaFileObject;
 import javax.tools.JavaFileObject.Kind;
 
-import org.springframework.aot.test.generate.file.ClassFile;
-import org.springframework.aot.test.generate.file.ClassFiles;
-import org.springframework.aot.test.generate.file.ResourceFile;
-import org.springframework.aot.test.generate.file.ResourceFiles;
 import org.springframework.util.ClassUtils;
 
 /**

spring-core-test/src/main/java/org/springframework/core/test/tools/DynamicJavaFileObject.java

@@ -14,15 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.net.URI;
 
 import javax.tools.JavaFileObject;
 import javax.tools.SimpleJavaFileObject;
 
-import org.springframework.aot.test.generate.file.SourceFile;
-
 /**
  * Adapts a {@link SourceFile} instance to a {@link JavaFileObject}.
  *

spring-core-test/src/main/java/org/springframework/core/test/tools/DynamicResourceFileObject.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

spring-core-test/src/main/java/org/springframework/core/test/tools/ResourceFile.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;

spring-core-test/src/main/java/org/springframework/core/test/tools/ResourceFileAssert.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 /**
  * Assertion methods for {@code ResourceFile} instances.

spring-core-test/src/main/java/org/springframework/core/test/tools/ResourceFiles.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import java.util.Iterator;
 import java.util.stream.Stream;

spring-core-test/src/main/java/org/springframework/core/test/tools/SourceFile.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import java.io.File;
 import java.io.FileInputStream;

spring-core-test/src/main/java/org/springframework/core/test/tools/SourceFileAssert.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 /**
  * Assertion methods for {@code SourceFile} instances.

spring-core-test/src/main/java/org/springframework/core/test/tools/SourceFiles.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import java.util.Iterator;
 import java.util.Objects;

spring-core-test/src/main/java/org/springframework/core/test/tools/TestCompiler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.io.PrintStream;
 import java.util.ArrayList;
@@ -35,13 +35,6 @@ import javax.tools.ToolProvider;
 
 import org.springframework.aot.generate.GeneratedFiles.Kind;
 import org.springframework.aot.generate.InMemoryGeneratedFiles;
-import org.springframework.aot.test.generate.file.ClassFile;
-import org.springframework.aot.test.generate.file.ClassFiles;
-import org.springframework.aot.test.generate.file.ResourceFile;
-import org.springframework.aot.test.generate.file.ResourceFiles;
-import org.springframework.aot.test.generate.file.SourceFile;
-import org.springframework.aot.test.generate.file.SourceFiles;
-import org.springframework.aot.test.generate.file.WritableContent;
 import org.springframework.lang.Nullable;
 
 /**

spring-core-test/src/main/java/org/springframework/core/test/tools/WritableContent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import java.io.IOException;
 

spring-core-test/src/main/java/org/springframework/core/test/tools/package-info.java

@@ -3,7 +3,7 @@
  */
 @NonNullApi
 @NonNullFields
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import org.springframework.lang.NonNullApi;
 import org.springframework.lang.NonNullFields;

spring-core-test/src/test/java/org/springframework/core/test/tools/ClassFileTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import org.junit.jupiter.api.Test;
 

spring-core-test/src/test/java/org/springframework/core/test/tools/ClassFilesTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import java.util.Iterator;
 

spring-core-test/src/test/java/org/springframework/core/test/tools/CompilationExceptionTests.java

@@ -14,16 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.aot.test.generate.file.ResourceFiles;
-import org.springframework.aot.test.generate.file.SourceFiles;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
-
 /**
  * Tests for {@link CompilationException}.
  *

spring-core-test/src/test/java/org/springframework/core/test/tools/CompiledTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -22,11 +22,6 @@ import java.util.function.Supplier;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.aot.test.generate.file.ResourceFile;
-import org.springframework.aot.test.generate.file.ResourceFiles;
-import org.springframework.aot.test.generate.file.SourceFile;
-import org.springframework.aot.test.generate.file.SourceFiles;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 

spring-core-test/src/test/java/org/springframework/core/test/tools/DynamicClassFileObjectTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.io.ByteArrayInputStream;
 import java.io.OutputStream;

spring-core-test/src/test/java/org/springframework/core/test/tools/DynamicJavaFileManagerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -31,10 +31,6 @@ import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import org.springframework.aot.test.generate.file.ClassFile;
-import org.springframework.aot.test.generate.file.ClassFiles;
-import org.springframework.aot.test.generate.file.ResourceFile;
-import org.springframework.aot.test.generate.file.ResourceFiles;
 import org.springframework.util.StreamUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;

spring-core-test/src/test/java/org/springframework/core/test/tools/DynamicJavaFileObjectTests.java

@@ -14,12 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.aot.test.generate.file.SourceFile;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**

spring-core-test/src/test/java/org/springframework/core/test/tools/DynamicResourceFileObjectTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;

spring-core-test/src/test/java/org/springframework/core/test/tools/ResourceFileTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import org.junit.jupiter.api.Test;
 

spring-core-test/src/test/java/org/springframework/core/test/tools/ResourceFilesTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import java.util.Iterator;
 

spring-core-test/src/test/java/org/springframework/core/test/tools/SourceFileAssertTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import org.junit.jupiter.api.Test;
 

spring-core-test/src/test/java/org/springframework/core/test/tools/SourceFileTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import java.io.File;
 import java.io.IOException;
@@ -88,15 +88,15 @@ class SourceFileTests {
 	@Test
 	void forClassWithClassUsesClass() {
 		SourceFile sourceFile = SourceFile.forClass(new File("src/test/java"), SourceFileTests.class);
-		assertThat(sourceFile.getPath()).isEqualTo("org/springframework/aot/test/generate/file/SourceFileTests.java");
-		assertThat(sourceFile.getClassName()).isEqualTo("org.springframework.aot.test.generate.file.SourceFileTests");
+		assertThat(sourceFile.getPath()).isEqualTo("org/springframework/core/test/tools/SourceFileTests.java");
+		assertThat(sourceFile.getClassName()).isEqualTo("org.springframework.core.test.tools.SourceFileTests");
 	}
 
 	@Test
 	void forTestClassWithClassUsesClass() {
 		SourceFile sourceFile = SourceFile.forTestClass(SourceFileTests.class);
-		assertThat(sourceFile.getPath()).isEqualTo("org/springframework/aot/test/generate/file/SourceFileTests.java");
-		assertThat(sourceFile.getClassName()).isEqualTo("org.springframework.aot.test.generate.file.SourceFileTests");
+		assertThat(sourceFile.getPath()).isEqualTo("org/springframework/core/test/tools/SourceFileTests.java");
+		assertThat(sourceFile.getClassName()).isEqualTo("org.springframework.core.test.tools.SourceFileTests");
 	}
 
 	@Test

spring-core-test/src/test/java/org/springframework/core/test/tools/SourceFilesTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import java.util.Iterator;
 

spring-core-test/src/test/java/org/springframework/core/test/tools/TestCompilerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,12 +30,6 @@ import javax.lang.model.element.TypeElement;
 import com.example.PublicInterface;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.aot.test.generate.file.ClassFile;
-import org.springframework.aot.test.generate.file.ResourceFile;
-import org.springframework.aot.test.generate.file.ResourceFiles;
-import org.springframework.aot.test.generate.file.SourceFile;
-import org.springframework.aot.test.generate.file.SourceFiles;
-import org.springframework.aot.test.generate.file.WritableContent;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.ClassUtils;