Merge branch 'prebid:master' into tradplus

prebid · Oct 24, 2024 · 1891f43 · 1891f43
2 parents 5056de3 + 4f6ee8e
commit 1891f43
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/docs/developers/functional-tests.md b/docs/developers/functional-tests.md
@@ -70,7 +70,7 @@ Functional tests need to have name template **.\*Spec.groovy**
 **Properties:**
 
 `launchContainers` - responsible for starting the MockServer and the MySQLContainer container. Default value is false to not launch containers for unit tests.
-`tests.max-container-count` - maximum number of simultaneously running PBS containers. Default value is 2.
+`tests.max-container-count` - maximum number of simultaneously running PBS containers. Default value is 5.
 `skipFunctionalTests` - allow to skip funtional tests. Default value is false.
 `skipUnitTests` - allow to skip unit tests. Default value is false.
 

diff --git a/pom.xml b/pom.xml
@@ -645,7 +645,7 @@
                     <systemPropertyVariables>
                         <mockserver.version>${mockserver.version}</mockserver.version>
                         <pbs.version>${project.version}</pbs.version>
-                        <tests.max-container-count>2</tests.max-container-count>
+                        <tests.max-container-count>5</tests.max-container-count>
                         <tests.fixed-container-ports>false</tests.fixed-container-ports>
                     </systemPropertyVariables>
                 </configuration>

diff --git a/src/main/resources/bidder-config/bluesea.yaml b/src/main/resources/bidder-config/bluesea.yaml
@@ -10,5 +10,8 @@ adapters:
         - video
         - native
       site-media-types:
+        - banner
+        - video
+        - native
       supported-vendors:
-      vendor-id: 0
+      vendor-id: 1294
diff --git a/src/test/groovy/org/prebid/server/functional/model/bidder/GeneralBidderAdapter.groovy b/src/test/groovy/org/prebid/server/functional/model/bidder/GeneralBidderAdapter.groovy
@@ -1,16 +1,7 @@
 package org.prebid.server.functional.model.bidder
 
-import com.fasterxml.jackson.annotation.JsonProperty
+class GeneralBidderAdapter extends Generic {
 
-class GeneralBidderAdapter implements BidderAdapter {
-
-    Object exampleProperty
-    Integer firstParam
-    Integer secondParam
-    @JsonProperty("dealsonly")
-    Boolean dealsOnly
-    @JsonProperty("pgdealsonly")
-    Boolean pgDealsOnly
     String siteId
     List<Integer> size
     String sid

diff --git a/src/test/groovy/org/prebid/server/functional/testcontainers/PbsServiceFactory.groovy b/src/test/groovy/org/prebid/server/functional/testcontainers/PbsServiceFactory.groovy
@@ -64,6 +64,6 @@ class PbsServiceFactory {
     private static int getMaxContainerCount() {
         USE_FIXED_CONTAINER_PORTS
                 ? 1
-                : SystemProperties.getPropertyOrDefault("tests.max-container-count", 2)
+                : SystemProperties.getPropertyOrDefault("tests.max-container-count", 5)
     }
 }