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

KEYCLOAK-7718 DemoFilterServletAdapterTest test not configured correctly

Browse source
This commit is contained in:
vramik 2018-06-27 12:25:52 +02:00 committed by Pedro Igor
parent 5f0c86a49f
commit 9039b44f4d
16 changed files with 219 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
testsuite/integration-arquillian/servers/app-server/jboss/common/add-secured-deployments.bat Normal file
View file

@ -0,0 +1,35 @@
set NOPAUSE=true
start "JBoss Server" /b cmd /c %JBOSS_HOME%\bin\standalone.bat -Djboss.server.config.dir=%JBOSS_HOME%\standalone-secured-deployments\configuration
set ERROR=0
set TIMEOUT=10
set I=0
ping 127.0.0.1 -n 3 > nul
:wait_for_jboss
call %JBOSS_HOME%\bin\jboss-cli.bat -c --command=":read-attribute(name=server-state)" | findstr "running"
if %ERRORLEVEL% equ 0 goto add_secured_deployments
ping 127.0.0.1 -n 1 > nul
set /a I=%I%+1
if %I% gtr %TIMEOUT% (
set ERROR=1
goto shutdown_jboss
)
goto wait_for_jboss
:add_secured_deployments
call %JBOSS_HOME%\bin\jboss-cli.bat -c --file="%CLI_PATH%\add-secured-deployments.cli"
set ERROR=%ERRORLEVEL%
echo Error code: "%ERROR%"
if %ERROR% neq 0 (
goto shutdown_jboss
)
:shutdown_jboss
echo Shutting down with error code: "%ERROR%"
call %JBOSS_HOME%\bin\jboss-cli.bat -c --command=":shutdown"
exit /b %ERROR%

41
testsuite/integration-arquillian/servers/app-server/jboss/common/add-secured-deployments.sh Executable file
View file

@ -0,0 +1,41 @@
#!/bin/bash
echo "JBOSS_HOME=$JBOSS_HOME"
if [ ! -d "$JBOSS_HOME/bin" ] ; then
>&2 echo "JBOSS_HOME/bin doesn't exist"
exit 1
fi
cd $JBOSS_HOME/bin
./standalone.sh -Djboss.server.config.dir=$JBOSS_HOME/standalone-secured-deployments/configuration &
sleep 3
TIMEOUT=10
DELAY=1
T=0
RESULT=0
until [ $T -gt $TIMEOUT ]
do
if ./jboss-cli.sh -c --command=":read-attribute(name=server-state)" | grep -q "running" ; then
echo "Server is running. Adding secured deployments"
./jboss-cli.sh -c --file="$CLI_PATH/add-secured-deployments.cli"
RESULT=$?
echo "Return code:"${RESULT}
./jboss-cli.sh -c --command=":shutdown"
rm -rf $JBOSS_HOME/standalone/data
rm -rf $JBOSS_HOME/standalone/log
echo "Exiting with return code: "$RESULT
exit $RESULT
fi
echo "Server is not running."
sleep $DELAY
let T=$T+$DELAY
done
exit 1

1
testsuite/integration-arquillian/servers/app-server/jboss/common/install-adapters-online.bat
View file

@ -39,7 +39,6 @@ if "%SAML_SUPPORTED%" == "true" (
)
call %JBOSS_HOME%\bin\jboss-cli.bat -c --file="%CLI_PATH%\add-adapter-log-level.cli"
call %JBOSS_HOME%\bin\jboss-cli.bat -c --file="%CLI_PATH%\add-secured-deployments.cli"
:shutdown_jboss
echo Shutting down with error code: "%ERROR%"

1
testsuite/integration-arquillian/servers/app-server/jboss/common/install-adapters-online.sh
View file

@ -33,7 +33,6 @@ do
fi
./jboss-cli.sh -c --file="$CLI_PATH/add-adapter-log-level.cli"
./jboss-cli.sh -c --file="$CLI_PATH/add-secured-deployments.cli"
./jboss-cli.sh -c --command=":shutdown"
rm -rf $JBOSS_HOME/standalone/data

1
testsuite/integration-arquillian/servers/app-server/jboss/eap/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAPAppServerProvider.java
View file

