Repository navigation
Refactor builders in testsuite part 1 - #48315
Conversation
2f3fb62 to
497a248
Compare
497a248 to
d5230c4
Compare
e0c3f10 to
9e7a1df
Compare
9e7a1df to
5cce5ac
Compare
Unreported flaky test detectedIf the flaky tests below are affected by the changes, please review and update the changes accordingly. Otherwise, a maintainer should report the flaky tests prior to merging the PR. org.keycloak.testsuite.model.singleUseObject.SingleUseObjectModelTest#testClusterKeycloak CI - Store Model Tests org.keycloak.testsuite.model.user.UserModelTest#testAddRemoveUserConcurrentKeycloak CI - Store Model Tests |
8ad4eb6 to
5f4645e
Compare
Unreported flaky test detectedIf the flaky tests below are affected by the changes, please review and update the changes accordingly. Otherwise, a maintainer should report the flaky tests prior to merging the PR. org.keycloak.testsuite.authz.PolicyEvaluationTest# |
5f4645e to
1120d0f
Compare
1120d0f to
27bca59
Compare
Unreported flaky test detectedIf the flaky tests below are affected by the changes, please review and update the changes accordingly. Otherwise, a maintainer should report the flaky tests prior to merging the PR. org.keycloak.testsuite.authz.PolicyEvaluationTest# |
|
|
||
| import org.keycloak.representations.idm.AuthenticationExecutionExportRepresentation; | ||
|
|
||
| public class AuthenticationExecutionExportBuilder { |
There was a problem hiding this comment.
do you plan to move it 8BD0 to the builders module and extend the Builder class?
| @@ -4,61 +4,61 @@ | |||
| import org.keycloak.representations.idm.AuthenticationFlowRepresentation; | |||
| import org.keycloak.testframework.util.Collections; | |||
|
|
|||
| public class AuthenticationFlowConfigBuilder { | |||
| public class AuthenticationFlowBuilder { | |||
There was a problem hiding this comment.
do you plan to move it to the builders module and extend the Builder class?
| @@ -23,169 +23,169 @@ | |||
| import org.keycloak.representations.idm.UserRepresentation; | |||
| import org.keycloak.testframework.util.Collections; | |||
|
|
|||
| public class RealmConfigBuilder { | |||
| public class RealmBuilder { | |||
There was a problem hiding this comment.
do you plan to move it to the builders module and extend the Builder class?
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name(SCOPE_DEPARTMENT).protocol("openid-connect").build()); | ||
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name("profile").protocol("openid-connect").build()); |
There was a problem hiding this comment.
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name(SCOPE_DEPARTMENT).protocol("openid-connect").build()); | |
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name("profile").protocol("openid-connect").build()); | |
| testRealm.getClientScopes().add(ClientScopeBuilder.create().name(SCOPE_DEPARTMENT).protocol("openid-connect").build()); | |
| testRealm.getClientScopes().add(ClientScopeBuilder.create().name("profile").protocol("openid-connect").build()); |
There was a problem hiding this comment.
Fixed, not sure what happened here as I used IntelliJ to refactor, good catch though
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name(SCOPE_DEPARTMENT).protocol("openid-connect").build()); | ||
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name("profile").protocol("openid-connect").build()); |
There was a problem hiding this comment.
plus add import
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name(SCOPE_DEPARTMENT).protocol("openid-connect").build()); | |
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name("profile").protocol("openid-connect").build()); | |
| testRealm.getClientScopes().add(ClientScopeBuilder.create().name(SCOPE_DEPARTMENT).protocol("openid-connect").build()); | |
| testRealm.getClientScopes().add(ClientScopeBuilder.create().name("profile").protocol("openid-connect").build()); |
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name("phone-1-sel").build()); | ||
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name("phone-1").build()); | ||
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name("phone-2-sel").build()); | ||
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name("phone-2").build()); | ||
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name("phone-3-sel").build()); |
There was a problem hiding this comment.
plus add import
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name("phone-1-sel").build()); | |
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name("phone-1").build()); | |
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name("phone-2-sel").build()); | |
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name("phone-2").build()); | |
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name("phone-3-sel").build()); | |
| testRealm.getClientScopes().add(ClientScopeBuilder.create().name("phone-1-sel").build()); | |
| testRealm.getClientScopes().add(ClientScopeBuilder.create().name("phone-1").build()); | |
| testRealm.getClientScopes().add(ClientScopeBuilder.create().name("phone-2-sel").build()); | |
| testRealm.getClientScopes().add(ClientScopeBuilder.create().name("phone-2").build()); | |
| testRealm.getClientScopes().add(ClientScopeBuilder.create().name("phone-3-sel").build()); |
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name("customer").protocol("openid-connect").build()); | ||
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name("client-a").protocol("openid-connect").build()); | ||
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name("some-optional-scope").protocol("openid-connect").build()); |
There was a problem hiding this comment.
plus add import
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name("customer").protocol("openid-connect").build()); | |
| 10BC8 | testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name("client-a").protocol("openid-connect").build()); |
| testRealm.getClientScopes().add(org.keycloak.testframework.realm.ClientScopeBuilder.create().name("some-optional-scope").protocol("openid-connect").build()); | |
| testRealm.getClientScopes().add(ClientScopeBuilder.create().name("customer").protocol("openid-connect").build()); | |
| testRealm.getClientScopes().add(ClientScopeBuilder.create().name("client-a").protocol("openid-connect").build()); | |
| testRealm.getClientScopes().add(ClientScopeBuilder.create().name("some-optional-scope").protocol("openid-connect").build()); |
| @@ -138,7 +139,7 @@ public RealmBuilder client(ClientRepresentation client) { | |||
| return this; | |||
| } | |||
|
|
|||
| public RealmBuilder clientScope(ClientScopeBuilder clientScope) { | |||
| public RealmBuilder clientScope(org.keycloak.testframework.realm.ClientScopeBuilder clientScope) { | |||
There was a problem hiding this comment.
plus add import
| public RealmBuilder clientScope(org.keycloak.testframework.realm.ClientScopeBuilder clientScope) { | |
| public RealmBuilder clientScope(ClientScopeBuilder clientScope) { |
There was a problem hiding this comment.
do you plan to remove this file in the next step?
27bca59 to
d5abe56
Compare
Closes keycloak#48323 Signed-off-by: stianst <stianst@gmail.com>
e10cda2 to
8759445
Compare
Signed-off-by: stianst <stianst@gmail.com>
8759445 to
4cd1d25
Compare
Unreported flaky test detectedIf the flaky tests below are affected by the changes, please review and update the changes accordingly. Otherwise, a maintainer should report the flaky tests prior to merging the PR. org.keycloak.testsuite.authz.PolicyEvaluationTest# |
…k-test-framework-builders (#46) * fix(tests): replace RealmConfigBuilder with RealmBuilder from keycloak-test-framework-builders Following keycloak/keycloak#48315 Signed-off-by: Thomas DELORGE <thomas.delorge@orbeet.io> * fix(ci): dual realm config sources for multi-version Keycloak matrix Split AdaptiveRealmConfig into java-nightly (RealmBuilder) and java-released (RealmConfigBuilder), selected via keycloak.test.realm.source. CI uses separate build-args and test-args; stable builds use released sources, 26.5.7 tests run against 26.6.0. Scope builders dependency to nightly only. Signed-off-by: Thomas DELORGE <thomas.delorge@orbeet.io> --------- Signed-off-by: Thomas DELORGE <thomas.delorge@orbeet.io>
Refactor builders in testsuite part 1 Closes keycloak#48323 Signed-off-by: stianst <stianst@gmail.com>
No description provided.