From c8a0fb0710f330c02c91ece33add67bf9894fdc2 Mon Sep 17 00:00:00 2001 From: Markiyan Mykush <95693607+marki1an@users.noreply.github.com> Date: Thu, 14 Dec 2023 14:16:58 +0200 Subject: [PATCH] Tests: Remove tests for amp targeting (#2829) --- .../server/functional/tests/AmpFpdSpec.groovy | 118 ------------------ .../server/functional/util/HttpUtil.groovy | 4 - 2 files changed, 122 deletions(-) diff --git a/src/test/groovy/org/prebid/server/functional/tests/AmpFpdSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/AmpFpdSpec.groovy index a7ecc198eaf..762c55fe879 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/AmpFpdSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/AmpFpdSpec.groovy @@ -3,7 +3,6 @@ package org.prebid.server.functional.tests import org.prebid.server.functional.model.bidder.Generic import org.prebid.server.functional.model.db.StoredRequest import org.prebid.server.functional.model.request.amp.AmpRequest -import org.prebid.server.functional.model.request.amp.Targeting import org.prebid.server.functional.model.request.auction.BidRequest import org.prebid.server.functional.model.request.auction.BidderConfig import org.prebid.server.functional.model.request.auction.BidderConfigOrtb @@ -17,7 +16,6 @@ import org.prebid.server.functional.model.request.auction.ImpExtContextDataAdSer import org.prebid.server.functional.model.request.auction.Site import org.prebid.server.functional.model.request.auction.User import org.prebid.server.functional.service.PrebidServerException -import org.prebid.server.functional.util.HttpUtil import org.prebid.server.functional.util.PBSUtils import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST @@ -113,64 +111,6 @@ class AmpFpdSpec extends BaseSpec { assert ampStoredRequest.user.data[0].name == bidderRequest.user.data[0].name } - def "PBS should populate all FPD via targeting when targeting is present"() { - given: "Init targeting" - def targeting = new Targeting().tap { - site = Site.configFPDSite - user = User.configFPDUser - keywords = [PBSUtils.randomString] - bidders = [GENERIC] - } - - and: "Encode targeting to String" - def encodeTargeting = HttpUtil.encodeUrl(encode(targeting)) - - and: "AMP request" - def ampRequest = new AmpRequest(tagId: PBSUtils.randomString, targeting: encodeTargeting) - - and: "Stored request with FPD fields" - def ampStoredRequest = BidRequest.getDefaultBidRequest(SITE).tap { - site = new Site(page: PBSUtils.randomString) - user = new User(keywords: PBSUtils.randomString) - } - - and: "Stored request in DB" - def storedRequest = StoredRequest.getStoredRequest(ampRequest, ampStoredRequest) - storedRequestDao.save(storedRequest) - - when: "PBS processes amp request" - defaultPbsService.sendAmpRequest(ampRequest) - - then: "Bidder request should contain FPD field from the stored request" - def bidderRequest = bidder.getBidderRequest(ampStoredRequest.id) - verifyAll(bidderRequest) { - targeting.site.name == site.name - targeting.site.domain == site.domain - targeting.site.cat == site.cat - targeting.site.sectionCat == site.sectionCat - targeting.site.pageCat == site.pageCat - targeting.site.page == site.page - targeting.site.ref == site.ref - targeting.site.search == site.search - targeting.site.keywords == site.keywords - targeting.site.ext.data.language == site.ext.data.language - - targeting.user.yob == user.yob - targeting.user.gender == user.gender - targeting.user.keywords == user.keywords - targeting.user.ext.data.keywords == user.ext.data.keywords - targeting.user.ext.data.buyeruid == user.ext.data.buyeruid - targeting.user.ext.data.buyeruids == user.ext.data.buyeruids - } - - and: "Bidder request shouldn't contain imp[0].ext.rp" - bidderRequest.each { - verifyAll(it) { - !imp[0].ext.rp - } - } - } - def "PBS should emit error when targeting field is invalid"() { given: "AMP request with invalid targeting" def invalidTargeting = "InvalidTargeting" @@ -216,64 +156,6 @@ class AmpFpdSpec extends BaseSpec { assert ampStoredRequest.site.keywords == bidderRequest.site.keywords } - def "PBS should take precedence target from request when stored request contain site/user"() { - given: "Init targeting" - def targeting = new Targeting().tap { - site = Site.configFPDSite - user = User.configFPDUser - keywords = [PBSUtils.randomString] - bidders = [GENERIC] - } - - and: "Encode targeting to String" - def encodeTargeting = HttpUtil.encodeUrl(encode(targeting)) - - and: "Amp request" - def ampRequest = new AmpRequest(tagId: PBSUtils.randomString, targeting: encodeTargeting) - - and: "Stored request with FPD fields" - def ampStoredRequest = BidRequest.getDefaultBidRequest(SITE).tap { - site = Site.rootFPDSite - user = User.rootFPDUser - } - - and: "Save stored request in DB" - def storedRequest = StoredRequest.getStoredRequest(ampRequest, ampStoredRequest) - storedRequestDao.save(storedRequest) - - when: "PBS processes amp request" - defaultPbsService.sendAmpRequest(ampRequest) - - then: "Bidder request should contain FPD field from the targeting" - def bidderRequest = bidder.getBidderRequest(ampStoredRequest.id) - verifyAll(bidderRequest) { - targeting.site.name == site.name - targeting.site.domain == site.domain - targeting.site.cat == site.cat - targeting.site.sectionCat == site.sectionCat - targeting.site.pageCat == site.pageCat - targeting.site.page == site.page - targeting.site.ref == site.ref - targeting.site.search == site.search - targeting.site.keywords == site.keywords - targeting.site.ext.data.language == site.ext.data.language - - targeting.user.yob == user.yob - targeting.user.gender == user.gender - targeting.user.keywords == user.keywords - targeting.user.ext.data.keywords == user.ext.data.keywords - targeting.user.ext.data.buyeruid == user.ext.data.buyeruid - targeting.user.ext.data.buyeruids == user.ext.data.buyeruids - } - - and: "Bidder request shouldn't contain imp[0].ext.rp" - bidderRequest.each { - verifyAll(it) { - !imp[0].ext.rp - } - } - } - def "PBS should populate FPD via bidder config when config.ortb2 is present"() { given: "AMP request" def ampRequest = new AmpRequest(tagId: PBSUtils.randomString) diff --git a/src/test/groovy/org/prebid/server/functional/util/HttpUtil.groovy b/src/test/groovy/org/prebid/server/functional/util/HttpUtil.groovy index 10925b80e62..1f6c850f84c 100644 --- a/src/test/groovy/org/prebid/server/functional/util/HttpUtil.groovy +++ b/src/test/groovy/org/prebid/server/functional/util/HttpUtil.groovy @@ -33,10 +33,6 @@ class HttpUtil implements ObjectMapperWrapper { [(COOKIE_HEADER): "$value1=$value2"] } - static String encodeUrl(String url){ - URLEncoder.encode(url, UTF_8) - } - private static String decodeUrl(String url) { URLDecoder.decode(url, UTF_8) }