Skip to content

Commit 496ff97

Browse files
adamdecafadamdecaf
committed
meta: apply testifylint -fix
1 parent c42d882 commit 496ff97

File tree

57 files changed

+288
-288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+288
-288
lines changed

‎accountCreditedDrawdown_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,10 @@ func TestStringAccountCreditedDrawdownOptions(t *testing.T) {
128128
r.line = line
129129

130130
err := r.parseAccountCreditedDrawdown()
131-
require.Equal(t, err, nil)
131+
require.NoError(t, err)
132132

133133
acd := r.currentFEDWireMessage.AccountCreditedDrawdown
134-
require.Equal(t, acd.String(), "{5400}1 ")
135-
require.Equal(t, acd.Format(FormatOptions{VariableLengthFields: true}), "{5400}1 ")
134+
require.Equal(t, "{5400}1 ", acd.String())
135+
require.Equal(t, "{5400}1 ", acd.Format(FormatOptions{VariableLengthFields: true}))
136136
require.Equal(t, acd.String(), acd.Format(FormatOptions{VariableLengthFields: false}))
137137
}

‎accountDebitedDrawdown_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ func TestStringAccountDebitedDrawdownVariableLength(t *testing.T) {
194194
r.line = line
195195

196196
err = r.parseAccountDebitedDrawdown()
197-
require.Equal(t, err, nil)
197+
require.NoError(t, err)
198198
}
199199

200200
// TestStringDebitedDrawdownOptions validates Format() formatted according to the FormatOptions
@@ -204,10 +204,10 @@ func TestStringAccountDebitedDrawdownOptions(t *testing.T) {
204204
r.line = line
205205

206206
err := r.parseAccountDebitedDrawdown()
207-
require.Equal(t, err, nil)
207+
require.NoError(t, err)
208208

209209
add := r.currentFEDWireMessage.AccountDebitedDrawdown
210-
require.Equal(t, add.String(), "{4400}D2 *3 * * * *")
211-
require.Equal(t, add.Format(FormatOptions{VariableLengthFields: true}), "{4400}D2*3*")
210+
require.Equal(t, "{4400}D2 *3 * * * *", add.String())
211+
require.Equal(t, "{4400}D2*3*", add.Format(FormatOptions{VariableLengthFields: true}))
212212
require.Equal(t, add.String(), add.Format(FormatOptions{VariableLengthFields: false}))
213213
}

‎actualAmountPaid_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ func TestStringActualAmountPaidVariableLength(t *testing.T) {
136136
r.line = line
137137

138138
err = r.parseActualAmountPaid()
139-
require.Equal(t, err, nil)
139+
require.NoError(t, err)
140140
}
141141

142142
// TestStringActualAmountPaidOptions validates Format() formatted according to the FormatOptions
@@ -146,10 +146,10 @@ func TestStringActualAmountPaidOptions(t *testing.T) {
146146
r.line = line
147147

148148
err := r.parseActualAmountPaid()
149-
require.Equal(t, err, nil)
149+
require.NoError(t, err)
150150

151151
aap := r.currentFEDWireMessage.ActualAmountPaid
152-
require.Equal(t, aap.String(), "{8450}USD1234.56 *")
153-
require.Equal(t, aap.Format(FormatOptions{VariableLengthFields: true}), "{8450}USD1234.56*")
152+
require.Equal(t, "{8450}USD1234.56 *", aap.String())
153+
require.Equal(t, "{8450}USD1234.56*", aap.Format(FormatOptions{VariableLengthFields: true}))
154154
require.Equal(t, aap.String(), aap.Format(FormatOptions{VariableLengthFields: false}))
155155
}

‎adjustment_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ func TestStringAdjustmentVariableLength(t *testing.T) {
172172
r.line = line
173173

174174
err = r.parseAdjustment()
175-
require.Equal(t, err, nil)
175+
require.NoError(t, err)
176176
}
177177

