Update json test files and Assert ImpIDs after sorting

prebid · Jan 10, 2024 · c40b264 · c40b264
1 parent acbe193
commit c40b264
Show file tree

Hide file tree

Showing 258 changed files with 519 additions and 259 deletions.
diff --git a/adapters/adapterstest/test_json.go b/adapters/adapterstest/test_json.go
@@ -7,10 +7,11 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
-	"reflect"
 	"regexp"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/mitchellh/copystructure"
 	"github.com/prebid/openrtb/v19/openrtb2"
 	"github.com/prebid/prebid-server/v2/adapters"
@@ -325,7 +326,8 @@ func diffHttpRequests(description string, actual *adapters.RequestData, expected
 		return fmt.Errorf(`expected.ImpIDs must contain at least one imp ID`)
 	}
 
-	if !reflect.DeepEqual(expected.ImpIDs, actual.ImpIDs) {
+	opt := cmpopts.SortSlices(func(a, b string) bool { return a < b })
+	if !cmp.Equal(expected.ImpIDs, actual.ImpIDs, opt) {
 		return fmt.Errorf(`%s actual.ImpIDs "%q" do not match expected "%q"`, description, actual.ImpIDs, expected.ImpIDs)
 	}
 	return diffJson(description, actual.Body, expected.Body)

diff --git a/adapters/decenterads/decenteradstest/exemplary/simple-banner.json b/adapters/decenterads/decenteradstest/exemplary/simple-banner.json
@@ -67,7 +67,8 @@
             "ip": "123.123.123.123",
             "ifa": "zxcjbzxmc-zxcbmz-zxbcz-zxczx"
           }
-        }
+        },
+        "impIDs":["test-imp-id"]
       },
       "mockResponse": {
         "status": 200,

diff --git a/adapters/decenterads/decenteradstest/exemplary/simple-video.json b/adapters/decenterads/decenteradstest/exemplary/simple-video.json
@@ -55,7 +55,8 @@
               }
             }
           ]
-        }
+        },
+        "impIDs":["test-imp-id"]
       },
       "mockResponse": {
         "status": 200,

diff --git a/adapters/decenterads/decenteradstest/exemplary/simple-web-banner.json b/adapters/decenterads/decenteradstest/exemplary/simple-web-banner.json
@@ -64,7 +64,8 @@
           "device": {
             "ip": "123.123.123.123"
           }
-        }
+        },
+        "impIDs":["test-imp-id"]
       },
       "mockResponse": {
         "status": 200,

diff --git a/adapters/decenterads/decenteradstest/supplemental/bad_response.json b/adapters/decenterads/decenteradstest/supplemental/bad_response.json
@@ -66,7 +66,8 @@
             "ip": "123.123.123.123",
             "ifa": "sdjfksdf-dfsds-dsdg-dsgg"
           }
-        }
+        },
+        "impIDs":["test-imp-id"]
       },
       "mockResponse": {
         "status": 200,

diff --git a/adapters/decenterads/decenteradstest/supplemental/bad_status_code.json b/adapters/decenterads/decenteradstest/supplemental/bad_status_code.json
@@ -60,7 +60,8 @@
             "bundle": "com.wls.testwlsapplication"
           },
           "device": {}
-        }
+        },
+        "impIDs":["test-imp-id"]
       },
       "mockResponse": {
         "status": 400,

diff --git a/adapters/decenterads/decenteradstest/supplemental/status-204.json b/adapters/decenterads/decenteradstest/supplemental/status-204.json
@@ -66,7 +66,8 @@
             "ip": "123.123.123.123",
             "ifa": "sdjfksdf-dfsds-dsdg-dsgg"
           }
-        }
+        },
+        "impIDs":["test-imp-id"]
       },
       "expectedBidResponses": [],
       "mockResponse": {

diff --git a/adapters/decenterads/decenteradstest/supplemental/status-404.json b/adapters/decenterads/decenteradstest/supplemental/status-404.json
@@ -66,7 +66,8 @@
             "ip": "123.123.123.123",
             "ifa": "sdjfksdf-dfsds-dsdg-dsgg"
           }
