Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Testsuite PoC - modules refactoring. #31411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stianst merged 1 commit into from
Jul 22, 2024
Merged

Testsuite PoC - modules refactoring. #31411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test-poc/base/pom.xml → test-poc/examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>keycloak-tests-base</artifactId>
<name>Keycloak Base Tests</name>
<artifactId>keycloak-test-junit5-framework-examples</artifactId>
<name>Keycloak JUnit5 Framework Examples</name>
<packaging>jar</packaging>
<description>Example tests to demonstrate new testing framework</description>

Expand Down
6 changes: 3 additions & 3 deletions .../keycloak/test/base/CustomConfigTest.java → ...cloak/test/examples/CustomConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package org.keycloak.test.base;
package org.keycloak.test.examples;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.keycloak.admin.client.Keycloak;
import org.keycloak.common.Profile;
import org.keycloak.representations.info.FeatureRepresentation;
import org.keycloak.test.framework.KeycloakIntegrationTest;
import org.keycloak.test.framework.TestAdminClient;
import org.keycloak.test.framework.annotations.KeycloakIntegrationTest;
import org.keycloak.test.framework.annotations.TestAdminClient;
import org.keycloak.test.framework.server.KeycloakTestServerConfig;

import java.util.Optional;
Expand Down
6 changes: 3 additions & 3 deletions ...eycloak/test/base/DefaultConfig1Test.java → ...oak/test/examples/DefaultConfig1Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.keycloak.test.base;
package org.keycloak.test.examples;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.keycloak.admin.client.Keycloak;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.test.framework.KeycloakIntegrationTest;
import org.keycloak.test.framework.TestAdminClient;
import org.keycloak.test.framework.annotations.KeycloakIntegrationTest;
import org.keycloak.test.framework.annotations.TestAdminClient;

import java.util.List;

Expand Down
6 changes: 3 additions & 3 deletions ...eycloak/test/base/DefaultConfig2Test.java → ...oak/test/examples/DefaultConfig2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.keycloak.test.base;
package org.keycloak.test.examples;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.keycloak.admin.client.Keycloak;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.test.framework.KeycloakIntegrationTest;
import org.keycloak.test.framework.TestAdminClient;
import org.keycloak.test.framework.annotations.KeycloakIntegrationTest;
import org.keycloak.test.framework.annotations.TestAdminClient;

import java.util.List;

Expand Down
13 changes: 5 additions & 8 deletions ...test/base/GlobalManagedResourcesTest.java → .../examples/GlobalManagedResourcesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
package org.keycloak.test.base;
package org.keycloak.test.examples;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.keycloak.admin.client.resource.ClientResource;
import org.keycloak.admin.client.resource.RealmResource;
import org.keycloak.admin.client.resource.UserResource;
import org.keycloak.representations.idm.ClientRepresentation;
import org.keycloak.test.framework.KeycloakIntegrationTest;
import org.keycloak.test.framework.TestClient;
import org.keycloak.test.framework.TestRealm;
import org.keycloak.test.framework.TestUser;
import org.keycloak.test.framework.annotations.KeycloakIntegrationTest;
import org.keycloak.test.framework.annotations.TestClient;
import org.keycloak.test.framework.annotations.TestRealm;
import org.keycloak.test.framework.annotations.TestUser;
import org.keycloak.test.framework.injection.LifeCycle;
import org.keycloak.test.framework.realm.DefaultClientConfig;
import org.keycloak.test.framework.realm.DefaultRealmConfig;
import org.keycloak.test.framework.realm.DefaultUserConfig;

import java.util.List;

