WFLY-7617 Remove workaround for WFCORE-1941 in jgroups subsystem tran…

…sform/reject tests
wildfly · Nov 30, 2016 · ea93d82 · ea93d82
1 parent 84c2c72
commit ea93d82
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 78 deletions.
diff --git a/.../test/java/org/jboss/as/clustering/jgroups/subsystem/JGroupsSubsystemParsingTestCase.java b/.../test/java/org/jboss/as/clustering/jgroups/subsystem/JGroupsSubsystemParsingTestCase.java
@@ -97,7 +97,7 @@ private KernelServicesBuilder createKernelServicesBuilder(String xml) throws XML
     }
 
     @Override
-    protected AdditionalInitialization createAdditionalInitialization() {
+    protected org.jboss.as.subsystem.test.AdditionalInitialization createAdditionalInitialization() {
         return new AdditionalInitialization()
                 .require(CommonUnaryRequirement.SOCKET_BINDING, "jgroups-udp", "some-binding", "jgroups-diagnostics", "jgroups-mping", "jgroups-tcp-fd", "jgroups-state-xfr")
                 ;

diff --git a/.../src/test/java/org/jboss/as/clustering/jgroups/subsystem/JGroupsTransformersTestCase.java b/.../src/test/java/org/jboss/as/clustering/jgroups/subsystem/JGroupsTransformersTestCase.java
@@ -34,6 +34,7 @@
 import java.util.List;
 
 import org.jboss.as.clustering.controller.CommonUnaryRequirement;
+import org.jboss.as.clustering.subsystem.AdditionalInitialization;
 import org.jboss.as.controller.ModelVersion;
 import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.descriptions.ModelDescriptionConstants;
@@ -42,7 +43,6 @@
 import org.jboss.as.model.test.FailedOperationTransformationConfig;
 import org.jboss.as.model.test.ModelTestControllerVersion;
 import org.jboss.as.model.test.ModelTestUtils;
-import org.jboss.as.subsystem.test.AdditionalInitialization;
 import org.jboss.as.subsystem.test.KernelServices;
 import org.jboss.as.subsystem.test.KernelServicesBuilder;
 import org.jboss.dmr.ModelNode;
@@ -90,18 +90,23 @@ private static String[] getDependencies(ModelTestControllerVersion version) {
             case EAP_6_3_0:
             case EAP_6_4_0:
             case EAP_6_4_7:
-                return new String[] {formatEAP6SubsystemArtifact(version)};
+                return new String[] {
+                        formatEAP6SubsystemArtifact(version),
+                };
             case EAP_7_0_0:
-                return new String[] {formatEAP7SubsystemArtifact(version),
+                return new String[] {
+                        formatEAP7SubsystemArtifact(version),
                         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)};
+                        formatArtifact("org.jboss.eap:wildfly-clustering-jgroups-spi:%s", version),
+                };
+            default:
+                throw new IllegalArgumentException();
         }
-        throw new IllegalArgumentException();
     }
 
-    private AdditionalInitialization createAdditionalInitialization() {
+    private org.jboss.as.subsystem.test.AdditionalInitialization createAdditionalInitialization() {
-        return new LegacyControllerAdditionalInitialization()
+        return new AdditionalInitialization()
                 .require(CommonUnaryRequirement.SOCKET_BINDING, "jgroups-tcp", "jgroups-udp", "jgroups-udp-fd", "some-binding", "jgroups-diagnostics", "jgroups-mping", "jgroups-tcp-fd", "jgroups-state-xfr")
                 ;
     }
@@ -330,8 +335,8 @@ private void testRejections(final ModelTestControllerVersion controller) throws
         KernelServicesBuilder builder = createKernelServicesBuilder(this.createAdditionalInitialization());
 
         // initialize the legacy services and add required jars
-        builder.createLegacyKernelServicesBuilder(createAdditionalInitialization(), controller, version)
+        builder.createLegacyKernelServicesBuilder(this.createAdditionalInitialization(), controller, version)
-                .addSingleChildFirstClass(LegacyControllerAdditionalInitialization.class)
+                .addSingleChildFirstClass(AdditionalInitialization.class)
                 .addMavenResourceURL(dependencies)
                 .dontPersistXml();
 

diff --git a/...a/org/jboss/as/clustering/jgroups/subsystem/LegacyControllerAdditionalInitialization.java b/...a/org/jboss/as/clustering/jgroups/subsystem/LegacyControllerAdditionalInitialization.java