-        }
+        },
+        "impIDs":["test-imp-id"]
       },
       "mockResponse": {
         "status": 404,

diff --git a/adapters/deepintent/deepintenttest/exemplary/simple-banner.json b/adapters/deepintent/deepintenttest/exemplary/simple-banner.json
@@ -77,7 +77,8 @@
               "ip": "123.123.123.123",
               "ifa": "zxcjbzxmc-zxcbmz-zxbcz-zxczx"
           }
-      }
+      },
+      "impIDs":["test-imp-id"]
       },
       "mockResponse": {
         "status": 200,

diff --git a/adapters/deepintent/deepintenttest/exemplary/simple-web-banner.json b/adapters/deepintent/deepintenttest/exemplary/simple-web-banner.json
@@ -75,7 +75,8 @@
             "device": {
                 "ip": "123.123.123.123"
             }
-        }
+        },
+        "impIDs":["test-imp-id"]
         },
         "mockResponse": {
           "status": 200,

diff --git a/adapters/deepintent/deepintenttest/supplemental/bad_response.json b/adapters/deepintent/deepintenttest/supplemental/bad_response.json
@@ -75,7 +75,8 @@
                     "ip": "123.123.123.123",
                     "ifa": "sdjfksdf-dfsds-dsdg-dsgg"
                 }
-            }
+            },
+            "impIDs":["test-imp-id"]
 		},
 		"mockResponse": {
 			"status": 200,

diff --git a/adapters/deepintent/deepintenttest/supplemental/status-204.json b/adapters/deepintent/deepintenttest/supplemental/status-204.json
@@ -75,7 +75,8 @@
                     "ip": "123.123.123.123",
                     "ifa": "sdjfksdf-dfsds-dsdg-dsgg"
                 }
-            }
+            },
+            "impIDs":["test-imp-id"]
 		},
 		"mockResponse": {
 			"status": 204,

diff --git a/adapters/deepintent/deepintenttest/supplemental/status-404.json b/adapters/deepintent/deepintenttest/supplemental/status-404.json
@@ -75,7 +75,8 @@
                     "ip": "123.123.123.123",
                     "ifa": "sdjfksdf-dfsds-dsdg-dsgg"
                 }
-            }
+            },
+            "impIDs":["test-imp-id"]
 		},
 		"mockResponse": {
 			"status": 404,

diff --git a/adapters/deepintent/deepintenttest/supplemental/wrongimp.json b/adapters/deepintent/deepintenttest/supplemental/wrongimp.json
@@ -77,7 +77,8 @@
                 "ip": "123.123.123.123",
                 "ifa": "zxcjbzxmc-zxcbmz-zxbcz-zxczx"
             }
-        }
+        },
+        "impIDs":["test-imp-id"]
         },
         "mockResponse": {
           "status": 200,

diff --git a/adapters/definemedia/definemediatest/exemplary/sample-conative-banner.json b/adapters/definemedia/definemediatest/exemplary/sample-conative-banner.json
@@ -210,7 +210,8 @@
               }
             }
           }
-        }
+        },
+        "impIDs":["div-gpt-ad-1460505748561-0"]
       },
       "mockResponse": {
         "status": 200,

diff --git a/adapters/definemedia/definemediatest/exemplary/sample-conative-native.json b/adapters/definemedia/definemediatest/exemplary/sample-conative-native.json
@@ -196,7 +196,8 @@
               }
             }
           }
-        }
+        },
+        "impIDs":["div-gpt-ad-1460505748561-0"]
       },
       "mockResponse": {
         "status": 200,

diff --git a/adapters/definemedia/definemediatest/supplemental/nobid-response.json b/adapters/definemedia/definemediatest/supplemental/nobid-response.json
@@ -206,7 +206,8 @@
                 }
               }
             }
-          }
+          },
+          "impIDs":["div-gpt-ad-1460505748561-0"]
         },
         "mockResponse": {
           "status": 200,

diff --git a/adapters/definemedia/definemediatest/supplemental/nocontent-response.json b/adapters/definemedia/definemediatest/supplemental/nocontent-response.json
@@ -206,7 +206,8 @@
                 }
               }
             }
