libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Update arquillian testsuite for eap7

Browse source
This commit is contained in:
Vlasta Ramik 2016-02-02 11:05:35 +01:00
parent db78ea76b8
commit 8e49d4ff90
6 changed files with 16 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
testsuite/integration-arquillian/servers/eap7/pom.xml
View file

@ -68,7 +68,7 @@
<artifactItems> <artifactItems>
<artifactItem> <artifactItem>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-eap6-server-dist</artifactId> <artifactId>keycloak-server-dist</artifactId>
<version>${version.server.dist}</version> <version>${version.server.dist}</version>
<type>zip</type> <type>zip</type>
<outputDirectory>${project.build.directory}/unpacked</outputDirectory> <outputDirectory>${project.build.directory}/unpacked</outputDirectory>

2
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainersTestEnricher.java
View file

@ -290,11 +290,13 @@ public class ContainersTestEnricher {
log.info("Installing saml adapter to app server via cli script"); log.info("Installing saml adapter to app server via cli script");
execCommand(command + " --connect --file=" + samlAdapterScript + controllerArg, bin); execCommand(command + " --connect --file=" + samlAdapterScript + controllerArg, bin);
} }
if (new File(bin, adapterScript).exists() || new File(bin, samlAdapterScript).exists()) {
log.info("Restarting container"); log.info("Restarting container");
execCommand(command + " --connect --command=reload" + controllerArg, bin); execCommand(command + " --connect --command=reload" + controllerArg, bin);
log.info("Container restarted"); log.info("Container restarted");
pause(5000); pause(5000);
checkServerLog(jbossHomePath); checkServerLog(jbossHomePath);
}
if (container.getName().startsWith("app-server")) { if (container.getName().startsWith("app-server")) {
alreadyInstalled = true; alreadyInstalled = true;
} }

5
testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
View file

@ -130,10 +130,7 @@
<property name="jbossHome">${keycloak.home}</property> <property name="jbossHome">${keycloak.home}</property>
<property name="javaVmArguments">-Djboss.socket.binding.port-offset=${auth.server.port.offset} -Xms64m -Xmx512m -XX:MaxPermSize=256m ${adapter.test.props}</property> <property name="javaVmArguments">-Djboss.socket.binding.port-offset=${auth.server.port.offset} -Xms64m -Xmx512m -XX:MaxPermSize=256m ${adapter.test.props}</property>
<property name="startupTimeoutInSeconds">${startup.timeout.sec}</property> <property name="startupTimeoutInSeconds">${startup.timeout.sec}</property>
<property name="managementPort">${auth.server.management.port}</property>
<!--<property name="managementPort">${auth.server.management.port}</property>-->
<property name="managementPort">${auth.server.management.port.jmx}</property>
<property name="managementProtocol">remote</property>
</configuration> </configuration>
</container> </container>

25
testsuite/integration-arquillian/tests/other/adapters/eap6/pom.xml
View file

@ -17,29 +17,6 @@
<version.adapter.dist>${project.version}</version.adapter.dist> <version.adapter.dist>${project.version}</version.adapter.dist>
</properties> </properties>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-dist</artifactId>
<version>${jboss.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-eap6-adapter-dist</artifactId>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-saml-eap6-adapter-dist</artifactId>
<type>zip</type>
</dependency>
</dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -89,7 +66,7 @@
<artifactItem> <artifactItem>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-saml-eap6-adapter-dist</artifactId> <artifactId>keycloak-saml-eap6-adapter-dist</artifactId>
<version>${project.version}</version> <version>${version.adapter.dist}</version>
<type>zip</type> <type>zip</type>
<outputDirectory>${adapter.libs.eap6}</outputDirectory> <outputDirectory>${adapter.libs.eap6}</outputDirectory>
</artifactItem> </artifactItem>

6
testsuite/integration-arquillian/tests/other/adapters/eap7/pom.xml
View file

@ -38,12 +38,6 @@
<app.server.eap7.home>${containers.home}/jboss-eap-7.0</app.server.eap7.home> <app.server.eap7.home>${containers.home}/jboss-eap-7.0</app.server.eap7.home>
<adapter.libs.eap7>${containers.home}/keycloak-eap7-adapter-dist</adapter.libs.eap7> <adapter.libs.eap7>${containers.home}/keycloak-eap7-adapter-dist</adapter.libs.eap7>
</properties> </properties>
<!-- <dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
</dependency>
</dependencies>-->
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

6
testsuite/integration-arquillian/tests/other/adapters/pom.xml
View file

@ -282,6 +282,12 @@
<module>eap6</module> <module>eap6</module>
</modules> </modules>
</profile> </profile>
<profile>
<id>app-server-eap7</id>
<modules>
<module>eap7</module>
</modules>
</profile>
<profile> <profile>
<id>app-server-wildfly</id> <id>app-server-wildfly</id>
<modules> <modules>