keycloak-aplcache

Add system property for test constants location (cherry picked

3/15/2016 9:05:33 AM

Details

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java
index 22714b9..2de16e8 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java
@@ -120,7 +120,7 @@ public abstract class AbstractKeycloakTest {
         setDefaultPageUriParameters();
 
         driverSettings();
-        
+
         TestEventsLogger.setDriver(driver);
 
         if (!suiteContext.isAdminPasswordUpdated()) {
@@ -216,18 +216,6 @@ public abstract class AbstractKeycloakTest {
         return adminClient.realms();
     }
 
-    private void loadConstantsProperties() throws ConfigurationException {
-        constantsProperties = new PropertiesConfiguration("test-constants.properties");
-        constantsProperties.setThrowExceptionOnMissing(true);
-    }
-
-    protected PropertiesConfiguration getConstantsProperties() throws ConfigurationException {
-        if (constantsProperties == null) {
-            loadConstantsProperties();
-        }
-        return constantsProperties;
-    }
-
     public void createRealm(String realm) {
         try {
             RealmResource realmResource = adminClient.realms().realm(realm);
@@ -287,4 +275,16 @@ public abstract class AbstractKeycloakTest {
         userResource.update(userRepresentation);
     }
 
+    private void loadConstantsProperties() throws ConfigurationException {
+        constantsProperties = new PropertiesConfiguration(System.getProperty("testsuite.constants"));
+        constantsProperties.setThrowExceptionOnMissing(true);
+    }
+
+    protected PropertiesConfiguration getConstantsProperties() throws ConfigurationException {
+        if (constantsProperties == null) {
+            loadConstantsProperties();
+        }
+        return constantsProperties;
+    }
+
 }
diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index 6d76831..9c82a30 100644
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -68,6 +68,8 @@
         <backends.console.output>true</backends.console.output>
         
         <auth.server.java.home>${java.home}</auth.server.java.home>
+
+        <testsuite.constants>test-constants.properties</testsuite.constants>
         
     </properties>
 
@@ -127,6 +129,7 @@
                             <jboss.server.config.dir>${jboss.server.config.dir}</jboss.server.config.dir>
                             <frontend.console.output>${frontend.console.output}</frontend.console.output>
                             <backends.console.output>${backend.console.output}</backends.console.output>
+                            <testsuite.constants>${testsuite.constants}</testsuite.constants>
                         </systemPropertyVariables>
                         <properties>
                             <property>