WFLY-15694 do not run JPA tests when ts.ee9 + ts.bootable.ee9 not set.

Signed-off-by: Scott Marlow <smarlow@redhat.com>

testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/hibernate/Hibernate2LCacheStatsTestCase.java

@@ -92,7 +92,7 @@ public static void beforeClass() throws NamingException {
         // TODO This can be re-looked at once HHH-13188 is resolved. This may require further changes in Hibernate.
         AssumeTestGroupUtil.assumeSecurityManagerDisabled();
         // This test needs to be recompiled against Hibernate ORM 6 (WFLY-16178) in order to pass.
-        assumeTrue(System.getProperty("ts.ee9") == null);
+        assumeTrue(System.getProperty("ts.ee9") == null && System.getProperty("ts.bootable.ee9") == null);
 
         iniCtx = new InitialContext();
     }

testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/hibernate/Hibernate4NativeAPIProviderTestCase.java

@@ -81,7 +81,7 @@ public static void beforeClass() throws NamingException {
         // TODO This can be re-looked at once HHH-13188 is resolved. This may require further changes in Hibernate.
         AssumeTestGroupUtil.assumeSecurityManagerDisabled();
         // This test needs to be recompiled against Hibernate ORM 6 (WFLY-16178) in order to pass.
-        assumeTrue(System.getProperty("ts.ee9") == null);
+        assumeTrue(System.getProperty("ts.ee9") == null && System.getProperty("ts.bootable.ee9") == null);
 
         iniCtx = new InitialContext();
     }

testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/hibernate/HibernateNativeAPITransactionTestCase.java

@@ -81,7 +81,7 @@ public static void beforeClass() throws NamingException {
         // TODO This can be re-looked at once HHH-13188 is resolved. This may require further changes in Hibernate.
         AssumeTestGroupUtil.assumeSecurityManagerDisabled();
         // This test needs to be recompiled against Hibernate ORM 6 (WFLY-16178) in order to pass.
-        assumeTrue(System.getProperty("ts.ee9") == null);
+        assumeTrue(System.getProperty("ts.ee9") == null && System.getProperty("ts.bootable.ee9") == null);
 
         iniCtx = new InitialContext();
     }

testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/hibernate/search/HibernateSearchJPATestCase.java

@@ -36,6 +36,7 @@
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -44,6 +45,8 @@
  *
  * @author Sanne Grinovero <sanne@hibernate.org> (C) 2014 Red Hat Inc.
  */
+/* Ignore until we upgrade to Hibernate Search 6.1 via WFLY-15838 */
+@Ignore
 @RunWith(Arquillian.class)
 public class HibernateSearchJPATestCase {
 

testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/hibernate/entitytest/EntityTestCase.java

@@ -75,7 +75,7 @@ protected <T> T rawLookup(String name, Class<T> interfaceType) throws NamingExce
     // This test needs to be recompiled against Hibernate ORM 6 (WFLY-16178) in order to pass.
     @BeforeClass
     public static void beforeClass() {
-        assumeTrue(System.getProperty("ts.ee9") == null);
+        assumeTrue(System.getProperty("ts.ee9") == null && System.getProperty("ts.bootable.ee9") == null);
     }
 
     @Deployment

testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/hibernate/sessionfactorytest/SessionFactoryTestCase.java

@@ -55,7 +55,7 @@ public class SessionFactoryTestCase {
 
     private static final String ARCHIVE_NAME = "jpa_sessionfactory";
 
-    // This test needs to be recompiled against Hibernater ORM 6 (WFLY-16178) in order to pass.
+    // This test needs to be recompiled against Hibernate ORM 6 (WFLY-16178) in order to pass.
     @BeforeClass
     public static void beforeClass() {
         assumeTrue(System.getProperty("ts.ee9") == null && System.getProperty("ts.bootable.ee9") == null);