Tests: Refactoring functional tests

src/test/groovy/org/prebid/server/functional/model/config/AdminConfig.groovy

@@ -3,7 +3,6 @@ package org.prebid.server.functional.model.config
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.annotation.JsonNaming
 import groovy.transform.ToString
-import org.prebid.server.functional.model.ModuleName
 
 @ToString(includeNames = true, ignoreNulls = true)
 @JsonNaming(PropertyNamingStrategies.KebabCaseStrategy)

src/test/groovy/org/prebid/server/functional/model/config/EndpointExecutionPlan.groovy

@@ -1,16 +1,16 @@
 package org.prebid.server.functional.model.config
 
 import groovy.transform.ToString
-import org.prebid.server.functional.model.ModuleName
 
 @ToString(includeNames = true, ignoreNulls = true)
 class EndpointExecutionPlan {
 
     Map<Stage, StageExecutionPlan> stages
 
     static EndpointExecutionPlan getModuleEndpointExecutionPlan(ModuleName name, List<Stage> stages) {
-        new EndpointExecutionPlan(stages:  stages.collectEntries {
-            it -> [(it): StageExecutionPlan.getModuleStageExecutionPlan(name, it)] } as Map<Stage, StageExecutionPlan>)
+        new EndpointExecutionPlan(stages: stages.collectEntries {
+            it -> [(it): StageExecutionPlan.getModuleStageExecutionPlan(name, it)]
+        } as Map<Stage, StageExecutionPlan>)
     }
 
     static EndpointExecutionPlan getModulesEndpointExecutionPlan(Map<Stage, List<ModuleName>> modulesStages) {
@@ -24,4 +24,17 @@ class EndpointExecutionPlan {
                 } as Map<Stage, StageExecutionPlan>
         )
     }
+
+    static EndpointExecutionPlan getModuleEndpointExecutionPlan(List<ModuleHookImplementation> modulesHooks) {
+        Map<Stage, StageExecutionPlan> stages = [:]
+        modulesHooks.each { moduleHook ->
+            def stage = Stage.forValue(moduleHook)
+            if (!stages.containsKey(stage)) {
+                stages[stage] = StageExecutionPlan.getModuleStageExecutionPlan([moduleHook])
+            } else {
+                stages[stage].addGroup(moduleHook)
+            }
+        }
+        new EndpointExecutionPlan(stages: stages)
+    }
 }

src/test/groovy/org/prebid/server/functional/model/config/ExecutionGroup.groovy

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.annotation.JsonNaming
 import groovy.transform.ToString
-import org.prebid.server.functional.model.ModuleName
 
 @ToString(includeNames = true, ignoreNulls = true)
 @JsonNaming(PropertyNamingStrategies.KebabCaseStrategy)
