keycloak-uncached

Make it easier to use test utils

10/12/2013 7:29:12 AM

Details

pom.xml 5(+5 -0)

diff --git a/pom.xml b/pom.xml
index ed404ba..61503c5 100755
--- a/pom.xml
+++ b/pom.xml
@@ -400,6 +400,11 @@
                     <artifactId>maven-jar-plugin</artifactId>
                     <version>2.2</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>1.2.1</version>
+                </plugin>
             </plugins>
         </pluginManagement>
 
diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml
index 3184758..f0f3eea 100644
--- a/testsuite/integration/pom.xml
+++ b/testsuite/integration/pom.xml
@@ -205,26 +205,49 @@
 
     <profiles>
         <profile>
-            <id>jboss-managed</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.jboss.as</groupId>
-                    <artifactId>jboss-as-arquillian-container-managed</artifactId>
-                    <scope>test</scope>
-                    <version>7.1.1.Final</version>
-                </dependency>
-            </dependencies>
+            <id>keycloak-server</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <configuration>
+                            <mainClass>org.keycloak.testutils.KeycloakServer</mainClass>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
         <profile>
-            <id>jboss-remote</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.jboss.as</groupId>
-                    <artifactId>jboss-as-arquillian-container-remote</artifactId>
-                    <scope>test</scope>
-                    <version>7.1.1.Final</version>
-                </dependency>
-            </dependencies>
+            <id>mail-server</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <configuration>
+                            <mainClass>org.keycloak.testutils.MailServer</mainClass>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>totp</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <configuration>
+                            <mainClass>org.keycloak.testutils.TotpGenerator</mainClass>
+                            <arguments>
+                                <argument>${secret}</argument>
+                            </arguments>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
     </profiles>
 </project>
\ No newline at end of file
diff --git a/testsuite/integration/src/main/java/org/keycloak/testutils/KeycloakServer.java b/testsuite/integration/src/main/java/org/keycloak/testutils/KeycloakServer.java
index 66192b0..afcedbe 100644
--- a/testsuite/integration/src/main/java/org/keycloak/testutils/KeycloakServer.java
+++ b/testsuite/integration/src/main/java/org/keycloak/testutils/KeycloakServer.java
@@ -121,6 +121,10 @@ public class KeycloakServer {
             }
         }
 
+        if (System.getProperties().containsKey("import")) {
+            keycloak.importRealm(new FileInputStream(System.getProperty("import")));
+        }
+
         Runtime.getRuntime().addShutdownHook(new Thread() {
             @Override
             public void run() {
diff --git a/testsuite/integration/src/main/java/org/keycloak/testutils/MailServer.java b/testsuite/integration/src/main/java/org/keycloak/testutils/MailServer.java
index 42302e3..8ba730a 100644
--- a/testsuite/integration/src/main/java/org/keycloak/testutils/MailServer.java
+++ b/testsuite/integration/src/main/java/org/keycloak/testutils/MailServer.java
@@ -13,6 +13,9 @@ public class MailServer {
 
         GreenMail greenMail = new GreenMail(setup);
         greenMail.start();
+
+        System.out.println("Started mail server (localhost:3025)");
+        System.out.println();
         
         while (true) {
             int c = greenMail.getReceivedMessages().length;