Skip to content

Commit 6f32685

Browse files
osulzhenkoosulzhenko
committed
update module tests
1 parent de08366 commit 6f32685

4 files changed

Lines changed: 56 additions & 47 deletions

File tree

‎src/test/groovy/org/prebid/server/functional/model/config/ModuleName.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import com.fasterxml.jackson.annotation.JsonValue
44

55
enum ModuleName {
66

7-
PB_RICHMEDIA_FILTER("pb-richmedia-filter"),
8-
PB_RESPONSE_CORRECTION ("pb-response-correction"),
9-
ORTB2_BLOCKING("ortb2-blocking"),
7+
PB_RICHMEDIA_FILTER('pb-richmedia-filter'),
8+
PB_RESPONSE_CORRECTION ('pb-response-correction'),
9+
ORTB2_BLOCKING('ortb2-blocking'),
1010
PB_REQUEST_CORRECTION('pb-request-correction'),
1111
OPTABLE_TARGETING('optable-targeting'),
12-
PB_RULE_ENGINE('pb-rule-engine')
12+
PB_RULE_ENGINE('pb-rule-engine'),
1313

1414
@JsonValue
1515
final String code

‎src/test/groovy/org/prebid/server/functional/tests/module/ModuleBaseSpec.groovy‎

Lines changed: 48 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8,83 +8,77 @@ import org.prebid.server.functional.model.config.ModuleHookImplementation
88
import org.prebid.server.functional.model.config.ModuleName
99
import org.prebid.server.functional.model.config.PbsModulesConfig
1010
import org.prebid.server.functional.model.db.Account
11-
import org.prebid.server.functional.service.PrebidServerService
1211
import org.prebid.server.functional.model.response.auction.AnalyticResult
1312
import org.prebid.server.functional.model.response.auction.BidResponse
13+
import org.prebid.server.functional.service.PrebidServerService
1414
import org.prebid.server.functional.tests.BaseSpec
15-
import spock.lang.Shared
1615
import org.prebid.server.functional.util.PBSUtils
16+
import spock.lang.Shared
1717

1818
import static org.prebid.server.functional.model.bidder.BidderName.AMX
1919
import static org.prebid.server.functional.model.bidder.BidderName.GENERIC
20+
import static org.prebid.server.functional.model.bidder.BidderName.IX
2021
import static org.prebid.server.functional.model.bidder.BidderName.OPENX
2122
import static org.prebid.server.functional.model.bidder.BidderName.OPENX_ALIAS
23+
import static org.prebid.server.functional.model.config.Endpoint.OPENRTB2_AUCTION
2224
import static org.prebid.server.functional.model.config.ModuleHookImplementation.PB_RICHMEDIA_FILTER_ALL_PROCESSED_RESPONSES
2325
import static org.prebid.server.functional.model.config.ModuleName.OPTABLE_TARGETING
2426
import static org.prebid.server.functional.model.config.ModuleName.ORTB2_BLOCKING
27+
import static org.prebid.server.functional.model.config.ModuleName.PB_REQUEST_CORRECTION
2528
import static org.prebid.server.functional.model.config.ModuleName.PB_RESPONSE_CORRECTION
2629
import static org.prebid.server.functional.model.config.ModuleName.PB_RICHMEDIA_FILTER
27-
import static org.prebid.server.functional.model.config.ModuleName.PB_REQUEST_CORRECTION
2830
import static org.prebid.server.functional.model.config.ModuleName.PB_RULE_ENGINE
29-
import static org.prebid.server.functional.model.config.Endpoint.OPENRTB2_AUCTION
3031
import static org.prebid.server.functional.testcontainers.Dependencies.getNetworkServiceContainer
3132
import static org.prebid.server.functional.util.privacy.TcfConsent.GENERIC_VENDOR_ID
3233

3334
class ModuleBaseSpec extends BaseSpec {
3435

3536
protected static final String WILDCARD = '*'
36-
protected static final String CONFIG_DATA_CENTER = PBSUtils.randomString
37-
protected final static Map<String, String> EXTERNAL_MODULES_CONFIG = getModuleBaseSettings(PB_RICHMEDIA_FILTER) +
38-
getModuleBaseSettings(PB_RESPONSE_CORRECTION) +
39-
getModuleBaseSettings(ORTB2_BLOCKING) +
40-
getModuleBaseSettings(PB_REQUEST_CORRECTION) +
41-
getOptableTargetingSettings() +
42-
getRulesEngineSettings()
37+
protected static final String RANDOM_DATACENTER_REGION = PBSUtils.randomString
38+
39+
protected static final Map<String, String> GENERIC_CONFIG = [
40+
"adapters.${GENERIC.value}.usersync.redirect.url" : "$networkServiceContainer.rootUri/generic-usersync".toString(),
41+
"adapters.${GENERIC.value}.usersync.redirect.support-cors": 'false',
42+
"adapters.${GENERIC.value}.meta-info.vendor-id" : GENERIC_VENDOR_ID.toString()]
43+
44+
protected static final Map<String, String> IX_CONFIG = ["adapters.${IX}.enabled" : "true",
45+
"adapters.${IX}.endpoint": "$networkServiceContainer.rootUri/auction".toString()]
46+
protected static final Map<String, String> AMX_CONFIG = ["adapters.${AMX}.enabled" : "true",
47+
"adapters.${AMX}.endpoint": "$networkServiceContainer.rootUri/auction".toString()]
48+
protected static final Map<String, String> OPENX_CONFIG = ["adapters.${OPENX}.enabled" : "true",
49+
"adapters.${OPENX}.endpoint": "$networkServiceContainer.rootUri/auction".toString()]
50+
51+
protected static final Map<String, String> OPENX_ALIAS_CONFIG = ["adapters.${OPENX}.aliases.${OPENX_ALIAS}.enabled" : "true",
52+
"adapters.${OPENX}.aliases.${OPENX_ALIAS}.endpoint": "$networkServiceContainer.rootUri/auction".toString()]
4353

4454
private static final Map<String, String> ENABLED_DEBUG_LOG_MODE = ["logging.level.root": "debug"]
55+
4556
private static final Map<String, String> ORTB_ADAPTER_CONFIG = ['adapter-defaults.ortb.multiformat-supported': 'false']
57+
4658
private static final Map<String, String> MODIFYING_VAST_CONFIG = ["adapter-defaults.modifying-vast-xml-allowed": "false",
4759
"adapters.generic.modifying-vast-xml-allowed": "false"]
60+
4861
private static final Map<String, String> CACHE_STORAGE_CONFIG = ['storage.pbc.path' : "$networkServiceContainer.rootUri/stored-cache".toString(),
4962
'storage.pbc.call-timeout-ms': '1000',
5063
'storage.pbc.enabled' : 'true',
5164
'cache.module.enabled' : 'true',
5265
'pbc.api.key' : PBSUtils.randomString,
5366
'cache.api-key-secured' : 'false']
54-
private static final String USER_SYNC_URL = "$networkServiceContainer.rootUri/generic-usersync"
55-
private static final Map<String, String> GENERIC_CONFIG = [
56-
"adapters.${GENERIC.value}.usersync.redirect.url" : USER_SYNC_URL,
57-
"adapters.${GENERIC.value}.usersync.redirect.support-cors": false as String,
58-
"adapters.${GENERIC.value}.meta-info.vendor-id" : GENERIC_VENDOR_ID as String]
59-
private static final Map<String, String> IX_CONFIG = ["adapters.ix.enabled" : "true",
60-
"adapters.ix.endpoint": "$networkServiceContainer.rootUri/auction".toString()]
61-
private static final Map<String, String> AMX_CONFIG = ["adapters.${AMX}.enabled" : "true",
62-
"adapters.${AMX}.endpoint": "$networkServiceContainer.rootUri/auction".toString()]
63-
private static final Map<String, String> OPENX_CONFIG = ["adapters.${OPENX}.enabled" : "true",
64-
"adapters.${OPENX}.endpoint": "$networkServiceContainer.rootUri/auction".toString()]
65-
66-
private static final Map<String, String> OPENX_ALIAS_CONFIG = ["adapters.${OPENX}.aliases.${OPENX_ALIAS}.enabled" : "true",
67-
"adapters.${OPENX}.aliases.${OPENX_ALIAS}.endpoint": "$networkServiceContainer.rootUri/auction".toString()]
67+
68+
protected final static Map<String, String> EXTERNAL_MODULES_CONFIG = getModuleBaseSettings(PB_RICHMEDIA_FILTER) +
69+
getModuleBaseSettings(PB_RESPONSE_CORRECTION) +
70+
getModuleBaseSettings(ORTB2_BLOCKING) +
71+
getModuleBaseSettings(PB_REQUEST_CORRECTION) +
72+
getOptableTargetingSettings() +
73+
getRulesEngineSettings()
6874

6975
@Shared
7076
protected static PrebidServerService pbsServiceWithMultipleModules
7177

7278
def setupSpec() {
7379
prebidCache.setResponse()
7480
bidder.setResponse()
75-
pbsServiceWithMultipleModules = pbsServiceFactory.getService(
76-
['datacenter-region': CONFIG_DATA_CENTER] +
77-
EXTERNAL_MODULES_CONFIG +
78-
ENABLED_DEBUG_LOG_MODE +
79-
ORTB_ADAPTER_CONFIG +
80-
MODIFYING_VAST_CONFIG +
81-
CACHE_STORAGE_CONFIG +
82-
GENERIC_CONFIG +
83-
IX_CONFIG +
84-
AMX_CONFIG +
85-
OPENX_CONFIG +
86-
OPENX_ALIAS_CONFIG
87-
)
81+
pbsServiceWithMultipleModules = pbsServiceFactory.getService(getDefaultMultipleModulesConfig())
8882
}
8983

9084
def cleanupSpec() {
@@ -93,6 +87,21 @@ class ModuleBaseSpec extends BaseSpec {
9387
repository.removeAllDatabaseData()
9488
}
9589

90+
protected Map<String, String> getDefaultMultipleModulesConfig() {
91+
['datacenter-region': RANDOM_DATACENTER_REGION] +
92+
EMPTY_CACHE_TTL_CONFIG +
93+
EXTERNAL_MODULES_CONFIG +
94+
ENABLED_DEBUG_LOG_MODE +
95+
ORTB_ADAPTER_CONFIG +
96+
MODIFYING_VAST_CONFIG +
97+
CACHE_STORAGE_CONFIG +
98+
GENERIC_CONFIG +
99+
IX_CONFIG +
100+
AMX_CONFIG +
101+
OPENX_CONFIG +
102+
OPENX_ALIAS_CONFIG
103+
}
104+
96105
protected static Map<String, String> getModuleBaseSettings(ModuleName name, boolean isEnabled = true) {
97106
[("hooks.${name.code}.enabled".toString()): isEnabled as String]
98107
}
@@ -124,6 +133,7 @@ class ModuleBaseSpec extends BaseSpec {
124133
"hooks.${PB_RULE_ENGINE.code}.rule-parsing.retry-max-delay-millis" : "10000",
125134
"hooks.${PB_RULE_ENGINE.code}.rule-parsing.retry-exponential-factor" : "1.2",
126135
"hooks.${PB_RULE_ENGINE.code}.rule-parsing.retry-exponential-jitter" : "1.2"]
136+
.collectEntries { key, value -> [(key.toString()): value.toString()] }
127137
}
128138

129139
protected static Account getAccountWithModuleConfig(String accountId,

‎src/test/groovy/org/prebid/server/functional/tests/module/pbruleengine/RuleEngineInfrastructureSpec.groovy‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package org.prebid.server.functional.tests.module.pbruleengine
22

33
import org.prebid.server.functional.model.config.RuleEngineFunctionArgs
44
import org.prebid.server.functional.model.config.RuleEngineModelSchema
5-
import org.prebid.server.functional.model.response.auction.AnalyticTagStatus
65
import org.prebid.server.functional.util.PBSUtils
76

87
import java.time.Instant
@@ -30,7 +29,7 @@ class RuleEngineInfrastructureSpec extends RuleEngineBaseSpec {
3029
def pbRuleEngine = createRulesEngineWithRule().tap {
3130
it.ruleSets[0].modelGroups[0].schema[0].tap {
3231
it.function = DATA_CENTER_IN
33-
it.args = new RuleEngineFunctionArgs(countries: [CONFIG_DATA_CENTER])
32+
it.args = new RuleEngineFunctionArgs(countries: [RANDOM_DATACENTER_REGION])
3433
}
3534
}
3635

@@ -73,7 +72,7 @@ class RuleEngineInfrastructureSpec extends RuleEngineBaseSpec {
7372
def pbRuleEngine = createRulesEngineWithRule().tap {
7473
it.ruleSets[0].modelGroups[0].schema[0].tap {
7574
it.function = DATA_CENTER_IN
76-
it.args = new RuleEngineFunctionArgs(datacenters: [CONFIG_DATA_CENTER])
75+
it.args = new RuleEngineFunctionArgs(datacenters: [RANDOM_DATACENTER_REGION])
7776
}
7877
}
7978

@@ -172,7 +171,7 @@ class RuleEngineInfrastructureSpec extends RuleEngineBaseSpec {
172171
def pbRuleEngine = createRulesEngineWithRule().tap {
173172
it.ruleSets[0].modelGroups[0].tap {
174173
schema = [new RuleEngineModelSchema(function: DATA_CENTER)]
175-
rules[0].conditions = [CONFIG_DATA_CENTER]
174+
rules[0].conditions = [RANDOM_DATACENTER_REGION]
176175
}
177176
}
178177

‎src/test/groovy/org/prebid/server/functional/util/PBSUtils.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class PBSUtils implements ObjectMapperWrapper {
4848

4949
static String getRandomString(int stringLength = 20) {
5050
RandomStringUtils.randomAlphanumeric(stringLength)
51-
}
51+
}
5252

5353
static String getRandomSpecialChars(int stringLength = 20) {
5454
RandomStringUtils.random(stringLength, "!@#\$%^&*()-_=+[]{}|;:'\",.<>/?")

0 commit comments

Comments
 (0)