@ -85,6 +85,7 @@ public class EAPAppServerProvider implements AppServerContainerProvider {
createChild("jbossHome", appServerHome);
createChild("javaHome", appServerJavaHome);
createChild("jbossArguments",
"-Djboss.server.base.dir=" + appServerHome + "/standalone-test " +
"-Djboss.socket.binding.port-offset=" + appServerPortOffset + " " +
System.getProperty("adapter.test.props", " ") +
System.getProperty("kie.maven.settings", " ")

16
testsuite/integration-arquillian/servers/app-server/jboss/eap6/pom.xml
View file

@ -118,6 +118,22 @@
</environmentVariables>
</configuration>
</execution>
<execution>
<id>add-secured-deployments-eap6</id>
<phase>generate-test-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>${common.resources}/add-secured-deployments.${script.suffix}</executable>
<workingDirectory>${app.server.jboss.home}/bin</workingDirectory>
<environmentVariables>
<JAVA_HOME>${app.server.java.home}</JAVA_HOME>
<JBOSS_HOME>${app.server.jboss.home}</JBOSS_HOME>
<CLI_PATH>${common.resources}/cli/eap6/</CLI_PATH>
</environmentVariables>
</configuration>
</execution>
</executions>
</plugin>
</plugins>

1
testsuite/integration-arquillian/servers/app-server/jboss/eap6/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAP6AppServerProvider.java
View file

@ -85,6 +85,7 @@ public class EAP6AppServerProvider implements AppServerContainerProvider {
createChild("jbossHome", appServerHome);
createChild("javaHome", appServerJavaHome);
createChild("jbossArguments",
"-Djboss.server.base.dir=" + appServerHome + "/standalone-test " +
"-Djboss.socket.binding.port-offset=" + appServerPortOffset + " " +
System.getProperty("adapter.test.props", " ") +
System.getProperty("kie.maven.settings", " ")

18
testsuite/integration-arquillian/servers/app-server/jboss/pom.xml
View file

@ -204,6 +204,21 @@
</resources>
</configuration>
</execution>
<execution>
<id>copy-configs-secured-deployments</id>
<phase>generate-test-sources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${app.server.jboss.home}/standalone-secured-deployments</outputDirectory>
<resources>
<resource>
<directory>${app.server.jboss.home}/standalone</directory>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-configs-crossdc</id>
<phase>generate-test-sources</phase>
@ -393,7 +408,7 @@
</execution>
<execution>
<id>add-secured-deployments</id>
<phase>process-resources</phase>
<phase>generate-test-sources</phase>
<goals>
<goal>exec</goal>
</goals>
@ -403,6 +418,7 @@
<executable>./jboss-cli.sh</executable>
<arguments>
<argument>--file=${common.resources}/cli/add-secured-deployments.cli</argument>
<argument>-Djboss.server.config.dir=${app.server.jboss.home}/standalone-secured-deployments/configuration</argument>
</arguments>
</configuration>
</execution>

1
testsuite/integration-arquillian/servers/app-server/jboss/wildfly/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyAppServerProvider.java
View file

@ -85,6 +85,7 @@ public class WildflyAppServerProvider implements AppServerContainerProvider {
createChild("jbossHome", appServerHome);
createChild("javaHome", appServerJavaHome);
createChild("jbossArguments",
"-Djboss.server.base.dir=" + appServerHome + "/standalone-test " +
"-Djboss.socket.binding.port-offset=" + appServerPortOffset + " " +
System.getProperty("adapter.test.props", " ") +
System.getProperty("kie.maven.settings", " ")

1
testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly10AppServerProvider.java
View file

@ -85,6 +85,7 @@ public class Wildfly10AppServerProvider implements AppServerContainerProvider {
createChild("jbossHome", appServerHome);
createChild("javaHome", appServerJavaHome);
createChild("jbossArguments",
"-Djboss.server.base.dir=" + appServerHome + "/standalone-test " +
"-Djboss.socket.binding.port-offset=" + appServerPortOffset + " " +
System.getProperty("adapter.test.props", " ") +
System.getProperty("kie.maven.settings", " ")

1
testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly9AppServerProvider.java
View file

@ -85,6 +85,7 @@ public class Wildfly9AppServerProvider implements AppServerContainerProvider {
createChild("jbossHome", appServerHome);
createChild("javaHome", appServerJavaHome);
createChild("jbossArguments",
"-Djboss.server.base.dir=" + appServerHome + "/standalone-test " +
"-Djboss.socket.binding.port-offset=" + appServerPortOffset + " " +
System.getProperty("adapter.test.props", " ") +
System.getProperty("kie.maven.settings", " ")

37
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java
View file

@ -17,6 +17,8 @@
package org.keycloak.testsuite.arquillian;
import java.io.File;
import org.apache.commons.io.FileUtils;
import org.jboss.arquillian.container.test.api.ContainerController;
import org.jboss.arquillian.core.api.Instance;
import org.jboss.arquillian.core.api.annotation.Inject;
@ -25,6 +27,7 @@ import org.jboss.arquillian.test.spi.event.suite.BeforeClass;
import org.jboss.logging.Logger;
import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
import org.keycloak.testsuite.arquillian.annotation.AppServerContainers;
import org.keycloak.testsuite.arquillian.containers.SelfManagedAppContainerLifecycle;
import org.wildfly.extras.creaper.core.ManagementClient;
import org.wildfly.extras.creaper.core.online.ManagementProtocol;
import org.wildfly.extras.creaper.core.online.OnlineManagementClient;
@ -33,6 +36,8 @@ import org.wildfly.extras.creaper.core.online.OnlineOptions;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -46,7 +51,7 @@ import static org.keycloak.testsuite.arquillian.AuthServerTestEnricher.getAuthSe
*/
public class AppServerTestEnricher {
protected final Logger log = Logger.getLogger(this.getClass());
private static final Logger log = Logger.getLogger(AppServerTestEnricher.class);
public static final String CURRENT_APP_SERVER = System.getProperty("app.server", "undertow");
@ -160,7 +165,15 @@ public class AppServerTestEnricher {
}
public void startAppServer(@Observes(precedence = -1) BeforeClass event) throws MalformedURLException, InterruptedException, IOException {
// if testClass implements SelfManagedAppContainerLifecycle we skip starting container and let the test to manage the lifecycle itself
if (SelfManagedAppContainerLifecycle.class.isAssignableFrom(event.getTestClass().getJavaClass())) {
log.debug("Skipping starting App server. Server should be started by testClass.");
return;
}
if (testContext.isAdapterContainerEnabled() && !testContext.isRelativeAdapterTest()) {
if (isJBossBased()) {
prepareServerDir("standalone");
}
ContainerController controller = containerConrollerInstance.get();
if (!controller.isStarted(testContext.getAppServerInfo().getQualifier())) {
log.info("Starting app server: " + testContext.getAppServerInfo().getQualifier());
@ -169,6 +182,25 @@ public class AppServerTestEnricher {
}
}
/**
* Workaround for WFARQ-44. It cannot be used 'cleanServerBaseDir' property.
*
* It copies deployments and configuration into $JBOSS_HOME/standalone-test from where
* the container is started for the test
*
* @param baseDir string representing folder name, relative to app.server.home, from which the copy is made
* @throws IOException
*/
public static void prepareServerDir(String baseDir) throws IOException {
log.debug("Creating cleanServerBaseDir from: " + baseDir);
Path path = Paths.get(System.getProperty("app.server.home"), "standalone-test");
File targetSubdirFile = path.toFile();
FileUtils.deleteDirectory(targetSubdirFile);
FileUtils.forceMkdir(targetSubdirFile);
FileUtils.copyDirectory(Paths.get(System.getProperty("app.server.home"), baseDir, "deployments").toFile(), new File(targetSubdirFile, "deployments"));
FileUtils.copyDirectory(Paths.get(System.getProperty("app.server.home"), baseDir, "configuration").toFile(), new File(targetSubdirFile, "configuration"));
}
/**
*
* @param testClass
@ -230,4 +262,7 @@ public class AppServerTestEnricher {
return CURRENT_APP_SERVER.contains("karaf") || CURRENT_APP_SERVER.contains("fuse");
}
private boolean isJBossBased() {
return testContext.getAppServerInfo().isJBossBased();
}
}

27
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/SelfManagedAppContainerLifecycle.java Normal file
View file

@ -0,0 +1,27 @@
/*
* Copyright 2018 Red Hat, Inc. and/or its affiliates
* and other contributors as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.keycloak.testsuite.arquillian.containers;
/**
*
* @author vramik
*/
public interface SelfManagedAppContainerLifecycle {
void startServer();
void stopServer();
}

5
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterTest.java
View file

@ -17,6 +17,7 @@
package org.keycloak.testsuite.adapter;
import java.io.File;
import org.apache.commons.io.IOUtils;
import org.jboss.arquillian.graphene.page.Page;
import org.jboss.shrinkwrap.api.Archive;
@ -43,10 +44,14 @@ import org.wildfly.extras.creaper.core.online.operations.admin.Administration;
import java.io.IOException;
import java.net.URL;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeoutException;
import org.apache.commons.io.FileUtils;
import org.junit.Before;
/**
* <code>@AppServerContainer</code> is needed for stopping recursion in

2
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoServletsAdapterTest.java
View file

@ -997,7 +997,7 @@ public class DemoServletsAdapterTest extends AbstractServletsAdapterTest {
String appServer = System.getProperty("app.server");
if (appServer != null && (appServer.equals("wildfly") || appServer.equals("eap6") || appServer.equals("eap"))) {
serverLogPath = System.getProperty("app.server.home") + "/standalone/log/server.log";
serverLogPath = System.getProperty("app.server.home") + "/standalone-test/log/server.log";
}
String appServerUrl;

42
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SecuredDeploymentsAdapterTest.java
View file

@ -17,29 +17,41 @@
package org.keycloak.testsuite.adapter.servlet;
import static org.hamcrest.Matchers.containsString;
import static org.junit.Assert.assertThat;
import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlEquals;
import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWithLoginUrlOf;
import java.io.IOException;
import org.jboss.arquillian.container.test.api.ContainerController;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.graphene.page.Page;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.keycloak.testsuite.adapter.AbstractServletsAdapterTest;
import org.keycloak.testsuite.adapter.filter.AdapterActionsFilter;
import org.keycloak.testsuite.adapter.page.CustomerDb;
import org.keycloak.testsuite.adapter.page.CustomerPortalSubsystem;
import org.keycloak.testsuite.adapter.page.ProductPortalSubsystem;
import org.keycloak.testsuite.arquillian.AppServerTestEnricher;
import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
import org.keycloak.testsuite.arquillian.containers.ContainerConstants;
import static org.hamcrest.Matchers.containsString;
import static org.junit.Assert.assertThat;
import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlEquals;
import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWithLoginUrlOf;
import org.keycloak.testsuite.arquillian.containers.SelfManagedAppContainerLifecycle;
@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY9)
@AppServerContainer(ContainerConstants.APP_SERVER_EAP)
@AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
public class SecuredDeploymentsAdapterTest extends AbstractServletsAdapterTest {
public class SecuredDeploymentsAdapterTest extends AbstractServletsAdapterTest implements SelfManagedAppContainerLifecycle {
@ArquillianResource
private ContainerController controller;
@Page
private CustomerPortalSubsystem customerPortalSubsystem;
@ -62,6 +74,24 @@ public class SecuredDeploymentsAdapterTest extends AbstractServletsAdapterTest {
return servletDeployment(CustomerDb.DEPLOYMENT_NAME, AdapterActionsFilter.class, CustomerDatabaseServlet.class);
}
@Before
@Override
public void startServer() {
try {
AppServerTestEnricher.prepareServerDir("standalone-secured-deployments");
} catch (IOException ex) {
throw new RuntimeException("Wasn't able to prepare server dir.", ex);
}
controller.start(testContext.getAppServerInfo().getQualifier());
}
@After
@Override
public void stopServer() {
controller.stop(testContext.getAppServerInfo().getQualifier());
}
@Test
public void testSecuredDeployments() {
customerPortalSubsystem.navigateTo();