Share tests across modules

Author: sebersole

buildSrc/src/main/groovy/shared-testing.gradle

@@ -1,3 +1,8 @@
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Sets up shared testing
+// 		to execute tests from hibernate-models in the context of other modules.
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 plugins {
 	id "testing"
 }
@@ -24,7 +29,7 @@ configurations {
 }
 
 dependencies {
-	testImplementation project( path: ":hibernate-models", configuration: "exposedTestClasses" )
+	testImplementation project( ":hibernate-models-testing" )
 
 	sharedTestClasses project(path: ':hibernate-models', configuration: 'exposedTestClasses')
 	sharedTestResources project(path: ':hibernate-models', configuration: 'exposedTestResources')

buildSrc/src/main/groovy/testing.gradle

@@ -1,3 +1,8 @@
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Module that need testing
+//		- automatically applied by published-java-module
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 plugins {
 	id "java-module"
 	id "jacoco"

hibernate-models-jandex/src/test/java/org/hibernate/models/testing/shared/intg/JandexTestingModelContextFactoryImpl.java renamed to hibernate-models-jandex/src/test/java/org/hibernate/models/testing/shared/intg/JandexModelContextFactoryImpl.java

@@ -13,7 +13,7 @@
 import org.hibernate.models.spi.ClassLoading;
 import org.hibernate.models.spi.RegistryPrimer;
 import org.hibernate.models.spi.SourceModelBuildingContext;
-import org.hibernate.models.testing.intg.TestingModelContextFactory;
+import org.hibernate.models.testing.intg.ModelContextFactory;
 import org.hibernate.models.testing.orm.JpaAnnotations;
 
 import org.jboss.jandex.Index;
@@ -24,7 +24,7 @@
 /**
  * @author Steve Ebersole
  */
-public class JandexTestingModelContextFactoryImpl implements TestingModelContextFactory {
+public class JandexModelContextFactoryImpl implements ModelContextFactory {
 	@Override
 	public SourceModelBuildingContext createModelContext(
 			RegistryPrimer registryPrimer,

hibernate-models-jandex/src/test/resources/META-INF/services/org.hibernate.models.testing.intg.ModelContextFactory

@@ -0,0 +1 @@
+org.hibernate.models.testing.shared.intg.JandexModelContextFactoryImpl

hibernate-models-jandex/src/test/resources/META-INF/services/org.hibernate.models.testing.intg.TestingModelContextFactory

@@ -0,0 +1,10 @@
+plugins {
+    id 'java-module'
+}
+
+description = "Test fixtures for modules performing tests"
+
+dependencies {
+    implementation project( ":hibernate-models" )
+    implementation jakartaLibs.jpa
+}

hibernate-models-testing/build.gradle

@@ -13,6 +13,6 @@
  *
  * @author Steve Ebersole
  */
-public interface TestingModelContextFactory {
+public interface ModelContextFactory {
 	SourceModelBuildingContext createModelContext(RegistryPrimer registryPrimer, Class<?>... modelClasses);
 }

hibernate-models/src/test/java/org/hibernate/models/testing/intg/TestingModelContextFactory.java renamed to hibernate-models-testing/src/main/java/org/hibernate/models/testing/intg/ModelContextFactory.java

@@ -4,6 +4,9 @@ plugins {
 
 description = "A de-typed abstraction over reflection and annotations"
 
+dependencies {
+	testImplementation project( ":hibernate-models-testing" )
+}
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Export testing

hibernate-models/src/test/java/org/hibernate/models/testing/orm/AttributeMarker.java renamed to hibernate-models-testing/src/main/java/org/hibernate/models/testing/orm/AttributeMarker.java

@@ -11,7 +11,7 @@
 import org.hibernate.models.internal.util.CollectionHelper;
 import org.hibernate.models.spi.RegistryPrimer;
 import org.hibernate.models.spi.SourceModelBuildingContext;
-import org.hibernate.models.testing.intg.TestingModelContextFactory;
+import org.hibernate.models.testing.intg.ModelContextFactory;
 import org.hibernate.models.testing.orm.OrmAnnotationHelper;
 
 import static org.hibernate.models.internal.SimpleClassLoading.SIMPLE_CLASS_LOADING;
@@ -45,10 +45,10 @@ public static SourceModelBuildingContext createModelContext(
 	private static SourceModelBuildingContext buildModelContext(
 			RegistryPrimer additionalPrimer,
 			Class<?>... modelClasses) {
-		final ServiceLoader<TestingModelContextFactory> loader = ServiceLoader.load( TestingModelContextFactory.class );
-		final Iterator<TestingModelContextFactory> serviceImpls = loader.iterator();
+		final ServiceLoader<ModelContextFactory> loader = ServiceLoader.load( ModelContextFactory.class );
+		final Iterator<ModelContextFactory> serviceImpls = loader.iterator();
 		if ( serviceImpls.hasNext() ) {
-			final TestingModelContextFactory contextFactory = serviceImpls.next();
+			final ModelContextFactory contextFactory = serviceImpls.next();
 			if ( serviceImpls.hasNext() ) {
 				throw new IllegalStateException( "Found more than one TestingModelContextFactory" );
 			}

hibernate-models/src/test/java/org/hibernate/models/testing/orm/BasicAnnotation.java renamed to hibernate-models-testing/src/main/java/org/hibernate/models/testing/orm/BasicAnnotation.java

@@ -129,4 +129,5 @@ dependencyResolutionManagement {
 
 include "hibernate-models"
 include "hibernate-models-jandex"
+include 'hibernate-models-testing'