Skip to content

Commit 4b353fe

Browse files
pm-aditi-bansalpm-aditi-bansal
committed
Fixes unit Testcases
1 parent 447a992 commit 4b353fe

File tree

11 files changed

+44
-26
lines changed

11 files changed

+44
-26
lines changed

‎adapters/adapterstest/adapter_test_util.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,21 @@ func SampleBid(width *int64, height *int64, impId string, index int) openrtb2.Bi
4545
// VerifyStringValue Helper function to assert string equals.
4646
func VerifyStringValue(value string, expected string, t *testing.T) {
4747
if value != expected {
48-
t.Fatalf(fmt.Sprintf("%s expected, got %s", expected, value))
48+
t.Fatalf("%s expected, got %s", expected, value)
4949
}
5050
}
5151

5252
// VerifyIntValue Helper function to assert Int equals.
5353
func VerifyIntValue(value int, expected int, t *testing.T) {
5454
if value != expected {
55-
t.Fatalf(fmt.Sprintf("%d expected, got %d", expected, value))
55+
t.Fatalf("%d expected, got %d", expected, value)
5656
}
5757
}
5858

5959
// VerifyBoolValue Helper function to assert bool equals.
6060
func VerifyBoolValue(value bool, expected bool, t *testing.T) {
6161
if value != expected {
62-
t.Fatalf(fmt.Sprintf("%v expected, got %v", expected, value))
62+
t.Fatalf("%v expected, got %v", expected, value)
6363
}
6464
}
6565