-          }
+          },
+          "impIDs":["div-gpt-ad-1460505748561-0"]
         },
         "mockResponse": {
           "status": 204,

diff --git a/adapters/definemedia/definemediatest/supplemental/status_400.json b/adapters/definemedia/definemediatest/supplemental/status_400.json
@@ -206,7 +206,8 @@
                 }
               }
             }
-          }
+          },
+          "impIDs":["div-gpt-ad-1460505748561-0"]
         },
         "mockResponse": {
           "status": 400,

diff --git a/adapters/definemedia/definemediatest/supplemental/status_418.json b/adapters/definemedia/definemediatest/supplemental/status_418.json
@@ -206,7 +206,8 @@
                 }
               }
             }
-          }
+          },
+          "impIDs":["div-gpt-ad-1460505748561-0"]
         },
         "mockResponse": {
           "status": 418,

diff --git a/adapters/definemedia/definemediatest/supplemental/unmarshal-error.json b/adapters/definemedia/definemediatest/supplemental/unmarshal-error.json
@@ -206,7 +206,8 @@
                 }
               }
             }
-          }
+          },
+          "impIDs":["div-gpt-ad-1460505748561-0"]
         },
         "mockResponse": {
           "status": 200,

diff --git a/adapters/definemedia/definemediatest/supplemental/unsupported-type.json b/adapters/definemedia/definemediatest/supplemental/unsupported-type.json
@@ -208,7 +208,8 @@
               }
             }
           }
-        }
+        },
+        "impIDs":["div-gpt-ad-1460505748561-0"]
       },
       "mockResponse": {
         "status": 200,

diff --git a/adapters/dianomi/dianomitest/exemplary/multi-format.json b/adapters/dianomi/dianomitest/exemplary/multi-format.json
@@ -95,7 +95,8 @@
           },
           "tagid": "9526"
         }]
-      }
+      },
+      "impIDs":["test-imp-id-1","test-imp-id-2"]
     },
     "mockResponse": {
       "status": 200,

diff --git a/adapters/dianomi/dianomitest/exemplary/multi-native.json b/adapters/dianomi/dianomitest/exemplary/multi-native.json
@@ -63,7 +63,8 @@
           },
           "tagid": "9607"
         }]
-      }
+      },
+      "impIDs":["test-imp-id-1","test-imp-id-2"]
     },
     "mockResponse": {
       "status": 200,

diff --git a/adapters/dianomi/dianomitest/exemplary/single-banner-pricetype-gross-extend-ext.json b/adapters/dianomi/dianomitest/exemplary/single-banner-pricetype-gross-extend-ext.json
@@ -81,7 +81,8 @@
           "w": 1920,
           "h": 800
         }
-      }
+      },
+      "impIDs":["test-imp-id"]
     },
     "mockResponse": {
       "status": 200,

diff --git a/adapters/dianomi/dianomitest/exemplary/single-banner-pricetype-gross.json b/adapters/dianomi/dianomitest/exemplary/single-banner-pricetype-gross.json
@@ -71,7 +71,8 @@
           "w": 1920,
           "h": 800
         }
-      }
+      },
+      "impIDs":["test-imp-id"]
     },
     "mockResponse": {
       "status": 200,

diff --git a/adapters/dianomi/dianomitest/exemplary/single-banner-pricetype-net.json b/adapters/dianomi/dianomitest/exemplary/single-banner-pricetype-net.json
@@ -71,7 +71,8 @@
           "w": 1920,
           "h": 800
         }
-      }
+      },
+      "impIDs":["test-imp-id"]
     },
     "mockResponse": {
       "status": 200,

diff --git a/adapters/dianomi/dianomitest/exemplary/single-banner.json b/adapters/dianomi/dianomitest/exemplary/single-banner.json
@@ -64,7 +64,8 @@
           "w": 1920,
           "h": 800
         }
