Skip to content

Commit 822deb7

Browse files
marki1anmarki1an
committed
Few update
1 parent a6a8efe commit 822deb7

16 files changed

Lines changed: 86 additions & 107 deletions

‎src/test/groovy/org/prebid/server/functional/model/HttpStatusCode.groovy‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/test/groovy/org/prebid/server/functional/testcontainers/scaffolding/Bidder.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo
1313
import static com.github.tomakehurst.wiremock.client.WireMock.matchingJsonPath
1414
import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo
1515
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse
16-
import static org.prebid.server.functional.model.HttpStatusCode.OK_200
16+
import static org.apache.http.HttpStatus.SC_OK
1717

1818
class Bidder extends NetworkScaffolding {
1919

@@ -59,8 +59,8 @@ class Bidder extends NetworkScaffolding {
5959
}
6060

6161
RequestPattern getRequest(String bidRequestId, String requestMatchPath) {
62-
postRequestedFor(urlMatching("^$endpoint(\\?.*)?\$"))
63-
.withRequestBody(matchingJsonPath("\$[?(@." + requestMatchPath + " == '" + bidRequestId + "')]"))
62+
postRequestedFor(urlMatching("^${endpoint}(\\?.*)?\$"))
63+
.withRequestBody(matchingJsonPath("\$[?(@.${requestMatchPath} == '${bidRequestId}')]"))
6464
.build()
6565
}
6666

@@ -69,8 +69,8 @@ class Bidder extends NetworkScaffolding {
6969
wireMockClient.register(post(urlPathEqualTo(endpoint))
7070
.atPriority(Integer.MAX_VALUE)
7171
.willReturn(aResponse()
72+
.withStatus(SC_OK)
7273
.withTransformers("response-template")
73-
.withStatus(OK_200.code)
7474
.withBody(DEFAULT_BODY_RESPONSE)))
7575
}
7676

‎src/test/groovy/org/prebid/server/functional/testcontainers/scaffolding/CurrencyConversion.groovy‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ class CurrencyConversion extends NetworkScaffolding {
2323
}
2424

2525
@Override
26-
void setResponse() {}
26+
void setResponse() {
27+
throw new UnsupportedOperationException()
28+
}
2729

2830
@Override
2931
protected RequestPattern getRequest() {

‎src/test/groovy/org/prebid/server/functional/testcontainers/scaffolding/FloorsProvider.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.anyRequestedFor
1111
import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor
1212
import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo
1313
import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching
14-
import static org.prebid.server.functional.model.HttpStatusCode.OK_200
14+
import static org.apache.http.HttpStatus.SC_OK
1515

1616
class FloorsProvider extends NetworkScaffolding {
1717

@@ -36,7 +36,7 @@ class FloorsProvider extends NetworkScaffolding {
3636
wireMockClient.register(any(urlMatching("^.*$endpoint.*\$"))
3737
.atPriority(Integer.MAX_VALUE)
3838
.willReturn(aResponse()
39-
.withStatus(OK_200.code)
39+
.withStatus(SC_OK)
4040
.withBody(encode(PriceFloorData.priceFloorData))))
4141
}
4242
}

‎src/test/groovy/org/prebid/server/functional/testcontainers/scaffolding/HttpSettings.groovy‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@ import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder
44
import com.github.tomakehurst.wiremock.matching.RequestPattern
55
import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder
66
import com.github.tomakehurst.wiremock.stubbing.StubMapping
7-
import org.prebid.server.functional.model.HttpStatusCode
87
import org.prebid.server.functional.model.ResponseModel
98
import org.prebid.server.functional.testcontainers.container.NetworkServiceContainer
109

1110
import static com.github.tomakehurst.wiremock.client.WireMock.anyRequestedFor
1211
import static com.github.tomakehurst.wiremock.client.WireMock.equalTo
1312
import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor
1413
import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo
15-
import static org.prebid.server.functional.model.HttpStatusCode.OK_200
14+
import static org.apache.http.HttpStatus.SC_OK
1615

1716
class HttpSettings extends NetworkScaffolding {
1817

@@ -36,6 +35,7 @@ class HttpSettings extends NetworkScaffolding {
3635

3736
@Override
3837
void setResponse() {
38+
throw new UnsupportedOperationException()
3939
}
4040

4141
protected RequestPatternBuilder getRfcRequestPattern(String accountId) {
@@ -45,11 +45,10 @@ class HttpSettings extends NetworkScaffolding {
4545

4646
void setRfcResponse(String value,
4747
ResponseModel responseModel,
48-
HttpStatusCode statusCode = OK_200,
4948
Map<String, String> headers = [:]) {
5049

5150
def responseBuilder = ResponseDefinitionBuilder.responseDefinition()
52-
.withStatus(statusCode.code)
51+
.withStatus(SC_OK)
5352
.withHeader("Content-Type", "application/json")
5453
.withBody(encode(responseModel))
5554

‎src/test/groovy/org/prebid/server/functional/testcontainers/scaffolding/NetworkScaffolding.groovy‎

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ import com.github.tomakehurst.wiremock.client.WireMock
55
import com.github.tomakehurst.wiremock.matching.RequestPattern
66
import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder
77
import com.github.tomakehurst.wiremock.stubbing.StubMapping
8-
import org.prebid.server.functional.model.HttpStatusCode
98
import org.prebid.server.functional.model.ResponseModel
109
import org.prebid.server.functional.testcontainers.container.NetworkServiceContainer
1110
import org.prebid.server.functional.util.ObjectMapperWrapper
1211

13-
import static org.prebid.server.functional.model.HttpStatusCode.OK_200
12+
import static org.apache.http.HttpStatus.SC_OK
1413

1514
abstract class NetworkScaffolding implements ObjectMapperWrapper {
1615

@@ -38,10 +37,10 @@ abstract class NetworkScaffolding implements ObjectMapperWrapper {
3837

3938
void setResponse(RequestPattern requestPattern,
4039
ResponseModel responseModel,
41-
HttpStatusCode statusCode = OK_200) {
40+
Integer statusCode = SC_OK) {
4241

4342
def responseBuilder = ResponseDefinitionBuilder.responseDefinition()
44-
.withStatus(statusCode.code)
43+
.withStatus(statusCode)
4544
.withHeader("Content-Type", "application/json")
4645
.withBody(encode(responseModel))
4746

@@ -51,16 +50,16 @@ abstract class NetworkScaffolding implements ObjectMapperWrapper {
5150
void setResponse(String value,
5251
ResponseModel responseModel,
5352
Map<String, String> headers) {
54-
setResponse(value, responseModel, OK_200, headers)
53+
setResponse(value, responseModel, SC_OK, headers)
5554
}
5655

5756
void setResponse(String value,
5857
ResponseModel responseModel,
59-
HttpStatusCode statusCode = OK_200,
58+
Integer statusCode = SC_OK,
6059
Map<String, String> headers = [:]) {
6160

6261
def responseBuilder = ResponseDefinitionBuilder.responseDefinition()
63-
.withStatus(statusCode.code)
62+
.withStatus(statusCode)
6463
.withHeader("Content-Type", "application/json")
6564
.withBody(encode(responseModel))
6665

@@ -74,9 +73,9 @@ abstract class NetworkScaffolding implements ObjectMapperWrapper {
7473
void setResponse(String value,
7574
ResponseModel responseModel,
7675
int responseDelay,
77-
HttpStatusCode statusCode = OK_200) {
76+
Integer statusCode = SC_OK) {
7877
def responseBuilder = ResponseDefinitionBuilder.responseDefinition()
79-
.withStatus(statusCode.code)
78+
.withStatus(statusCode)
8079
.withHeader("Content-Type", "application/json")
8180
.withBody(encode(responseModel))
8281
.withFixedDelay(responseDelay)
@@ -86,24 +85,25 @@ abstract class NetworkScaffolding implements ObjectMapperWrapper {
8685

8786
void setResponse(String value, String mockResponse) {
8887
def responseBuilder = ResponseDefinitionBuilder.responseDefinition()
89-
.withStatus(OK_200.code)
88+
.withStatus(SC_OK)
89+
.withHeader("Content-Type", "application/json")
9090
.withBody(mockResponse)
9191

9292
wireMockClient.register(new StubMapping(getRequest(value).build(), responseBuilder.build()))
9393
}
9494

9595
void setResponse(ResponseModel responseModel) {
9696
def responseBuilder = ResponseDefinitionBuilder.responseDefinition()
97-
.withStatus(OK_200.code)
97+
.withStatus(SC_OK)
9898
.withHeader("Content-Type", "application/json")
9999
.withBody(encode(responseModel))
100100

101101
wireMockClient.register(new StubMapping(getRequest(), responseBuilder.build()))
102102
}
103103

104-
void setResponse(String value, HttpStatusCode httpStatusCode) {
104+
void setResponse(String value, Integer statusCode) {
105105
def responseBuilder = ResponseDefinitionBuilder.responseDefinition()
106-
.withStatus(httpStatusCode.code)
106+
.withStatus(statusCode)
107107

108108
wireMockClient.register(new StubMapping(getRequest(value).build(), responseBuilder.build()))
109109
}
@@ -136,19 +136,10 @@ abstract class NetworkScaffolding implements ObjectMapperWrapper {
136136
getRecordedRequestsHeaders(requestPatternBuilder).last()
137137
}
138138

139-
List<Map<String, List<String>>> getRecordedRequestsHeaders(RequestPatternBuilder requestPatternBuilder) {
140-
def requests = wireMockClient.find(requestPatternBuilder)
141-
142-
List<Map<String, List<String>>> result = []
143-
requests.each { req ->
144-
Map<String, List<String>> headersMap = [:]
145-
req.headers.all().each { header ->
146-
headersMap[header.key() as String] = header.values()*.toString()
147-
}
148-
result << headersMap
139+
List<Map<String, List<String>>> getRecordedRequestsHeaders(RequestPatternBuilder builder) {
140+
wireMockClient.find(builder).collect { req ->
141+
req.headers.all().collectEntries { [it.key(), it.values()*.toString()] }
149142
}
150-
151-
result
152143
}
153144

154145
Map<String, List<String>> getLastRecordedRequestHeaders(String value) {

‎src/test/groovy/org/prebid/server/functional/testcontainers/scaffolding/PrebidCache.groovy‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo
1818
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse
1919
import static com.github.tomakehurst.wiremock.client.WireMock.get
2020
import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor
21-
import static org.prebid.server.functional.model.HttpStatusCode.INTERNAL_SERVER_ERROR_500
22-
import static org.prebid.server.functional.model.HttpStatusCode.OK_200
21+
import static org.apache.hc.core5.http.HttpStatus.SC_INTERNAL_SERVER_ERROR
22+
import static org.apache.hc.core5.http.HttpStatus.SC_OK
2323

2424
class PrebidCache extends NetworkScaffolding {
2525

@@ -81,31 +81,31 @@ class PrebidCache extends NetworkScaffolding {
8181
.atPriority(MAX_VALUE)
8282
.willReturn(aResponse()
8383
.withTransformers("response-template")
84-
.withStatus(OK_200.code)
84+
.withStatus(SC_OK)
8585
.withBody(RESPONSE_BODY)))
8686
}
8787

8888
void setGetResponse(TransferValue vTrackResponse) {
8989
wireMockClient.register(get(urlPathEqualTo(endpoint))
9090
.atPriority(MAX_VALUE)
9191
.willReturn(aResponse()
92-
.withStatus(OK_200.code)
92+
.withStatus(SC_OK)
9393
.withBody(encode(vTrackResponse))))
9494
}
9595

9696
void setInvalidPostResponse() {
9797
wireMockClient.register(post(urlPathEqualTo(endpoint))
9898
.atPriority(MAX_VALUE)
9999
.willReturn(aResponse()
100-
.withStatus(INTERNAL_SERVER_ERROR_500.code)))
100+
.withStatus(SC_INTERNAL_SERVER_ERROR)))
101101
}
102102

103103
void setInvalidGetResponse(String uuid, String errorMessage = PBSUtils.randomString) {
104104
wireMockClient.register(get(urlPathEqualTo(endpoint))
105105
.withQueryParam("uuid", equalTo(uuid))
106106
.atPriority(MAX_VALUE)
107107
.willReturn(aResponse()
108-
.withStatus(INTERNAL_SERVER_ERROR_500.code)
108+
.withStatus(SC_INTERNAL_SERVER_ERROR)
109109
.withBody(errorMessage)))
110110
}
111111

‎src/test/groovy/org/prebid/server/functional/testcontainers/scaffolding/PubStackAnalytics.groovy‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ class PubStackAnalytics extends NetworkScaffolding {
2424

2525
@Override
2626
protected RequestPatternBuilder getRequest(String value) {
27-
return null
27+
throw new UnsupportedOperationException()
2828
}
2929

3030
@Override
31-
void setResponse() {}
31+
void setResponse() {
32+
throw new UnsupportedOperationException()
33+
}
3234
}

‎src/test/groovy/org/prebid/server/functional/testcontainers/scaffolding/StoredCache.groovy‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package org.prebid.server.functional.testcontainers.scaffolding
22

33
import com.github.tomakehurst.wiremock.matching.RequestPattern
44
import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder
5-
import org.prebid.server.functional.model.HttpStatusCode
65
import org.prebid.server.functional.model.config.Audience
76
import org.prebid.server.functional.model.config.AudienceId
87
import org.prebid.server.functional.model.config.IdentifierType
@@ -22,8 +21,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor
2221
import static com.github.tomakehurst.wiremock.client.WireMock.post
2322
import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo
2423
import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo
25-
import static org.prebid.server.functional.model.HttpStatusCode.NO_CONTENT_204
26-
import static org.prebid.server.functional.model.HttpStatusCode.OK_200
24+
import static org.apache.http.HttpStatus.SC_NO_CONTENT
25+
import static org.apache.http.HttpStatus.SC_OK
2726

2827
class StoredCache extends NetworkScaffolding {
2928

@@ -40,18 +39,20 @@ class StoredCache extends NetworkScaffolding {
4039

4140
@Override
4241
protected RequestPatternBuilder getRequest(String bidRequestId) {
43-
return null
42+
throw new UnsupportedOperationException()
4443
}
4544

4645
@Override
47-
void setResponse() {}
46+
void setResponse() {
47+
throw new UnsupportedOperationException()
48+
}
4849

4950
TargetingResult setTargetingResponse(BidRequest bidRequest, OptableTargetingConfig config) {
5051
def targetingResult = getBodyByRequest(bidRequest)
5152
wireMockClient.register(get(urlPathEqualTo("$endpoint${QueryBuilder.buildQuery(bidRequest, config)}"))
5253
.atPriority(Integer.MAX_VALUE)
5354
.willReturn(aResponse()
54-
.withStatus(OK_200.code)
55+
.withStatus(SC_OK)
5556
.withBody(encode(targetingResult))))
5657
targetingResult
5758
}
@@ -61,16 +62,16 @@ class StoredCache extends NetworkScaffolding {
6162
wireMockClient.register(get(urlPathEqualTo(endpoint))
6263
.atPriority(Integer.MAX_VALUE)
6364
.willReturn(aResponse()
64-
.withStatus(OK_200.code)
65+
.withStatus(SC_OK)
6566
.withBody(encode(targetingResult))))
6667
targetingResult
6768
}
6869

69-
void setCachingResponse(HttpStatusCode statusCode = NO_CONTENT_204) {
70+
void setCachingResponse(Integer statusCode = SC_NO_CONTENT) {
7071
wireMockClient.register(post(urlPathEqualTo(endpoint))
7172
.atPriority(Integer.MAX_VALUE)
7273
.willReturn(aResponse()
73-
.withStatus(statusCode.code)))
74+
.withStatus(statusCode)))
7475
}
7576

7677
private static TargetingResult getBodyByRequest(BidRequest bidRequest) {

‎src/test/groovy/org/prebid/server/functional/testcontainers/scaffolding/VendorList.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.any
99
import static com.github.tomakehurst.wiremock.client.WireMock.anyRequestedFor
1010
import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo
1111
import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching
12-
import static org.prebid.server.functional.model.HttpStatusCode.OK_200
12+
import static org.apache.http.HttpStatus.SC_OK
1313
import static org.prebid.server.functional.model.mock.services.vendorlist.GvlSpecificationVersion.V2
1414
import static org.prebid.server.functional.model.mock.services.vendorlist.GvlSpecificationVersion.V3
1515
import static org.prebid.server.functional.model.mock.services.vendorlist.VendorListResponse.Vendor
@@ -50,7 +50,7 @@ class VendorList extends NetworkScaffolding {
5050
wireMockClient.register(any(urlMatching(prepareEndpoint))
5151
.atPriority(Integer.MAX_VALUE)
5252
.willReturn(aResponse()
53-
.withStatus(OK_200.code)
53+
.withStatus(SC_OK)
5454
.withFixedDelay(second * 1000)
5555
.withBody(prepareEncodeResponseBody)))
5656
}

0 commit comments

Comments
 (0)