HSEARCH-2029 Making sure only HCANN version is present for integratio…

…n tests adding HSEARCH through deployment unit
hibernate · Nov 5, 2015 · 7814354 · 7814354
1 parent e56e318
commit 7814354
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/...performance/src/test/java/org/hibernate/search/test/performance/TestRunnerArquillian.java b/...performance/src/test/java/org/hibernate/search/test/performance/TestRunnerArquillian.java
@@ -17,10 +17,10 @@
 
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.hibernate.search.testsupport.TestConstants;
 import org.hibernate.search.test.integration.wildfly.PackagerHelper;
 import org.hibernate.search.test.performance.scenario.TestScenario;
 import org.hibernate.search.test.performance.scenario.TestScenarioFactory;
+import org.hibernate.search.testsupport.TestConstants;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
@@ -54,6 +54,7 @@ public static Archive<?> createTestArchive() throws IOException {
 				.addPackages( true, TestRunnerArquillian.class.getPackage() )
 				.addClass( TestConstants.class )
 				.addAsResource( createPersistenceXml(), "META-INF/persistence.xml" )
+				.addAsWebInfResource( "jboss-deployment-structure-hcann.xml", "/jboss-deployment-structure.xml" )
 				.addAsLibraries( PackagerHelper.hibernateSearchLibraries() )
 				.addAsLibraries( PackagerHelper.hibernateSearchTestingLibraries() )
 				.addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" )

diff --git a/...st/java/org/hibernate/search/test/integration/wildfly/MemberRegistrationEarArchiveIT.java b/...st/java/org/hibernate/search/test/integration/wildfly/MemberRegistrationEarArchiveIT.java
@@ -55,6 +55,7 @@ public static Archive<?> createTestArchive() {
 		EnterpriseArchive ear = ShrinkWrap
 				.create( EnterpriseArchive.class, MemberRegistrationEarArchiveIT.class.getSimpleName() + ".ear" )
 				.addAsModules( ejb )
+				.addAsManifestResource( "jboss-deployment-structure-hcann.xml", "/jboss-deployment-structure.xml" )
 				.addAsLibraries( PackagerHelper.hibernateSearchLibraries() )
 				.setApplicationXML( new StringAsset( applicationXml ) );
 		return ear;

diff --git a/...fly/src/test/java/org/hibernate/search/test/integration/wildfly/MemberRegistrationIT.java b/...fly/src/test/java/org/hibernate/search/test/integration/wildfly/MemberRegistrationIT.java
@@ -41,11 +41,12 @@
 public class MemberRegistrationIT {
 
 	@Deployment
-	public static Archive<?> createTestArchive() {
+	public static Archive<?> createTestArchive() throws Exception {
 		WebArchive archive = ShrinkWrap
 				.create( WebArchive.class, MemberRegistrationIT.class.getSimpleName() + ".war" )
 				.addClasses( Member.class, MemberRegistration.class, Resources.class )
 				.addAsResource( persistenceXml(), "META-INF/persistence.xml" )
+				.addAsWebInfResource( "jboss-deployment-structure-hcann.xml", "/jboss-deployment-structure.xml" )
 				.addAsLibraries( PackagerHelper.hibernateSearchLibraries() )
 				.addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" );
 		return archive;

diff --git a/...t/wildfly/src/test/java/org/hibernate/search/test/integration/wildfly/PackagerHelper.java b/...t/wildfly/src/test/java/org/hibernate/search/test/integration/wildfly/PackagerHelper.java
@@ -31,6 +31,7 @@ private PackagerHelper() {
 	 */
 	private static String[] exclusions = new String[] {
 		"org.hibernate:hibernate-core",
+		"org.hibernate.common:hibernate-commons-annotations",
 		"org.hibernate.javax.persistence:hibernate-jpa-2.1-api",
 		"org.jboss.logging:jboss-logging",
 		"org.jboss.logging:jboss-logging-processor",

diff --git a/integrationtest/wildfly/src/test/resources/jboss-deployment-structure-hcann.xml b/integrationtest/wildfly/src/test/resources/jboss-deployment-structure-hcann.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.1">
+    <deployment>
+        <dependencies>
+            <module name="org.hibernate.commons-annotations" slot="main"/>
+        </dependencies>
+    </deployment>
+</jboss-deployment-structure>