WFLY-11693 Add missing Infinispan subsystem transformer tests for EAP…

… 7.2
wildfly · Feb 11, 2019 · e2bdb72 · e2bdb72
1 parent 8f52fdb
commit e2bdb72
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 22 deletions.
diff --git a/...extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/InfinispanModel.java b/...extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/InfinispanModel.java
@@ -38,7 +38,7 @@ public enum InfinispanModel implements Model {
     VERSION_5_0_0(5, 0, 0), // WildFly 11, EAP 7.1
     VERSION_6_0_0(6, 0, 0), // WildFly 12
     VERSION_7_0_0(7, 0, 0), // WildFly 13
-    VERSION_8_0_0(8, 0, 0), // WildFly 14
+    VERSION_8_0_0(8, 0, 0), // WildFly 14, EAP 7.2
     ;
     static final InfinispanModel CURRENT = VERSION_8_0_0;
 

diff --git a/...est/java/org/jboss/as/clustering/infinispan/subsystem/InfinispanTransformersTestCase.java b/...est/java/org/jboss/as/clustering/infinispan/subsystem/InfinispanTransformersTestCase.java
@@ -97,6 +97,8 @@ private static InfinispanModel getModelVersion(ModelTestControllerVersion contro
                 return InfinispanModel.VERSION_4_0_0;
             case EAP_7_1_0:
                 return InfinispanModel.VERSION_5_0_0;
+            case EAP_7_2_0_TEMP:
+                return InfinispanModel.VERSION_8_0_0;
             default:
                 throw new IllegalArgumentException();
         }
@@ -112,36 +114,23 @@ private static String[] getDependencies(ModelTestControllerVersion version) {
                         "org.infinispan:infinispan-cachestore-jdbc:5.2.11.Final-redhat-2",
                 };
             case EAP_7_0_0:
-                return new String[] {
-                        formatEAP7SubsystemArtifact(version),
-                        "org.infinispan:infinispan-core:8.1.2.Final-redhat-1",
-                        "org.infinispan:infinispan-cachestore-jdbc:8.1.2.Final-redhat-1",
-                        formatArtifact("org.jboss.eap:wildfly-clustering-common:%s", version),
-                        formatArtifact("org.jboss.eap:wildfly-clustering-service:%s", version),
-                        formatArtifact("org.jboss.eap:wildfly-clustering-jgroups-spi:%s", version),
-                        // Following are needed for InfinispanSubsystemInitialization
-                        formatArtifact("org.jboss.eap:wildfly-clustering-jgroups-extension:%s", version),
-                        formatArtifact("org.jboss.eap:wildfly-connector:%s", version),
-                        formatArtifact("org.jboss.eap:wildfly-clustering-infinispan-spi:%s", version),
-                        formatArtifact("org.jboss.eap:wildfly-clustering-spi:%s", version),
-                };
             case EAP_7_1_0:
+            case EAP_7_2_0_TEMP:
                 return new String[] {
                         formatEAP7SubsystemArtifact(version),
-                        "org.infinispan:infinispan-core:8.2.8.Final-redhat-1",
-                        "org.infinispan:infinispan-cachestore-jdbc:8.2.8.Final-redhat-1",
-                        formatArtifact("org.jboss.eap:wildfly-clustering-common:%s", version),
-                        formatArtifact("org.jboss.eap:wildfly-clustering-service:%s", version),
-                        formatArtifact("org.jboss.eap:wildfly-clustering-jgroups-spi:%s", version),
                         // Following are needed for InfinispanSubsystemInitialization
-                        formatArtifact("org.jboss.eap:wildfly-clustering-jgroups-extension:%s", version),
-                        formatArtifact("org.jboss.eap:wildfly-connector:%s", version),
+                        formatArtifact("org.jboss.eap:wildfly-clustering-common:%s", version),
                         formatArtifact("org.jboss.eap:wildfly-clustering-infinispan-spi:%s", version),
+                        formatArtifact("org.jboss.eap:wildfly-clustering-jgroups-extension:%s", version),
+                        formatArtifact("org.jboss.eap:wildfly-clustering-jgroups-spi:%s", version),
+                        formatArtifact("org.jboss.eap:wildfly-clustering-service:%s", version),
                         formatArtifact("org.jboss.eap:wildfly-clustering-singleton-api:%s", version),
                         formatArtifact("org.jboss.eap:wildfly-clustering-spi:%s", version),
+                        formatArtifact("org.jboss.eap:wildfly-connector:%s", version),
                 };
-            default:
+            default: {
                 throw new IllegalArgumentException();
+            }
         }
     }