Tests: Increase test coverage for cookie_sync

src/test/groovy/org/prebid/server/functional/model/bidder/BidderName.groovy

@@ -5,7 +5,7 @@ import net.minidev.json.annotate.JsonIgnore
 
 enum BidderName {
 
-    ALIAS, GENERIC, RUBICON, APPNEXUS, BOGUS, OPENX
+    ALIAS, GENERIC, RUBICON, APPNEXUS, BOGUS, OPENX, ACEEX, ACUITYADS, GRID, AAX, ADKERNEL, MEDIANET
 
     @JsonValue
     String getValue() {

src/test/groovy/org/prebid/server/functional/model/mock/services/vendorlist/VendorListResponse.groovy

@@ -1,12 +1,11 @@
 package org.prebid.server.functional.model.mock.services.vendorlist
 
 import org.prebid.server.functional.util.PBSUtils
-import org.prebid.server.functional.util.privacy.TcfConsent
 
 import java.time.Clock
 import java.time.ZonedDateTime
 
-import static org.prebid.server.functional.util.privacy.TcfConsent.GENERIC_VENDOR_ID
+import static org.prebid.server.functional.util.privacy.TcfConsent.VENDOR_LIST_VERSION
 
 class VendorListResponse {
 
@@ -19,9 +18,8 @@ class VendorListResponse {
     static VendorListResponse getDefaultVendorListResponse() {
         new VendorListResponse().tap {
             it.gvlSpecificationVersion = 2
-            it.tcfPolicyVersion = 2
+            it.vendorListVersion = VENDOR_LIST_VERSION
             it.lastUpdated = ZonedDateTime.now(Clock.systemUTC()).minusWeeks(2)
-            it.vendors = [(GENERIC_VENDOR_ID): Vendor.defaultVendor]
         }
     }
 
@@ -43,9 +41,9 @@ class VendorListResponse {
         Boolean usesNonCookieAccess
         Boolean deviceStorageDisclosureUrl
 
-        static Vendor getDefaultVendor() {
+        static Vendor getDefaultVendor(Integer id) {
             new Vendor().tap {
-                it.id = GENERIC_VENDOR_ID
+                it.id = id
                 it.name = PBSUtils.randomString
                 it.purposes = [1, 3, 4, 5]
                 it.legIntPurposes = [2, 7, 10]

src/test/groovy/org/prebid/server/functional/model/request/cookiesync/MethodFilter.groovy

@@ -1,11 +1,11 @@
 package org.prebid.server.functional.model.request.cookiesync
 
 import groovy.transform.ToString
-import org.prebid.server.functional.model.bidder.BidderName
 
 @ToString(includeNames = true, ignoreNulls = true)
-class MethodFilter {
+class MethodFilter<T> {
 
-    List<BidderName> bidders
+    // Here we use wildcard for different compatibility
+    T bidders
     FilterType filter
 }

src/test/groovy/org/prebid/server/functional/model/response/setuid/SetuidResponse.groovy

@@ -1,13 +1,12 @@
 package org.prebid.server.functional.model.response.setuid
 
 import groovy.transform.ToString
-import io.restassured.http.Headers
 import org.prebid.server.functional.model.UidsCookie
 
 @ToString(includeNames = true, ignoreNulls = true)
 class SetuidResponse {
 
-    Headers headers
+    Map<String, String> headers
     UidsCookie uidsCookie
     Byte[] responseBody
 }

src/test/groovy/org/prebid/server/functional/service/PrebidServerService.groovy

@@ -127,7 +127,7 @@ class PrebidServerService implements ObjectMapperWrapper {
 
     @Step("[POST] /cookie_sync with headers")
     CookieSyncResponse sendCookieSyncRequest(CookieSyncRequest request, Map<String, String> headers) {
-        def response = postCookieSync(request, headers)
+        def response = postCookieSync(request, null, headers)
 
         checkResponseStatusCode(response)
         response.as(CookieSyncResponse)
@@ -141,6 +141,14 @@ class PrebidServerService implements ObjectMapperWrapper {
         response.as(CookieSyncResponse)
     }
 
+    @Step("[POST] /cookie_sync with uids cookie")
+    CookieSyncResponse sendCookieSyncRequest(CookieSyncRequest request, String uidsCookie) {
+        def response = postCookieSync(request, null, null, null, uidsCookie)
+
+        checkResponseStatusCode(response)
+        response.as(CookieSyncResponse)
+    }
+
     @Step("[POST] /cookie_sync with uids and additional cookies")
     CookieSyncResponse sendCookieSyncRequest(CookieSyncRequest request,
                                              UidsCookie uidsCookie,
@@ -165,7 +173,7 @@ class PrebidServerService implements ObjectMapperWrapper {
         def setuidResponse = new SetuidResponse()
         setuidResponse.uidsCookie = getDecodedUidsCookie(response)
         setuidResponse.responseBody = response.asByteArray()
-        setuidResponse.headers = response.headers()
+        setuidResponse.headers = getHeaders(response)
         setuidResponse
     }
 
@@ -310,25 +318,22 @@ class PrebidServerService implements ObjectMapperWrapper {
                                    .post(AUCTION_ENDPOINT)
     }
 
-    private Response postCookieSync(CookieSyncRequest cookieSyncRequest, Map<String, String> header) {
-        postCookieSync(cookieSyncRequest, null, header)
-    }
-
     private Response postCookieSync(CookieSyncRequest cookieSyncRequest,
                                     UidsCookie uidsCookie = null,
                                     Map<String, ?> additionalCookies = null,
-                                    Map<String, String> header = null) {
-
-        def cookies = [:]
+                                    Map<String, String> header = null,
+                                    String uidsAudit = null) {
 
-        if (additionalCookies) {
-            cookies.putAll(additionalCookies)
-        }
+        def cookies = additionalCookies ?: [:]
 
         if (uidsCookie) {
             cookies.put(UIDS_COOKIE_NAME, Base64.urlEncoder.encodeToString(encode(uidsCookie).bytes))
         }
 
+        if (uidsAudit) {
+            cookies.put("uids-audit", uidsAudit)
+        }
+
         postCookieSync(cookieSyncRequest, cookies, header)
     }
 

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

@@ -4,13 +4,16 @@ import org.mockserver.matchers.TimeToLive
 import org.mockserver.matchers.Times
 import org.mockserver.model.HttpRequest
 import org.mockserver.model.HttpResponse
-import org.prebid.server.functional.model.mock.services.vendorlist.VendorListResponse
 import org.testcontainers.containers.MockServerContainer
 
 import static org.mockserver.model.HttpRequest.request
 import static org.mockserver.model.HttpResponse.response
 import static org.mockserver.model.HttpStatusCode.OK_200
+import static org.prebid.server.functional.model.mock.services.vendorlist.VendorListResponse.getDefaultVendorListResponse
+import static org.prebid.server.functional.model.mock.services.vendorlist.VendorListResponse.Vendor
+import static org.prebid.server.functional.util.privacy.TcfConsent.GENERIC_VENDOR_ID
 import static org.prebid.server.functional.util.privacy.TcfConsent.TcfPolicyVersion
+import static org.prebid.server.functional.util.privacy.TcfConsent.TcfPolicyVersion.TCF_POLICY_V2
 
 class VendorList extends NetworkScaffolding {
 
@@ -30,18 +33,17 @@ class VendorList extends NetworkScaffolding {
         request().withPath(VENDOR_LIST_ENDPOINT)
     }
 
-    @Override
-    void setResponse(){}
-
-    void setResponse(TcfPolicyVersion tcfPolicyVersion) {
+    void setResponse(TcfPolicyVersion tcfPolicyVersion = TCF_POLICY_V2,
+                     Map<Integer, Vendor> vendors = [(GENERIC_VENDOR_ID): Vendor.getDefaultVendor(GENERIC_VENDOR_ID)]) {
         def prepareEndpoint = endpoint.replace("{TCF_POLICY}", "v" + tcfPolicyVersion.vendorListVersion)
-        def prepareEncodeResponseBody = encode(VendorListResponse.defaultVendorListResponse.tap {
-            it.vendorListVersion = tcfPolicyVersion.vendorListVersion
+        def prepareEncodeResponseBody = encode(defaultVendorListResponse.tap {
+            it.tcfPolicyVersion = tcfPolicyVersion.vendorListVersion
+            it.vendors = vendors
         })
 
         mockServerClient.when(request().withPath(prepareEndpoint), Times.unlimited(), TimeToLive.unlimited(), -10)
-                        .respond {request -> request.withPath(endpoint)
-                                ? response().withStatusCode(OK_200.code()).withBody(prepareEncodeResponseBody)
-                                : HttpResponse.notFoundResponse()}
+                .respond { request -> request.withPath(endpoint)
+                            ? response().withStatusCode(OK_200.code()).withBody(prepareEncodeResponseBody)
+                            : HttpResponse.notFoundResponse()}
     }
 }

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

@@ -10,6 +10,7 @@ import org.prebid.server.functional.testcontainers.Dependencies
 import org.prebid.server.functional.testcontainers.PbsServiceFactory
 import org.prebid.server.functional.testcontainers.scaffolding.Bidder
 import org.prebid.server.functional.testcontainers.scaffolding.PrebidCache
+import org.prebid.server.functional.testcontainers.scaffolding.VendorList
 import org.prebid.server.functional.util.ObjectMapperWrapper
 import org.prebid.server.functional.util.PBSUtils
 import spock.lang.Specification
@@ -22,6 +23,7 @@ abstract class BaseSpec extends Specification implements ObjectMapperWrapper {
 
     protected static final PbsServiceFactory pbsServiceFactory = new PbsServiceFactory(networkServiceContainer)
     protected static final Bidder bidder = new Bidder(networkServiceContainer)
+    protected static final VendorList vendorList = new VendorList(networkServiceContainer)
     protected static final PrebidCache prebidCache = new PrebidCache(networkServiceContainer)
 
     protected static final HibernateRepositoryService repository = new HibernateRepositoryService(Dependencies.mysqlContainer)
@@ -40,12 +42,14 @@ abstract class BaseSpec extends Specification implements ObjectMapperWrapper {
     def setupSpec() {
         prebidCache.setResponse()
         bidder.setResponse()
+        vendorList.setResponse()
     }
 
     def cleanupSpec() {
         bidder.reset()
         prebidCache.reset()
         repository.removeAllDatabaseData()
+        vendorList.reset()
     }
 
     protected static int getRandomTimeout() {