Merge pull request #21459 from dazey3/enableJPAFATLite_v2_integration

Enable JPA FAT for LITE testing v2

Author: dazey3

dev/com.ibm.ws.jpa.tests.beanvalidation_fat.common/fat/src/com/ibm/ws/jpa/tests/beanvalidation/tests/BeanValidation20_Web.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 IBM Corporation and others.
+ * Copyright (c) 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -45,7 +45,7 @@
 import componenttest.topology.utils.PrivHelper;
 
 @RunWith(FATRunner.class)
-@Mode(TestMode.FULL)
+@Mode(TestMode.LITE)
 public class BeanValidation20_Web extends JPAFATServletClient {
 
     @Rule

dev/com.ibm.ws.jpa.tests.beanvalidation_fat.common/fat/src/com/ibm/ws/jpa/tests/beanvalidation/tests/BeanValidation_Web.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 IBM Corporation and others.
+ * Copyright (c) 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -45,7 +45,7 @@
 import componenttest.topology.utils.PrivHelper;
 
 @RunWith(FATRunner.class)
-@Mode(TestMode.FULL)
+@Mode(TestMode.LITE)
 public class BeanValidation_Web extends JPAFATServletClient {
 
     @Rule

dev/com.ibm.ws.jpa.tests.beanvalidation_jpa_2.0_fat/fat/src/com/ibm/ws/jpa/tests/beanvalidation/RepeatWithJPA20.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 IBM Corporation and others.
+ * Copyright (c) 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,12 +16,9 @@
 import com.ibm.ws.testtooling.jpaprovider.JPAPersistenceProvider;
 
 import componenttest.common.apiservices.Bootstrap;
-import componenttest.rules.repeater.RepeatTestAction;
+import componenttest.rules.repeater.EE6FeatureReplacementAction;
 
-/**
- *
- */
-public class RepeatWithJPA20 implements RepeatTestAction {
+public class RepeatWithJPA20 extends EE6FeatureReplacementAction {
     public static final String ID = "JPA20";
 
     @Override
@@ -30,7 +27,7 @@ public boolean isEnabled() {
             Bootstrap b = Bootstrap.getInstance();
             String installRoot = b.getValue("libertyInstallPath");
             File jpa20Feature = new File(installRoot + "/lib/features/com.ibm.websphere.appserver.jpa-2.0.mf");
-            return jpa20Feature.exists();
+            return jpa20Feature.exists() && super.isEnabled();
         } catch (Exception e) {
             return false;
         }

dev/com.ibm.ws.jpa.tests.beanvalidation_jpa_2.1_fat/fat/src/com/ibm/ws/jpa/tests/beanvalidation/RepeatWithJPA21.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 IBM Corporation and others.
+ * Copyright (c) 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,17 +13,18 @@
 
 import com.ibm.ws.testtooling.jpaprovider.JPAPersistenceProvider;
 
-import componenttest.rules.repeater.RepeatTestAction;
+import componenttest.custom.junit.runner.Mode.TestMode;
+import componenttest.rules.repeater.EE7FeatureReplacementAction;
 
-/**
- *
- */
-public class RepeatWithJPA21 implements RepeatTestAction {
+public class RepeatWithJPA21 extends EE7FeatureReplacementAction {
     public static final String ID = "JPA21";
 
-    @Override
-    public boolean isEnabled() {
-        return true;
+    /**
+     * Allow the default repeat action to run on LITE mode
+     */
+    public RepeatWithJPA21() {
+        // Used in componenttest.rules.repeater.RepeatTestAction.isEnabled() to determine if the test should run
+        withTestMode(TestMode.LITE);
     }
 
     @Override

dev/com.ibm.ws.jpa.tests.beanvalidation_jpa_2.1_fat/fat/src/com/ibm/ws/jpa/tests/beanvalidation/RepeatWithJPA21Hibernate.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 IBM Corporation and others.
+ * Copyright (c) 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,17 +13,18 @@
 
 import com.ibm.ws.testtooling.jpaprovider.JPAPersistenceProvider;
 
-import componenttest.rules.repeater.RepeatTestAction;
+import componenttest.custom.junit.runner.Mode.TestMode;
+import componenttest.rules.repeater.EE7FeatureReplacementAction;
 
-/**
- *
- */
-public class RepeatWithJPA21Hibernate implements RepeatTestAction {
+public class RepeatWithJPA21Hibernate extends EE7FeatureReplacementAction {
     public static final String ID = "JPA21_HIBERNATE";
 
-    @Override
-    public boolean isEnabled() {
-        return true;
+    /**
+     * Restrict Hibernate tests to run on FULL mode
+     */
+    public RepeatWithJPA21Hibernate() {
+        // Used in componenttest.rules.repeater.RepeatTestAction.isEnabled() to determine if the test should run
+        withTestMode(TestMode.FULL);
     }
 
     @Override

dev/com.ibm.ws.jpa.tests.beanvalidation_jpa_2.1_fat/fat/src/com/ibm/ws/jpa/tests/beanvalidation/RepeatWithJPA21OpenJPA.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 IBM Corporation and others.
+ * Copyright (c) 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,17 +13,18 @@
 
 import com.ibm.ws.testtooling.jpaprovider.JPAPersistenceProvider;
 
-import componenttest.rules.repeater.RepeatTestAction;
+import componenttest.custom.junit.runner.Mode.TestMode;
+import componenttest.rules.repeater.EE7FeatureReplacementAction;
 
-/**
- *
- */
-public class RepeatWithJPA21OpenJPA implements RepeatTestAction {
+public class RepeatWithJPA21OpenJPA extends EE7FeatureReplacementAction {
     public static final String ID = "JPA21_OPENJPA";
 
-    @Override
-    public boolean isEnabled() {
-        return true;
+    /**
+     * Restrict OpenJPA tests to run on FULL mode
+     */
+    public RepeatWithJPA21OpenJPA() {
+        // Used in componenttest.rules.repeater.RepeatTestAction.isEnabled() to determine if the test should run
+        withTestMode(TestMode.FULL);
     }
 
     @Override

dev/com.ibm.ws.jpa.tests.beanvalidation_jpa_2.2_fat/fat/src/com/ibm/ws/jpa/tests/beanvalidation/RepeatWithJPA22.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 IBM Corporation and others.
+ * Copyright (c) 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,17 +13,18 @@
 
 import com.ibm.ws.testtooling.jpaprovider.JPAPersistenceProvider;
 
-import componenttest.rules.repeater.RepeatTestAction;
+import componenttest.custom.junit.runner.Mode.TestMode;
+import componenttest.rules.repeater.EE8FeatureReplacementAction;
 
-/**
- *
- */
-public class RepeatWithJPA22 implements RepeatTestAction {
+public class RepeatWithJPA22 extends EE8FeatureReplacementAction {
     public static final String ID = "JPA22";
 
-    @Override
-    public boolean isEnabled() {
-        return true;
+    /**
+     * Allow the default repeat action to run on LITE mode
+     */
+    public RepeatWithJPA22() {
+        // Used in componenttest.rules.repeater.RepeatTestAction.isEnabled() to determine if the test should run
+        withTestMode(TestMode.LITE);
     }
 
     @Override

dev/com.ibm.ws.jpa.tests.beanvalidation_jpa_2.2_fat/fat/src/com/ibm/ws/jpa/tests/beanvalidation/RepeatWithJPA22Hibernate.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 IBM Corporation and others.
+ * Copyright (c) 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,17 +13,18 @@
 
 import com.ibm.ws.testtooling.jpaprovider.JPAPersistenceProvider;
 
-import componenttest.rules.repeater.RepeatTestAction;
+import componenttest.custom.junit.runner.Mode.TestMode;
+import componenttest.rules.repeater.EE8FeatureReplacementAction;
 
-/**
- *
- */
-public class RepeatWithJPA22Hibernate implements RepeatTestAction {
+public class RepeatWithJPA22Hibernate extends EE8FeatureReplacementAction {
     public static final String ID = "JPA22_HIBERNATE";
 
-    @Override
-    public boolean isEnabled() {
-        return true;
+    /**
+     * Restrict Hibernate tests to run on FULL mode
+     */
+    public RepeatWithJPA22Hibernate() {
+        // Used in componenttest.rules.repeater.RepeatTestAction.isEnabled() to determine if the test should run
+        withTestMode(TestMode.FULL);
     }
 
     @Override

dev/com.ibm.ws.jpa.tests.beanvalidation_jpa_2.2_fat/fat/src/com/ibm/ws/jpa/tests/beanvalidation/RepeatWithJPA22OpenJPA.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 IBM Corporation and others.
+ * Copyright (c) 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,17 +13,18 @@
 
 import com.ibm.ws.testtooling.jpaprovider.JPAPersistenceProvider;
 
-import componenttest.rules.repeater.RepeatTestAction;
+import componenttest.custom.junit.runner.Mode.TestMode;
+import componenttest.rules.repeater.EE8FeatureReplacementAction;
 
-/**
- *
- */
-public class RepeatWithJPA22OpenJPA implements RepeatTestAction {
+public class RepeatWithJPA22OpenJPA extends EE8FeatureReplacementAction {
     public static final String ID = "JPA22_OPENJPA";
 
-    @Override
-    public boolean isEnabled() {
-        return true;
+    /**
+     * Restrict OpenJPA tests to run on FULL mode
+     */
+    public RepeatWithJPA22OpenJPA() {
+        // Used in componenttest.rules.repeater.RepeatTestAction.isEnabled() to determine if the test should run
+        withTestMode(TestMode.FULL);
     }
 
     @Override

dev/com.ibm.ws.jpa.tests.beanvalidation_jpa_3.0_fat/fat/src/com/ibm/ws/jpa/tests/beanvalidation/FATSuite.java

@@ -37,6 +37,6 @@ public class FATSuite extends AbstractFATSuite {
     @ClassRule
     public static RepeatTests r = RepeatTests
                     .with(new RepeatWithJPA30())
-                    .with(new RepeatWithJPA30Hibernate());
+                    .andWith(new RepeatWithJPA30Hibernate());
 
 }