test: updates after requiring error in NewTagMaxLengthErr(..)

moov-io · Jun 6, 2023 · 17baa04 · 17baa04
1 parent df51ffb
commit 17baa04
Show file tree

Hide file tree

Showing 57 changed files with 172 additions and 110 deletions.
diff --git a/accountCreditedDrawdown_test.go b/accountCreditedDrawdown_test.go
@@ -1,6 +1,7 @@
 package wire
 
 import (
+	"errors"
 	"strings"
 	"testing"
 
@@ -94,7 +95,7 @@ func TestStringAccountCreditedDrawdownVariableLength(t *testing.T) {
 	r.line = line
 
 	err = r.parseAccountCreditedDrawdown()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{5400} *"
 	r = NewReader(strings.NewReader(line))

diff --git a/accountDebitedDrawdown_test.go b/accountDebitedDrawdown_test.go
@@ -1,6 +1,7 @@
 package wire
 
 import (
+	"errors"
 	"strings"
 	"testing"
 
@@ -179,7 +180,7 @@ func TestStringAccountDebitedDrawdownVariableLength(t *testing.T) {
 	r.line = line
 
 	err = r.parseAccountDebitedDrawdown()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{4400}***"
 	r = NewReader(strings.NewReader(line))

diff --git a/actualAmountPaid_test.go b/actualAmountPaid_test.go
@@ -1,6 +1,7 @@
 package wire
 
 import (
+	"errors"
 	"strings"
 	"testing"
 
@@ -115,14 +116,14 @@ func TestStringActualAmountPaidVariableLength(t *testing.T) {
 	r.line = line
 
 	err = r.parseActualAmountPaid()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{8450}****"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 
 	err = r.parseActualAmountPaid()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{8450}**"
 	r = NewReader(strings.NewReader(line))

diff --git a/adjustment_test.go b/adjustment_test.go
@@ -1,6 +1,7 @@
 package wire
 
 import (
+	"errors"
 	"strings"
 	"testing"
 
@@ -158,14 +159,14 @@ func TestStringAdjustmentVariableLength(t *testing.T) {
 	r.line = line
 
 	err = r.parseAdjustment()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{8600}01CRDTUSD1234.56****"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 
 	err = r.parseAdjustment()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{8600}01CRDTUSD1234.56*"
 	r = NewReader(strings.NewReader(line))

diff --git a/amountNegotiatedDiscount_test.go b/amountNegotiatedDiscount_test.go
@@ -1,6 +1,7 @@
 package wire
 
 import (
+	"errors"
 	"strings"
 	"testing"
 
@@ -115,14 +116,14 @@ func TestStringAmountNegotiatedDiscountVariableLength(t *testing.T) {
 	r.line = line
 
 	err = r.parseAmountNegotiatedDiscount()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{8550}USD1234.56***"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 
 	err = r.parseAmountNegotiatedDiscount()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{8550}USD1234.56*"
 	r = NewReader(strings.NewReader(line))

diff --git a/beneficiaryCustomer_test.go b/beneficiaryCustomer_test.go
@@ -1,6 +1,7 @@
 package wire
 
 import (
+	"errors"
 	"strings"
 	"testing"
 
@@ -148,14 +149,14 @@ func TestStringBeneficiaryCustomerVariableLength(t *testing.T) {
 	r.line = line
 
 	err = r.parseBeneficiaryCustomer()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{7059}********"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 
 	err = r.parseBeneficiaryCustomer()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{7059}******"
 	r = NewReader(strings.NewReader(line))

diff --git a/beneficiaryFI_test.go b/beneficiaryFI_test.go
@@ -1,6 +1,7 @@
 package wire
 
 import (
+	"errors"
 	"strings"
 	"testing"
 
@@ -169,14 +170,14 @@ func TestStringBeneficiaryFIVariableLength(t *testing.T) {
 	r.line = line
 
 	err = r.parseBeneficiaryFI()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{4100}D123456789*******"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 
 	err = r.parseBeneficiaryFI()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{4100}D123456789****"
 	r = NewReader(strings.NewReader(line))

diff --git a/beneficiaryIntermediaryFI_test.go b/beneficiaryIntermediaryFI_test.go
@@ -1,6 +1,7 @@
 package wire
 
 import (
+	"errors"
 	"strings"
 	"testing"
 
@@ -172,14 +173,14 @@ func TestStringBeneficiaryIntermediaryFIVariableLength(t *testing.T) {
 	r.line = line
 
 	err = r.parseBeneficiaryIntermediaryFI()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{4000}D123456789*******"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 
 	err = r.parseBeneficiaryIntermediaryFI()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{4000}D123456789****"
 	r = NewReader(strings.NewReader(line))

diff --git a/beneficiaryReference_test.go b/beneficiaryReference_test.go
@@ -1,6 +1,7 @@
 package wire
 
 import (
+	"errors"
 	"strings"
 	"testing"
 
@@ -83,14 +84,14 @@ func TestStringBeneficiaryReferenceVariableLength(t *testing.T) {
 	r.line = line
 
 	err = r.parseBeneficiaryReference()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{4320}***"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 
 	err = r.parseBeneficiaryReference()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{4320}*"
 	r = NewReader(strings.NewReader(line))

diff --git a/beneficiary_test.go b/beneficiary_test.go
@@ -1,6 +1,7 @@
 package wire
 
 import (
+	"errors"
 	"strings"
 	"testing"
 
@@ -159,14 +160,14 @@ func TestStringBeneficiaryVariableLength(t *testing.T) {
 	r.line = line
 
 	err = r.parseBeneficiary()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{4200}31234*******"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 
 	err = r.parseBeneficiary()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{4200}31234*****"
 	r = NewReader(strings.NewReader(line))

diff --git a/businessFunctionCode_test.go b/businessFunctionCode_test.go
@@ -1,6 +1,7 @@
 package wire
 
 import (
+	"errors"
 	"strings"
 	"testing"
 
@@ -95,14 +96,14 @@ func TestStringBusinessFunctionCodeVariableLength(t *testing.T) {
 	r.line = line
 
 	err = r.parseBusinessFunctionCode()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{3600}BTR***"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 
 	err = r.parseBusinessFunctionCode()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{3600}BTR*"
 	r = NewReader(strings.NewReader(line))

diff --git a/charges_test.go b/charges_test.go
@@ -1,6 +1,7 @@
 package wire
 
 import (
+	"errors"
 	"strings"
 	"testing"
 
@@ -58,14 +59,14 @@ func TestStringChargesVariableLength(t *testing.T) {
 	r.line = line
 
 	err = r.parseCharges()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{3700}B******"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 
 	err = r.parseCharges()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{3700}B*"
 	r = NewReader(strings.NewReader(line))

diff --git a/converters.go b/converters.go
@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
-	"unicode/utf8"
 )
 
 // converters handles golang to WIRE type Converters
@@ -153,7 +152,7 @@ func (c *converters) stripDelimiters(data string) string {
 
 // verify input data with read length
 func (c *converters) verifyDataWithReadLength(data string, expected int) error {
-	n := utf8.RuneCountInString(data)
+	n := len(data) // utf8.RuneCountInString(data)
 	if n == expected {
 		return nil
 	}

diff --git a/currencyInstructedAmount_test.go b/currencyInstructedAmount_test.go
@@ -1,6 +1,7 @@
 package wire
 
 import (
+	"errors"
 	"strings"
 	"testing"
 
@@ -96,7 +97,7 @@ func TestStringCurrencyInstructedAmountVariableLength(t *testing.T) {
 	r.line = line
 
 	err = r.parseCurrencyInstructedAmount()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 }
 
 // TestStringCurrencyInstructedAmountOptions validates Format() formatted according to the FormatOptions

diff --git a/errorWire_test.go b/errorWire_test.go
@@ -1,6 +1,7 @@
 package wire
 
 import (
+	"errors"
 	"strings"
 	"testing"
 
@@ -63,14 +64,14 @@ func TestStringErrorWireAmountVariableLength(t *testing.T) {
 	r.line = line
 
 	err = r.parseErrorWire()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{1130}1XYZData Error***"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 
 	err = r.parseErrorWire()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{1130}1XYZData Error*"
 	r = NewReader(strings.NewReader(line))

diff --git a/exchangeRate_test.go b/exchangeRate_test.go
@@ -1,6 +1,7 @@
 package wire
 
 import (
+	"errors"
 	"strings"
 	"testing"
 
@@ -85,14 +86,14 @@ func TestStringErrorExchangeRateVariableLength(t *testing.T) {
 	r.line = line
 
 	err = r.parseExchangeRate()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{3720}123***"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 
 	err = r.parseExchangeRate()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{3720}123*"
 	r = NewReader(strings.NewReader(line))

diff --git a/fIBeneficiaryFIAdvice_test.go b/fIBeneficiaryFIAdvice_test.go
@@ -1,6 +1,7 @@
 package wire
 
 import (
+	"errors"
 	"strings"
 	"testing"
 
@@ -149,14 +150,14 @@ func TestStringFIBeneficiaryFIAdviceVariableLength(t *testing.T) {
 	r.line = line
 
 	err = r.parseFIBeneficiaryFIAdvice()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{6310}HLD********"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 
 	err = r.parseFIBeneficiaryFIAdvice()
-	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
+	require.ErrorContains(t, err, r.parseError(NewTagMaxLengthErr(errors.New(""))).Error())
 
 	line = "{6310}HLD*"
 	r = NewReader(strings.NewReader(line))