Add conditional workflow for test-poc #31406

stianst · 2024-07-18T12:30:05Z

Signed-off-by: stianst [email protected]

lhanusov

here are few suggestions, otherwise it looks good to me 👍

lhanusov · 2024-07-18T13:57:20Z

...c/framework/src/main/java/org/keycloak/test/framework/webdriver/ChromeWebDriverSupplier.java


+    @Override
+    public WebDriver getWebDriver() {
+        return new ChromeDriver();


This will help to find Selenium Web elements properly:
ChromeOptions options = new ChromeOptions();
options.setImplicitWaitTimeout(Duration.ofMillis(1000));
options.setPageLoadStrategy(PageLoadStrategy.NORMAL);
return new ChromeDriver(options);

Added to AbstractWebDriverSupplier

lhanusov · 2024-07-18T13:58:14Z

.../framework/src/main/java/org/keycloak/test/framework/webdriver/FirefoxWebDriverSupplier.java

-    public String getAlias() {
-        return "firefox";
+    public WebDriver getWebDriver() {
+        return new FirefoxDriver();


Same as for chrome:
FirefoxOptions options = new FirefoxOptions();
options.setImplicitWaitTimeout(Duration.ofMillis(1000));
options.setPageLoadStrategy(PageLoadStrategy.NORMAL);
return new `FirefoxDriver(options);

Added to AbstractWebDriverSupplier

lhanusov · 2024-07-18T14:01:44Z

...c/framework/src/main/java/org/keycloak/test/framework/webdriver/ChromeWebDriverSupplier.java

+public class ChromeWebDriverSupplier extends AbstractWebDriverSupplier {

    @Override
    public String getAlias() {


this should be also defined as abstract in AbstractWebDriverSupplier

No, alias is optional, the default name for a supplier will be class.getSimpleName

lhanusov · 2024-07-18T14:02:23Z

.../framework/src/main/java/org/keycloak/test/framework/webdriver/FirefoxWebDriverSupplier.java

-    @Override
-    public void close(WebDriver instance) {
-        instance.quit();
+    public String getAlias() {


this should be also defined as abstract in AbstractWebDriverSupplier

No, alias is optional, the default name for a supplier will be class.getSimpleName

lhanusov · 2024-07-18T14:07:40Z

test-poc/base/src/test/java/org/keycloak/test/base/PagesTest.java

-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
+        Thread.sleep(1000);


Once Chrome and Firefox options are in place this can be removed.

lhanusov · 2024-07-18T14:16:40Z

test-poc/framework/src/main/java/org/keycloak/test/framework/injection/Supplier.java

-        return getValue(registry, annotation);
+    void initValue(InstanceContext<T, S> instanceContext);
+
+    default LifeCycle lifeCycle(S annotation) {


What is the difference between lifecycle and getDefaultLifecycle? In AbstractWebDriverSupplier is lifecycle and in AbstractKeycloakServerSupplier only getDefaultLifecycle.

Registry calls getLifeCycle(annotation) to get the life cycle a given instance should have, by default that will look for a method lifecycle on the annotation and use that value if present, otherwise it will call getDefaultLifeCycle. That basically means we can have a consistent approach to the lifecycle in annotations.

An alternative approach would just be to let the suppliers handle it all; and return the lifecycle from the annotation if present, or the default lifecycle. Then we'd only have getLifeCycle (without a default implementation) and remove getDefaultLifecycle.

Signed-off-by: stianst <[email protected]>

jonkoops · 2024-07-18T12:43:32Z

.github/workflows/ci.yml

+    steps:
+      - uses: actions/checkout@v4
+
+      - id: integration-test-setup


You can omit the id if you are not referencing it anywhere.

Yup, just copy/paste from elsewhere though. Having id/name makes the run a bit more readable though as the output with reusable actions is not very elegant without it.

Yeah, I'd just add a human readable name to it and call it a day

jonkoops · 2024-07-18T12:43:58Z

test-poc/base/src/test/java/org/keycloak/test/base/NoAdminUserKeycloakTestServerConfig.java

 public class NoAdminUserKeycloakTestServerConfig implements KeycloakTestServerConfig {

    @Override
-    public Optional<String> adminUserName() {


Not a fan of my optionals? 😢

They have their place, but found it easier to not have it in this case, as it's both simpler to just return null, and found the checks when setting the values simpler without optional stuff ;)

Well, it's a matter of personal preference I guess. However using optionals forces you to handle nullability, whereas nulls do not. Also:

serverConfig.adminUserName().ifPresentOrElse( username -> System.setProperty("keycloakAdmin", username), () -> System.getProperties().remove("keycloakAdmin") );

jonkoops · 2024-07-19T09:15:05Z

test-poc/framework/src/main/java/org/keycloak/test/framework/injection/Supplier.java

-        return getValue(registry, annotation);
+    T getValue(InstanceContext<T, S> instanceContext);
+
+    default LifeCycle getLifeCycle(S annotation) {


I'd do:

if (annotation == null) { return getDefaultLifecycle(); } // The rest

Don't think it matters too much - down to personal preference I guess ;)

Oh for sure, you know how much I hate nesting, this is just a prime example of an early return pattern.

Signed-off-by: stianst <[email protected]>

stianst requested a review from a team as a code owner July 18, 2024 12:30

stianst mentioned this pull request Jul 18, 2024

Testsuite PoC - Injection framework support for multiple instances #31293

Merged

stianst force-pushed the testpoc-github-action branch 2 times, most recently from f43629e to 80e5949 Compare July 18, 2024 13:30

stianst mentioned this pull request Jul 18, 2024

Testsuite PoC - modules refactoring. #31411

Merged

lhanusov reviewed Jul 18, 2024

View reviewed changes

stianst force-pushed the testpoc-github-action branch from 80e5949 to 6d6de67 Compare July 19, 2024 06:28

keycloak-github-bot bot added the flaky-test label Jul 19, 2024

keycloak-github-bot bot mentioned this pull request Jul 19, 2024

Flaky test: org.keycloak.testsuite.oidc.AuthenticationMethodReferenceTest#testAmrPastMaxAge #26117

Closed

Add conditional workflow for test-poc

abdc736

Signed-off-by: stianst <[email protected]>

stianst force-pushed the testpoc-github-action branch from 6d6de67 to abdc736 Compare July 19, 2024 08:24

jonkoops approved these changes Jul 19, 2024

View reviewed changes

stianst merged commit 7216967 into keycloak:main Jul 19, 2024

stianst deleted the testpoc-github-action branch July 19, 2024 10:23

stianst mentioned this pull request Jul 25, 2024

testsuite poc managed realm wrapper #31618

Closed

stianst added a commit to stianst/keycloak that referenced this pull request Jul 25, 2024

Add conditional workflow for test-poc (keycloak#31406)

aa1c768

Signed-off-by: stianst <[email protected]>

Add conditional workflow for test-poc #31406

Add conditional workflow for test-poc #31406

Uh oh!

Conversation

stianst commented Jul 18, 2024

Uh oh!

lhanusov left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants