Fix fallen tests after rebase

Author: zxPhoenix

src/main/java/org/prebid/server/auction/requestfactory/Ortb2RequestFactory.java

@@ -192,7 +192,8 @@ public Future<ActivityInfrastructure> activityInfrastructureFrom(AuctionContext
                 auctionContext.getDebugContext().getTraceLevel()));
     }
 
-    public Future<BidRequest> validateRequest(Account account, BidRequest bidRequest,
+    public Future<BidRequest> validateRequest(Account account,
+                                              BidRequest bidRequest,
                                               HttpRequestContext httpRequestContext,
                                               DebugContext debugContext,
                                               List<String> warnings) {

src/main/java/org/prebid/server/auction/requestfactory/VideoRequestFactory.java

@@ -33,7 +33,6 @@
 import org.prebid.server.model.HttpRequestContext;
 import org.prebid.server.proto.openrtb.ext.request.ExtPublisher;
 import org.prebid.server.proto.openrtb.ext.request.ExtPublisherPrebid;
-import org.prebid.server.settings.model.Account;
 import org.prebid.server.util.HttpUtil;
 import org.prebid.server.util.ObjectUtil;
 

src/test/java/org/prebid/server/auction/requestfactory/AmpRequestFactoryTest.java

@@ -1754,7 +1754,7 @@ private void givenBidRequest(
         given(ortb2ImplicitParametersResolver.resolve(any(), any(), any(), anyBoolean())).willAnswer(
                 answerWithFirstArgument());
         given(ortb2RequestFactory.validateRequest(any(), any(), any(), any(), any()))
-                .willAnswer(invocation -> Future.succeededFuture((BidRequest) invocation.getArgument(0)));
+                .willAnswer(invocation -> Future.succeededFuture((BidRequest) invocation.getArgument(1)));
 
         given(ortb2RequestFactory.enrichBidRequestWithAccountAndPrivacyData(any()))
                 .willAnswer(invocation -> Future.succeededFuture(((AuctionContext) invocation.getArgument(0))

src/test/java/org/prebid/server/auction/requestfactory/AuctionRequestFactoryTest.java

@@ -166,7 +166,7 @@ public void setUp() {
                 .willAnswer(invocation -> Future.succeededFuture(
                         ((AuctionContext) invocation.getArgument(0)).getBidRequest()));
         given(ortb2RequestFactory.validateRequest(any(), any(), any(), any(), any()))
-                .willAnswer(invocationOnMock -> Future.succeededFuture((BidRequest) invocationOnMock.getArgument(0)));
+                .willAnswer(invocationOnMock -> Future.succeededFuture((BidRequest) invocationOnMock.getArgument(1)));
         given(ortb2RequestFactory.removeEmptyEids(any(), any()))
                 .willAnswer(invocationOnMock -> invocationOnMock.getArgument(0));
         given(ortb2RequestFactory.updateTimeout(any())).willAnswer(invocation -> invocation.getArgument(0));
@@ -662,7 +662,7 @@ public void shouldReturnFailedFutureIfRequestValidationFailed() {
         // given
         givenValidBidRequest();
 
-        given(ortb2RequestFactory.validateRequest(any(), any(), any()))
+        given(ortb2RequestFactory.validateRequest(any(), any(), any(), any(), any()))
                 .willReturn(Future.failedFuture(new InvalidRequestException("errors")));
 
         // when

src/test/java/org/prebid/server/auction/requestfactory/VideoRequestFactoryTest.java

@@ -405,7 +405,7 @@ private void givenBidRequest(BidRequest bidRequest, List<PodError> podErrors) {
         given(ortb2RequestFactory.fetchAccountWithoutStoredRequestLookup(any())).willReturn(Future.succeededFuture());
 
         given(ortb2RequestFactory.validateRequest(any(), any(), any(), any(), any()))
-                .willAnswer(invocation -> Future.succeededFuture((BidRequest) invocation.getArgument(0)));
+                .willAnswer(invocation -> Future.succeededFuture((BidRequest) invocation.getArgument(1)));
 
         given(paramsResolver.resolve(any(), any(), any(), anyBoolean()))
                 .willAnswer(answerWithFirstArgument());

src/test/java/org/prebid/server/validation/RequestValidatorTest.java

@@ -1195,7 +1195,7 @@ public void validateShouldReturnValidationMessageWhenAliasPointOnNotValidBidderN
         final ValidationResult result = target.validate(Account.empty(ACCOUNT_ID), bidRequest, null, null);
 
         // then
-        assertThat(result.getErrors()).hasSize(1)
+        assertThat(result.getWarnings()).hasSize(1)
                 .containsOnly("request.ext.prebid.aliases.alias refers to unknown bidder: fake");
     }
 
@@ -1213,7 +1213,7 @@ public void validateShouldReturnValidationMessageWhenAliasPointOnDisabledBidder(
         final ValidationResult result = target.validate(Account.empty(ACCOUNT_ID), bidRequest, null, null);
 
         // then
-        assertThat(result.getErrors()).hasSize(1)
+        assertThat(result.getWarnings()).hasSize(1)
                 .containsOnly("request.ext.prebid.aliases.alias refers to disabled bidder: appnexus");
     }