Skip to content

Tests: Rework metrics handling for functional tests #4598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
osulzhenko wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Tests: Rework metrics handling for functional tests #4598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/test/groovy/org/prebid/server/functional/model/bidder/Adrino.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package org.prebid.server.functional.model.bidder

class Adrino implements BidderAdapter {

Integer hash
}
4 changes: 1 addition & 3 deletions ...nctional/model/request/auction/Amx.groovy → ...server/functional/model/bidder/Amx.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package org.prebid.server.functional.model.request.auction
package org.prebid.server.functional.model.bidder

import com.fasterxml.jackson.annotation.JsonProperty
import org.prebid.server.functional.model.bidder.BidderAdapter
import org.prebid.server.functional.model.bidder.BidderName

class Amx implements BidderAdapter {

Expand Down
4 changes: 2 additions & 2 deletions ...unctional/model/request/auction/Ix.groovy → .../server/functional/model/bidder/Ix.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.prebid.server.functional.model.request.auction
package org.prebid.server.functional.model.bidder

import groovy.transform.EqualsAndHashCode
import org.prebid.server.functional.util.PBSUtils

@EqualsAndHashCode
class Ix {
class Ix implements BidderAdapter {

String siteId
List<Integer> size
Expand Down
2 changes: 1 addition & 1 deletion ...ional/model/request/auction/IxDiag.groovy → ...ver/functional/model/bidder/IxDiag.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.prebid.server.functional.model.request.auction
package org.prebid.server.functional.model.bidder

import groovy.transform.ToString

Expand Down
52 changes: 0 additions & 52 deletions src/test/groovy/org/prebid/server/functional/model/privacy/Metric.groovy
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions src/test/groovy/org/prebid/server/functional/model/request/auction/Adrino.groovy
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions src/test/groovy/org/prebid/server/functional/model/request/auction/BidRequestExt.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
package org.prebid.server.functional.model.request.auction

import com.fasterxml.jackson.annotation.JsonProperty
import groovy.transform.EqualsAndHashCode
import groovy.transform.ToString
import org.prebid.server.functional.model.bidder.AppNexus
import org.prebid.server.functional.model.bidder.IxDiag

@EqualsAndHashCode
@ToString(includeNames = true, ignoreNulls = true)
class BidRequestExt {

Prebid prebid
SupplyChain schain
AppNexus appnexus
@JsonProperty("appnexus")
AppNexus appNexus
String bc
String platform
IxDiag ixdiag
@JsonProperty("ixdiag")
IxDiag ixDiag
}
4 changes: 3 additions & 1 deletion src/test/groovy/org/prebid/server/functional/model/request/auction/Bidder.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ package org.prebid.server.functional.model.request.auction
import com.fasterxml.jackson.annotation.JsonIgnore
import com.fasterxml.jackson.annotation.JsonProperty
import groovy.transform.ToString
import org.prebid.server.functional.model.bidder.Adrino
import org.prebid.server.functional.model.bidder.Amx
import org.prebid.server.functional.model.bidder.AppNexus
import org.prebid.server.functional.model.bidder.Generic
import org.prebid.server.functional.model.bidder.Ix
import org.prebid.server.functional.model.bidder.Openx
import org.prebid.server.functional.model.bidder.Magnite

Expand All @@ -27,7 +30,6 @@ class Bidder {
@JsonProperty("openxalias")
Openx openxAlias
Adrino adrino
Generic nativo
Amx amx
@JsonProperty("AMX")
Amx amxUpperCase
Expand Down
Loading
Loading