‎adapters/ortbbidder/multi_request_builder.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func (rb *multiRequestBuilder) makeRequest() (requestData []*adapters.RequestDat
5757
//step 1: clone request
5858
if requestCloneRequired {
5959
if newRequest, err = cloneRequest(rb.rawRequest); err != nil {
60-
errs = append(errs, util.NewBadInputError(err.Error()))
60+
errs = append(errs, util.NewBadInputError("%s", err.Error()))
6161
continue
6262
}
6363
}
@@ -68,7 +68,7 @@ func (rb *multiRequestBuilder) makeRequest() (requestData []*adapters.RequestDat
6868

6969
//step 3: get endpoint
7070
if endpoint, err = rb.getEndpoint(bidderParams); err != nil {
71-
errs = append(errs, util.NewBadInputError(err.Error()))
71+
errs = append(errs, util.NewBadInputError("%s", err.Error()))
7272
continue
7373
}
7474

@@ -82,7 +82,7 @@ func (rb *multiRequestBuilder) makeRequest() (requestData []*adapters.RequestDat
8282
}
8383
//step 5: append new request data
8484
if requestData, err = appendRequestData(requestData, newRequest, endpoint, []string{imp[idKey].(string)}); err != nil {
85-
errs = append(errs, util.NewBadInputError(err.Error()))
85+
errs = append(errs, util.NewBadInputError("%s", err.Error()))
8686
}
8787
}
8888
return requestData, errs

‎adapters/ortbbidder/ortbbidder.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func Builder(bidderName openrtb_ext.BidderName, config config.Adapter, server co
6363
// MakeRequests prepares oRTB bidder-specific request information using which prebid server make call(s) to bidder.
6464
func (o *adapter) MakeRequests(request *openrtb2.BidRequest, requestInfo *adapters.ExtraRequestInfo) ([]*adapters.RequestData, []error) {
6565
if o.bidderParamsConfig == nil {
66-
return nil, []error{util.NewBadInputError(util.ErrNilBidderParamCfg.Error())}
66+
return nil, []error{util.NewBadInputError("%s", util.ErrNilBidderParamCfg.Error())}
6767
}
6868

6969
requestBuilder := newRequestBuilder(
@@ -73,7 +73,7 @@ func (o *adapter) MakeRequests(request *openrtb2.BidRequest, requestInfo *adapte
7373
o.bidderParamsConfig.GetRequestParams(o.bidderName.String()))
7474

7575
if err := requestBuilder.parseRequest(request); err != nil {
76-
return nil, []error{util.NewBadInputError(err.Error())}
76+
return nil, []error{util.NewBadInputError("%s", err.Error())}
7777
}
7878

7979
return requestBuilder.makeRequest()

‎adapters/ortbbidder/ortbbidder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ func TestMakeRequests(t *testing.T) {
149149
bidderCfg: bidderparams.NewBidderConfig(),
150150
},
151151
want: want{
152-
errors: []error{util.NewBadInputError(util.ErrImpMissing.Error())},
152+
errors: []error{util.NewBadInputError("%s", util.ErrImpMissing.Error())},
153153
},
154154
},
155155
{

‎adapters/ortbbidder/response_builder.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func (rb *responseBuilder) setPrebidBidderResponse(bidderResponseBytes json.RawM
3838

3939
err := jsonutil.UnmarshalValid(bidderResponseBytes, &rb.bidderResponse)
4040
if err != nil {
41-
return []error{util.NewBadServerResponseError(err.Error())}
41+
return []error{util.NewBadServerResponseError("%s", err.Error())}
4242
}
4343
// Create a new ParamResolver with the bidder response.
4444
paramResolver := resolver.New(rb.request, rb.bidderResponse)
@@ -101,12 +101,12 @@ func (rb *responseBuilder) buildAdapterResponse() (resp *adapters.BidderResponse
101101
var adapterResponeBytes json.RawMessage
102102
adapterResponeBytes, err = jsonutil.Marshal(rb.adapterRespone)
103103
if err != nil {
104-
return nil, util.NewBadServerResponseError(err.Error())
104+
return nil, util.NewBadServerResponseError("%s", err.Error())
105105
}
106106

107107
err = jsonutil.UnmarshalValid(adapterResponeBytes, &resp)
108108
if err != nil {
109-
return nil, util.NewBadServerResponseError(err.Error())
109+
return nil, util.NewBadServerResponseError("%s", err.Error())
110110
}
111111
return
112112
}
@@ -120,7 +120,7 @@ func collectWarningMessages(errs, resolverErrors []error, parameter string, isDe
120120
errs = append(errs, util.NewWarning("Potential issue encountered while setting the response parameter [%s]", parameter))
121121
return errs
122122
}
123-
errs = append(errs, util.NewWarning(err.Error()))
123+
errs = append(errs, util.NewWarning("%s", err.Error()))
124124
}
125125
}
126126
return errs

‎adapters/ortbbidder/single_request_builder.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func (rb *singleRequestBuilder) parseRequest(request *openrtb2.BidRequest) (err
5252
// it create single RequestData object for all impressions.
5353
func (rb *singleRequestBuilder) makeRequest() (requestData []*adapters.RequestData, errs []error) {
5454
if len(rb.imps) == 0 {
55-
errs = append(errs, util.NewBadInputError(util.ErrImpMissing.Error()))
55+
errs = append(errs, util.NewBadInputError("%s", util.ErrImpMissing.Error()))
5656
return
5757
}
5858

@@ -63,7 +63,7 @@ func (rb *singleRequestBuilder) makeRequest() (requestData []*adapters.RequestDa
6363

6464
//step 1: get endpoint
6565
if endpoint, err = rb.getEndpoint(getImpExtBidderParams(rb.imps[0])); err != nil {
66-
errs = append(errs, util.NewBadInputError(err.Error()))
66+
errs = append(errs, util.NewBadInputError("%s", err.Error()))
6767
return
6868
}
6969

@@ -76,7 +76,7 @@ func (rb *singleRequestBuilder) makeRequest() (requestData []*adapters.RequestDa
7676

7777
//step 3: append new request data
7878
if requestData, err = appendRequestData(requestData, rb.newRequest, endpoint, rb.impIDs); err != nil {
79-
errs = append(errs, util.NewBadInputError(err.Error()))
79+
errs = append(errs, util.NewBadInputError("%s", err.Error()))
8080
}
8181
return
8282
}

‎adapters/ortbbidder/single_request_builder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func TestSingleRequestBuilderMakeRequest(t *testing.T) {
112112
},
113113
want: want{
114114
requestData: nil,
115-
errs: []error{util.NewBadInputError(util.ErrImpMissing.Error())},
115+
errs: []error{util.NewBadInputError("%s", util.ErrImpMissing.Error())},
116116
},
117117
},
118118
{

‎adapters/ortbbidder/util/errors.go

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,37 @@ var (
1414
)
1515

1616
func NewBadInputError(message string, args ...any) error {
17+
var msg string
18+
if len(args) > 0 {
19+
msg = fmt.Sprintf(message, args...)
20+
} else {
21+
msg = message
22+
}
1723
return &errortypes.BadInput{
18-
Message: fmt.Sprintf(message, args...),
24+
Message: msg,
1925
}
2026
}
2127

2228
func NewBadServerResponseError(message string, args ...any) error {
29+
var msg string
30+
if len(args) > 0 {
31+
msg = fmt.Sprintf(message, args...)
32+
} else {
33+
msg = message
34+
}
2335
return &errortypes.BadServerResponse{
24-
Message: fmt.Sprintf(message, args...),
36+
Message: msg,
2537
}
2638
}
2739

2840
func NewWarning(message string, args ...any) error {
41+
var msg string
42+
if len(args) > 0 {
43+
msg = fmt.Sprintf(message, args...)
44+
} else {
45+
msg = message
46+
}
2947
return &errortypes.Warning{
30-
Message: fmt.Sprintf(message, args...),
48+
Message: msg,
3149
}
3250
}

‎endpoints/openrtb2/amp_auction_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3057,7 +3057,7 @@ func TestAmpAuctionDebugWarningsOnly(t *testing.T) {
30573057
)
30583058

30593059
for _, test := range testCases {
3060-
httpReq := httptest.NewRequest("GET", fmt.Sprintf("/openrtb2/auction/amp"+test.requestURLArguments), nil)
3060+
httpReq := httptest.NewRequest("GET", fmt.Sprintf("%s", "/openrtb2/auction/amp"+test.requestURLArguments), nil)
30613061
test.addRequestHeaders(httpReq)
30623062
recorder := httptest.NewRecorder()
30633063

‎modules/fiftyonedegrees/devicedetection/hook_raw_auction_request.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func handleAuctionRequestHook(ctx hookstage.ModuleInvocationContext, deviceDetec
3535

3636
result, err := hydrateFields(deviceInfo, rawPayload)
3737
if err != nil {
38-
return rawPayload, hookexecution.NewFailure(fmt.Sprintf("error hydrating fields %s", err))
38+
return rawPayload, hookexecution.NewFailure("%s", fmt.Sprintf("error hydrating fields %s", err))
3939
}
4040

4141
return result, nil

0 commit comments

Comments
 (0)