Tests: Fix flaky GPP tests and refactor code #4309
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
marki1an
requested changes
Dec 4, 2025
Collaborator
marki1an
left a comment
marki1an
left a comment
There was a problem hiding this comment.
Comments applicable to other cases.
|
|
||
| static DataActivity fromGppDataActivity(GppDataActivity gppActivity) { | ||
| if (gppActivity == null) { | ||
| return INVALID; |
Collaborator
There was a problem hiding this comment.
Don't need semicolon here.
Comment on lines
9
to
13
| NOTICE_NOT_PROVIDED(2), | ||
| NO_CONSENT(1), | ||
| CONSENT(2), | ||
| INVALID(-1), | ||
| INVALID(-1) |
Collaborator
There was a problem hiding this comment.
Please reorder your number without duplication.
Comment on lines
19
to
29
| switch (gppActivity) { | ||
| case GppDataActivity.NOT_APPLICABLE: | ||
| return NOT_APPLICABLE | ||
| case GppDataActivity.NO_CONSENT: | ||
| return NO_CONSENT | ||
| case GppDataActivity.CONSENT: | ||
| return CONSENT | ||
| default: | ||
| return INVALID | ||
| } | ||
| } |
Collaborator
There was a problem hiding this comment.
In general, looks weird. Please consider removing the current enum.
Comment on lines
55
to
56
| enum ConfigCase { | ||
| CAMEL_CASE, KEBAB_CASE, SNAKE_CASE |
Collaborator
There was a problem hiding this comment.
I propose to move into the core model. In future, we can also reuse this functionality.
src/test/groovy/org/prebid/server/functional/model/config/GppModuleConfig.groovy
Show resolved
Hide resolved
Comment on lines
717
to
700
| accountGppConfig << [ | ||
| new AccountGppConfig(code: IAB_US_GENERAL, enabled: false), | ||
| new AccountGppConfig(code: IAB_US_GENERAL, config: new GppModuleConfig(skipSids: [US_NAT_V1]), enabled: true) | ||
| ] | ||
| accountGppConfig << [new AccountGppConfig(code: IAB_US_GENERAL, enabled: false), | ||
| new AccountGppConfig(code: IAB_US_GENERAL, config: new GppModuleConfig(skipSids: [US_NAT_V1]), enabled: true)] |
| new UsNatV1Consent.Builder().setPersonalDataConsents(GppDataActivity.CONSENT).build() | [new EqualityValueRule(GPC, NOTICE_PROVIDED), | ||
| new EqualityValueRule(PERSONAL_DATA_CONSENTS, NOTICE_NOT_PROVIDED)] | ||
| gppConsent | valueRules | ||
| new UsNatV1Consent.Builder().setPersonalDataConsents(CONSENT).build() | [new EqualityValueRule(PERSONAL_DATA_CONSENTS, DataActivity.NOTICE_NOT_PROVIDED)] |
Collaborator
There was a problem hiding this comment.
DataActivity static import?
Comment on lines
-1402
to
-1407
| disallowGppLogic << [ | ||
| SIMPLE_GPC_DISALLOW_LOGIC, | ||
| new UsNatV1Consent.Builder() | ||
| .setMspaServiceProviderMode(MspaMode.YES) | ||
| .setMspaOptOutOptionMode(MspaMode.NO) | ||
| .build(), |
Collaborator
There was a problem hiding this comment.
Let's create a rule to format this?
Collaborator
There was a problem hiding this comment.
We need to define one standard for all tests with the best practices
Comment on lines
587
to
588
| def sensitiveData | ||
| def consentBuilder |
Collaborator
There was a problem hiding this comment.
Please use proper Obj instead of def
Comment on lines
623
to
624
| def childSensitiveData | ||
| def consentBuilder |
marki1an
requested changes
Dec 5, 2025
| @@ -1,3 +1,3 @@ | |||
| package org.prebid.server.functional.model.privacy.gpp | |||
|
|
|||
| import org.prebid.server.functional.util.PBSUtils | |||
Collaborator
There was a problem hiding this comment.
Please remove unused imports, same for others
src/test/groovy/org/prebid/server/functional/tests/privacy/PrivacyBaseSpec.groovy
Show resolved
Hide resolved
marki1an
previously approved these changes
Dec 5, 2025
marki1an
approved these changes
Dec 5, 2025
CTMBNara
approved these changes
Dec 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🔧 Type of changes
✨ What's the context?
What's the context for the changes?
🧠 Rationale behind the change
Why did you choose to make these changes? Were there any trade-offs you had to consider?
🔎 New Bid Adapter Checklist
🧪 Test plan
How do you know the changes are safe to ship to production?
🏎 Quality check