From cf627154991f3ff53ad7e317d7c630a40730c8d1 Mon Sep 17 00:00:00 2001
From: Tomas Kyjovsky <tkyjovsk@redhat.com>
Date: Fri, 9 Dec 2016 17:41:07 +0100
Subject: [PATCH] KEYCLOAK-4061 fixed testsuite URLProvider for AS7/EAP6 app
 server (managed and remote mode)

---
 .../testsuite/arquillian/provider/URLProvider.java        | 2 +-
 .../tests/other/adapters/jboss/remote/pom.xml             | 8 ++++++++
 .../jboss/remote/src/test/resources/xslt/arquillian.xsl   | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/URLProvider.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/URLProvider.java
index 77640aada5..e8852bc151 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/URLProvider.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/URLProvider.java
@@ -74,7 +74,7 @@ public class URLProvider extends URLResourceProvider {
         }
 
         try {
-            if (System.getProperty("app.server","").startsWith("eap6")) {
+            if (System.getProperty("app.server.management.protocol","").equals("remote")) {
                 if (url == null) {
                     url = new URL("http://localhost:8080/");
                 }
diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/pom.xml
index 2726651246..6b26801d70 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/pom.xml
@@ -126,6 +126,14 @@
             <id>auth-server-remote</id>
             <!--dummy profile for enforcer-->
         </profile>
+        <profile>
+            <id>app-server-remote-as7-eap6</id>
+            <!--this profile is required if remote app server is AS7 or EAP6-->
+            <properties>
+                <app.server.management.protocol>remote</app.server.management.protocol>
+                <app.server.management.port>${app.server.management.port.jmx}</app.server.management.port>
+            </properties>
+        </profile>
         <profile>
             <id>no-offset</id>
             <properties>
diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/resources/xslt/arquillian.xsl b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/resources/xslt/arquillian.xsl
index 9da934154e..c18ecc1c64 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/resources/xslt/arquillian.xsl
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/resources/xslt/arquillian.xsl
@@ -32,6 +32,7 @@
                 <configuration>
                     <property name="adapterImplClass">org.jboss.as.arquillian.container.remote.RemoteDeployableContainer</property>
 
+                    <property name="managementProtocol">${app.server.management.protocol}</property>
                     <property name="managementAddress">${app.server.host}</property>
                     <property name="managementPort">${app.server.management.port}</property>
                     <property name="username">admin</property>