178178
// TestStringAdjustmentOptions validates Format() formatted according to the FormatOptions
@@ -182,10 +182,10 @@ func TestStringAdjustmentOptions(t *testing.T) {
182182
r.line = line
183183

184184
err := r.parseAdjustment()
185-
require.Equal(t, err, nil)
185+
require.NoError(t, err)
186186

187187
adj := r.currentFEDWireMessage.Adjustment
188-
require.Equal(t, adj.String(), "{8600}01CRDTUSD1234.56 * *")
189-
require.Equal(t, adj.Format(FormatOptions{VariableLengthFields: true}), "{8600}01CRDTUSD1234.56*")
188+
require.Equal(t, "{8600}01CRDTUSD1234.56 * *", adj.String())
189+
require.Equal(t, "{8600}01CRDTUSD1234.56*", adj.Format(FormatOptions{VariableLengthFields: true}))
190190
require.Equal(t, adj.String(), adj.Format(FormatOptions{VariableLengthFields: false}))
191191
}

‎amountNegotiatedDiscount_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func TestStringAmountNegotiatedDiscountVariableLength(t *testing.T) {
130130
r.line = line
131131

132132
err = r.parseAmountNegotiatedDiscount()
133-
require.Equal(t, err, nil)
133+
require.NoError(t, err)
134134
}
135135

136136
// TestStringAmountNegotiatedDiscountOptions validates Format() formatted according to the FormatOptions
@@ -140,10 +140,10 @@ func TestStringAmountNegotiatedDiscountOptions(t *testing.T) {
140140
r.line = line
141141

142142
err := r.parseAmountNegotiatedDiscount()
143-
require.Equal(t, err, nil)
143+
require.NoError(t, err)
144144

145145
and := r.currentFEDWireMessage.AmountNegotiatedDiscount
146-
require.Equal(t, and.String(), "{8550}USD1234.56 *")
147-
require.Equal(t, and.Format(FormatOptions{VariableLengthFields: true}), "{8550}USD1234.56*")
146+
require.Equal(t, "{8550}USD1234.56 *", and.String())
147+
require.Equal(t, "{8550}USD1234.56*", and.Format(FormatOptions{VariableLengthFields: true}))
148148
require.Equal(t, and.String(), and.Format(FormatOptions{VariableLengthFields: false}))
149149
}

