diff --git a/querydsl-tooling/pom.xml b/querydsl-tooling/pom.xml index 4bee6e72d..911dac0a3 100644 --- a/querydsl-tooling/pom.xml +++ b/querydsl-tooling/pom.xml @@ -14,6 +14,7 @@ querydsl-apt + querydsl-apt-test querydsl-codegen querydsl-codegen-utils querydsl-jpa-codegen diff --git a/querydsl-tooling/querydsl-apt-test/pom.xml b/querydsl-tooling/querydsl-apt-test/pom.xml new file mode 100644 index 000000000..125d33e6d --- /dev/null +++ b/querydsl-tooling/querydsl-apt-test/pom.xml @@ -0,0 +1,136 @@ + + + 4.0.0 + + + io.github.openfeign.querydsl + querydsl-tooling + 7.2-SNAPSHOT + + + querydsl-apt-test + Querydsl - APT tests + Tests for APT based Source code generation for Querydsl + + + true + true + true + true + + + + + io.github.openfeign.querydsl + querydsl-apt + ${project.version} + + + jakarta.persistence + jakarta.persistence-api + + + + + org.hibernate.orm + hibernate-core + ${hibernate.version} + test + + + jakarta.activation + activation-api + + + org.javassist + javassist + + + + + org.hibernate.orm + hibernate-envers + ${hibernate.version} + test + + + io.github.openfeign.querydsl + querydsl-core + ${project.version} + test-jar + test + + + + org.joda + joda-money + 2.0.3 + test + + + + org.eclipse.jdt + ecj + test + + + + org.junit.jupiter + junit-jupiter + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + process-test-annotations + + testCompile + + generate-test-sources + + only + + com.querydsl.apt.QuerydslAnnotationProcessor + + + + + process-test-annotations-hibernate + + testCompile + + generate-test-sources + + only + + com.querydsl.apt.hibernate.HibernateAnnotationProcessor + + + + + default-testCompile + + none + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + false + + + + + + + diff --git a/querydsl-tooling/querydsl-apt/src/test/apt/com/querydsl/BooleanExtensions.java b/querydsl-tooling/querydsl-apt-test/src/test/apt/com/querydsl/BooleanExtensions.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/apt/com/querydsl/BooleanExtensions.java rename to querydsl-tooling/querydsl-apt-test/src/test/apt/com/querydsl/BooleanExtensions.java diff --git a/querydsl-tooling/querydsl-apt/src/test/apt/com/querydsl/BooleanExtensions2.java b/querydsl-tooling/querydsl-apt-test/src/test/apt/com/querydsl/BooleanExtensions2.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/apt/com/querydsl/BooleanExtensions2.java rename to querydsl-tooling/querydsl-apt-test/src/test/apt/com/querydsl/BooleanExtensions2.java diff --git a/querydsl-tooling/querydsl-apt/src/test/apt/com/querydsl/ExampleEntity.java b/querydsl-tooling/querydsl-apt-test/src/test/apt/com/querydsl/ExampleEntity.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/apt/com/querydsl/ExampleEntity.java rename to querydsl-tooling/querydsl-apt-test/src/test/apt/com/querydsl/ExampleEntity.java diff --git a/querydsl-tooling/querydsl-apt/src/test/apt/com/querydsl/ExampleEntity2.java b/querydsl-tooling/querydsl-apt-test/src/test/apt/com/querydsl/ExampleEntity2.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/apt/com/querydsl/ExampleEntity2.java rename to querydsl-tooling/querydsl-apt-test/src/test/apt/com/querydsl/ExampleEntity2.java diff --git a/querydsl-tooling/querydsl-apt/src/test/apt/com/querydsl/InnerExtensions.java b/querydsl-tooling/querydsl-apt-test/src/test/apt/com/querydsl/InnerExtensions.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/apt/com/querydsl/InnerExtensions.java rename to querydsl-tooling/querydsl-apt-test/src/test/apt/com/querydsl/InnerExtensions.java diff --git a/querydsl-tooling/querydsl-apt/src/test/apt/com/querydsl/IntegerExtensions.java b/querydsl-tooling/querydsl-apt-test/src/test/apt/com/querydsl/IntegerExtensions.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/apt/com/querydsl/IntegerExtensions.java rename to querydsl-tooling/querydsl-apt-test/src/test/apt/com/querydsl/IntegerExtensions.java diff --git a/querydsl-tooling/querydsl-apt/src/test/apt/com/querydsl/eclipse/SimpleEntity.java b/querydsl-tooling/querydsl-apt-test/src/test/apt/com/querydsl/eclipse/SimpleEntity.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/apt/com/querydsl/eclipse/SimpleEntity.java rename to querydsl-tooling/querydsl-apt-test/src/test/apt/com/querydsl/eclipse/SimpleEntity.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/Entity.java b/querydsl-tooling/querydsl-apt-test/src/test/java/Entity.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/Entity.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/Entity.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/AbstractProcessorTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/AbstractProcessorTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/AbstractProcessorTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/AbstractProcessorTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/BooleanExtensionsTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/BooleanExtensionsTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/BooleanExtensionsTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/BooleanExtensionsTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/DateExtensions.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/DateExtensions.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/DateExtensions.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/DateExtensions.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/DateExtensionsTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/DateExtensionsTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/DateExtensionsTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/DateExtensionsTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/EclipseCompilationTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EclipseCompilationTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/EclipseCompilationTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EclipseCompilationTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/EmbeddableTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EmbeddableTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/EmbeddableTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EmbeddableTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/EntityExtensions.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EntityExtensions.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/EntityExtensions.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EntityExtensions.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/EntityExtensionsTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EntityExtensionsTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/EntityExtensionsTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EntityExtensionsTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/EntityWithExtensions.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EntityWithExtensions.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/EntityWithExtensions.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EntityWithExtensions.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/ExcludedClassesTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/ExcludedClassesTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/ExcludedClassesTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/ExcludedClassesTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/ExcludedPackagesTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/ExcludedPackagesTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/ExcludedPackagesTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/ExcludedPackagesTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/GenericExporterTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/GenericExporterTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/GenericExporterTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/GenericExporterTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/GenericTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/GenericTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/GenericTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/GenericTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/IncludedClassesTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IncludedClassesTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/IncludedClassesTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IncludedClassesTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/IncludedPackagesTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IncludedPackagesTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/IncludedPackagesTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IncludedPackagesTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/IncrementalCompilationTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IncrementalCompilationTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/IncrementalCompilationTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IncrementalCompilationTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/IntegerExtensionsTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IntegerExtensionsTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/IntegerExtensionsTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IntegerExtensionsTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/NamePrefixTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/NamePrefixTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/NamePrefixTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/NamePrefixTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/NameSuffixTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/NameSuffixTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/NameSuffixTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/NameSuffixTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/NoteTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/NoteTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/NoteTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/NoteTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/PackageSuffixTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/PackageSuffixTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/PackageSuffixTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/PackageSuffixTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/UnknownAsEmbeddableTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/UnknownAsEmbeddableTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/UnknownAsEmbeddableTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/UnknownAsEmbeddableTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractClasses2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractClasses2Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractClasses2Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractClasses2Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractClassesTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractClassesTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractClassesTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractClassesTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractEntityTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractEntityTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractEntityTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractEntityTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractProperties2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractProperties2Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractProperties2Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractProperties2Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractProperties3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractProperties3Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractProperties3Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractProperties3Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractPropertiesTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractPropertiesTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractPropertiesTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractPropertiesTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractSecurable.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractSecurable.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractSecurable.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractSecurable.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Address.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Address.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Address.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Address.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnimalTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnimalTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnimalTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnimalTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnnotatedGettersTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnnotatedGettersTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnnotatedGettersTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnnotatedGettersTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnnotationTypeTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnnotationTypeTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnnotationTypeTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnnotationTypeTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnyPathTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnyPathTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnyPathTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnyPathTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnyUsageTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnyUsageTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnyUsageTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnyUsageTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Array2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Array2Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Array2Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Array2Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Array3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Array3Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Array3Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Array3Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ArrayExtTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ArrayExtTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ArrayExtTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ArrayExtTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ArrayTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ArrayTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ArrayTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ArrayTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/B.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/B.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/B.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/B.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/BlockingTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/BlockingTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/BlockingTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/BlockingTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/City.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/City.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/City.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/City.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/CollectionTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/CollectionTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/CollectionTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/CollectionTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ComparableTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ComparableTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ComparableTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ComparableTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ConstructorTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ConstructorTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ConstructorTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ConstructorTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/CustomCollection.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/CustomCollection.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/CustomCollection.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/CustomCollection.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/CustomMethods.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/CustomMethods.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/CustomMethods.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/CustomMethods.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/DeepInitializationTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/DeepInitializationTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/DeepInitializationTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/DeepInitializationTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Delegate2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Delegate2Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Delegate2Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Delegate2Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Delegate3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Delegate3Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Delegate3Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Delegate3Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/DelegateTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/DelegateTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/DelegateTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/DelegateTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Embeddable2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Embeddable2Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Embeddable2Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Embeddable2Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Embeddable3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Embeddable3Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Embeddable3Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Embeddable3Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/EmbeddableDeepTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddableDeepTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/EmbeddableDeepTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddableDeepTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/EmbeddableInterfaceTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddableInterfaceTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/EmbeddableInterfaceTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddableInterfaceTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/EmbeddableTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddableTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/EmbeddableTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddableTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Embedded2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Embedded2Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Embedded2Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Embedded2Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/EmbeddedTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddedTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/EmbeddedTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddedTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/EntityInheritanceTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EntityInheritanceTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/EntityInheritanceTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EntityInheritanceTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/EntityTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EntityTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/EntityTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EntityTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Enum2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Enum2Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Enum2Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Enum2Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Enum3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Enum3Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Enum3Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Enum3Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Enum4Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Enum4Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Enum4Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Enum4Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/EnumTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EnumTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/EnumTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EnumTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExampleEntity.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExampleEntity.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExampleEntity.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExampleEntity.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Examples.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Examples.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Examples.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Examples.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExcludedClassTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExcludedClassTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExcludedClassTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExcludedClassTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Expression.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Expression.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Expression.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Expression.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExpressionTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExpressionTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExpressionTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExpressionTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExtendsAndSuperTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExtendsAndSuperTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExtendsAndSuperTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExtendsAndSuperTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExternalEmbeddableTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExternalEmbeddableTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExternalEmbeddableTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExternalEmbeddableTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExternalEntityTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExternalEntityTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExternalEntityTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExternalEntityTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/FileAttachment.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/FileAttachment.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/FileAttachment.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/FileAttachment.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic10Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic10Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic10Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic10Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic11Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic11Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic11Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic11Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic12Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic12Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic12Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic12Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic13Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic13Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic13Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic13Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic14Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic14Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic14Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic14Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic15Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic15Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic15Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic15Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic16Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic16Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic16Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic16Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic2Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic2Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic2Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic3Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic3Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic3Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic4Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic4Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic4Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic4Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic5Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic5Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic5Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic5Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic6Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic6Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic6Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic6Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic7Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic7Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic7Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic7Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic8Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic8Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic8Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic8Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic9Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic9Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic9Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic9Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/GenericSignatureTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/GenericSignatureTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/GenericSignatureTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/GenericSignatureTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/GenericStackOverflowTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/GenericStackOverflowTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/GenericStackOverflowTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/GenericStackOverflowTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/GenericTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/GenericTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/GenericTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/GenericTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Hierarchy2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Hierarchy2Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Hierarchy2Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Hierarchy2Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/HierarchyTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/HierarchyTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/HierarchyTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/HierarchyTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/InitTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InitTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/InitTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InitTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/InnerExtensionsTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InnerExtensionsTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/InnerExtensionsTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InnerExtensionsTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/InterfaceType2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InterfaceType2Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/InterfaceType2Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InterfaceType2Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/InterfaceType3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InterfaceType3Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/InterfaceType3Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InterfaceType3Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/InterfaceTypeTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InterfaceTypeTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/InterfaceTypeTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InterfaceTypeTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/JPATest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JPATest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/JPATest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JPATest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/JSR310Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JSR310Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/JSR310Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JSR310Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/JSR310TimeSupportTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JSR310TimeSupportTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/JSR310TimeSupportTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JSR310TimeSupportTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/JodaMoneyHelpers.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JodaMoneyHelpers.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/JodaMoneyHelpers.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JodaMoneyHelpers.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/JodaMoneyTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JodaMoneyTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/JodaMoneyTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JodaMoneyTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/KeywordsTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/KeywordsTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/KeywordsTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/KeywordsTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/LiteralEntityTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/LiteralEntityTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/LiteralEntityTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/LiteralEntityTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Location.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Location.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Location.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Location.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ManagedEmailTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ManagedEmailTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ManagedEmailTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ManagedEmailTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ManyToManyTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ManyToManyTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ManyToManyTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ManyToManyTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/MonitoredCompany.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/MonitoredCompany.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/MonitoredCompany.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/MonitoredCompany.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/MonitoredCompanyTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/MonitoredCompanyTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/MonitoredCompanyTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/MonitoredCompanyTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/NumberTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/NumberTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/NumberTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/NumberTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/OneToOneTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/OneToOneTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/OneToOneTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/OneToOneTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/OrderTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/OrderTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/OrderTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/OrderTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Path.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Path.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Path.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Path.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/PathInits.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PathInits.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/PathInits.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PathInits.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/PathMetadata.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PathMetadata.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/PathMetadata.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PathMetadata.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/PathMetadataTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PathMetadataTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/PathMetadataTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PathMetadataTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/PathTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PathTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/PathTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PathTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Person.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Person.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Person.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Person.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/PersonTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PersonTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/PersonTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PersonTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Private.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Private.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Private.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Private.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Properties2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Properties2Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Properties2Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Properties2Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Properties3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Properties3Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Properties3Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Properties3Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Properties4Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Properties4Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Properties4Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Properties4Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/PropertiesTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PropertiesTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/PropertiesTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PropertiesTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/PropertyTypeTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PropertyTypeTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/PropertyTypeTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PropertyTypeTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Public.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Public.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Public.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Public.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryByExampleTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryByExampleTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryByExampleTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryByExampleTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbeddable2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddable2Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbeddable2Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddable2Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbeddable3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddable3Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbeddable3Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddable3Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbeddableTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddableTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbeddableTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddableTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded2Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded2Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded2Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded3Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded3Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded3Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded4Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded4Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded4Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded4Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded5Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded5Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded5Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded5Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded6Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded6Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded6Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded6Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded7Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded7Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded7Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded7Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbeddedTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddedTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbeddedTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddedTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryExcludeTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryExcludeTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryExcludeTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryExcludeTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit2Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit2Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit2Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit3Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit3Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit3Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit4Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit4Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit4Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit4Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit5Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit5Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit5Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit5Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit6Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit6Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit6Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit6Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit7Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit7Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit7Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit7Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInitTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInitTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInitTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInitTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryProjectionBuilderTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryProjectionBuilderTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryProjectionBuilderTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryProjectionBuilderTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryProjectionBuilderTestEntity.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryProjectionBuilderTestEntity.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryProjectionBuilderTestEntity.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryProjectionBuilderTestEntity.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryProjectionTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryProjectionTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryProjectionTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryProjectionTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryTypeOverTransientTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryTypeOverTransientTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryTypeOverTransientTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryTypeOverTransientTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryTypeTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryTypeTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryTypeTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryTypeTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QuerydslConfig2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QuerydslConfig2Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QuerydslConfig2Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QuerydslConfig2Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QuerydslConfigTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QuerydslConfigTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/QuerydslConfigTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QuerydslConfigTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/RawTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/RawTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/RawTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/RawTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/RelationTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/RelationTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/RelationTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/RelationTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ReservedNamesInTypesTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ReservedNamesInTypesTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ReservedNamesInTypesTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ReservedNamesInTypesTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ReservedNamesTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ReservedNamesTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/ReservedNamesTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ReservedNamesTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Revision.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Revision.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Revision.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Revision.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/SecurableEntity.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SecurableEntity.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/SecurableEntity.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SecurableEntity.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/SignatureTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SignatureTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/SignatureTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SignatureTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/SimpleTypesTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SimpleTypesTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/SimpleTypesTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SimpleTypesTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/SubCat.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SubCat.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/SubCat.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SubCat.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Subclass.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Subclass.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Subclass.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Subclass.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Superclass2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass2Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Superclass2Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass2Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Superclass3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass3Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Superclass3Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass3Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Superclass4Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass4Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Superclass4Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass4Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Superclass5Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass5Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Superclass5Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass5Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/SuperclassTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SuperclassTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/SuperclassTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SuperclassTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Temporal2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Temporal2Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Temporal2Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Temporal2Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/TemporalTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/TemporalTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/TemporalTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/TemporalTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/TransientTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/TransientTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/TransientTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/TransientTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/UserUtils.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/UserUtils.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/UserUtils.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/UserUtils.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/CustomNumber.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/custom/CustomNumber.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/CustomNumber.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/custom/CustomNumber.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/EmbeddedType.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/custom/EmbeddedType.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/EmbeddedType.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/custom/EmbeddedType.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/EmbeddedType2.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/custom/EmbeddedType2.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/EmbeddedType2.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/custom/EmbeddedType2.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/EmbeddedType3.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/custom/EmbeddedType3.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/EmbeddedType3.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/custom/EmbeddedType3.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/Entity.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/custom/Entity.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/Entity.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/custom/Entity.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p1/SEntity1.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p1/SEntity1.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p1/SEntity1.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p1/SEntity1.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/AbstractPersistable.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p10/AbstractPersistable.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/AbstractPersistable.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p10/AbstractPersistable.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/BasePersistable.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p10/BasePersistable.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/BasePersistable.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p10/BasePersistable.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/BaseReferencablePersistable.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p10/BaseReferencablePersistable.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/BaseReferencablePersistable.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p10/BaseReferencablePersistable.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/Persistable.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p10/Persistable.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/Persistable.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p10/Persistable.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/UpdateInfo.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p10/UpdateInfo.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/UpdateInfo.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p10/UpdateInfo.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/UserAccount.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p10/UserAccount.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/UserAccount.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p10/UserAccount.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p2/SEntity2.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p2/SEntity2.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p2/SEntity2.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p2/SEntity2.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p3/SEntity3.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p3/SEntity3.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p3/SEntity3.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p3/SEntity3.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p4/SSupertype.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p4/SSupertype.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p4/SSupertype.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p4/SSupertype.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p6/Type1.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p6/Type1.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p6/Type1.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p6/Type1.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p6/Type2.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p6/Type2.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p6/Type2.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p6/Type2.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p6/TypeTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p6/TypeTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p6/TypeTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p6/TypeTest.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p6/package-info.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p6/package-info.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p6/package-info.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p6/package-info.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p7/MyEntity.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p7/MyEntity.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p7/MyEntity.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p7/MyEntity.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p8/Custom.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p8/Custom.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p8/Custom.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p8/Custom.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p8/Entity.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p8/Entity.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p8/Entity.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p8/Entity.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p9/Article.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p9/Article.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p9/Article.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p9/Article.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p9/Content.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p9/Content.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p9/Content.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p9/Content.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p9/Person.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p9/Person.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/p9/Person.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p9/Person.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/package-info.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/package-info.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/package-info.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/package-info.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/rel/RelationType2.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/rel/RelationType2.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/rel/RelationType2.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/rel/RelationType2.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/rel/SimpleType.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/rel/SimpleType.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/rel/SimpleType.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/rel/SimpleType.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/rel/SimpleType2.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/rel/SimpleType2.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/rel/SimpleType2.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/rel/SimpleType2.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain2/BImpl.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain2/BImpl.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain2/BImpl.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain2/BImpl.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance11Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance11Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance11Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance11Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance2Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance2Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance2Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance3Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance3Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance3Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance4Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance4Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance4Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance4Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance5Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance5Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance5Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance5Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance6Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance6Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance6Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance6Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance7Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance7Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance7Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance7Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance8Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance8Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance8Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance8Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance9Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance9Test.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance9Test.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance9Test.java diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/InheritanceTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/InheritanceTest.java similarity index 100% rename from querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/InheritanceTest.java rename to querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/InheritanceTest.java diff --git a/querydsl-tooling/querydsl-apt/pom.xml b/querydsl-tooling/querydsl-apt/pom.xml index 8cb108334..03135e86c 100644 --- a/querydsl-tooling/querydsl-apt/pom.xml +++ b/querydsl-tooling/querydsl-apt/pom.xml @@ -47,49 +47,19 @@ hibernate-core ${hibernate.version} test - - - jakarta.activation - activation-api - - - org.javassist - javassist - - - org.hibernate.orm - hibernate-envers - ${hibernate.version} + com.google.testing.compile + compile-testing + 0.23.0 test - - io.github.openfeign.querydsl - querydsl-core - ${project.version} - test-jar - test - - - - org.joda - joda-money - 2.0.3 - test - - - - org.eclipse.jdt - ecj - test - - org.junit.jupiter junit-jupiter test + @@ -112,14 +82,6 @@ maven-bundle-plugin - - org.apache.maven.plugins - maven-surefire-plugin - - false - - - org.apache.maven.plugins maven-assembly-plugin @@ -145,29 +107,6 @@ - - com.mysema.maven - apt-maven-plugin - 1.1.3 - - - - test-process - add-test-sources - - generate-test-sources - - target/generated-test-sources/java - true - - com.querydsl.apt.QuerydslAnnotationProcessor - com.querydsl.apt.hibernate.HibernateAnnotationProcessor - - - - - - diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorCompileTest.java b/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorCompileTest.java new file mode 100644 index 000000000..7d63a8464 --- /dev/null +++ b/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorCompileTest.java @@ -0,0 +1,169 @@ +package com.querydsl.apt; + +import static com.google.testing.compile.Compiler.javac; +import static org.assertj.core.api.Assertions.assertThat; + +import com.google.testing.compile.Compilation; +import com.google.testing.compile.CompilationSubject; +import com.google.testing.compile.JavaFileObjects; +import javax.tools.JavaFileObject; +import org.junit.jupiter.api.Test; + +class QuerydslAnnotationProcessorCompileTest { + + @Test + void queryEntity_generatesQClass() { + JavaFileObject source = + JavaFileObjects.forSourceString( + "test.MyEntity", + """ + package test; + + import com.querydsl.core.annotations.QueryEntity; + + @QueryEntity + public class MyEntity { + public String name; + public int count; + } + """); + + Compilation compilation = + javac().withProcessors(new QuerydslAnnotationProcessor()).compile(source); + + CompilationSubject.assertThat(compilation).succeeded(); + assertThat(compilation.generatedSourceFile("test.QMyEntity")).isPresent(); + } + + @Test + void querySupertype_generatesQClass() { + JavaFileObject source = + JavaFileObjects.forSourceString( + "test.MySupertype", + """ + package test; + + import com.querydsl.core.annotations.QuerySupertype; + + @QuerySupertype + public class MySupertype { + public String id; + } + """); + + Compilation compilation = + javac().withProcessors(new QuerydslAnnotationProcessor()).compile(source); + + CompilationSubject.assertThat(compilation).succeeded(); + assertThat(compilation.generatedSourceFile("test.QMySupertype")).isPresent(); + } + + @Test + void queryEmbeddable_generatesQClass() { + JavaFileObject source = + JavaFileObjects.forSourceString( + "test.MyEmbeddable", + """ + package test; + + import com.querydsl.core.annotations.QueryEmbeddable; + + @QueryEmbeddable + public class MyEmbeddable { + public String street; + public String city; + } + """); + + Compilation compilation = + javac().withProcessors(new QuerydslAnnotationProcessor()).compile(source); + + CompilationSubject.assertThat(compilation).succeeded(); + assertThat(compilation.generatedSourceFile("test.QMyEmbeddable")).isPresent(); + } + + @Test + void generatedQClass_containsStringField() throws Exception { + JavaFileObject source = + JavaFileObjects.forSourceString( + "test.Person", + """ + package test; + + import com.querydsl.core.annotations.QueryEntity; + + @QueryEntity + public class Person { + public String name; + public int age; + } + """); + + Compilation compilation = + javac().withProcessors(new QuerydslAnnotationProcessor()).compile(source); + + CompilationSubject.assertThat(compilation).succeeded(); + var generated = compilation.generatedSourceFile("test.QPerson").orElseThrow(); + var content = generated.getCharContent(false).toString(); + assertThat(content).contains("StringPath name"); + assertThat(content).contains("NumberPath"); + } + + @Test + void unannotatedClass_noQClassGenerated() { + JavaFileObject source = + JavaFileObjects.forSourceString( + "test.PlainClass", + """ + package test; + + public class PlainClass { + public String field; + } + """); + + Compilation compilation = + javac().withProcessors(new QuerydslAnnotationProcessor()).compile(source); + + CompilationSubject.assertThat(compilation).succeeded(); + assertThat(compilation.generatedSourceFile("test.QPlainClass")).isEmpty(); + } + + @Test + void entityWithInheritance_generatesQClasses() { + JavaFileObject superSource = + JavaFileObjects.forSourceString( + "test.BaseEntity", + """ + package test; + + import com.querydsl.core.annotations.QuerySupertype; + + @QuerySupertype + public class BaseEntity { + public Long id; + } + """); + + JavaFileObject subSource = + JavaFileObjects.forSourceString( + "test.ChildEntity", + """ + package test; + + import com.querydsl.core.annotations.QueryEntity; + + @QueryEntity + public class ChildEntity extends BaseEntity { + public String childField; + } + """); + + Compilation compilation = + javac().withProcessors(new QuerydslAnnotationProcessor()).compile(superSource, subSource); + + CompilationSubject.assertThat(compilation).succeeded(); + assertThat(compilation.generatedSourceFile("test.QBaseEntity")).isPresent(); + assertThat(compilation.generatedSourceFile("test.QChildEntity")).isPresent(); + } +} diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/hibernate/HibernateAnnotationProcessorCompileTest.java b/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/hibernate/HibernateAnnotationProcessorCompileTest.java new file mode 100644 index 000000000..fc564f45d --- /dev/null +++ b/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/hibernate/HibernateAnnotationProcessorCompileTest.java @@ -0,0 +1,106 @@ +package com.querydsl.apt.hibernate; + +import static com.google.testing.compile.Compiler.javac; +import static org.assertj.core.api.Assertions.assertThat; + +import com.google.testing.compile.Compilation; +import com.google.testing.compile.CompilationSubject; +import com.google.testing.compile.JavaFileObjects; +import javax.tools.JavaFileObject; +import org.junit.jupiter.api.Test; + +class HibernateAnnotationProcessorCompileTest { + + @Test + void jpaEntity_generatesQClass() { + JavaFileObject source = + JavaFileObjects.forSourceString( + "test.Product", + """ + package test; + + import jakarta.persistence.Entity; + import jakarta.persistence.Id; + + @Entity + public class Product { + @Id public Long id; + public String name; + public double price; + } + """); + + Compilation compilation = + javac().withProcessors(new HibernateAnnotationProcessor()).compile(source); + + CompilationSubject.assertThat(compilation).succeeded(); + assertThat(compilation.generatedSourceFile("test.QProduct")).isPresent(); + } + + @Test + void hibernateFormula_handledCorrectly() { + JavaFileObject source = + JavaFileObjects.forSourceString( + "test.Account", + """ + package test; + + import jakarta.persistence.Entity; + import jakarta.persistence.Id; + import org.hibernate.annotations.Formula; + + @Entity + public class Account { + @Id public Long id; + public double balance; + @Formula("balance * 1.1") + public double projectedBalance; + } + """); + + Compilation compilation = + javac().withProcessors(new HibernateAnnotationProcessor()).compile(source); + + CompilationSubject.assertThat(compilation).succeeded(); + assertThat(compilation.generatedSourceFile("test.QAccount")).isPresent(); + } + + @Test + void entityWithMappedSuperclass_generatesQClasses() { + JavaFileObject superSource = + JavaFileObjects.forSourceString( + "test.AbstractEntity", + """ + package test; + + import jakarta.persistence.Id; + import jakarta.persistence.MappedSuperclass; + + @MappedSuperclass + public abstract class AbstractEntity { + @Id public Long id; + } + """); + + JavaFileObject subSource = + JavaFileObjects.forSourceString( + "test.Item", + """ + package test; + + import jakarta.persistence.Entity; + + @Entity + public class Item extends AbstractEntity { + public String title; + } + """); + + Compilation compilation = + javac().withProcessors(new HibernateAnnotationProcessor()).compile(superSource, subSource); + + CompilationSubject.assertThat(compilation).succeeded(); + assertThat(compilation.generatedSourceFile("test.QAbstractEntity")).isPresent(); + assertThat(compilation.generatedSourceFile("test.QItem")).isPresent(); + } +} diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/jpa/JPAAnnotationProcessorCompileTest.java b/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/jpa/JPAAnnotationProcessorCompileTest.java new file mode 100644 index 000000000..40934e280 --- /dev/null +++ b/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/jpa/JPAAnnotationProcessorCompileTest.java @@ -0,0 +1,163 @@ +package com.querydsl.apt.jpa; + +import static com.google.testing.compile.Compiler.javac; +import static org.assertj.core.api.Assertions.assertThat; + +import com.google.testing.compile.Compilation; +import com.google.testing.compile.CompilationSubject; +import com.google.testing.compile.JavaFileObjects; +import javax.tools.JavaFileObject; +import org.junit.jupiter.api.Test; + +class JPAAnnotationProcessorCompileTest { + + @Test + void jpaEntity_generatesQClass() { + JavaFileObject source = + JavaFileObjects.forSourceString( + "test.Customer", + """ + package test; + + import jakarta.persistence.Entity; + import jakarta.persistence.Id; + + @Entity + public class Customer { + @Id public Long id; + public String name; + } + """); + + Compilation compilation = javac().withProcessors(new JPAAnnotationProcessor()).compile(source); + + CompilationSubject.assertThat(compilation).succeeded(); + assertThat(compilation.generatedSourceFile("test.QCustomer")).isPresent(); + } + + @Test + void mappedSuperclass_generatesQClass() { + JavaFileObject source = + JavaFileObjects.forSourceString( + "test.BaseEntity", + """ + package test; + + import jakarta.persistence.MappedSuperclass; + import jakarta.persistence.Id; + + @MappedSuperclass + public class BaseEntity { + @Id public Long id; + } + """); + + Compilation compilation = javac().withProcessors(new JPAAnnotationProcessor()).compile(source); + + CompilationSubject.assertThat(compilation).succeeded(); + assertThat(compilation.generatedSourceFile("test.QBaseEntity")).isPresent(); + } + + @Test + void embeddable_generatesQClass() { + JavaFileObject source = + JavaFileObjects.forSourceString( + "test.Address", + """ + package test; + + import jakarta.persistence.Embeddable; + + @Embeddable + public class Address { + public String street; + public String city; + } + """); + + Compilation compilation = javac().withProcessors(new JPAAnnotationProcessor()).compile(source); + + CompilationSubject.assertThat(compilation).succeeded(); + assertThat(compilation.generatedSourceFile("test.QAddress")).isPresent(); + } + + @Test + void entityWithEmbedded_generatesQClasses() { + JavaFileObject embeddable = + JavaFileObjects.forSourceString( + "test.Address", + """ + package test; + + import jakarta.persistence.Embeddable; + + @Embeddable + public class Address { + public String street; + } + """); + + JavaFileObject entity = + JavaFileObjects.forSourceString( + "test.Person", + """ + package test; + + import jakarta.persistence.Embedded; + import jakarta.persistence.Entity; + import jakarta.persistence.Id; + + @Entity + public class Person { + @Id public Long id; + @Embedded public Address address; + } + """); + + Compilation compilation = + javac().withProcessors(new JPAAnnotationProcessor()).compile(embeddable, entity); + + CompilationSubject.assertThat(compilation).succeeded(); + assertThat(compilation.generatedSourceFile("test.QAddress")).isPresent(); + assertThat(compilation.generatedSourceFile("test.QPerson")).isPresent(); + } + + @Test + void entityWithInheritance_generatesQClasses() { + JavaFileObject superSource = + JavaFileObjects.forSourceString( + "test.BaseEntity", + """ + package test; + + import jakarta.persistence.Id; + import jakarta.persistence.MappedSuperclass; + + @MappedSuperclass + public class BaseEntity { + @Id public Long id; + } + """); + + JavaFileObject subSource = + JavaFileObjects.forSourceString( + "test.Order", + """ + package test; + + import jakarta.persistence.Entity; + + @Entity + public class Order extends BaseEntity { + public String description; + } + """); + + Compilation compilation = + javac().withProcessors(new JPAAnnotationProcessor()).compile(superSource, subSource); + + CompilationSubject.assertThat(compilation).succeeded(); + assertThat(compilation.generatedSourceFile("test.QBaseEntity")).isPresent(); + assertThat(compilation.generatedSourceFile("test.QOrder")).isPresent(); + } +}