Merge pull request #43 from UnityTech/PPS-669

CarolynU · web-flow · commit 3ee1d38c9db5 · 2025-02-11T02:30:40.000-08:00
[PPS-669] Always passing source.fd
diff --git a/audio_test.go b/audio_test.go
@@ -56,7 +56,7 @@ func TestAudio_Validate(t *testing.T) {
 		},
 		CompanionType: []int{VASTCompanionStatic, VASTCompanionHTML},
 	}
-	if exp, got := ErrInvalidAudioNoMimes, subject.Validate(); !errors.Is(exp, got) {
+	if exp, got := ErrInvalidAudioNoMimes, subject.Validate(); !errors.Is(got, exp) {
 		t.Fatalf("expected %v, got %v", exp, got)
 	}
 }
diff --git a/bid_test.go b/bid_test.go
@@ -35,11 +35,11 @@ func TestBid(t *testing.T) {
 
 func TestBid_Validate(t *testing.T) {
 	subject := &Bid{}
-	if exp, got := ErrInvalidBidNoID, subject.Validate(); !errors.Is(exp, got) {
+	if exp, got := ErrInvalidBidNoID, subject.Validate(); !errors.Is(got, exp) {
 		t.Fatalf("expected %v, got %v", exp, got)
 	}
 	subject = &Bid{ID: "BIDID"}
-	if exp, got := ErrInvalidBidNoImpID, subject.Validate(); !errors.Is(exp, got) {
+	if exp, got := ErrInvalidBidNoImpID, subject.Validate(); !errors.Is(got, exp) {
 		t.Fatalf("expected %v, got %v", exp, got)
 	}
 }
diff --git a/bidrequest_test.go b/bidrequest_test.go
@@ -74,15 +74,15 @@ func TestBidRequest_complex(t *testing.T) {
 
 func TestBidRequest_Validate(t *testing.T) {
 	subject := &BidRequest{}
-	if exp, got := ErrInvalidReqNoID, subject.Validate(); !errors.Is(exp, got) {
+	if exp, got := ErrInvalidReqNoID, subject.Validate(); !errors.Is(got, exp) {
 		t.Fatalf("expected %v, got %v", exp, got)
 	}
 	subject = &BidRequest{ID: "RID"}
-	if exp, got := ErrInvalidReqNoImps, subject.Validate(); !errors.Is(exp, got) {
+	if exp, got := ErrInvalidReqNoImps, subject.Validate(); !errors.Is(got, exp) {
 		t.Fatalf("expected %v, got %v", exp, got)
 	}
 	subject = &BidRequest{ID: "A", Imp: []Impression{{ID: "1"}}, Site: &Site{}, App: &App{}}
-	if exp, got := ErrInvalidReqMultiInv, subject.Validate(); !errors.Is(exp, got) {
+	if exp, got := ErrInvalidReqMultiInv, subject.Validate(); !errors.Is(got, exp) {
 		t.Fatalf("expected %v, got %v", exp, got)
 	}
 }
diff --git a/bidresponse_test.go b/bidresponse_test.go
@@ -56,11 +56,11 @@ func TestBidResponse_complex(t *testing.T) {
 
 func TestBidResponse_Validate(t *testing.T) {
 	subject := &BidResponse{}
-	if exp, got := ErrInvalidRespNoID, subject.Validate(); !errors.Is(exp, got) {
+	if exp, got := ErrInvalidRespNoID, subject.Validate(); !errors.Is(got, exp) {
 		t.Fatalf("expected %v, got %v", exp, got)
 	}
 	subject = &BidResponse{ID: "RID"}
-	if exp, got := ErrInvalidRespNoSeatBids, subject.Validate(); !errors.Is(exp, got) {
+	if exp, got := ErrInvalidRespNoSeatBids, subject.Validate(); !errors.Is(got, exp) {
 		t.Fatalf("expected %v, got %v", exp, got)
 	}
 }
diff --git a/impression_test.go b/impression_test.go
@@ -55,11 +55,11 @@ func TestImpression(t *testing.T) {
 
 func TestImpression_Validate(t *testing.T) {
 	subject := &Impression{}
-	if exp, got := ErrInvalidImpNoID, subject.Validate(); !errors.Is(exp, got) {
+	if exp, got := ErrInvalidImpNoID, subject.Validate(); !errors.Is(got, exp) {
 		t.Fatalf("expected %v, got %v", exp, got)
 	}
 	subject = &Impression{ID: "IMPID", Banner: &Banner{}, Video: &Video{}}
-	if exp, got := ErrInvalidImpMultiAssets, subject.Validate(); !errors.Is(exp, got) {
+	if exp, got := ErrInvalidImpMultiAssets, subject.Validate(); !errors.Is(got, exp) {
 		t.Fatalf("expected %v, got %v", exp, got)
 	}
 }
diff --git a/seatbid_test.go b/seatbid_test.go
@@ -9,7 +9,7 @@ import (
 
 func TestSeatBid_Validate(t *testing.T) {
 	subject := &SeatBid{}
-	if exp, got := ErrInvalidSeatBidBid, subject.Validate(); !errors.Is(exp, got) {
+	if exp, got := ErrInvalidSeatBidBid, subject.Validate(); !errors.Is(got, exp) {
 		t.Fatalf("expected %v, got %v", exp, got)
 	}
 }
diff --git a/source.go b/source.go
@@ -2,7 +2,7 @@ package openrtb
 
 // Source object describes the nature and behavior of the entity that is the source of the bid request upstream from the exchange.
 type Source struct {
-	FinalSaleDecision int       `json:"fd,omitempty"`     // Entity responsible for the final impression sale decision, where 0 = exchange, 1 = upstream source.
+	FinalSaleDecision int       `json:"fd"`               // Entity responsible for the final impression sale decision, where 0 = exchange, 1 = upstream source.
 	TransactionID     string    `json:"tid,omitempty"`    // Transaction ID that must be common across all participants in this bid request (e.g., potentially multiple exchanges).
 	PaymentChain      string    `json:"pchain,omitempty"` // Payment ID chain string containing embedded syntax described in the TAG Payment ID Protocol v1.0.
 	Ext               Extension `json:"ext,omitempty"`    // Placeholder for exchange-specific extensions to OpenRTB.
diff --git a/video_test.go b/video_test.go
@@ -52,11 +52,11 @@ func TestVideo(t *testing.T) {
 
 func TestVideo_Validate(t *testing.T) {
 	subject := &Video{}
-	if exp, got := ErrInvalidVideoNoMimes, subject.Validate(); !errors.Is(exp, got) {
+	if exp, got := ErrInvalidVideoNoMimes, subject.Validate(); !errors.Is(got, exp) {
 		t.Fatalf("expected %v, got %v", exp, got)
 	}
 	subject = &Video{Mimes: []string{"video/mp4"}}
-	if exp, got := ErrInvalidVideoNoLinearity, subject.Validate(); !errors.Is(exp, got) {
+	if exp, got := ErrInvalidVideoNoLinearity, subject.Validate(); !errors.Is(got, exp) {
 		t.Fatalf("expected %v, got %v", exp, got)
 	}
 	subject = &Video{
@@ -65,7 +65,7 @@ func TestVideo_Validate(t *testing.T) {
 		Linearity:   VideoLinearityNonLinear,
 		Mimes:       []string{"video/mp4"},
 	}
-	if exp, got := ErrInvalidVideoNoProtocols, subject.Validate(); !errors.Is(exp, got) {
+	if exp, got := ErrInvalidVideoNoProtocols, subject.Validate(); !errors.Is(got, exp) {
 		t.Fatalf("expected %v, got %v", exp, got)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ func TestAudio_Validate(t *testing.T) {`
`56`	`56`	`},`
`57`	`57`	`CompanionType: []int{VASTCompanionStatic, VASTCompanionHTML},`
`58`	`58`	`}`
`59`		`- if exp, got := ErrInvalidAudioNoMimes, subject.Validate(); !errors.Is(exp, got) {`
	`59`	`+ if exp, got := ErrInvalidAudioNoMimes, subject.Validate(); !errors.Is(got, exp) {`
`60`	`60`	`t.Fatalf("expected %v, got %v", exp, got)`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,11 @@ func TestBid(t *testing.T) {`
`35`	`35`
`36`	`36`	`func TestBid_Validate(t *testing.T) {`
`37`	`37`	`subject := &Bid{}`
`38`		`- if exp, got := ErrInvalidBidNoID, subject.Validate(); !errors.Is(exp, got) {`
	`38`	`+ if exp, got := ErrInvalidBidNoID, subject.Validate(); !errors.Is(got, exp) {`
`39`	`39`	`t.Fatalf("expected %v, got %v", exp, got)`
`40`	`40`	`}`
`41`	`41`	`subject = &Bid{ID: "BIDID"}`
`42`		`- if exp, got := ErrInvalidBidNoImpID, subject.Validate(); !errors.Is(exp, got) {`
	`42`	`+ if exp, got := ErrInvalidBidNoImpID, subject.Validate(); !errors.Is(got, exp) {`
`43`	`43`	`t.Fatalf("expected %v, got %v", exp, got)`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,15 +74,15 @@ func TestBidRequest_complex(t *testing.T) {`
`74`	`74`
`75`	`75`	`func TestBidRequest_Validate(t *testing.T) {`
`76`	`76`	`subject := &BidRequest{}`
`77`		`- if exp, got := ErrInvalidReqNoID, subject.Validate(); !errors.Is(exp, got) {`
	`77`	`+ if exp, got := ErrInvalidReqNoID, subject.Validate(); !errors.Is(got, exp) {`
`78`	`78`	`t.Fatalf("expected %v, got %v", exp, got)`
`79`	`79`	`}`
`80`	`80`	`subject = &BidRequest{ID: "RID"}`
`81`		`- if exp, got := ErrInvalidReqNoImps, subject.Validate(); !errors.Is(exp, got) {`
	`81`	`+ if exp, got := ErrInvalidReqNoImps, subject.Validate(); !errors.Is(got, exp) {`
`82`	`82`	`t.Fatalf("expected %v, got %v", exp, got)`
`83`	`83`	`}`
`84`	`84`	`subject = &BidRequest{ID: "A", Imp: []Impression{{ID: "1"}}, Site: &Site{}, App: &App{}}`
`85`		`- if exp, got := ErrInvalidReqMultiInv, subject.Validate(); !errors.Is(exp, got) {`
	`85`	`+ if exp, got := ErrInvalidReqMultiInv, subject.Validate(); !errors.Is(got, exp) {`
`86`	`86`	`t.Fatalf("expected %v, got %v", exp, got)`
`87`	`87`	`}`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,11 +56,11 @@ func TestBidResponse_complex(t *testing.T) {`
`56`	`56`
`57`	`57`	`func TestBidResponse_Validate(t *testing.T) {`
`58`	`58`	`subject := &BidResponse{}`
`59`		`- if exp, got := ErrInvalidRespNoID, subject.Validate(); !errors.Is(exp, got) {`
	`59`	`+ if exp, got := ErrInvalidRespNoID, subject.Validate(); !errors.Is(got, exp) {`
`60`	`60`	`t.Fatalf("expected %v, got %v", exp, got)`
`61`	`61`	`}`
`62`	`62`	`subject = &BidResponse{ID: "RID"}`
`63`		`- if exp, got := ErrInvalidRespNoSeatBids, subject.Validate(); !errors.Is(exp, got) {`
	`63`	`+ if exp, got := ErrInvalidRespNoSeatBids, subject.Validate(); !errors.Is(got, exp) {`
`64`	`64`	`t.Fatalf("expected %v, got %v", exp, got)`
`65`	`65`	`}`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,11 +55,11 @@ func TestImpression(t *testing.T) {`
`55`	`55`
`56`	`56`	`func TestImpression_Validate(t *testing.T) {`
`57`	`57`	`subject := &Impression{}`
`58`		`- if exp, got := ErrInvalidImpNoID, subject.Validate(); !errors.Is(exp, got) {`
	`58`	`+ if exp, got := ErrInvalidImpNoID, subject.Validate(); !errors.Is(got, exp) {`
`59`	`59`	`t.Fatalf("expected %v, got %v", exp, got)`
`60`	`60`	`}`
`61`	`61`	`subject = &Impression{ID: "IMPID", Banner: &Banner{}, Video: &Video{}}`
`62`		`- if exp, got := ErrInvalidImpMultiAssets, subject.Validate(); !errors.Is(exp, got) {`
	`62`	`+ if exp, got := ErrInvalidImpMultiAssets, subject.Validate(); !errors.Is(got, exp) {`
`63`	`63`	`t.Fatalf("expected %v, got %v", exp, got)`
`64`	`64`	`}`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`
`10`	`10`	`func TestSeatBid_Validate(t *testing.T) {`
`11`	`11`	`subject := &SeatBid{}`
`12`		`- if exp, got := ErrInvalidSeatBidBid, subject.Validate(); !errors.Is(exp, got) {`
	`12`	`+ if exp, got := ErrInvalidSeatBidBid, subject.Validate(); !errors.Is(got, exp) {`
`13`	`13`	`t.Fatalf("expected %v, got %v", exp, got)`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,11 +52,11 @@ func TestVideo(t *testing.T) {`
`52`	`52`
`53`	`53`	`func TestVideo_Validate(t *testing.T) {`
`54`	`54`	`subject := &Video{}`
`55`		`- if exp, got := ErrInvalidVideoNoMimes, subject.Validate(); !errors.Is(exp, got) {`
	`55`	`+ if exp, got := ErrInvalidVideoNoMimes, subject.Validate(); !errors.Is(got, exp) {`
`56`	`56`	`t.Fatalf("expected %v, got %v", exp, got)`
`57`	`57`	`}`
`58`	`58`	`subject = &Video{Mimes: []string{"video/mp4"}}`
`59`		`- if exp, got := ErrInvalidVideoNoLinearity, subject.Validate(); !errors.Is(exp, got) {`
	`59`	`+ if exp, got := ErrInvalidVideoNoLinearity, subject.Validate(); !errors.Is(got, exp) {`
`60`	`60`	`t.Fatalf("expected %v, got %v", exp, got)`
`61`	`61`	`}`
`62`	`62`	`subject = &Video{`
`@@ -65,7 +65,7 @@ func TestVideo_Validate(t *testing.T) {`
`65`	`65`	`Linearity: VideoLinearityNonLinear,`
`66`	`66`	`Mimes: []string{"video/mp4"},`
`67`	`67`	`}`
`68`		`- if exp, got := ErrInvalidVideoNoProtocols, subject.Validate(); !errors.Is(exp, got) {`
	`68`	`+ if exp, got := ErrInvalidVideoNoProtocols, subject.Validate(); !errors.Is(got, exp) {`
`69`	`69`	`t.Fatalf("expected %v, got %v", exp, got)`
`70`	`70`	`}`
`71`	`71`	`}`