‎beneficiaryCustomer_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func TestStringBeneficiaryCustomerVariableLength(t *testing.T) {
142142
r.line = line
143143

144144
err := r.parseBeneficiaryCustomer()
145-
require.Nil(t, err)
145+
require.NoError(t, err)
146146

147147
line = "{7059}SwiftSwift ®ine One *Swift Line Two *Swift Line Three *Swift Line Four *Swift Line Five NN"
148148
r = NewReader(strings.NewReader(line))
@@ -163,7 +163,7 @@ func TestStringBeneficiaryCustomerVariableLength(t *testing.T) {
163163
r.line = line
164164

165165
err = r.parseBeneficiaryCustomer()
166-
require.Equal(t, err, nil)
166+
require.NoError(t, err)
167167
}
168168

169169
// TestStringBeneficiaryCustomerOptions validates Format() formatted according to the FormatOptions
@@ -173,10 +173,10 @@ func TestStringBeneficiaryCustomerOptions(t *testing.T) {
173173
r.line = line
174174

175175
err := r.parseBeneficiaryCustomer()
176-
require.Equal(t, err, nil)
176+
require.NoError(t, err)
177177

178178
bc := r.currentFEDWireMessage.BeneficiaryCustomer
179-
require.Equal(t, bc.String(), "{7059} * * * * * *")
180-
require.Equal(t, bc.Format(FormatOptions{VariableLengthFields: true}), "{7059}*")
179+
require.Equal(t, "{7059} * * * * * *", bc.String())
180+
require.Equal(t, "{7059}*", bc.Format(FormatOptions{VariableLengthFields: true}))
181181
require.Equal(t, bc.String(), bc.Format(FormatOptions{VariableLengthFields: false}))
182182
}

‎beneficiaryFI_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ func TestStringBeneficiaryFIVariableLength(t *testing.T) {
184184
r.line = line
185185

186186
err = r.parseBeneficiaryFI()
187-
require.Equal(t, err, nil)
187+
require.NoError(t, err)
188188
}
189189

190190
// TestStringBeneficiaryFIOptions validates Format() formatted according to the FormatOptions
@@ -194,10 +194,10 @@ func TestStringBeneficiaryFIOptions(t *testing.T) {
194194
r.line = line
195195

196196
err := r.parseBeneficiaryFI()
197-
require.Equal(t, err, nil)
197+
require.NoError(t, err)
198198

199199
bfi := r.currentFEDWireMessage.BeneficiaryFI
200-
require.Equal(t, bfi.String(), "{4100}D123456789 * * * * *")
201-
require.Equal(t, bfi.Format(FormatOptions{VariableLengthFields: true}), "{4100}D123456789*")
200+
require.Equal(t, "{4100}D123456789 * * * * *", bfi.String())
201+
require.Equal(t, "{4100}D123456789*", bfi.Format(FormatOptions{VariableLengthFields: true}))
202202
require.Equal(t, bfi.String(), bfi.Format(FormatOptions{VariableLengthFields: false}))
203203
}

‎beneficiaryIntermediaryFI_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ func TestStringBeneficiaryIntermediaryFIVariableLength(t *testing.T) {
187187
r.line = line
188188

189189
err = r.parseBeneficiaryIntermediaryFI()
190-
require.Equal(t, err, nil)
190+
require.NoError(t, err)
191191
}
192192

193193
// TestStringBeneficiaryIntermediaryFIOptions validates Format() formatted according to the FormatOptions
@@ -197,10 +197,10 @@ func TestStringBeneficiaryIntermediaryFIOptions(t *testing.T) {
197197
r.line = line
198198

199199
err := r.parseBeneficiaryIntermediaryFI()
200-
require.Equal(t, err, nil)
200+
require.NoError(t, err)
201201

202202
bifi := r.currentFEDWireMessage.BeneficiaryIntermediaryFI
203-
require.Equal(t, bifi.String(), "{4000}D123456789 * * * * *")
204-
require.Equal(t, bifi.Format(FormatOptions{VariableLengthFields: true}), "{4000}D123456789*")
203+
require.Equal(t, "{4000}D123456789 * * * * *", bifi.String())
204+
require.Equal(t, "{4000}D123456789*", bifi.Format(FormatOptions{VariableLengthFields: true}))
205205
require.Equal(t, bifi.String(), bifi.Format(FormatOptions{VariableLengthFields: false}))
206206
}

‎beneficiaryReference_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func TestStringBeneficiaryReferenceVariableLength(t *testing.T) {
7777
r.line = line
7878

7979
err := r.parseBeneficiaryReference()
80-
require.Nil(t, err)
80+
require.NoError(t, err)
8181

8282
line = "{4320}Reference NN"
8383
r = NewReader(strings.NewReader(line))
@@ -98,7 +98,7 @@ func TestStringBeneficiaryReferenceVariableLength(t *testing.T) {
9898
r.line = line
9999

100100
err = r.parseBeneficiaryReference()
101-
require.Equal(t, err, nil)
101+
require.NoError(t, err)
102102
}
103103

104104
// TestStringBeneficiaryReferenceOptions validates Format() formatted according to the FormatOptions
@@ -108,10 +108,10 @@ func TestStringBeneficiaryReferenceOptions(t *testing.T) {
108108
r.line = line
109109

110110
err := r.parseBeneficiaryReference()
111-
require.Equal(t, err, nil)
111+
require.NoError(t, err)
112112

113113
br := r.currentFEDWireMessage.BeneficiaryReference
114-
require.Equal(t, br.String(), "{4320}Reference *")
115-
require.Equal(t, br.Format(FormatOptions{VariableLengthFields: true}), "{4320}Reference*")
114+
require.Equal(t, "{4320}Reference *", br.String())
115+
require.Equal(t, "{4320}Reference*", br.Format(FormatOptions{VariableLengthFields: true}))
116116
require.Equal(t, br.String(), br.Format(FormatOptions{VariableLengthFields: false}))
117117
}

‎beneficiary_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ func TestStringBeneficiaryVariableLength(t *testing.T) {
178178
r.line = line
179179

180180
err = r.parseBeneficiary()
181-
require.Equal(t, err, nil)
181+
require.NoError(t, err)
182182
}
183183

184184
// TestStringBeneficiaryOptions validates Format() formatted according to the FormatOptions
@@ -188,10 +188,10 @@ func TestStringBeneficiaryOptions(t *testing.T) {
188188
r.line = line
189189

190190
err := r.parseBeneficiary()
191-
require.Equal(t, err, nil)
191+
require.NoError(t, err)
192192

193193
ben := r.currentFEDWireMessage.Beneficiary
194-
require.Equal(t, ben.String(), "{4200}31234 * * * * *")
195-
require.Equal(t, ben.Format(FormatOptions{VariableLengthFields: true}), "{4200}31234*")
194+
require.Equal(t, "{4200}31234 * * * * *", ben.String())
195+
require.Equal(t, "{4200}31234*", ben.Format(FormatOptions{VariableLengthFields: true}))
196196
require.Equal(t, ben.String(), ben.Format(FormatOptions{VariableLengthFields: false}))
197197
}

‎businessFunctionCode_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func TestStringBusinessFunctionCodeVariableLength(t *testing.T) {
121121
r.line = line
122122

123123
err = r.parseBusinessFunctionCode()
124-
require.Equal(t, err, nil)
124+
require.NoError(t, err)
125125
}
126126

127127
// TestStringBusinessFunctionCodeOptions validates Format() formatted according to the FormatOptions
@@ -131,7 +131,7 @@ func TestStringBusinessFunctionCodeOptions(t *testing.T) {
131131
r.line = line
132132

133133
err := r.parseBusinessFunctionCode()
134-
require.Equal(t, err, nil)
134+
require.NoError(t, err)
135135

136136
bfc := r.currentFEDWireMessage.BusinessFunctionCode
137137
require.Equal(t, "{3600}BTR", bfc.String())

‎charges_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func TestStringChargesVariableLength(t *testing.T) {
7373
r.line = line
7474

7575
err = r.parseCharges()
76-
require.Equal(t, err, nil)
76+
require.NoError(t, err)
7777
}
7878

7979
// TestStringChargesOptions validates Format() formatted according to the FormatOptions
@@ -83,10 +83,10 @@ func TestStringChargesOptions(t *testing.T) {
8383
r.line = line
8484

8585
err := r.parseCharges()
86-
require.Equal(t, err, nil)
86+
require.NoError(t, err)
8787

8888
record := r.currentFEDWireMessage.Charges
89-
require.Equal(t, record.String(), "{3700}B * * * *")
90-
require.Equal(t, record.Format(FormatOptions{VariableLengthFields: true}), "{3700}B*")
89+
require.Equal(t, "{3700}B * * * *", record.String())
90+
require.Equal(t, "{3700}B*", record.Format(FormatOptions{VariableLengthFields: true}))
9191
require.Equal(t, record.String(), record.Format(FormatOptions{VariableLengthFields: false}))
9292
}

‎converters_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ func TestConverters__stripDelimiters(t *testing.T) {
2626
func TestConverters__parseFirstOption(t *testing.T) {
2727
c := &converters{}
2828

29-
require.Equal(t, false, c.parseFirstOption([]bool{}))
30-
require.Equal(t, false, c.parseFirstOption([]bool{false, false}))
31-
require.Equal(t, false, c.parseFirstOption([]bool{false, true}))
32-
require.Equal(t, true, c.parseFirstOption([]bool{true, false}))
33-
require.Equal(t, true, c.parseFirstOption([]bool{true, true}))
29+
require.False(t, c.parseFirstOption([]bool{}))
30+
require.False(t, c.parseFirstOption([]bool{false, false}))
31+
require.False(t, c.parseFirstOption([]bool{false, true}))
32+
require.True(t, c.parseFirstOption([]bool{true, false}))
33+
require.True(t, c.parseFirstOption([]bool{true, true}))
3434
}
3535

3636
func TestConverters__parseVariableStringField(t *testing.T) {

‎currencyInstructedAmount_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func TestStringCurrencyInstructedAmountVariableLength(t *testing.T) {
8989
r.line = line
9090

9191
err := r.parseCurrencyInstructedAmount()
92-
require.Nil(t, err)
92+
require.NoError(t, err)
9393

9494
line = "{7033}B NNN"
9595
r = NewReader(strings.NewReader(line))
@@ -106,10 +106,10 @@ func TestStringCurrencyInstructedAmountOptions(t *testing.T) {
106106
r.line = line
107107

108108
err := r.parseCurrencyInstructedAmount()
109-
require.Equal(t, err, nil)
109+
require.NoError(t, err)
110110

111111
record := r.currentFEDWireMessage.CurrencyInstructedAmount
112-
require.Equal(t, record.String(), "{7033} *000000000001500,49*")
113-
require.Equal(t, record.Format(FormatOptions{VariableLengthFields: true}), "{7033}*000000000001500,49*")
112+
require.Equal(t, "{7033} *000000000001500,49*", record.String())
113+
require.Equal(t, "{7033}*000000000001500,49*", record.Format(FormatOptions{VariableLengthFields: true}))
114114
require.Equal(t, record.String(), record.Format(FormatOptions{VariableLengthFields: false}))
115115
}

‎errorWire_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func TestStringErrorWireAmountVariableLength(t *testing.T) {
5757
r.line = line
5858

5959
err := r.parseErrorWire()
60-
require.Nil(t, err)
60+
require.NoError(t, err)
6161

6262
line = "{1130}1XYZData Error NNN"
6363
r = NewReader(strings.NewReader(line))
@@ -78,7 +78,7 @@ func TestStringErrorWireAmountVariableLength(t *testing.T) {
7878
r.line = line
7979

8080
err = r.parseErrorWire()
81-
require.Equal(t, err, nil)
81+
require.NoError(t, err)
8282
}
8383

8484
// TestStringErrorWireOptions validates Format() formatted according to the FormatOptions
@@ -88,10 +88,10 @@ func TestStringErrorWireOptions(t *testing.T) {
8888
r.line = line
8989

9090
err := r.parseErrorWire()
91-
require.Equal(t, err, nil)
91+
require.NoError(t, err)
9292

9393
record := r.currentFEDWireMessage.ErrorWire
94-
require.Equal(t, record.String(), "{1130}1XYZData Error *")
95-
require.Equal(t, record.Format(FormatOptions{VariableLengthFields: true}), "{1130}1XYZData Error*")
94+
require.Equal(t, "{1130}1XYZData Error *", record.String())
95+
require.Equal(t, "{1130}1XYZData Error*", record.Format(FormatOptions{VariableLengthFields: true}))
9696
require.Equal(t, record.String(), record.Format(FormatOptions{VariableLengthFields: false}))
9797
}

‎exchangeRate_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func TestStringErrorExchangeRateVariableLength(t *testing.T) {
7979
r.line = line
8080

8181
err := r.parseExchangeRate()
82-
require.Nil(t, err)
82+
require.NoError(t, err)
8383

8484
line = "{3720}123 NNN"
8585
r = NewReader(strings.NewReader(line))
@@ -100,7 +100,7 @@ func TestStringErrorExchangeRateVariableLength(t *testing.T) {
100100
r.line = line
101101

102102
err = r.parseExchangeRate()
103-
require.Equal(t, err, nil)
103+
require.NoError(t, err)
104104
}
105105

106106
// TestStringExchangeRateOptions validates Format() formatted according to the FormatOptions
@@ -110,10 +110,10 @@ func TestStringExchangeRateOptions(t *testing.T) {
110110
r.line = line
111111

112112
err := r.parseExchangeRate()
113-
require.Equal(t, err, nil)
113+
require.NoError(t, err)
114114

115115
record := r.currentFEDWireMessage.ExchangeRate
116-
require.Equal(t, record.String(), "{3720}123 *")
117-
require.Equal(t, record.Format(FormatOptions{VariableLengthFields: true}), "{3720}123*")
116+
require.Equal(t, "{3720}123 *", record.String())
117+
require.Equal(t, "{3720}123*", record.Format(FormatOptions{VariableLengthFields: true}))
118118
require.Equal(t, record.String(), record.Format(FormatOptions{VariableLengthFields: false}))
119119
}

0 commit comments

Comments
 (0)