From a35aa47f275629d2bbff208de50b7d83744b0dcf Mon Sep 17 00:00:00 2001
From: Vaclav Muzikar <vmuzikar@redhat.com>
Date: Thu, 25 Feb 2016 17:51:38 +0100
Subject: [PATCH] Add support for some test constants in props file

---
 .../integration-arquillian/tests/base/pom.xml    |  5 +++++
 .../keycloak/testsuite/AbstractKeycloakTest.java | 16 ++++++++++++++++
 .../src/test/resources/test-constants.properties |  2 ++
 3 files changed, 23 insertions(+)
 create mode 100644 testsuite/integration-arquillian/tests/base/src/test/resources/test-constants.properties

diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml
index ecfe1cea55..61b360484c 100644
--- a/testsuite/integration-arquillian/tests/base/pom.xml
+++ b/testsuite/integration-arquillian/tests/base/pom.xml
@@ -52,6 +52,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+            <version>1.10</version>
+        </dependency>
     </dependencies>
     
     <build>
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 92dc9c57e2..989b105fb6 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
@@ -16,6 +16,8 @@
  */
 package org.keycloak.testsuite;
 
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.PropertiesConfiguration;
 import org.keycloak.testsuite.arquillian.TestContext;
 import java.util.ArrayList;
 import java.util.List;
@@ -98,6 +100,8 @@ public abstract class AbstractKeycloakTest {
 
     protected UserRepresentation adminUser;
 
+    private PropertiesConfiguration constantsProperties;
+
     @Before
     public void beforeAbstractKeycloakTest() {
         adminClient = Keycloak.getInstance(AuthServerTestEnricher.getAuthServerContextRoot() + "/auth",
@@ -205,4 +209,16 @@ 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;
+    }
+
 }
diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/test-constants.properties b/testsuite/integration-arquillian/tests/base/src/test/resources/test-constants.properties
new file mode 100644
index 0000000000..6dbea51bbe
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/base/src/test/resources/test-constants.properties
@@ -0,0 +1,2 @@
+# Some constants used in tests which may vary
+ldap-vendors = Active Directory,Red Hat Directory Server,Tivoli,Novell eDirectory,Other
\ No newline at end of file