@KeycloakIntegrationTest
public class GlobalManagedResourcesTest {

Expand Down
8 changes: 4 additions & 4 deletions ...loak/test/base/ManagedResources2Test.java → .../test/examples/ManagedResources2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.keycloak.test.base;
package org.keycloak.test.examples;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.keycloak.admin.client.resource.ClientResource;
import org.keycloak.admin.client.resource.RealmResource;
import org.keycloak.representations.idm.ClientRepresentation;
import org.keycloak.test.framework.KeycloakIntegrationTest;
import org.keycloak.test.framework.TestClient;
import org.keycloak.test.framework.TestRealm;
import org.keycloak.test.framework.annotations.KeycloakIntegrationTest;
import org.keycloak.test.framework.annotations.TestClient;
import org.keycloak.test.framework.annotations.TestRealm;
import org.keycloak.test.framework.injection.LifeCycle;

import java.util.List;
Expand Down
10 changes: 5 additions & 5 deletions ...cloak/test/base/ManagedResourcesTest.java → ...k/test/examples/ManagedResourcesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package org.keycloak.test.base;
package org.keycloak.test.examples;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.keycloak.admin.client.resource.ClientResource;
import org.keycloak.admin.client.resource.RealmResource;
import org.keycloak.admin.client.resource.UserResource;
import org.keycloak.representations.idm.ClientRepresentation;
import org.keycloak.test.framework.KeycloakIntegrationTest;
import org.keycloak.test.framework.TestClient;
import org.keycloak.test.framework.TestRealm;
import org.keycloak.test.framework.TestUser;
import org.keycloak.test.framework.annotations.KeycloakIntegrationTest;
import org.keycloak.test.framework.annotations.TestClient;
import org.keycloak.test.framework.annotations.TestRealm;
import org.keycloak.test.framework.annotations.TestUser;
import org.keycloak.test.framework.injection.LifeCycle;

import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion .../NoAdminUserKeycloakTestServerConfig.java → .../NoAdminUserKeycloakTestServerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.keycloak.test.base;
package org.keycloak.test.examples;

import org.keycloak.test.framework.server.KeycloakTestServerConfig;

Expand Down
6 changes: 3 additions & 3 deletions ...ava/org/keycloak/test/base/PagesTest.java → ...org/keycloak/test/examples/PagesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.keycloak.test.base;
package org.keycloak.test.examples;

import org.junit.jupiter.api.Test;
import org.keycloak.test.framework.KeycloakIntegrationTest;
import org.keycloak.test.framework.annotations.KeycloakIntegrationTest;
import org.keycloak.test.framework.page.LoginPage;
import org.keycloak.test.framework.page.TestPage;
import org.keycloak.test.framework.annotations.TestPage;
import org.keycloak.test.framework.page.WelcomePage;

@KeycloakIntegrationTest
Expand Down
6 changes: 3 additions & 3 deletions ...g/keycloak/test/base/WelcomePageTest.java → ...ycloak/test/examples/WelcomePageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.keycloak.test.base;
package org.keycloak.test.examples;

import org.junit.jupiter.api.Test;
import org.keycloak.test.framework.KeycloakIntegrationTest;
import org.keycloak.test.framework.annotations.KeycloakIntegrationTest;
import org.keycloak.test.framework.page.WelcomePage;
import org.keycloak.test.framework.webdriver.TestWebDriver;
import org.keycloak.test.framework.annotations.TestWebDriver;
import org.openqa.selenium.WebDriver;

@KeycloakIntegrationTest(config = NoAdminUserKeycloakTestServerConfig.class)
Expand Down
0 ...esources/container-license-acceptance.txt → ...esources/container-license-acceptance.txt
View file
Open in desktop
File renamed without changes.
0 ...ase/src/test/resources/logging.properties → ...les/src/test/resources/logging.properties
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...framework/src/main/java/org/keycloak/test/framework/KeycloakIntegrationTestExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.keycloak.test.framework.annotations.KeycloakIntegrationTest;
import org.keycloak.test.framework.injection.Registry;

public class KeycloakIntegrationTestExtension implements BeforeEachCallback, AfterEachCallback, AfterAllCallback {
Expand Down
2 changes: 1 addition & 1 deletion ...ramework/src/main/java/org/keycloak/test/framework/admin/KeycloakAdminClientSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.keycloak.test.framework.admin;

import org.keycloak.admin.client.Keycloak;
import org.keycloak.test.framework.TestAdminClient;
import org.keycloak.test.framework.annotations.TestAdminClient;
import org.keycloak.test.framework.injection.InstanceContext;
import org.keycloak.test.framework.injection.LifeCycle;
import org.keycloak.test.framework.injection.RequestedInstance;
Expand Down
2 changes: 1 addition & 1 deletion ...st/framework/KeycloakIntegrationTest.java → .../annotations/KeycloakIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.keycloak.test.framework;
package org.keycloak.test.framework.annotations;

import org.keycloak.test.framework.server.DefaultKeycloakTestServerConfig;
import org.keycloak.test.framework.server.KeycloakTestServerConfig;
Expand Down
2 changes: 1 addition & 1 deletion .../test/framework/KeycloakTestDatabase.java → ...ork/annotations/KeycloakTestDatabase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.keycloak.test.framework;
package org.keycloak.test.framework.annotations;

import org.keycloak.test.framework.database.DatabaseConfig;
import org.keycloak.test.framework.injection.LifeCycle;
Expand Down
2 changes: 1 addition & 1 deletion ...cloak/test/framework/TestAdminClient.java → ...ramework/annotations/TestAdminClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.keycloak.test.framework;
package org.keycloak.test.framework.annotations;


import java.lang.annotation.ElementType;
Expand Down
2 changes: 1 addition & 1 deletion ...g/keycloak/test/framework/TestClient.java → ...est/framework/annotations/TestClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.keycloak.test.framework;
package org.keycloak.test.framework.annotations;

import org.keycloak.test.framework.injection.LifeCycle;
import org.keycloak.test.framework.realm.ClientConfig;
Expand Down
2 changes: 1 addition & 1 deletion ...eycloak/test/framework/page/TestPage.java → .../test/framework/annotations/TestPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.keycloak.test.framework.page;
package org.keycloak.test.framework.annotations;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down
2 changes: 1 addition & 1 deletion ...rg/keycloak/test/framework/TestRealm.java → ...test/framework/annotations/TestRealm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.keycloak.test.framework;
package org.keycloak.test.framework.annotations;

import org.keycloak.test.framework.injection.LifeCycle;
import org.keycloak.test.framework.realm.DefaultRealmConfig;
Expand Down
4 changes: 1 addition & 3 deletions ...org/keycloak/test/framework/TestUser.java → .../test/framework/annotations/TestUser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package org.keycloak.test.framework;
package org.keycloak.test.framework.annotations;

import org.keycloak.test.framework.injection.LifeCycle;
import org.keycloak.test.framework.realm.ClientConfig;
import org.keycloak.test.framework.realm.DefaultClientConfig;
import org.keycloak.test.framework.realm.DefaultUserConfig;
import org.keycloak.test.framework.realm.UserConfig;

Expand Down
2 changes: 1 addition & 1 deletion ...st/framework/webdriver/TestWebDriver.java → .../framework/annotations/TestWebDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.keycloak.test.framework.webdriver;
package org.keycloak.test.framework.annotations;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down
2 changes: 1 addition & 1 deletion ...ramework/src/main/java/org/keycloak/test/framework/database/AbstractDatabaseSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.keycloak.test.framework.database;

import org.keycloak.test.framework.KeycloakTestDatabase;
import org.keycloak.test.framework.annotations.KeycloakTestDatabase;
import org.keycloak.test.framework.injection.InstanceContext;
import org.keycloak.test.framework.injection.LifeCycle;
import org.keycloak.test.framework.injection.RequestedInstance;
Expand Down
1 change: 1 addition & 0 deletions test-poc/framework/src/main/java/org/keycloak/test/framework/page/PageSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.keycloak.test.framework.page;

import org.keycloak.test.framework.annotations.TestPage;
import org.keycloak.test.framework.injection.InstanceContext;
import org.keycloak.test.framework.injection.RequestedInstance;
import org.keycloak.test.framework.injection.Supplier;
Expand Down
2 changes: 1 addition & 1 deletion test-poc/framework/src/main/java/org/keycloak/test/framework/realm/ClientSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import org.keycloak.admin.client.resource.ClientResource;
import org.keycloak.admin.client.resource.RealmResource;
import org.keycloak.representations.idm.ClientRepresentation;
import org.keycloak.test.framework.TestClient;
import org.keycloak.test.framework.annotations.TestClient;
import org.keycloak.test.framework.injection.InstanceContext;
import org.keycloak.test.framework.injection.LifeCycle;
import org.keycloak.test.framework.injection.RequestedInstance;
Expand Down
2 changes: 1 addition & 1 deletion test-poc/framework/src/main/java/org/keycloak/test/framework/realm/RealmSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import org.keycloak.admin.client.Keycloak;
import org.keycloak.admin.client.resource.RealmResource;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.test.framework.TestRealm;
import org.keycloak.test.framework.annotations.TestRealm;
import org.keycloak.test.framework.injection.InstanceContext;
import org.keycloak.test.framework.injection.LifeCycle;
import org.keycloak.test.framework.injection.RequestedInstance;
Expand Down
2 changes: 1 addition & 1 deletion test-poc/framework/src/main/java/org/keycloak/test/framework/realm/UserSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import org.keycloak.admin.client.resource.RealmResource;
import org.keycloak.admin.client.resource.UserResource;
import org.keycloak.representations.idm.UserRepresentation;
import org.keycloak.test.framework.TestUser;
import org.keycloak.test.framework.annotations.TestUser;
import org.keycloak.test.framework.injection.InstanceContext;
import org.keycloak.test.framework.injection.LifeCycle;
import org.keycloak.test.framework.injection.RequestedInstance;
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/keycloak/test/framework/server/AbstractKeycloakTestServerSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.keycloak.test.framework.server;

import org.keycloak.test.framework.KeycloakIntegrationTest;
import org.keycloak.test.framework.annotations.KeycloakIntegrationTest;
import org.keycloak.test.framework.database.TestDatabase;
import org.keycloak.test.framework.injection.InstanceContext;
import org.keycloak.test.framework.injection.LifeCycle;
Expand Down
1 change: 1 addition & 0 deletions ...mework/src/main/java/org/keycloak/test/framework/webdriver/AbstractWebDriverSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.keycloak.test.framework.webdriver;

import org.keycloak.test.framework.annotations.TestWebDriver;
import org.keycloak.test.framework.injection.InstanceContext;
import org.keycloak.test.framework.injection.LifeCycle;
import org.keycloak.test.framework.injection.RequestedInstance;
Expand Down
3 changes: 2 additions & 1 deletion test-poc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@
<description>Keycloak Test Parent</description>

<modules>
<module>base</module>
<module>framework</module>
<module>examples</module>
<module>showcase</module>
</modules>

</project>
72 changes: 72 additions & 0 deletions test-poc/showcase/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<?xml version="1.0"?>
<!--
~ Copyright 2016 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.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-test-parent</artifactId>
<groupId>org.keycloak.test</groupId>
<version>999.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>keycloak-test-junit5-framework-showcase</artifactId>
<name>Keycloak JUnit5 Framework Showcase</name>
<packaging>jar</packaging>
<description>Showcase of new tests demonstrating the new testing framework usability</description>

<dependencies>
<dependency>
<groupId>org.keycloak.test</groupId>
<artifactId>keycloak-test-junit5-framework</artifactId>
<version>999.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-suite</artifactId>
<version>1.10.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.logmanager</groupId>
<artifactId>jboss-logmanager</artifactId>
</dependency>
<!-- JDBC Drivers -->
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
<java.util.concurrent.ForkJoinPool.common.threadFactory>io.quarkus.bootstrap.forkjoin.QuarkusForkJoinWorkerThreadFactory</java.util.concurrent.ForkJoinPool.common.threadFactory>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>

</project>
Empty file added test-poc/showcase/src/test/java/org/keycloak/test/showcase/DUMMY.txt
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions test-poc/showcase/src/test/resources/container-license-acceptance.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mcr.microsoft.com/mssql/server:latest
15 changes: 15 additions & 0 deletions test-poc/showcase/src/test/resources/logging.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
loggers=org.keycloak.test
logger.org.keycloak.test.level=TRACE

logger.handlers=CONSOLE

handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
handler.CONSOLE.properties=autoFlush
handler.CONSOLE.level=ERROR
handler.CONSOLE.autoFlush=true
handler.CONSOLE.formatter=PATTERN

# The log format pattern for both logs
formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
formatter.PATTERN.properties=pattern
formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p %t [%c] %m%n