Rename integration to channel in account config tests

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

@@ -1,4 +1,4 @@
-package org.prebid.server.functional.model.config
+package org.prebid.server.functional.model
 
 import com.fasterxml.jackson.annotation.JsonValue
 

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

@@ -3,11 +3,12 @@ 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.ChannelType
 
 @ToString(includeNames = true, ignoreNulls = true)
 @JsonNaming(PropertyNamingStrategies.KebabCaseStrategy)
 class AccountCcpaConfig {
 
     Boolean enabled
-    Map<ChannelType, Boolean> enabledForRequestType
+    Map<ChannelType, Boolean> channelEnabled
 }

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

@@ -3,13 +3,14 @@ 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.ChannelType
 
 @ToString(includeNames = true, ignoreNulls = true)
 @JsonNaming(PropertyNamingStrategies.KebabCaseStrategy)
 class AccountGdprConfig {
 
     Boolean enabled
-    Map<ChannelType, Boolean> enabledForRequestType
+    Map<ChannelType, Boolean> channelEnabled
     Map<Purpose, PurposeConfig> purposes
     Map<SpecialFeature, SpecialFeatureConfig> specialFeatures
     PurposeOneTreatmentInterpretation purposeOneTreatmentInterpretation

src/test/groovy/org/prebid/server/functional/model/request/amp/AmpRequest.groovy

@@ -22,7 +22,6 @@ class AmpRequest {
     Integer account
     String gdprConsent
     String consentString
-    String targeting
     ConsentType consentType
     Boolean gdprApplies
     String addtlConsent

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

@@ -23,6 +23,9 @@ class App {
     AppExt ext
 
     static App getDefaultApp() {
-        new App(id: PBSUtils.randomString)
+        new App().tap {
+            id = PBSUtils.randomString
+            publisher = Publisher.defaultPublisher
+        }
     }
 }

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

@@ -4,6 +4,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 
+import static org.prebid.server.functional.model.request.auction.DistributionChannel.APP
+import static org.prebid.server.functional.model.request.auction.DistributionChannel.SITE
+
 @EqualsAndHashCode
 @ToString(includeNames = true, ignoreNulls = true)
 class BidRequest {
@@ -29,14 +32,19 @@ class BidRequest {
     Regs regs
     BidRequestExt ext
 
-    static BidRequest getDefaultBidRequest() {
+    static BidRequest getDefaultBidRequest(DistributionChannel channel = SITE) {
         new BidRequest().tap {
             it.addImp(Imp.defaultImpression)
             regs = Regs.defaultRegs
             id = UUID.randomUUID()
             tmax = 2500
-            site = Site.defaultSite
             ext = new BidRequestExt(prebid: new Prebid(debug: 1))
+            if (channel == SITE) {
+                site = Site.defaultSite
+            }
+            if (channel == APP) {
+                app = App.defaultApp
+            }
         }
     }
 

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

@@ -1,9 +1,11 @@
 package org.prebid.server.functional.model.request.auction
 
 import groovy.transform.ToString
+import org.prebid.server.functional.model.ChannelType
 
 @ToString(includeNames = true, ignoreNulls = true)
 class Channel {
 
-    String name
+    ChannelType name
+    String version
 }

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

@@ -0,0 +1,13 @@
+package org.prebid.server.functional.model.request.auction
+
+import com.fasterxml.jackson.annotation.JsonValue
+
+enum DistributionChannel {
+
+    SITE, APP
+
+    @JsonValue
+    String getValue() {
+        name().toLowerCase()
+    }
+}

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

@@ -6,7 +6,7 @@ import org.prebid.server.functional.util.privacy.ConsentString
 @ToString(includeNames = true, ignoreNulls = true)
 class UserExt {
 
-    ConsentString consent
+    String consent
     List<String> fcapids
     UserTime time
     UserExtData data

src/test/groovy/org/prebid/server/functional/testcontainers/PbsServiceFactory.groovy

@@ -22,13 +22,13 @@ class PbsServiceFactory {
     }
 
     PrebidServerService getService(Map<String, String> config) {
-        if (containers.size() >= MAX_CONTAINERS_COUNT) {
-            def container = containers.find { !it.key.isEmpty() }
-            remove([(container.key): container.value])
-        }
         if (containers.containsKey(config)) {
-            return new PrebidServerService(getContainer(config), mapper)
+            return new PrebidServerService(containers.get(config), mapper)
         } else {
+            if (containers.size() >= MAX_CONTAINERS_COUNT) {
+                def container = containers.find { !it.key.isEmpty() }
+                remove([(container.key): container.value])
+            }
             def pbsContainer = new PrebidServerContainer(config)
             pbsContainer.start()
             containers.put(config, pbsContainer)

src/test/groovy/org/prebid/server/functional/testcontainers/container/PrebidServerContainer.groovy

@@ -115,8 +115,8 @@ LIMIT 1
 
     void withBidder(String host) {
         withConfig(["adapters.generic.enabled"      : "true",
-                    "adapters.generic.endpoint"     : "$host/auction".toString(),
-                    "adapters.generic.usersync.url" : "$host/generic-usersync".toString(),
+                    "adapters.generic.endpoint"     : "$host/auction" as String,
+                    "adapters.generic.usersync.url" : "$host/generic-usersync" as String,
                     "adapters.generic.usersync.type": "redirect"
         ])
     }

src/test/groovy/org/prebid/server/functional/tests/pg/TargetingSpec.groovy

@@ -207,7 +207,8 @@ class TargetingSpec extends BasePgSpec {
         }
 
         APP_BUNDLE    | BidRequest.defaultBidRequest.tap {
-            app = App.defaultApp.tap { bundle = stringTargetingValue }
+            app = new App(id: PBSUtils.randomString,
+                    bundle: stringTargetingValue)
         }
 
         UFPD_LANGUAGE | BidRequest.defaultBidRequest.tap {
@@ -320,7 +321,7 @@ class TargetingSpec extends BasePgSpec {
                     }
                 },
                 BidRequest.defaultBidRequest.tap {
-                    app = App.defaultApp.tap {
+                    app = new App(id: PBSUtils.randomString).tap {
                         ext = new AppExt(data: new AppExtData(language: stringTargetingValue))
                     }
                 }