HSEARCH-1950 Integration tests should not hardcode the module slot

Author: Sanne

integrationtest/wildfly/src/test/java/org/hibernate/search/test/integration/VersionTestHelper.java

@@ -41,7 +41,7 @@ private VersionTestHelper() {
 	/**
 	 * @return the slot version of the Hibernate Search modules generated by this project
 	 */
-	private static synchronized String getModuleSlotString() {
+	public static synchronized String getModuleSlotString() {
 		if ( hibernateSearchModuleSlot == null ) {
 			String versionHibernateSearch = getDependencyVersionHibernateSearch();
 			String[] split = versionHibernateSearch.split( "\\." );

integrationtest/wildfly/src/test/java/org/hibernate/search/test/integration/wildfly/ModuleMemberRegistrationEarArchiveWithJbossDeploymentIT.java

@@ -11,10 +11,14 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
+import java.util.Scanner;
 
 import javax.inject.Inject;
 
+import org.hibernate.search.test.integration.VersionTestHelper;
 import org.hibernate.search.test.integration.wildfly.controller.MemberRegistration;
 import org.hibernate.search.test.integration.wildfly.model.Member;
 import org.hibernate.search.test.integration.wildfly.util.Resources;
@@ -43,7 +47,7 @@
 public class ModuleMemberRegistrationEarArchiveWithJbossDeploymentIT {
 
 	@Deployment
-	public static Archive<?> createTestArchive() {
+	public static Archive<?> createTestArchive() throws IllegalArgumentException, IOException {
 		JavaArchive ejb = ShrinkWrap
 				.create( JavaArchive.class, ModuleMemberRegistrationEarArchiveWithJbossDeploymentIT.class.getSimpleName() + ".jar" )
 				.addClasses( ModuleMemberRegistrationEarArchiveWithJbossDeploymentIT.class, Member.class, MemberRegistration.class, Resources.class )
@@ -55,11 +59,22 @@ public static Archive<?> createTestArchive() {
 		EnterpriseArchive ear = ShrinkWrap
 				.create( EnterpriseArchive.class, ModuleMemberRegistrationEarArchiveWithJbossDeploymentIT.class.getSimpleName() + ".ear" )
 				.addAsModules( ejb )
-				.addAsResource( "jboss-deployment-structure-ear.xml", "/jboss-deployment-structure.xml" )
+				.addAsResource( jbossDeploymentXml(), "/jboss-deployment-structure.xml" )
 				.setApplicationXML( new StringAsset( applicationXml ) );
 		return ear;
 	}
 
+	private static Asset jbossDeploymentXml() throws IOException {
+		String text;
+		try ( InputStream inputStream = ModuleMemberRegistrationEarArchiveWithJbossDeploymentIT.class.getClassLoader().getResourceAsStream( "jboss-deployment-structure.xml" ) ) {
+			try ( Scanner scanner = new Scanner( inputStream, "UTF-8" ) ) {
+				text = scanner.useDelimiter( "\\A" ).next();
+			}
+		}
+		String finalXml = text.replace( (CharSequence)"${project.slot}", (CharSequence)VersionTestHelper.getModuleSlotString() );
+		return new StringAsset( finalXml );
+	}
+
 	private static Asset persistenceXml() {
 		String persistenceXml = Descriptors.create( PersistenceDescriptor.class )
 			.version( "2.0" )

integrationtest/wildfly/src/test/resources/jboss-deployment-structure-ear.xml renamed to integrationtest/wildfly/src/test/resources/jboss-deployment-structure.xml

@@ -2,8 +2,7 @@
 <jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.1">
     <deployment>
         <dependencies>
-            <!-- FIXME use properties rather than hardcode the slot -->
-            <module name="org.hibernate.search.orm" services="export" export="true" slot="5.4"/>
+            <module name="org.hibernate.search.orm" services="export" export="true" slot="${project.slot}"/>
         </dependencies>
     </deployment>
 </jboss-deployment-structure>