update privacy tests

Author: osulzhenko

src/test/groovy/org/prebid/server/functional/model/request/auction/ConsentedProvidersSettings.groovy

@@ -2,8 +2,10 @@ package org.prebid.server.functional.model.request.auction
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.annotation.JsonNaming
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 
+@EqualsAndHashCode
 @ToString(includeNames = true, ignoreNulls = true)
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy)
 class ConsentedProvidersSettings {

src/test/groovy/org/prebid/server/functional/model/request/auction/Regs.groovy

@@ -2,8 +2,10 @@ package org.prebid.server.functional.model.request.auction
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.annotation.JsonNaming
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 
+@EqualsAndHashCode
 @ToString(includeNames = true, ignoreNulls = true)
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy)
 class Regs {

src/test/groovy/org/prebid/server/functional/model/request/auction/RegsExt.groovy

@@ -2,8 +2,10 @@ package org.prebid.server.functional.model.request.auction
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.annotation.JsonNaming
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 
+@EqualsAndHashCode
 @ToString(includeNames = true, ignoreNulls = true)
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy)
 class RegsExt {

src/test/groovy/org/prebid/server/functional/model/request/get/GeneralGetRequest.groovy

@@ -175,46 +175,46 @@ class GeneralGetRequest {
     String targeting
 
     @JsonProperty("tcfc")
-    String consent
+    String tcfConsent
 
     @JsonProperty("gdpr_consent")
-    String consentLegacy
+    String generalConsent
 
     @JsonProperty("consent_string")
-    String consentStringLegacy
+    String generalConsentString
 
     Integer gdpr
 
-    @JsonProperty("privacy")
-    Integer gdprPrivacy
-
     @JsonProperty("gdpr_applies")
-    String gdprApplies
-
-    @JsonProperty("usp")
-    String usPrivacy
+    Boolean gdprApplies
 
     @JsonProperty("addtl_consent")
     String additionalConsent
 
     @JsonProperty("consent_type")
     ConsentType consentType
 
-    @JsonProperty("gpp_sid")
+    @JsonProperty("gppc")
+    String gpp
+
+    @JsonProperty("gpps")
     @JsonSerialize(using = CommaSeparatedListSerializer)
     List<Integer> gppSid
 
-    Integer coppa
-
     @JsonProperty("gpc")
     Integer globalPrivacyControl
 
+    Integer coppa
+
     @JsonProperty("dnt")
     Integer doNotTrack
 
     @JsonProperty("lmt")
     Integer limitAdTracking
 
+    @JsonProperty("usp")
+    String usPrivacy
+
     @JsonProperty("bcat")
     @JsonSerialize(using = CommaSeparatedListSerializer)
     List<String> blockedCategories