Reorganized arquillian testsuite modules.

keycloak · Jan 20, 2016 · cc82c50 · cc82c50
1 parent 1dd8a04
commit cc82c50
Show file tree

Hide file tree

Showing 179 changed files with 214 additions and 556 deletions.
diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.keycloak</groupId>
         <artifactId>keycloak-testsuite-pom</artifactId>
         <version>1.9.0.CR1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.keycloak.testsuite</groupId>
     <artifactId>integration-arquillian</artifactId>
     <packaging>pom</packaging>
-    <name>Keycloak Integration TestSuite with Arquillian</name>
+
+    <name>Keycloak Arquillian Integration TestSuite</name>
 
     <modules>
         <module>servers</module>

diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml
@@ -9,16 +9,20 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>integration-arquillian-tests-base</artifactId>
-    <name>Base Test Suite</name>
+
+    <name>Base TestSuite</name>
+
+    <description></description>
 
     <properties>
         <exclude.console>-</exclude.console>
         <exclude.account>-</exclude.account>
         <exclude.client>-</exclude.client>
         <exclude.migration>-</exclude.migration>
     </properties>
-	<dependencies>
-	    <dependency>
+
+    <dependencies>
+        <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-util-embedded-ldap</artifactId>
             <exclusions>
@@ -28,7 +32,8 @@
                 </exclusion>
             </exclusions>
         </dependency>
-	</dependencies>
+    </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -43,6 +48,7 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -55,17 +61,37 @@
                     </excludes>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-admin-user-json-file</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${jboss.server.config.dir}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/test/resources</directory>
+                                    <includes>
+                                        <include>keycloak-add-user.json</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
+
     </build>
 
     <profiles>    
-        <profile>
-            <id>no-console</id>
-            <properties>
-                <!-- Exclude all admin console tests. -->
-                <exclude.console>**/console/**/*Test.java</exclude.console>           
-            </properties>
-        </profile>
         <profile>
             <id>no-account</id>
             <properties>
@@ -76,14 +102,13 @@
         <profile>
             <id>no-client</id>
             <properties>
-                <!-- Exclude all account management tests. -->
-                <exclude.account>**/client/**/*Test.java</exclude.account>
+                <!-- Exclude all client tests. -->
+                <exclude.client>**/client/**/*Test.java</exclude.client>
             </properties>
         </profile>
         <profile>
             <id>adapters-only</id>
             <properties>
-                <exclude.console>**/console/**/*Test.java</exclude.console>           
                 <exclude.account>**/account/**/*Test.java</exclude.account>
                 <exclude.client>**/client/**/*Test.java</exclude.client>
                 <exclude.migration>**/migration/**/*Test.java</exclude.migration>