[WFLY-8038] Undertow subsystem tests should only register socket-bind…

…ing caps once
wildfly · Feb 7, 2017 · 01b78a7 · 01b78a7
1 parent f5063ad
commit 01b78a7
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 37 deletions.
diff --git a/undertow/src/test/java/org/wildfly/extension/undertow/AbstractUndertowSubsystemTestCase.java b/undertow/src/test/java/org/wildfly/extension/undertow/AbstractUndertowSubsystemTestCase.java
@@ -49,7 +49,8 @@ public static void setProperty() {
 
     public static void testRuntime(KernelServices mainServices, final String virtualHostName, int flag) throws Exception {
         if (!mainServices.isSuccessfulBoot()) {
-            Assert.fail(mainServices.getBootError().toString());
+            Throwable t = mainServices.getBootError();
+            Assert.fail("Boot unsuccessful: " + (t != null ? t.toString() : "no boot error provided"));
         }
         ServiceController<FilterService> connectionLimiter = (ServiceController<FilterService>) mainServices.getContainer()
                 .getService(UndertowService.FILTER.append("limit-connections"));

diff --git a/undertow/src/test/java/org/wildfly/extension/undertow/UndertowSubsystem30TestCase.java b/undertow/src/test/java/org/wildfly/extension/undertow/UndertowSubsystem30TestCase.java
@@ -42,7 +42,6 @@
 import org.jboss.as.domain.management.security.SecurityRealmService;
 import org.jboss.as.naming.deployment.ContextNames;
 import org.jboss.as.naming.service.NamingStoreService;
-import org.jboss.as.network.SocketBinding;
 import org.jboss.as.remoting.HttpListenerRegistryService;
 import org.jboss.as.server.Services;
 import org.jboss.as.server.moduleservice.ServiceModuleLoader;
@@ -149,10 +148,6 @@ protected void initializeExtraSubystemsAndModel(ExtensionRegistry extensionRegis
                     XnioWorker.class);
             capabilities.put(buildDynamicCapabilityName(ListenerResourceDefinition.IO_BUFFER_POOL_CAPABILITY,
                     ListenerResourceDefinition.BUFFER_POOL.getDefaultValue().asString()), Pool.class);
-            for (String entry : sockets.keySet()) {
-                capabilities.put(buildDynamicCapabilityName(ListenerResourceDefinition.SOCKET_CAPABILITY, entry),
-                        SocketBinding.class);
-            }
             registerServiceCapabilities(capabilityRegistry, capabilities);
 
         }

diff --git a/undertow/src/test/java/org/wildfly/extension/undertow/UndertowSubsystem31TestCase.java b/undertow/src/test/java/org/wildfly/extension/undertow/UndertowSubsystem31TestCase.java
@@ -43,7 +43,6 @@
 import org.jboss.as.domain.management.security.SecurityRealmService;
 import org.jboss.as.naming.deployment.ContextNames;
 import org.jboss.as.naming.service.NamingStoreService;
-import org.jboss.as.network.SocketBinding;
 import org.jboss.as.remoting.HttpListenerRegistryService;
 import org.jboss.as.server.Services;
 import org.jboss.as.server.moduleservice.ServiceModuleLoader;
@@ -212,16 +211,22 @@ protected RunningMode getRunningMode() {
             return RunningMode.ADMIN_ONLY;
         }
 
+        @Override
+        protected void setupController(ControllerInitializer controllerInitializer) {
+            super.setupController(controllerInitializer);
+
+            for (Map.Entry<String, Integer> entry : sockets.entrySet()) {
+                controllerInitializer.addSocketBinding(entry.getKey(), entry.getValue());
+            }
+        }
+
         @Override
         protected void initializeExtraSubystemsAndModel(ExtensionRegistry extensionRegistry, Resource rootResource, ManagementResourceRegistration rootRegistration, RuntimeCapabilityRegistry capabilityRegistry) {
             super.initializeExtraSubystemsAndModel(extensionRegistry, rootResource, rootRegistration, capabilityRegistry);
             Map<String, Class> capabilities = new HashMap<>();
             capabilities.put(buildDynamicCapabilityName(ListenerResourceDefinition.IO_WORKER_CAPABILITY, ListenerResourceDefinition.WORKER.getDefaultValue().asString()), XnioWorker.class);
             capabilities.put(buildDynamicCapabilityName(ListenerResourceDefinition.IO_WORKER_CAPABILITY, "non-default"), XnioWorker.class);
             capabilities.put(buildDynamicCapabilityName(ListenerResourceDefinition.IO_BUFFER_POOL_CAPABILITY, ListenerResourceDefinition.BUFFER_POOL.getDefaultValue().asString()), Pool.class);
-            for (String entry : sockets.keySet()) {
-                capabilities.put(buildDynamicCapabilityName(ListenerResourceDefinition.SOCKET_CAPABILITY, entry), SocketBinding.class);
-            }
             registerServiceCapabilities(capabilityRegistry, capabilities);
 
         }
@@ -239,15 +244,6 @@ protected RunningMode getRunningMode() {
             return RunningMode.NORMAL;
         }
 
-        @Override
-        protected void setupController(ControllerInitializer controllerInitializer) {
-            super.setupController(controllerInitializer);
-
-            for (Map.Entry<String, Integer> entry : sockets.entrySet()) {
-                controllerInitializer.addSocketBinding(entry.getKey(), entry.getValue());
-            }
-        }
-
         @Override
         protected void addExtraServices(ServiceTarget target) {
             super.addExtraServices(target);

diff --git a/undertow/src/test/java/org/wildfly/extension/undertow/UndertowSubsystemTestCase.java b/undertow/src/test/java/org/wildfly/extension/undertow/UndertowSubsystemTestCase.java
@@ -32,6 +32,9 @@
 
 import javax.net.ssl.SSLContext;
 
+import io.undertow.predicate.Predicates;
+import io.undertow.server.HttpHandler;
+import io.undertow.server.handlers.PathHandler;
 import org.jboss.as.controller.ControlledProcessStateService;
 import org.jboss.as.controller.RunningMode;
 import org.jboss.as.controller.capability.registry.RuntimeCapabilityRegistry;
@@ -42,7 +45,6 @@
 import org.jboss.as.domain.management.security.SecurityRealmService;
 import org.jboss.as.naming.deployment.ContextNames;
 import org.jboss.as.naming.service.NamingStoreService;
-import org.jboss.as.network.SocketBinding;
 import org.jboss.as.remoting.HttpListenerRegistryService;
 import org.jboss.as.server.Services;
 import org.jboss.as.server.moduleservice.ServiceModuleLoader;
@@ -66,10 +68,6 @@
 import org.xnio.Pool;
 import org.xnio.XnioWorker;
 
-import io.undertow.predicate.Predicates;
-import io.undertow.server.HttpHandler;
-import io.undertow.server.handlers.PathHandler;
-
 /**
  * This is the barebone test example that tests subsystem
  *
@@ -155,6 +153,15 @@ protected RunningMode getRunningMode() {
             return RunningMode.ADMIN_ONLY;
         }
 
+        @Override
+        protected void setupController(ControllerInitializer controllerInitializer) {
+            super.setupController(controllerInitializer);
+
+            for (Map.Entry<String, Integer> entry : sockets.entrySet()) {
+                controllerInitializer.addSocketBinding(entry.getKey(), entry.getValue());
+            }
+        }
+
         @Override
         protected void initializeExtraSubystemsAndModel(ExtensionRegistry extensionRegistry, Resource rootResource,
                 ManagementResourceRegistration rootRegistration, RuntimeCapabilityRegistry capabilityRegistry) {
@@ -166,10 +173,6 @@ protected void initializeExtraSubystemsAndModel(ExtensionRegistry extensionRegis
                     XnioWorker.class);
             capabilities.put(buildDynamicCapabilityName(ListenerResourceDefinition.IO_BUFFER_POOL_CAPABILITY,
                     ListenerResourceDefinition.BUFFER_POOL.getDefaultValue().asString()), Pool.class);
-            for (String entry : sockets.keySet()) {
-                capabilities.put(buildDynamicCapabilityName(ListenerResourceDefinition.SOCKET_CAPABILITY, entry),
-                        SocketBinding.class);
-            }
             capabilities.put(buildDynamicCapabilityName("org.wildfly.security.http-authentication-factory", "elytron-factory"), HttpAuthenticationFactory.class);
             capabilities.put(buildDynamicCapabilityName("org.wildfly.security.ssl-context", "TestContext"), SSLContext.class);
             capabilities.put(buildDynamicCapabilityName("org.wildfly.security.ssl-context", "my-ssl-context"), SSLContext.class);
@@ -191,15 +194,6 @@ protected RunningMode getRunningMode() {
             return RunningMode.NORMAL;
         }
 
-        @Override
-        protected void setupController(ControllerInitializer controllerInitializer) {
-            super.setupController(controllerInitializer);
-
-            for (Map.Entry<String, Integer> entry : sockets.entrySet()) {
-                controllerInitializer.addSocketBinding(entry.getKey(), entry.getValue());
-            }
-        }
-
         @Override
         protected void addExtraServices(ServiceTarget target) {
             super.addExtraServices(target);