minor fix

prebid · Feb 5, 2024 · 47b66c3 · 47b66c3
1 parent a205776
commit 47b66c3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/ActivityType.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/ActivityType.groovy
@@ -8,10 +8,10 @@ enum ActivityType {
     FETCH_BIDS("fetchBids"),
     ENRICH_UFPD("enrichUfpd"),
     REPORT_ANALYTICS("reportAnalytics"),
-    TRANSMIT_UFPD("transmitUfpd"),
-    TRANSMIT_EIDS("transmitEids"),
     TRANSMIT_PRECISE_GEO("transmitPreciseGeo"),
-    TRANSMIT_TID("transmitTid")
+    TRANSMIT_TID("transmitTid"),
+    TRANSMIT_UFPD("transmitUfpd"),
+    TRANSMIT_EIDS("transmitEids")
 
     @JsonValue
     final String value

diff --git a/src/test/groovy/org/prebid/server/functional/tests/AuctionSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/AuctionSpec.groovy
@@ -20,7 +20,6 @@ import org.prebid.server.functional.service.PrebidServerException
 import org.prebid.server.functional.service.PrebidServerService
 import org.prebid.server.functional.util.HttpUtil
 import org.prebid.server.functional.util.PBSUtils
-import spock.lang.IgnoreRest
 import spock.lang.Shared
 
 import static org.prebid.server.functional.model.AccountStatus.INACTIVE

diff --git a/src/test/groovy/org/prebid/server/functional/tests/BidderParamsSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/BidderParamsSpec.groovy
@@ -6,7 +6,6 @@ import org.prebid.server.functional.model.db.Account
 import org.prebid.server.functional.model.db.StoredImp
 import org.prebid.server.functional.model.db.StoredRequest
 import org.prebid.server.functional.model.request.amp.AmpRequest
-import org.prebid.server.functional.model.request.auction.Asset
 import org.prebid.server.functional.model.request.auction.Banner
 import org.prebid.server.functional.model.request.auction.BidRequest
 import org.prebid.server.functional.model.request.auction.Device
@@ -24,7 +23,6 @@ import org.prebid.server.functional.model.response.auction.BidResponse
 import org.prebid.server.functional.model.response.auction.ErrorType
 import org.prebid.server.functional.util.PBSUtils
 import org.prebid.server.functional.util.privacy.CcpaConsent
-import spock.lang.IgnoreRest
 
 import static org.prebid.server.functional.model.bidder.BidderName.APPNEXUS
 import static org.prebid.server.functional.model.bidder.BidderName.GENERIC

diff --git a/src/test/groovy/org/prebid/server/functional/util/privacy/TcfUtils.groovy b/src/test/groovy/org/prebid/server/functional/util/privacy/TcfUtils.groovy
@@ -17,11 +17,10 @@ class TcfUtils {
         def purpose = enforcementRequirments.purposeConsent ?: enforcementRequirments.purpose
         def purposeConfig = new PurposeConfig(enforcePurpose: enforcementRequirments.enforcePurpose,
                 enforceVendors: enforcementRequirments?.enforceVendor,
-                softVendorExceptions: enforcementRequirments?.softVendorExceptions,
+                softVendorExceptions: enforcementRequirments?.softVendorExceptions?.value,
                 vendorExceptions: enforcementRequirments?.vendorExceptions?.value)
         def purposeEid = new PurposeEid(requireConsent: requireConsent, exceptions: eidsExceptions)
         Map<Purpose, PurposeConfig> purposes = [:]
-//        purposes[Purpose.P2] = new PurposeConfig(enforcePurpose: PurposeEnforcement.BASIC, enforceVendors: false)
         if (purpose == Purpose.P4) {
             purposeConfig.eid = purposeEid
             purposes[Purpose.P4] = purposeConfig
@@ -40,7 +39,6 @@ class TcfUtils {
         def restrictionType = enforcementRequirments.restrictionType
         def vendorIdGvl = enforcementRequirments.vendorIdGvl
         def builder = new Builder()
-//        builder.setPurposesConsent(PurposeId.convertPurposeToPurposeId(Purpose.P2))
         if (purposeConsent != null) {
             builder.setPurposesConsent(PurposeId.convertPurposeToPurposeId(purposeConsent))
         }