Skip to content

Commit

Permalink
Merge pull request #1939 from mhajas/master
Browse files Browse the repository at this point in the history
KEYCLOAK-1667 Added adapter tests of SAML to integration arquillian
  • Loading branch information
mposolda committed Dec 14, 2015
2 parents d46bad5 + 97357d0 commit 82a573a
Show file tree
Hide file tree
Showing 68 changed files with 2,456 additions and 57 deletions.
12 changes: 12 additions & 0 deletions testsuite/integration-arquillian/servers/wildfly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,11 @@
<artifactId>keycloak-wildfly-adapter-dist</artifactId>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-saml-wildfly-adapter-dist</artifactId>
<type>zip</type>
</dependency>
</dependencies>
<build>
<plugins>
Expand All @@ -192,6 +197,13 @@
<type>zip</type>
<outputDirectory>${keycloak.server.home}</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-saml-wildfly-adapter-dist</artifactId>
<version>${project.version}</version>
<type>zip</type>
<outputDirectory>${keycloak.server.home}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,15 @@
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
<extension module="org.keycloak.keycloak-adapter-subsystem"/>
<extension module="org.keycloak.keycloak-saml-adapter-subsystem"/>
</xsl:copy>
</xsl:template>

<xsl:template match="//j:profile">
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
<subsystem xmlns="urn:jboss:domain:keycloak:1.1"/>
<subsystem xmlns="urn:jboss:domain:keycloak-saml:1.1"/>
</xsl:copy>
</xsl:template>

Expand Down
25 changes: 25 additions & 0 deletions testsuite/integration-arquillian/tests/adapters/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,24 @@
<version>${project.version}</version>
<type>war</type>
</artifactItem>
<artifactItem>
<groupId>org.keycloak</groupId>
<artifactId>saml-post-signatures</artifactId>
<version>${project.version}</version>
<type>war</type>
</artifactItem>
<artifactItem>
<groupId>org.keycloak</groupId>
<artifactId>saml-post-encryption</artifactId>
<version>${project.version}</version>
<type>war</type>
</artifactItem>
<artifactItem>
<groupId>org.keycloak</groupId>
<artifactId>saml-redirect-signatures</artifactId>
<version>${project.version}</version>
<type>war</type>
</artifactItem>
</artifactItems>
<outputDirectory>${examples.home}</outputDirectory>
<overWriteIfNewer>true</overWriteIfNewer>
Expand All @@ -268,6 +286,13 @@
<type>zip</type>
<includes>**/*realm.json</includes>
</artifactItem>
<artifactItem>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-examples-dist</artifactId>
<version>${project.version}</version>
<type>zip</type>
<includes>**/testsaml.json</includes>
</artifactItem>
</artifactItems>
<outputDirectory>${examples.home}</outputDirectory>
<overWriteIfNewer>true</overWriteIfNewer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
<artifactId>keycloak-wildfly-adapter-dist</artifactId>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-saml-wildfly-adapter-dist</artifactId>
<type>zip</type>
</dependency>
</dependencies>

<profiles>
Expand All @@ -48,7 +53,7 @@
<executions>
<execution>
<id>unpack-adapter</id>
<phase>generate-resources</phase>
<phase>process-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
Expand All @@ -61,11 +66,43 @@
<type>zip</type>
<outputDirectory>${adapter.libs.wildfly}</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-saml-wildfly-adapter-dist</artifactId>
<version>${project.version}</version>
<type>zip</type>
<outputDirectory>${adapter.libs.wildfly}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
<executions>
<execution>
<id>configure-adapter-subsystem</id>
<phase>process-resources</phase>
<goals>
<goal>transform</goal>
</goals>
<configuration>
<transformationSets>
<transformationSet>
<dir>${auth.server.container}/standalone/configuration</dir>
<includes>
<include>standalone.xml</include>
</includes>
<stylesheet>src/main/xslt/standalone.xsl</stylesheet>
<outputDir>${auth.server.container}/standalone/configuration</outputDir>
</transformationSet>
</transformationSets>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,15 @@
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
<extension module="org.keycloak.keycloak-adapter-subsystem"/>
<extension module="org.keycloak.keycloak-saml-adapter-subsystem"/>
</xsl:copy>
</xsl:template>

<xsl:template match="//j:profile">
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
<subsystem xmlns="urn:jboss:domain:keycloak:1.1"/>
<subsystem xmlns="urn:jboss:domain:keycloak-saml:1.1"/>
</xsl:copy>
</xsl:template>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package org.keycloak.testsuite.adapter.example;

import org.keycloak.testsuite.arquillian.annotation.AdapterLibsLocationProperty;

