Skip to content

Commit 9a25d74

Browse files
osulzhenkoosulzhenko
committed
update after review
1 parent b786e96 commit 9a25d74

38 files changed

Lines changed: 68 additions & 72 deletions

‎src/test/groovy/org/prebid/server/functional/model/config/AppVideoHtml.groovy‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.prebid.server.functional.model.config
22

3-
43
import com.fasterxml.jackson.databind.PropertyNamingStrategies
54
import com.fasterxml.jackson.databind.annotation.JsonNaming
65
import groovy.transform.ToString

‎src/test/groovy/org/prebid/server/functional/model/config/Ortb2BlockingActionOverride.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import groovy.transform.ToString
66

77
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.AUDIO_BATTR
88
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BADV
9-
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BANNER_BATTR
109
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BAPP
10+
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BANNER_BATTR
1111
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BCAT
1212
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BTYPE
1313
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.VIDEO_BATTR

‎src/test/groovy/org/prebid/server/functional/model/config/Ortb2BlockingAttributeConfig.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import groovy.transform.ToString
66

77
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.AUDIO_BATTR
88
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BADV
9-
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BANNER_BATTR
109
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BAPP
10+
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BANNER_BATTR
1111
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BCAT
1212
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.BTYPE
1313
import static org.prebid.server.functional.model.config.Ortb2BlockingAttribute.VIDEO_BATTR

‎src/test/groovy/org/prebid/server/functional/model/db/StoredProfileRequest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import jakarta.persistence.Convert
66
import jakarta.persistence.Entity
77
import jakarta.persistence.Id
88
import jakarta.persistence.Table
9-
import org.prebid.server.functional.model.db.typeconverter.BidRequestConfigTypeConverter
109
import org.prebid.server.functional.model.db.typeconverter.ProfileMergePrecedenceConvert
1110
import org.prebid.server.functional.model.db.typeconverter.ProfileTypeConvert
11+
import org.prebid.server.functional.model.db.typeconverter.BidRequestConfigTypeConverter
1212
import org.prebid.server.functional.model.request.auction.BidRequest
1313
import org.prebid.server.functional.model.request.profile.ProfileMergePrecedence
14-
import org.prebid.server.functional.model.request.profile.ProfileType
1514
import org.prebid.server.functional.model.request.profile.RequestProfile
15+
import org.prebid.server.functional.model.request.profile.ProfileType
1616

1717
@Entity
1818
@Table(name = "profiles")

‎src/test/groovy/org/prebid/server/functional/model/db/StoredResponse.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import jakarta.persistence.Entity
77
import jakarta.persistence.GeneratedValue
88
import jakarta.persistence.Id
99
import jakarta.persistence.Table
10-
import org.prebid.server.functional.model.db.typeconverter.BidResponseConfigTypeConverter
1110
import org.prebid.server.functional.model.db.typeconverter.StoredAuctionResponseConfigTypeConverter
11+
import org.prebid.server.functional.model.db.typeconverter.BidResponseConfigTypeConverter
1212
import org.prebid.server.functional.model.response.auction.BidResponse
1313
import org.prebid.server.functional.model.response.auction.SeatBid
1414

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.prebid.server.functional.model.mock.services.vendorlist
22

33
import org.prebid.server.functional.util.PBSUtils
4-
54
import java.time.Clock
65
import java.time.ZonedDateTime
76