@@ -16,6 +15,13 @@ class ExecutionGroup {
     @JsonProperty("hook_sequence")
     List<HookId> hookSequenceSnakeCase
 
+    static ExecutionGroup getModuleExecutionGroup(ModuleHookImplementation moduleHook) {
+        new ExecutionGroup().tap {
+            timeout = 100
+            hookSequence = [new HookId(moduleCode: ModuleName.forValue(moduleHook).code, hookImplCode: moduleHook.code)]
+        }
+    }
+
     static ExecutionGroup getModuleExecutionGroup(ModuleName name, Stage stage) {
         new ExecutionGroup().tap {
             timeout = 100

src/test/groovy/org/prebid/server/functional/model/config/ExecutionPlan.groovy

@@ -3,15 +3,20 @@ package org.prebid.server.functional.model.config
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.annotation.JsonNaming
 import groovy.transform.ToString
-import org.prebid.server.functional.model.ModuleName
+
+import static org.prebid.server.functional.model.config.Endpoint.OPENRTB2_AUCTION
 
 @ToString(includeNames = true, ignoreNulls = true)
 @JsonNaming(PropertyNamingStrategies.LowerCaseStrategy)
 class ExecutionPlan {
 
-    List<AbTest> abTests
+    List<ModularityAbTest> abTests
     Map<Endpoint, EndpointExecutionPlan> endpoints
 
+    static ExecutionPlan getSingleEndpointExecutionPlan(List<ModuleHookImplementation> moduleHook, Endpoint endpoint = OPENRTB2_AUCTION) {
+        new ExecutionPlan(endpoints: [(endpoint): EndpointExecutionPlan.getModuleEndpointExecutionPlan(moduleHook)])
+    }
+
     static ExecutionPlan getSingleEndpointExecutionPlan(Endpoint endpoint, ModuleName moduleName, List<Stage> stage) {
         new ExecutionPlan(endpoints: [(endpoint): EndpointExecutionPlan.getModuleEndpointExecutionPlan(moduleName, stage)])
     }

src/test/groovy/org/prebid/server/functional/model/config/AbTest.groovy → src/test/groovy/org/prebid/server/functional/model/config/ModularityAbTest.groovy

@@ -7,7 +7,7 @@ import groovy.transform.ToString
 
 @ToString(includeNames = true, ignoreNulls = true)
 @JsonNaming(PropertyNamingStrategies.KebabCaseStrategy)
-class AbTest {
+class ModularityAbTest {
 
     Boolean enabled
     String moduleCode
@@ -21,8 +21,8 @@ class AbTest {
     @JsonProperty("log_analytics_tag")
     Boolean logAnalyticsTagSnakeCase
 
-    static AbTest getDefault(String moduleCode, List<Integer> accounts = null) {
-        new AbTest(enabled: true,
+    static ModularityAbTest getDefault(String moduleCode, List<Integer> accounts = null) {
+        new ModularityAbTest(enabled: true,
                 moduleCode: moduleCode,
                 accounts: accounts,
                 percentActive: 0,

src/test/groovy/org/prebid/server/functional/model/config/ModuleHookImplementation.groovy

@@ -1,7 +1,6 @@
 package org.prebid.server.functional.model.config
 
 import com.fasterxml.jackson.annotation.JsonValue
-import org.prebid.server.functional.model.ModuleName
 
 //TODO remove if module hooks implementation codes will become consistent
 enum ModuleHookImplementation {

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

@@ -1,4 +1,4 @@
-package org.prebid.server.functional.model
+package org.prebid.server.functional.model.config
 
 import com.fasterxml.jackson.annotation.JsonValue
 
@@ -15,4 +15,8 @@ enum ModuleName {
     ModuleName(String code) {
         this.code = code
     }
+
+    static ModuleName forValue(ModuleHookImplementation moduleHook) {
+        values().find { moduleHook.code.contains(it.code) }
+    }
 }

src/test/groovy/org/prebid/server/functional/model/config/Stage.groovy

@@ -24,6 +24,14 @@ enum Stage {
         this.metricValue = metricValue
     }
 
+    static Stage forValue(ModuleHookImplementation moduleHook) {
+        values()
+                .collect { [stage: it, matchLength: moduleHook.code.indexOf(it.value) >= 0 ? it.value.length() : -1] }
+                .findAll { it.matchLength > 0 }
+                .max { it.matchLength }
+                ?.stage
+    }
+
     @Override
     String toString() {
         value

src/test/groovy/org/prebid/server/functional/model/config/StageExecutionPlan.groovy

@@ -1,7 +1,6 @@
 package org.prebid.server.functional.model.config
 
 import groovy.transform.ToString
-import org.prebid.server.functional.model.ModuleName
 
 @ToString(includeNames = true, ignoreNulls = true)
 class StageExecutionPlan {
@@ -11,4 +10,13 @@ class StageExecutionPlan {
     static StageExecutionPlan getModuleStageExecutionPlan(ModuleName name, Stage stage) {
         new StageExecutionPlan(groups: [ExecutionGroup.getModuleExecutionGroup(name, stage)])
     }
+
+    static StageExecutionPlan getModuleStageExecutionPlan(List<ModuleHookImplementation> modulesHooks) {
+        new StageExecutionPlan(groups: modulesHooks.collect { ExecutionGroup.getModuleExecutionGroup(it) })
+    }
+
+    StageExecutionPlan addGroup(ModuleHookImplementation moduleHook) {
+        (groups ?: (groups = [])).add(ExecutionGroup.getModuleExecutionGroup(moduleHook))
+        this
+    }
 }

src/test/groovy/org/prebid/server/functional/model/request/auction/UserExtData.groovy

@@ -7,15 +7,15 @@ import org.prebid.server.functional.util.PBSUtils
 class UserExtData {
 
     List<String> keywords
-    String buyeruid
-    List<String> buyeruids
+    String buyerUid
+    List<String> buyerUids
     Geo geo
 
     static UserExtData getFPDUserExtData() {
         new UserExtData().tap {
             keywords = [PBSUtils.randomString]
-            buyeruid = PBSUtils.randomString
-            buyeruids = [PBSUtils.randomString]
+            buyerUid = PBSUtils.randomString
+            buyerUids = [PBSUtils.randomString]
         }
     }
 }

src/test/groovy/org/prebid/server/functional/model/response/auction/AnalyticResult.groovy

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.annotation.JsonNaming
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
-import org.prebid.server.functional.model.request.auction.FetchStatus
 import org.prebid.server.functional.model.request.auction.Imp
 
 import static org.prebid.server.functional.model.request.auction.FetchStatus.SUCCESS
@@ -15,12 +14,12 @@ import static org.prebid.server.functional.model.request.auction.FetchStatus.SUC
 class AnalyticResult {
 
     String name
-    FetchStatus status
+    String status
     List<ImpResult> results
 
     static AnalyticResult buildFromImp(Imp imp) {
         def appliedTo = new AppliedTo(impIds: [imp.id], bidders: [imp.ext.prebid.bidder.configuredBidders.first()])
         def impResult = new ImpResult(status: 'success-block', values: new ModuleValue(richmediaFormat: 'mraid'), appliedTo: appliedTo)
-        new AnalyticResult(name: 'reject-richmedia', status: SUCCESS, results: [impResult])
+        new AnalyticResult(name: 'reject-richmedia', status: SUCCESS.value, results: [impResult])
     }
 }

src/test/groovy/org/prebid/server/functional/model/response/auction/ModuleValue.groovy

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.annotation.JsonNaming
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
-import org.prebid.server.functional.model.ModuleName
+import org.prebid.server.functional.model.config.ModuleName
 
 @ToString(includeNames = true, ignoreNulls = true)
 @JsonNaming(PropertyNamingStrategies.KebabCaseStrategy)

src/test/groovy/org/prebid/server/functional/testcontainers/scaffolding/Bidder.groovy

@@ -36,7 +36,7 @@ class Bidder extends NetworkScaffolding {
         request().withPath(AUCTION_ENDPOINT)
     }
 
-    HttpRequest getRequest(String bidRequestId, String requestMatchPath) {
+    static HttpRequest getRequest(String bidRequestId, String requestMatchPath) {
         request().withPath(AUCTION_ENDPOINT)
                  .withBody(jsonPath("\$[?(@.$requestMatchPath == '$bidRequestId')]"))
     }
@@ -68,7 +68,7 @@ class Bidder extends NetworkScaffolding {
         return getLastRecordedRequestHeaders(bidRequestId)
     }
 
-    private String getBodyByRequest(HttpRequest request) {
+    private static String getBodyByRequest(HttpRequest request) {
         def requestString = request.bodyAsString
         def jsonNode = toJsonNode(requestString)
         def id = jsonNode.get("id").asText()

src/test/groovy/org/prebid/server/functional/testcontainers/scaffolding/FloorsProvider.groovy

@@ -37,7 +37,7 @@ class FloorsProvider extends NetworkScaffolding {
                                 : HttpResponse.notFoundResponse()}
     }
 
-    private String getDefaultResponse() {
+    private static String getDefaultResponse() {
         encode(PriceFloorData.priceFloorData)
     }
 }

src/test/groovy/org/prebid/server/functional/testcontainers/scaffolding/PrebidCache.groovy

@@ -76,7 +76,7 @@ class PrebidCache extends NetworkScaffolding {
                  .withBody(jsonPath("\$.puts[?(@.value =~/^.*$payload.*\$/)]"))
     }
 
-    private String getBodyByRequest(HttpRequest request) {
+    private static String getBodyByRequest(HttpRequest request) {
         def requestString = request.bodyAsString
         def jsonNode = toJsonNode(requestString)
         def putsSize = jsonNode.get("puts").size()

src/test/groovy/org/prebid/server/functional/tests/AliasSpec.groovy

@@ -79,8 +79,8 @@ class AliasSpec extends BaseSpec {
     def "PBS should apply compression type for bidder alias when adapters.BIDDER.endpoint-compression = gzip"() {
         given: "PBS with adapter configuration"
         def compressionType = GZIP.value
-        def pbsService = pbsServiceFactory.getService(
-                ["adapters.generic.endpoint-compression": compressionType])
+        def pbsConfig = ["adapters.generic.endpoint-compression": compressionType]
+        def pbsService = pbsServiceFactory.getService(pbsConfig)
 
         and: "Default bid request with alias"
         def bidRequest = BidRequest.defaultBidRequest.tap {
@@ -94,6 +94,9 @@ class AliasSpec extends BaseSpec {
         then: "Bidder request should contain header Content-Encoding = gzip"
         assert response.ext?.debug?.httpcalls?.get(ALIAS.value)?.requestHeaders?.first()
                 ?.get(CONTENT_ENCODING_HEADER)?.first() == compressionType
+
+        cleanup: "Stop and remove pbs container"
+        pbsServiceFactory.removeContainer(pbsConfig)
     }
 
     def "PBS should return an error when GVL Id alias refers to unknown bidder alias"() {

src/test/groovy/org/prebid/server/functional/tests/AmpFpdSpec.groovy

@@ -75,8 +75,8 @@ class AmpFpdSpec extends BaseSpec {
             ampStoredRequest.user.geo.zip == user.geo.zip
             ampStoredRequest.user.geo.country == user.geo.country
             ampStoredRequest.user.ext.data.keywords == user.ext.data.keywords
-            ampStoredRequest.user.ext.data.buyeruid == user.ext.data.buyeruid
-            ampStoredRequest.user.ext.data.buyeruids == user.ext.data.buyeruids
+            ampStoredRequest.user.ext.data.buyerUid == user.ext.data.buyerUid
+            ampStoredRequest.user.ext.data.buyerUids == user.ext.data.buyerUids
         }
 
         and: "Bidder request shouldn't contain imp[0].ext.rp"
@@ -196,8 +196,8 @@ class AmpFpdSpec extends BaseSpec {
             ortb2.user.gender == user.gender
             ortb2.user.keywords == user.keywords
             ortb2.user.ext.data.keywords == user.ext.data.keywords
-            ortb2.user.ext.data.buyeruid == user.ext.data.buyeruid
-            ortb2.user.ext.data.buyeruids == user.ext.data.buyeruids
+            ortb2.user.ext.data.buyerUid == user.ext.data.buyerUid
+            ortb2.user.ext.data.buyerUids == user.ext.data.buyerUids
         }
 
         and: "Bidder request shouldn't contain imp[0].ext.rp"
@@ -290,8 +290,8 @@ class AmpFpdSpec extends BaseSpec {
                 ampStoredRequest.user.geo.zip == user.geo.zip
                 ampStoredRequest.user.geo.country == user.geo.country
                 ampStoredRequest.user.ext.data.keywords == user.ext.data.keywords
-                ampStoredRequest.user.ext.data.buyeruid == user.ext.data.buyeruid
-                ampStoredRequest.user.ext.data.buyeruids == user.ext.data.buyeruids
+                ampStoredRequest.user.ext.data.buyerUid == user.ext.data.buyerUid
+                ampStoredRequest.user.ext.data.buyerUids == user.ext.data.buyerUids
             }
         }
 
@@ -370,8 +370,8 @@ class AmpFpdSpec extends BaseSpec {
             it.user.gender == fpdUser.gender
             it.user.keywords == fpdUser.keywords
             it.user.ext.data.keywords == fpdUser.ext.data.keywords
-            it.user.ext.data.buyeruid == fpdUser.ext.data.buyeruid
-            it.user.ext.data.buyeruids == fpdUser.ext.data.buyeruids
+            it.user.ext.data.buyerUid == fpdUser.ext.data.buyerUid
+            it.user.ext.data.buyerUids == fpdUser.ext.data.buyerUids
         }
 
         and: "Bidder request shouldn't contain imp[0].ext.rp"
@@ -455,8 +455,8 @@ class AmpFpdSpec extends BaseSpec {
             it.user.gender == fpdUser.gender
             it.user.keywords == fpdUser.keywords
             it.user.ext.data.keywords == fpdUser.ext.data.keywords
-            it.user.ext.data.buyeruid == fpdUser.ext.data.buyeruid
-            it.user.ext.data.buyeruids == fpdUser.ext.data.buyeruids
+            it.user.ext.data.buyerUid == fpdUser.ext.data.buyerUid
+            it.user.ext.data.buyerUids == fpdUser.ext.data.buyerUids
         }
 
         and: "Should should ignore any non FPD data"

src/test/groovy/org/prebid/server/functional/tests/AnalyticsSpec.groovy

@@ -28,7 +28,6 @@ class AnalyticsSpec extends BaseSpec {
             ENABLED_DEBUG_LOG_MODE + ['analytics.log.enabled'    : 'true',
                                       'analytics.global.adapters': ''])
 
-
     @Shared
     PubStackAnalytics analytics = new PubStackAnalytics(Dependencies.networkServiceContainer).tap {
         it.setResponse(PubStackResponse.getDefaultPubStackResponse(SCOPE_ID, Dependencies.networkServiceContainer.rootUri))