/**
*
* @author mhajas
*/
@AdapterLibsLocationProperty("adapter.libs.wildfly")
public class WildflyRelativeSAMLExampleAdapterTest extends AbstractSAMLExampleAdapterTest {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package org.keycloak.testsuite.adapter.servlet;

import org.keycloak.testsuite.arquillian.annotation.AdapterLibsLocationProperty;

/**
* @author mhajas
*/
@AdapterLibsLocationProperty("adapter.libs.wildfly")
public class WildflyRelativeSAMLServletsAdapterTest extends AbstractSAMLServletsAdapterTest {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package org.keycloak.testsuite.adapter.page;

import org.jboss.arquillian.container.test.api.OperateOnDeployment;
import org.jboss.arquillian.test.api.ArquillianResource;

import java.net.URL;

/**
* @author mhajas
*/
public class BadClientSalesPostSigServlet extends SAMLServletWithLogout {
public static final String DEPLOYMENT_NAME = "bad-client-sales-post-sig";

@ArquillianResource
@OperateOnDeployment(DEPLOYMENT_NAME)
private URL url;

@Override
public URL getInjectedUrl() {
return url;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package org.keycloak.testsuite.adapter.page;

import org.jboss.arquillian.container.test.api.OperateOnDeployment;
import org.jboss.arquillian.test.api.ArquillianResource;

import java.net.URL;

/**
* @author mhajas
*/
public class BadRealmSalesPostSigServlet extends SAMLServletWithLogout {
public static final String DEPLOYMENT_NAME = "bad-realm-sales-post-sig";

@ArquillianResource
@OperateOnDeployment(DEPLOYMENT_NAME)
private URL url;

@Override
public URL getInjectedUrl() {
return url;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package org.keycloak.testsuite.adapter.page;

import org.jboss.arquillian.container.test.api.OperateOnDeployment;
import org.jboss.arquillian.test.api.ArquillianResource;

import java.net.URL;

/**
* @author mhajas
*/
public class Employee2Servlet extends SAMLServletWithLogout {
public static final String DEPLOYMENT_NAME = "employee2";

@ArquillianResource
@OperateOnDeployment(DEPLOYMENT_NAME)
private URL url;

@Override
public URL getInjectedUrl() {
return url;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package org.keycloak.testsuite.adapter.page;

import org.jboss.arquillian.container.test.api.OperateOnDeployment;
import org.jboss.arquillian.test.api.ArquillianResource;

import java.net.URL;

/**
* @author mhajas
*/
public class EmployeeSigFrontServlet extends SAMLServletWithLogout {
public static final String DEPLOYMENT_NAME = "employee-sig-front";

@ArquillianResource
@OperateOnDeployment(DEPLOYMENT_NAME)
private URL url;

@Override
public URL getInjectedUrl() {
return url;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package org.keycloak.testsuite.adapter.page;

import org.jboss.arquillian.container.test.api.OperateOnDeployment;
import org.jboss.arquillian.test.api.ArquillianResource;

import java.net.URL;

/**
* @author mhajas
*/
public class EmployeeSigServlet extends SAMLServletWithLogout {
public static final String DEPLOYMENT_NAME = "employee-sig";

@ArquillianResource
@OperateOnDeployment(DEPLOYMENT_NAME)
private URL url;

@Override
public URL getInjectedUrl() {
return url;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package org.keycloak.testsuite.adapter.page;

import org.jboss.arquillian.container.test.api.OperateOnDeployment;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.keycloak.testsuite.page.AbstractPageWithInjectedUrl;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.FindBy;

import java.net.URL;

/**
* @author mhajas
*/
public class SAMLPostEncExample extends AbstractPageWithInjectedUrl {
public static final String DEPLOYMENT_NAME = "saml-post-encryption";

@ArquillianResource
@OperateOnDeployment(DEPLOYMENT_NAME)
private URL url;

@FindBy(tagName = "a")
WebElement logoutButton;

@Override
public URL getInjectedUrl() {
return url;
}

public void logout() {
logoutButton.click();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package org.keycloak.testsuite.adapter.page;

import org.jboss.arquillian.container.test.api.OperateOnDeployment;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.keycloak.testsuite.page.AbstractPageWithInjectedUrl;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.FindBy;

import java.net.URL;

/**
* @author mhajas
*/
public class SAMLPostSigExample extends AbstractPageWithInjectedUrl {
public static final String DEPLOYMENT_NAME = "saml-post-signatures";

@ArquillianResource
@OperateOnDeployment(DEPLOYMENT_NAME)
private URL url;

@FindBy(tagName = "a")
WebElement logoutButton;

@Override
public URL getInjectedUrl() {
return url;
}

public void logout() {
logoutButton.click();
}
}

0 comments on commit 82a573a

Please sign in to comment.