External-Mirrors/keycloak
2
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-10 15:32:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

KEYCLOAK-9712 KEYCLOAK-9911 moved Javascript adater tests and LoginModulesTest outsite of adapter package

Browse Source
This commit is contained in:
vramik 2019-03-27 10:29:25 +01:00 committed by Pavel Drozd
parent 5eb9291f37
commit 35fa4b878b
6 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/AbstractPhotozJavascriptExecutorTest.java
View File

@ -8,7 +8,6 @@ import org.junit.BeforeClass;
import org.keycloak.representations.idm.UserRepresentation;
import org.keycloak.testsuite.Assert;
import org.keycloak.testsuite.adapter.AbstractExampleAdapterTest;
import org.keycloak.testsuite.adapter.javascript.AbstractJavascriptTest;
import org.keycloak.testsuite.auth.page.login.OAuthGrant;
import org.keycloak.testsuite.auth.page.login.OIDCLogin;
import org.keycloak.testsuite.util.JavascriptBrowser;

22
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/jaas/LoginModulesTest.java → testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/jaas/LoginModulesTest.java
View File

@ -15,21 +15,18 @@
* limitations under the License.
*/
package org.keycloak.testsuite.adapter.jaas;
package org.keycloak.testsuite.jaas;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
import java.lang.invoke.MethodHandles;
import java.net.URI;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Scanner;
import java.util.Set;
import javax.security.auth.Subject;
@ -46,6 +43,7 @@ import javax.security.auth.login.LoginException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.AfterClass;
import org.junit.Assume;
import org.junit.Before;
import org.junit.BeforeClass;
@ -90,13 +88,20 @@ public class LoginModulesTest extends AbstractKeycloakTest {
testRealms.add(IOUtil.loadRealm("/adapter-test/demorealm.json"));
}
private static void enabled() {
Assume.assumeTrue(AUTH_SERVER_SSL_REQUIRED);
}
@BeforeClass
public static void createTemporaryFiles() throws Exception {
enabled();
copyContentAndReplaceAuthServerAddress(new File(DIRECT_GRANT_CONFIG), DIRECT_GRANT_CONFIG_FILE);
copyContentAndReplaceAuthServerAddress(new File(BEARER_CONFIG), BEARER_CONFIG_FILE);
}
public void removeTemporaryFiles() {
@AfterClass
public static void removeTemporaryFiles() {
DIRECT_GRANT_CONFIG_FILE.deleteOnExit();
BEARER_CONFIG_FILE.deleteOnExit();
}
@ -127,10 +132,6 @@ public class LoginModulesTest extends AbstractKeycloakTest {
@Test
public void testDirectAccessGrantLoginModuleLoginFailed() throws Exception {
Assume.assumeTrue(AUTH_SERVER_SSL_REQUIRED);
LoginContext loginContext = new LoginContext("does-not-matter", null,
createJaasCallbackHandler("bburke@redhat.com", "bad-password"),
createJaasConfigurationForDirectGrant(null));
@ -146,7 +147,6 @@ public class LoginModulesTest extends AbstractKeycloakTest {
@Test
public void testDirectAccessGrantLoginModuleLoginSuccess() throws Exception {
Assume.assumeTrue(AUTH_SERVER_SSL_REQUIRED);
oauth.realm("demo");
LoginContext loginContext = directGrantLogin(null);
@ -169,7 +169,6 @@ public class LoginModulesTest extends AbstractKeycloakTest {
@Test
public void testBearerLoginFailedLogin() throws Exception {
Assume.assumeTrue(AUTH_SERVER_SSL_REQUIRED);
oauth.realm("demo");
LoginContext directGrantCtx = directGrantLogin(null);
@ -194,7 +193,6 @@ public class LoginModulesTest extends AbstractKeycloakTest {
@Test
public void testBearerLoginSuccess() throws Exception {
Assume.assumeTrue(AUTH_SERVER_SSL_REQUIRED);
oauth.realm("demo");
LoginContext directGrantCtx = directGrantLogin("customer-db-audience-required");

2
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/javascript/AbstractJavascriptTest.java → testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/javascript/AbstractJavascriptTest.java
View File

@ -1,4 +1,4 @@
package org.keycloak.testsuite.adapter.javascript;
package org.keycloak.testsuite.javascript;
import org.jboss.arquillian.drone.api.annotation.Drone;
import org.jboss.arquillian.graphene.page.Page;

2
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/javascript/JavascriptAdapterTest.java → testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/javascript/JavascriptAdapterTest.java
View File

@ -1,4 +1,4 @@
package org.keycloak.testsuite.adapter.javascript;
package org.keycloak.testsuite.javascript;
import org.jboss.arquillian.graphene.page.Page;
import org.junit.Assume;

2
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/javascript/JavascriptAdapterWithNativePromisesTest.java → testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/javascript/JavascriptAdapterWithNativePromisesTest.java
View File

@ -1,4 +1,4 @@
package org.keycloak.testsuite.adapter.javascript;
package org.keycloak.testsuite.javascript;
import org.junit.Assume;
import org.junit.Before;

2
travis-run-tests.sh
View File

@ -60,7 +60,7 @@ if [ $1 == "server-group1" ]; then
fi
if [ $1 == "server-group2" ]; then
run-server-tests org.keycloak.testsuite.ac*.**.*Test,org.keycloak.testsuite.cli*.**.*Test,org.keycloak.testsuite.co*.**.*Test
run-server-tests org.keycloak.testsuite.ac*.**.*Test,org.keycloak.testsuite.cli*.**.*Test,org.keycloak.testsuite.co*.**.*Test,org.keycloak.testsuite.j*.**.*Test
fi
if [ $1 == "server-group3" ]; then