‎src/test/groovy/org/prebid/server/functional/model/response/BidderErrorCode.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import groovy.transform.ToString
66
@ToString(includeNames = true, ignoreNulls = true)
77
enum BidderErrorCode {
88

9+
TIMEOUT(1),
910
BAD_INPUT(2),
1011
BAD_SERVER_RESPONSE(3),
1112
FAILED_TO_REQUEST_BIDS(4),
1213
INVALID_BID(5),
1314
REJECTED_IPF(6),
14-
TIMEOUT(1),
1515
GENERIC(999)
1616

1717
@JsonValue

‎src/test/groovy/org/prebid/server/functional/repository/HibernateRepositoryService.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package org.prebid.server.functional.repository
33
import org.hibernate.SessionFactory
44
import org.hibernate.cfg.Configuration
55
import org.prebid.server.functional.model.db.Account
6-
import org.prebid.server.functional.model.db.StoredImp
76
import org.prebid.server.functional.model.db.StoredProfileImp
87
import org.prebid.server.functional.model.db.StoredProfileRequest
8+
import org.prebid.server.functional.model.db.StoredImp
99
import org.prebid.server.functional.model.db.StoredRequest
1010
import org.prebid.server.functional.model.db.StoredResponse
1111
import org.prebid.server.functional.repository.dao.AccountDao

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import io.restassured.authentication.BasicAuthScheme
66
import io.restassured.builder.RequestSpecBuilder
77
import io.restassured.response.Response
88
import io.restassured.specification.RequestSpecification
9-
import org.apache.http.HttpStatus
109
import org.prebid.server.functional.model.UidsCookie
1110
import org.prebid.server.functional.model.bidder.BidderName
1211
import org.prebid.server.functional.model.mock.services.prebidcache.response.PrebidCacheResponse
@@ -44,9 +43,9 @@ import java.time.format.DateTimeFormatter
4443

4544
import static io.restassured.RestAssured.given
4645
import static java.time.ZoneOffset.UTC
46+
import static org.apache.http.HttpStatus.SC_OK
4747
import static org.prebid.server.functional.testcontainers.Dependencies.influxdbContainer
4848

49-
5049
class PrebidServerService implements ObjectMapperWrapper {
5150

5251
static final String AUCTION_ENDPOINT = "/openrtb2/auction"
@@ -87,11 +86,11 @@ class PrebidServerService implements ObjectMapperWrapper {
8786
prometheusRequestSpecification = buildAndGetRequestSpecification(pbsContainer.prometheusRootUri, authenticationScheme)
8887
}
8988

90-
BidResponse sendAuctionRequest(BidRequest bidRequest, Integer statusCode = HttpStatus.SC_OK) {
89+
BidResponse sendAuctionRequest(BidRequest bidRequest, Integer statusCode = SC_OK) {
9190
sendAuctionRequest(bidRequest, [:], statusCode)
9291
}
9392

94-
BidResponse sendAuctionRequest(BidRequest bidRequest, Map<String, ?> headers, int statusCode = HttpStatus.SC_OK) {
93+
BidResponse sendAuctionRequest(BidRequest bidRequest, Map<String, ?> headers, int statusCode = SC_OK) {
9594
def response = postAuction(bidRequest, headers)
9695

9796
checkResponseStatusCode(response, statusCode)
@@ -115,11 +114,11 @@ class PrebidServerService implements ObjectMapperWrapper {
115114
decode(response.body.asString(), AmpResponse)
116115
}
117116

118-
AmpResponse sendAmpRequest(AmpRequest ampRequest, int statusCode = HttpStatus.SC_OK) {
117+
AmpResponse sendAmpRequest(AmpRequest ampRequest, int statusCode = SC_OK) {
119118
sendAmpRequest(ampRequest, [:], statusCode)
120119
}
121120

122-
AmpResponse sendAmpRequest(AmpRequest ampRequest, Map<String, String> headers, int statusCode = HttpStatus.SC_OK) {
121+
AmpResponse sendAmpRequest(AmpRequest ampRequest, Map<String, String> headers, int statusCode = SC_OK) {
123122
def response = getAmp(ampRequest, headers)
124123

125124
checkResponseStatusCode(response, statusCode)
@@ -383,7 +382,7 @@ class PrebidServerService implements ObjectMapperWrapper {
383382
.get(AMP_ENDPOINT)
384383
}
385384

386-
private void checkResponseStatusCode(Response response, int statusCode = HttpStatus.SC_OK) {
385+
private void checkResponseStatusCode(Response response, int statusCode = SC_OK) {
387386
def responseStatusCode = response.statusCode
388387
if (responseStatusCode != statusCode) {
389388
def responseBody = response.body.asString()

‎src/test/groovy/org/prebid/server/functional/testcontainers/Dependencies.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import org.prebid.server.functional.util.SystemProperties
55
import org.testcontainers.containers.InfluxDBContainer
66
import org.testcontainers.containers.MySQLContainer
77
import org.testcontainers.containers.Network
8-
import org.testcontainers.containers.PostgreSQLContainer
98
import org.testcontainers.containers.localstack.LocalStackContainer
9+
import org.testcontainers.containers.PostgreSQLContainer
1010
import org.testcontainers.lifecycle.Startables
1111
import org.testcontainers.utility.DockerImageName
1212

0 commit comments

Comments
 (0)