Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,7 @@
<systemPropertyVariables>
<pbs.version>${project.version}</pbs.version>
<tests.max-container-count>5</tests.max-container-count>
<tests.debug.enable>false</tests.debug.enable>
<tests.fixed-container-ports>false</tests.fixed-container-ports>
</systemPropertyVariables>
</configuration>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ enum BidderName {
ALIAS_UPPER_CASE("ALIAS"),
GENERIC_CAMEL_CASE("GeNerIc"),
GENERIC("generic"),
GENER_X("gener_x"),
GENER_X("gener-x"),
MAGNITE("magnite"),
APPNEXUS("appnexus"),
MAGNITE_ALIAS("magniteAlias"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ class GeneralBidderAdapter extends Generic {
String demandSource
@JsonProperty("bc")
BidderName bidderCode
@JsonProperty("placement_id")
String placementId
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.prebid.server.functional.model.config

import com.fasterxml.jackson.annotation.JsonProperty
import com.fasterxml.jackson.databind.PropertyNamingStrategies
import com.fasterxml.jackson.databind.annotation.JsonNaming
import groovy.transform.ToString
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import groovy.transform.ToString

import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.AUDIO_BATTR
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BADV
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BAPP
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BANNER_BATTR
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BAPP
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BCAT
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BTYPE
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.VIDEO_BATTR
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import groovy.transform.ToString

import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.AUDIO_BATTR
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BADV
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BAPP
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BANNER_BATTR
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BAPP
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BCAT
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BTYPE
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.VIDEO_BATTR
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import jakarta.persistence.Convert
import jakarta.persistence.Entity
import jakarta.persistence.Id
import jakarta.persistence.Table
import org.prebid.server.functional.model.db.typeconverter.BidRequestConfigTypeConverter
import org.prebid.server.functional.model.db.typeconverter.ProfileMergePrecedenceConvert
import org.prebid.server.functional.model.db.typeconverter.ProfileTypeConvert
import org.prebid.server.functional.model.db.typeconverter.BidRequestConfigTypeConverter
import org.prebid.server.functional.model.request.auction.BidRequest
import org.prebid.server.functional.model.request.profile.ProfileMergePrecedence
import org.prebid.server.functional.model.request.profile.RequestProfile
import org.prebid.server.functional.model.request.profile.ProfileType
import org.prebid.server.functional.model.request.profile.RequestProfile

@Entity
@Table(name = "profiles")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import jakarta.persistence.Entity
import jakarta.persistence.GeneratedValue
import jakarta.persistence.Id
import jakarta.persistence.Table
import org.prebid.server.functional.model.db.typeconverter.StoredAuctionResponseConfigTypeConverter
import org.prebid.server.functional.model.db.typeconverter.BidResponseConfigTypeConverter
import org.prebid.server.functional.model.db.typeconverter.StoredAuctionResponseConfigTypeConverter
import org.prebid.server.functional.model.response.auction.BidResponse
import org.prebid.server.functional.model.response.auction.SeatBid

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.prebid.server.functional.model.mock.services.vendorlist

import org.prebid.server.functional.util.PBSUtils

import java.time.Clock
import java.time.ZonedDateTime

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonValue
import groovy.transform.ToString

@ToString
enum FetchStatus {
enum AnalyticTagStatus {

NONE, SUCCESS, TIMEOUT, INPROGRESS, ERROR, SUCCESS_ALLOW, SUCCESS_BLOCK, SKIPPED, RUN

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty
import groovy.transform.ToString
import org.prebid.server.functional.model.bidder.AppNexus
import org.prebid.server.functional.model.bidder.Generic
import org.prebid.server.functional.model.bidder.Openx
import org.prebid.server.functional.model.bidder.Magnite
import org.prebid.server.functional.model.bidder.Openx

@ToString(includeNames = true, ignoreNulls = true)
class Bidder {
Expand All @@ -15,7 +15,7 @@ class Bidder {
@JsonProperty("ALIAS")
Generic aliasUpperCase
Generic generic
@JsonProperty("gener_x")
@JsonProperty("gener-x")
Generic generX
@JsonProperty("GeNerIc")
Generic genericCamelCase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class ExtPrebidFloors {

Boolean enabled
Location location
FetchStatus fetchStatus
AnalyticTagStatus fetchStatus
Boolean skipped
Currency floorMinCur
BigDecimal floorMin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ 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.AnalyticTagStatus
import org.prebid.server.functional.model.request.auction.Imp

import static org.prebid.server.functional.model.request.auction.FetchStatus.SUCCESS
import static org.prebid.server.functional.model.request.auction.FetchStatus.SUCCESS_BLOCK
import static org.prebid.server.functional.model.request.auction.AnalyticTagStatus.SUCCESS
import static org.prebid.server.functional.model.request.auction.AnalyticTagStatus.SUCCESS_BLOCK

@ToString(includeNames = true, ignoreNulls = true)
@JsonNaming(PropertyNamingStrategies.LowerCaseStrategy)
@EqualsAndHashCode
class AnalyticResult {

String name
FetchStatus status
AnalyticTagStatus status
List<ImpResult> results

static AnalyticResult buildFromImp(Imp imp) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package org.prebid.server.functional.model.response.auction

import com.fasterxml.jackson.annotation.JsonValue

enum AnalyticTagStatus {

NONE, LOOKUP, CONTROL, SUCCESS, ERROR, SUCCESS_ALLOW, SUCCESS_BLOCK, SKIPPED, RUN

@JsonValue
String getValue() {
name().toLowerCase().replace('_', '-')
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package org.prebid.server.functional.model.response.auction
import com.fasterxml.jackson.databind.PropertyNamingStrategies
import com.fasterxml.jackson.databind.annotation.JsonNaming
import groovy.transform.ToString
import org.prebid.server.functional.model.request.auction.FetchStatus
import org.prebid.server.functional.model.request.auction.AnalyticTagStatus

@ToString(includeNames = true, ignoreNulls = true)
@JsonNaming(PropertyNamingStrategies.LowerCaseStrategy)
class AnalyticsTagActivity {

ModuleActivityName name
FetchStatus status
AnalyticTagStatus status
List<AnalyticsTagActivityResult> results
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package org.prebid.server.functional.model.response.auction
import com.fasterxml.jackson.databind.PropertyNamingStrategies
import com.fasterxml.jackson.databind.annotation.JsonNaming
import groovy.transform.ToString
import org.prebid.server.functional.model.request.auction.FetchStatus
import org.prebid.server.functional.model.request.auction.AnalyticTagStatus

@ToString(includeNames = true, ignoreNulls = true)
@JsonNaming(PropertyNamingStrategies.LowerCaseStrategy)
class AnalyticsTagActivityResult {

FetchStatus status
AnalyticTagStatus status
AnalyticsTagActivityValue values
AppliedTo appliedTo
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ enum ErrorType {

GENERAL("general"),
GENERIC("generic"),
GENER_X("gener-x"),
GENERIC_CAMEL_CASE("GeNerIc"),
MAGNITE("magnite"),
APPNEXUS("appnexus"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ 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.AnalyticTagStatus

@ToString(includeNames = true, ignoreNulls = true)
@JsonNaming(PropertyNamingStrategies.LowerCaseStrategy)
@EqualsAndHashCode
class ImpResult {

FetchStatus status
AnalyticTagStatus status
ModuleValue values
AppliedTo appliedTo
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonValue

enum ModuleActivityName {

ORTB2_BLOCKING('enforce-blocking'),
PB_ORTB2_BLOCKING('enforce-blocking'),
REJECT_RICHMEDIA('reject-richmedia'),
AB_TESTING('core-module-abtests')

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package org.prebid.server.functional.model.response.auction
import com.fasterxml.jackson.annotation.JsonProperty
import groovy.transform.EqualsAndHashCode
import groovy.transform.ToString
import org.prebid.server.functional.model.config.ModuleName
import org.prebid.server.functional.model.bidder.BidderName
import org.prebid.server.functional.model.config.ModuleName

@ToString(includeNames = true, ignoreNulls = true)
@EqualsAndHashCode
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package org.prebid.server.functional.repository
import org.hibernate.SessionFactory
import org.hibernate.cfg.Configuration
import org.prebid.server.functional.model.db.Account
import org.prebid.server.functional.model.db.StoredImp
import org.prebid.server.functional.model.db.StoredProfileImp
import org.prebid.server.functional.model.db.StoredProfileRequest
import org.prebid.server.functional.model.db.StoredImp
import org.prebid.server.functional.model.db.StoredRequest
import org.prebid.server.functional.model.db.StoredResponse
import org.prebid.server.functional.repository.dao.AccountDao
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import org.slf4j.LoggerFactory

import java.time.Duration
import java.time.Instant
import java.time.ZoneId
import java.time.format.DateTimeFormatter

import static io.restassured.RestAssured.given
Expand All @@ -61,7 +60,6 @@ import static org.prebid.server.functional.model.config.Endpoint.VTRACK
import static org.prebid.server.functional.testcontainers.Dependencies.influxdbContainer
import static org.prebid.server.functional.util.SystemProperties.DEFAULT_TIMEOUT


class PrebidServerService implements ObjectMapperWrapper {

static final String UIDS_COOKIE_NAME = "uids"
Expand Down Expand Up @@ -468,7 +466,6 @@ class PrebidServerService implements ObjectMapperWrapper {
[]
}


Boolean isContainMetricByValue(String value) {
try {
PBSUtils.waitUntil({ sendInfluxMetricsRequest()[value] != null })
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import org.prebid.server.functional.util.SystemProperties
import org.testcontainers.containers.InfluxDBContainer
import org.testcontainers.containers.MySQLContainer
import org.testcontainers.containers.Network
import org.testcontainers.containers.localstack.LocalStackContainer
import org.testcontainers.containers.PostgreSQLContainer
import org.testcontainers.containers.localstack.LocalStackContainer
import org.testcontainers.lifecycle.Startables
import org.testcontainers.utility.DockerImageName

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.prebid.server.functional.testcontainers


import org.testcontainers.containers.MySQLContainer
import org.testcontainers.containers.PostgreSQLContainer

Expand Down
Loading
Loading