Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions build.pipeline
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ javaBuildPipeline(
'kc-cloudtrust-parent',
[
[name: 'cloudtrust-parent', path: '.'],
[name: 'cloudtrust-bom', path: './cloudtrust-bom'],
[name: 'cloudtrust-test-tools', path: './cloudtrust-test-tools'],
[name: 'cloudtrust-common', path: './cloudtrust-common'],
[name: 'kc-cloudtrust-common', path: './kc-cloudtrust-module/kc-cloudtrust-common', pom: './kc-cloudtrust-module/pom.xml'],
Expand Down
81 changes: 81 additions & 0 deletions cloudtrust-bom/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>io.cloudtrust</groupId>
<artifactId>cloudtrust-parent</artifactId>
<version>26.1.0-SNAPSHOT</version>
</parent>

<artifactId>cloudtrust-bom</artifactId>
<packaging>pom</packaging>
<name>cloudtrust-bom</name>
<description>BOM exposing Cloudtrust managed dependencies and third-party versions</description>

<properties>
<!-- Third-party versions exposed to BOM consumers -->
<keycloak.version>26.2.4</keycloak.version>
<java.version>21</java.version>
<jackson-core.version>2.18.2</jackson-core.version>
<jackson-databind.version>2.18.2</jackson-databind.version>
<systemlambda.version>1.2.1</systemlambda.version>
<junit.version>5.11.3</junit.version>
<junit.platform.version>1.11.3</junit.platform.version>
<hamcrest.version>1.3</hamcrest.version>
<jacoco.version>0.8.12</jacoco.version>
<spotbugs.version>4.8.6</spotbugs.version>
<fb-contrib.version>7.6.8</fb-contrib.version>
<findsecbugs.version>1.13.0</findsecbugs.version>
<owasp-check.version>11.1.1</owasp-check.version>

<flatbuffers.version>1.10.0</flatbuffers.version>
<apache-collections.version>4.4</apache-collections.version>
<libphonenumber.version>9.0.4</libphonenumber.version>
<mockito.version>5.14.2</mockito.version>
<version.pmd.plugin>3.14.0</version.pmd.plugin>
<version.jboss.maven.plugin>7.9.Final</version.jboss.maven.plugin>
<version.wildfly.maven.plugin>2.0.2.Final</version.wildfly.maven.plugin>
<version.frontend.maven.plugin>1.12.1</version.frontend.maven.plugin>

<arquillian-graphene.version>2.5.4</arquillian-graphene.version>
<undertow.version>1.0.0.Final</undertow.version>
<jackson.version>2.18.2</jackson.version>
<jbosslogging.version>3.4.1.Final</jbosslogging.version>
<slf4j.version>2.0.16</slf4j.version>
<greenmail.version>2.1.2</greenmail.version>
<selenium.version>4.25.0</selenium.version>
<webdrivermanager.version>6.1.0</webdrivermanager.version>
<underdow.servlet.version>2.3.18.Final</underdow.servlet.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.cloudtrust</groupId>
<artifactId>cloudtrust-common</artifactId>
<version>${cloudtrust.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.cloudtrust</groupId>
<artifactId>kc-cloudtrust-common</artifactId>
<version>${cloudtrust.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.cloudtrust</groupId>
<artifactId>cloudtrust-test-tools</artifactId>
<version>${cloudtrust.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.cloudtrust</groupId>
<artifactId>kc-cloudtrust-test-tools</artifactId>
<version>${cloudtrust.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
</project>
2 changes: 1 addition & 1 deletion cloudtrust-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.cloudtrust</groupId>
<artifactId>cloudtrust-parent</artifactId>
<version>26.0.10-SNAPSHOT</version>
<version>26.1.0-SNAPSHOT</version>
</parent>

<artifactId>cloudtrust-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cloudtrust-test-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.cloudtrust</groupId>
<artifactId>cloudtrust-parent</artifactId>
<version>26.0.10-SNAPSHOT</version>
<version>26.1.0-SNAPSHOT</version>
</parent>

<artifactId>cloudtrust-test-tools</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion kc-cloudtrust-module/kc-cloudtrust-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>io.cloudtrust</groupId>
<artifactId>kc-cloudtrust-module</artifactId>
<version>26.0.10-SNAPSHOT</version>
<version>26.1.0-SNAPSHOT</version>
</parent>

<artifactId>kc-cloudtrust-common</artifactId>
Expand Down
7 changes: 4 additions & 3 deletions kc-cloudtrust-module/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>io.cloudtrust</groupId>
<artifactId>kc-cloudtrust-module</artifactId>
<version>26.0.10-SNAPSHOT</version>
<version>26.1.0-SNAPSHOT</version>
<description>Parent for keycloak modules</description>
<packaging>pom</packaging>

Expand All @@ -12,6 +12,7 @@
</modules>

<properties>
<cloudtrust.version>26.1.0-SNAPSHOT</cloudtrust.version>
<keycloak.version>26.2.4</keycloak.version>
<flatbuffers.version>1.10.0</flatbuffers.version>
<apache-collections.version>4.4</apache-collections.version>
Expand Down Expand Up @@ -72,12 +73,12 @@
<dependency>
<groupId>io.cloudtrust</groupId>
<artifactId>cloudtrust-common</artifactId>
<version>${project.version}</version>
<version>${cloudtrust.version}</version>
</dependency>
<dependency>
<groupId>io.cloudtrust</groupId>
<artifactId>kc-cloudtrust-common</artifactId>
<version>${project.version}</version>
<version>${cloudtrust.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
Expand Down
2 changes: 1 addition & 1 deletion kc-cloudtrust-testsuite/kc-cloudtrust-db-access/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.cloudtrust</groupId>
<artifactId>kc-cloudtrust-testsuite</artifactId>
<version>26.0.10-SNAPSHOT</version>
<version>26.1.0-SNAPSHOT</version>
</parent>

<artifactId>kc-cloudtrust-db-access</artifactId>
Expand Down
6 changes: 5 additions & 1 deletion kc-cloudtrust-testsuite/kc-cloudtrust-test-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.cloudtrust</groupId>
<artifactId>kc-cloudtrust-testsuite</artifactId>
<version>26.0.10-SNAPSHOT</version>
<version>26.1.0-SNAPSHOT</version>
</parent>

<artifactId>kc-cloudtrust-test-tools</artifactId>
Expand All @@ -21,6 +21,10 @@
</properties>

<dependencies>
<dependency>
<groupId>io.cloudtrust</groupId>
<artifactId>cloudtrust-common</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-services</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
*
* @author fpe
*/
@Deprecated
public class KeycloakClientProvider {
private static final Logger LOG = Logger.getLogger(KeycloakClientProvider.class);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,14 @@ public void assertCurrent() {
Assertions.assertTrue(isCurrent(), "Expected " + name + " but was " + driver.getTitle() + " (" + driver.getCurrentUrl() + ")");
}

/**
* Deprecated method... Use AbstractPage::isActivePage instead
* @return true if the current page is the expected one
*/
@Deprecated
public boolean isCurrent() {
return false;
var currentPageId = getCurrentPageId();
return currentPageId!=null && currentPageId.equals(getExpectedPageId());
}

public boolean isNotCurrent() {
Expand All @@ -77,6 +83,10 @@ public void open() {
throw new CloudtrustRuntimeException("open() not implemented");
}

public void open(ManagedRealm realm) {
this.driver.navigate().to(getLoginFormUrl(realm));
}

/**
* Navigate to a logout URL. Automatically confirm logout if necessary
*/
Expand Down Expand Up @@ -218,6 +228,10 @@ public static void setTextValue(WebElement input, String value) {
}
}

public void refresh() {
driver.navigate().refresh();
}

public String getCurrentUrl() {
return this.driver.getCurrentUrl();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import org.junit.jupiter.api.Assertions;
import org.keycloak.testframework.realm.ManagedRealm;
import org.keycloak.testframework.realm.ManagedUser;
import org.openqa.selenium.By;
import org.openqa.selenium.NoSuchElementException;
import org.openqa.selenium.WebDriver;
Expand Down Expand Up @@ -66,6 +67,10 @@ public String getExpectedPageId() {
return null;
}

public void login(ManagedUser user) {
login(user.getUsername(), user.getPassword());
}

public void login(String username, String password) {
usernameInput.clear();
usernameInput.sendKeys(username);
Expand Down Expand Up @@ -142,8 +147,11 @@ public String getInfoMessage() {

@Override
public boolean isCurrent() {
String realm = "test";
return isCurrent(realm);
return isCurrent("test");
}

public boolean isCurrent(ManagedRealm realm) {
return isCurrent(realm.getName());
}

public boolean isCurrent(String realm) {
Expand Down Expand Up @@ -188,12 +196,9 @@ public boolean isRememberMeChecked() {
return rememberMe.isSelected();
}

@Override
public void open(ManagedRealm realm) {
openLoginForm(realm);
super.open(realm);
assertCurrent();
}

private void openLoginForm(ManagedRealm realm) {
driver.navigate().to(getLoginFormUrl(realm));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void changePassword(String username) {
}

@Override
public boolean isCurrent() {
public boolean isActivePage() {
return getPageTitle(driver).equals("Forgot Your Password?");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import java.util.function.Consumer;
import java.util.function.Function;

@Deprecated
public class EventsManager<T> {
private static final Logger LOG = Logger.getLogger(EventsManager.class);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,32 @@ protected AbstractCtPage convert(Object item) {
return item instanceof AbstractCtPage res ? res : null;
}

/**
* Use isActivePage instead
* @return
*/
@Deprecated
public static BaseMatcher<AbstractCtPage> isCurrent() {
return isActivePage();
}

public static BaseMatcher<AbstractCtPage> isActivePage() {
return new CtPageMatchers(
AbstractCtPage::isCurrent,
p -> String.format("Current page is %s", p.getClass().getName())
AbstractCtPage::isActivePage,
p -> String.format("Current page is %s (expected %s for class %s)", p.getCurrentPageId(), p.getExpectedPageId(), p.getClass().getName())
);
}

/**
* Use isNotActivePage instead
* @return
*/
@Deprecated
public static BaseMatcher<AbstractCtPage> isNotCurrent() {
return isNotActivePage();
}

public static BaseMatcher<AbstractCtPage> isNotActivePage() {
return new CtPageMatchers(
p -> !p.isCurrent(),
p -> String.format("Current page is %s", p.getClass().getName()),
Expand Down
17 changes: 9 additions & 8 deletions kc-cloudtrust-testsuite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.cloudtrust</groupId>
<artifactId>kc-cloudtrust-module</artifactId>
<version>26.0.10-SNAPSHOT</version>
<version>26.1.0-SNAPSHOT</version>
<relativePath>../kc-cloudtrust-module</relativePath>
</parent>

Expand Down Expand Up @@ -44,10 +44,6 @@
</properties>

<dependencies>
<dependency>
<groupId>io.cloudtrust</groupId>
<artifactId>cloudtrust-common</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down Expand Up @@ -138,20 +134,25 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.cloudtrust</groupId>
<artifactId>cloudtrust-common</artifactId>
<version>${cloudtrust.version}</version>
</dependency>
<dependency>
<groupId>io.cloudtrust</groupId>
<artifactId>cloudtrust-test-tools</artifactId>
<version>${project.version}</version>
<version>${cloudtrust.version}</version>
</dependency>
<dependency>
<groupId>io.cloudtrust</groupId>
<artifactId>kc-cloudtrust-db-access</artifactId>
<version>${project.version}</version>
<version>${cloudtrust.version}</version>
</dependency>
<dependency>
<groupId>io.cloudtrust</groupId>
<artifactId>kc-cloudtrust-test-tools</artifactId>
<version>${project.version}</version>
<version>${cloudtrust.version}</version>
</dependency>
<!-- env variables for unit tests -->
<dependency>
Expand Down
Loading