-      }
+      },
+      "impIDs":["test-imp-id"]
     },
     "mockResponse": {
       "status": 200,

diff --git a/adapters/dianomi/dianomitest/exemplary/single-native.json b/adapters/dianomi/dianomitest/exemplary/single-native.json
@@ -60,7 +60,8 @@
           "w": 1920,
           "h": 800
         }
-      }
+      },
+      "impIDs":["test-imp-id"]
     },
     "mockResponse": {
       "status": 200,

diff --git a/adapters/dianomi/dianomitest/exemplary/single-video.json b/adapters/dianomi/dianomitest/exemplary/single-video.json
@@ -64,7 +64,8 @@
           "w": 1920,
           "h": 800
         }
-      }
+      },
+      "impIDs":["test-imp-id"]
     },
     "mockResponse": {
       "status": 200,

diff --git a/adapters/dianomi/dianomitest/exemplary/two-banners-different-pricetypes-extend-ext.json b/adapters/dianomi/dianomitest/exemplary/two-banners-different-pricetypes-extend-ext.json
@@ -110,7 +110,8 @@
           "w": 1920,
           "h": 800
         }
-      }
+      },
+      "impIDs":["test-imp-id","test-imp-id2"]
     },
     "mockResponse": {
       "status": 200,

diff --git a/adapters/dianomi/dianomitest/exemplary/two-banners-different-pricetypes.json b/adapters/dianomi/dianomitest/exemplary/two-banners-different-pricetypes.json
@@ -100,7 +100,8 @@
           "w": 1920,
           "h": 800
         }
-      }
+      },
+      "impIDs":["test-imp-id","test-imp-id2"]
     },
     "mockResponse": {
       "status": 200,

diff --git a/adapters/dianomi/dianomitest/supplemental/bad-request.json b/adapters/dianomi/dianomitest/supplemental/bad-request.json
@@ -31,7 +31,8 @@
             },
             "tagid": "9607"
           }]
-        }
+        },
+        "impIDs":["test-imp-id"]
       },
       "mockResponse": {
         "status": 400

diff --git a/adapters/dianomi/dianomitest/supplemental/empty-response.json b/adapters/dianomi/dianomitest/supplemental/empty-response.json
@@ -31,7 +31,8 @@
             },
             "tagid": "9607"
           }]
-        }
+        },
+        "impIDs":["test-imp-id"]
       },
       "mockResponse": {
         "status": 204

diff --git a/adapters/dianomi/dianomitest/supplemental/invalid-imp-mediatype.json b/adapters/dianomi/dianomitest/supplemental/invalid-imp-mediatype.json
@@ -48,7 +48,8 @@
             },
             "tagid": "12345"
           }]
-        }
+        },
+        "impIDs":["test-imp-id","test-imp-id-2"]
       },
       "mockResponse": {
         "status": 200,

diff --git a/adapters/dianomi/dianomitest/supplemental/nobid-response.json b/adapters/dianomi/dianomitest/supplemental/nobid-response.json
@@ -31,7 +31,8 @@
             },
             "tagid": "9607"
           }]
-        }
+        },
+        "impIDs":["test-imp-id"]
       },
       "mockResponse": {
         "status": 200,

diff --git a/adapters/dianomi/dianomitest/supplemental/server-error.json b/adapters/dianomi/dianomitest/supplemental/server-error.json
@@ -31,7 +31,8 @@
             },
             "tagid": "9607"
           }]
-        }
+        },
+        "impIDs":["test-imp-id"]
       },
       "mockResponse": {
         "status": 500,

diff --git a/adapters/dianomi/dianomitest/supplemental/unparsable-response.json b/adapters/dianomi/dianomitest/supplemental/unparsable-response.json
@@ -31,7 +31,8 @@
             },
             "tagid": "9607"
           }]
-        }
+        },
+        "impIDs":["test-imp-id"]
       },
       "mockResponse": {
         "status": 200,
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,8 @@ @@
                   }
                 }
               ]
-            }
+            },
+            "impIDs":["test-imp-id"]
           },
           "mockResponse": {
             "status": 200,
@@ Expand Down @@