additional mocks

addiotnal mocks for writer and reader
moov-io · Apr 15, 2019 · a0285da · a0285da
1 parent ffbe06f
commit a0285da
Show file tree

Hide file tree

Showing 81 changed files with 704 additions and 230 deletions.
diff --git a/accountCreditedDrawdown_test.go b/accountCreditedDrawdown_test.go
@@ -1,6 +1,6 @@
 package wire
 
-//  mockAccountCreditedDrawdown creates a AccountCreditedDrawdown
+// mockAccountCreditedDrawdown creates a AccountCreditedDrawdown
 func mockAccountCreditedDrawdown() *AccountCreditedDrawdown {
 	creditDD := NewAccountCreditedDrawdown()
 	creditDD.DrawdownCreditAccountNumber = "123456789"

diff --git a/accountDebitedDrawdown_test.go b/accountDebitedDrawdown_test.go
@@ -1,6 +1,6 @@
 package wire
 
-//  mockAccountDebitedDrawdown creates a AccountDebitedDrawdown
+// mockAccountDebitedDrawdown creates a AccountDebitedDrawdown
 func mockAccountDebitedDrawdown() *AccountDebitedDrawdown {
 	debitDD := NewAccountDebitedDrawdown()
 	debitDD.IdentificationCode = "DemandDepositAccountNumber"

diff --git a/actualAmountPaid.go b/actualAmountPaid.go
@@ -11,7 +11,7 @@ type ActualAmountPaid struct {
 	// tag
 	tag string
 	// RemittanceAmount is remittance amounts
-	RemittanceAmount *RemittanceAmount `json:"remittanceAmount,omitempty"`
+	RemittanceAmount RemittanceAmount `json:"remittanceAmount,omitempty"`
 
 	// validator is composed for data validation
 	validator
@@ -20,8 +20,8 @@ type ActualAmountPaid struct {
 }
 
 // NewActualAmountPaid returns a new ActualAmountPaid
-func NewActualAmountPaid() ActualAmountPaid {
-	aap := ActualAmountPaid{
+func NewActualAmountPaid() *ActualAmountPaid {
+	aap := &ActualAmountPaid{
 		tag: TagActualAmountPaid,
 	}
 	return aap

diff --git a/actualAmountPaid_test.go b/actualAmountPaid_test.go
@@ -0,0 +1,9 @@
+package wire
+
+// ActualAmountPaid creates a ActualAmountPaid
+func mockActualAmountPaid() *ActualAmountPaid {
+	aap := NewActualAmountPaid()
+	aap.RemittanceAmount.CurrencyCode = "USD"
+	aap.RemittanceAmount.Amount = "1234.56"
+	return aap
+}
diff --git a/adjustment.go b/adjustment.go
@@ -26,8 +26,8 @@ type Adjustment struct {
 }
 
 // NewAdjustment returns a new Adjustment
-func NewAdjustment() Adjustment {
-	adj := Adjustment{
+func NewAdjustment() *Adjustment {
+	adj := &Adjustment{
 		tag: TagAdjustment,
 	}
 	return adj

diff --git a/adjustment_test.go b/adjustment_test.go
@@ -0,0 +1,12 @@
+package wire
+
+// Adjustment creates a Adjustment
+func mockAdjustment() *Adjustment {
+	adj := NewAdjustment()
+	adj.AdjustmentReasonCode = PricingError
+	adj.CreditDebitIndicator = CreditIndicator
+	adj.RemittanceAmount.CurrencyCode = "USD"
+	adj.RemittanceAmount.Amount = "1234.56"
+	adj.AdditionalInfo = " Adjustment Additional Information"
+	return adj
+}
diff --git a/amountNegotiatedDiscount.go b/amountNegotiatedDiscount.go
@@ -20,8 +20,8 @@ type AmountNegotiatedDiscount struct {
 }
 
 // NewAmountNegotiatedDiscount returns a new AmountNegotiatedDiscount
-func NewAmountNegotiatedDiscount() AmountNegotiatedDiscount {
-	nd := AmountNegotiatedDiscount{
+func NewAmountNegotiatedDiscount() *AmountNegotiatedDiscount {
+	nd := &AmountNegotiatedDiscount{
 		tag: TagAmountNegotiatedDiscount,
 	}
 	return nd

diff --git a/amountNegotiatedDiscount_test.go b/amountNegotiatedDiscount_test.go
@@ -0,0 +1,9 @@
+package wire
+
+// AmountNegotiatedDiscount creates a AmountNegotiatedDiscount
+func mockAmountNegotiatedDiscount() *AmountNegotiatedDiscount {
+	nd := NewAmountNegotiatedDiscount()
+	nd.RemittanceAmount.CurrencyCode = "USD"
+	nd.RemittanceAmount.Amount = "1234.56"
+	return nd
+}
diff --git a/amount_test.go b/amount_test.go
@@ -1,6 +1,6 @@
 package wire
 
-//  mockAmount creates an a Amount
+// mockAmount creates an a Amount
 func mockAmount() *Amount {
 	a := NewAmount()
 	a.Amount = "000001234567"

diff --git a/beneficiaryCustomer_test.go b/beneficiaryCustomer_test.go
@@ -1,14 +1,13 @@
 package wire
 
-//  mockBeneficiaryCustomer creates a BeneficiaryCustomer
+// mockBeneficiaryCustomer creates a BeneficiaryCustomer
 func mockBeneficiaryCustomer() *BeneficiaryCustomer {
 	bc := NewBeneficiaryCustomer()
-	bc.CoverPayment.SwiftFieldTag = ""
-	bc.CoverPayment.SwiftLineOne = ""
-	bc.CoverPayment.SwiftLineTwo = ""
-	bc.CoverPayment.SwiftLineThree= ""
-	bc.CoverPayment.SwiftLineFour = ""
-	bc.CoverPayment.SwiftLineFive = ""
-	bc.CoverPayment.SwiftLineSix = ""
+	bc.CoverPayment.SwiftFieldTag = "Swift Field Tag"
+	bc.CoverPayment.SwiftLineOne = "Swift Line One"
+	bc.CoverPayment.SwiftLineTwo = "Swift Line Two"
+	bc.CoverPayment.SwiftLineThree = "Swift Line Three"
+	bc.CoverPayment.SwiftLineFour = "Swift Line Four"
+	bc.CoverPayment.SwiftLineFive = "Swift Line Five"
 	return bc
-}
+}
diff --git a/beneficiaryFI_test.go b/beneficiaryFI_test.go
@@ -1,6 +1,6 @@
 package wire
 
-//  mockBeneficiaryFI creates a BeneficiaryFI
+// mockBeneficiaryFI creates a BeneficiaryFI
 func mockBeneficiaryFI() *BeneficiaryFI {
 	bfi := NewBeneficiaryFI()
 	bfi.FinancialInstitution.IdentificationCode = DemandDepositAccountNumber

diff --git a/beneficiaryReference_test.go b/beneficiaryReference_test.go
@@ -1,6 +1,6 @@
 package wire
 
-//  mockBeneficiaryReference creates a BeneficiaryReference
+// mockBeneficiaryReference creates a BeneficiaryReference
 func mockBeneficiaryReference() *BeneficiaryReference {
 	br:= NewBeneficiaryReference()
 	br.BeneficiaryReference = "Reference"

diff --git a/beneficiary_test.go b/beneficiary_test.go
@@ -1,6 +1,6 @@
 package wire
 
-//  mockBeneficiary creates a Beneficiary
+// mockBeneficiary creates a Beneficiary
 func mockBeneficiary() *Beneficiary {
 	ben := NewBeneficiary()
 	ben.Personal.IdentificationCode = DriversLicenseNumber

diff --git a/businessFunctionCode_test.go b/businessFunctionCode_test.go
@@ -1,6 +1,6 @@
 package wire
 
-//  mockBusinessFunctionCode creates a BusinessFunctionCode
+// mockBusinessFunctionCode creates a BusinessFunctionCode
 func mockBusinessFunctionCode() *BusinessFunctionCode {
 	bfc := NewBusinessFunctionCode()
 	bfc.BusinessFunctionCode = BankTransfer

diff --git a/charges_test.go b/charges_test.go
@@ -1,6 +1,6 @@
 package wire
 
-//  mockCharges creates a Charges
+// mockCharges creates a Charges
 func mockCharges() *Charges {
 	c := NewCharges()
 	c.ChargeDetails = "B"

diff --git a/currencyInstructedAmount.go b/currencyInstructedAmount.go
@@ -23,8 +23,8 @@ type CurrencyInstructedAmount struct {
 }
 
 // NewCurrencyInstructedAmount returns a new CurrencyInstructedAmount
-func NewCurrencyInstructedAmount() CurrencyInstructedAmount {
-	cia := CurrencyInstructedAmount{
+func NewCurrencyInstructedAmount() *CurrencyInstructedAmount {
+	cia := &CurrencyInstructedAmount{
 		tag: TagCurrencyInstructedAmount,
 	}
 	return cia

diff --git a/currencyInstructedAmount_test.go b/currencyInstructedAmount_test.go
@@ -0,0 +1,10 @@
+package wire
+
+//  CurrencyInstructedAmount creates a CurrencyInstructedAmount
+func mockCurrencyInstructedAmount() *CurrencyInstructedAmount {
+	cia := NewCurrencyInstructedAmount()
+	cia.SwiftFieldTag = "Swift Field Tag"
+	cia.Amount = "1500,49"
+
+	return cia
+}
diff --git a/dateRemittanceDocument.go b/dateRemittanceDocument.go
@@ -20,8 +20,8 @@ type DateRemittanceDocument struct {
 }
 
 // NewDateRemittanceDocument returns a new DateRemittanceDocument
-func NewDateRemittanceDocument() DateRemittanceDocument {
-	drd := DateRemittanceDocument{
+func NewDateRemittanceDocument() *DateRemittanceDocument {
+	drd := &DateRemittanceDocument{
 		tag: TagDateRemittanceDocument,
 	}
 	return drd
@@ -33,7 +33,7 @@ func NewDateRemittanceDocument() DateRemittanceDocument {
 // successful parsing and data validity.
 func (drd *DateRemittanceDocument) Parse(record string) {
 	drd.tag = record[:6]
-	drd.tag = drd.validateDate(record[6:14])
+	drd.DateRemittanceDocument = drd.parseStringField(record[6:14])
 }
 
 // String writes DateRemittanceDocument
@@ -65,5 +65,5 @@ func (drd *DateRemittanceDocument) fieldInclusion() error {
 
 // DateRemittanceDocumentField gets a string of the DateRemittanceDocument field
 func (drd *DateRemittanceDocument) DateRemittanceDocumentField() string {
-	return drd.validateDate(drd.DateRemittanceDocument)
+	return drd.alphaField(drd.DateRemittanceDocument,8)
 }
diff --git a/dateRemittanceDocument_test.go b/dateRemittanceDocument_test.go
@@ -0,0 +1,9 @@
+package wire
+
+// DateRemittanceDocument creates a DateRemittanceDocument
+func mockDateRemittanceDocument() *DateRemittanceDocument {
+	drd := NewDateRemittanceDocument()
+	// ToDo: Use date function
+	drd.DateRemittanceDocument = "20190415"
+	return drd
+}
diff --git a/exchangeRate_test.go b/exchangeRate_test.go
@@ -1,6 +1,6 @@
 package wire
 
-//  mockExchangeRate creates a ExchangeRate
+// mockExchangeRate creates a ExchangeRate
 func mockExchangeRate() *ExchangeRate {
 	eRate := NewExchangeRate()
 	eRate.ExchangeRate = "1,2345"

diff --git a/fIBeneficiaryFIAdvice_test.go b/fIBeneficiaryFIAdvice_test.go
@@ -1,6 +1,6 @@
 package wire
 
-//  mockFIBeneficiaryFIAdvice creates a FIBeneficiaryFIAdvice
+// mockFIBeneficiaryFIAdvice creates a FIBeneficiaryFIAdvice
 func mockFIBeneficiaryFIAdvice() *FIBeneficiaryFIAdvice {
 	fibfia := NewFIBeneficiaryFIAdvice()
 	fibfia.Advice.AdviceCode = AdviceCodeTelex

diff --git a/fedWireMessage.go b/fedWireMessage.go
@@ -566,8 +566,8 @@ func (fwm *FedWireMessage) GetIntermediaryInstitution() *IntermediaryInstitution
 }
 
 // SetInstitutionAccount appends a InstitutionAccount to the FedWireMessage
-func (fwm *FedWireMessage) SetInstitutionAccount(ia *InstitutionAccount) {
-	fwm.InstitutionAccount = ia
+func (fwm *FedWireMessage) SetInstitutionAccount(iAccount *InstitutionAccount) {
+	fwm.InstitutionAccount = iAccount
 }
 
 // GetInstitutionAccount returns the current InstitutionAccount
@@ -596,8 +596,8 @@ func (fwm *FedWireMessage) GetRemittance() *Remittance {
 }
 
 // SetSenderToReceiver appends a SenderToReceiver to the FedWireMessage
-func (fwm *FedWireMessage) SetSenderToReceiver(sr *SenderToReceiver) {
-	fwm.SenderToReceiver = sr
+func (fwm *FedWireMessage) SetSenderToReceiver(str *SenderToReceiver) {
+	fwm.SenderToReceiver = str
 }
 
 // GetSenderToReceiver  returns the current SenderToReceiver

diff --git a/fiAdditionalFIToFI_test.go b/fiAdditionalFIToFI_test.go
@@ -1,6 +1,6 @@
 package wire
 
-//  mockFIAdditionalFIToFI creates a FIAdditionalFIToFI
+// mockFIAdditionalFIToFI creates a FIAdditionalFIToFI
 func mockFIAdditionalFIToFI() *FIAdditionalFIToFI {
 	fifi := NewFIAdditionalFIToFI()
 	fifi.AdditionalFIToFI.LineOne = "Line One"

diff --git a/fiBeneficiaryAdvice_test.go b/fiBeneficiaryAdvice_test.go
@@ -1,6 +1,6 @@
 package wire
 
-//  mockFIBeneficiaryAdvice creates a FIBeneficiaryAdvice
+// mockFIBeneficiaryAdvice creates a FIBeneficiaryAdvice
 func mockFIBeneficiaryAdvice() *FIBeneficiaryAdvice {
 	fiba := NewFIBeneficiaryAdvice()
 	fiba.Advice.AdviceCode = AdviceCodeLetter

diff --git a/fiBeneficiaryFI_test.go b/fiBeneficiaryFI_test.go
@@ -1,6 +1,6 @@
 package wire
 
-//  mockFIBeneficiaryFI creates a FIBeneficiaryFI
+// mockFIBeneficiaryFI creates a FIBeneficiaryFI
 func mockFIBeneficiaryFI() *FIBeneficiaryFI {
 	fibfi := NewFIBeneficiaryFI()
 	fibfi.FIToFI.LineOne = "Line One"

diff --git a/fiBeneficiary_test.go b/fiBeneficiary_test.go
@@ -1,6 +1,6 @@
 package wire
 
-//  mockFIBeneficiary creates a FIBeneficiary
+// mockFIBeneficiary creates a FIBeneficiary
 func mockFIBeneficiary() *FIBeneficiary {
 	fib := NewFIBeneficiary()
 	fib.FIToFI.LineOne = "Line One"

diff --git a/fiDrawdownDebitAccountAdvice_test.go b/fiDrawdownDebitAccountAdvice_test.go
@@ -1,6 +1,6 @@
 package wire
 
-//  mockFIDrawdownDebitAccountAdvice creates a FIDrawdownDebitAccountAdvice
+// mockFIDrawdownDebitAccountAdvice creates a FIDrawdownDebitAccountAdvice
 func mockFIDrawdownDebitAccountAdvice() *FIDrawdownDebitAccountAdvice {
 	debitDDAdvice := NewFIDrawdownDebitAccountAdvice()
 	debitDDAdvice.Advice.AdviceCode = AdviceCodeLetter

diff --git a/fiIntermediaryFIAdvice_test.go b/fiIntermediaryFIAdvice_test.go
@@ -1,6 +1,6 @@
 package wire
 
-//  mockFIIntermediaryFIAdvice creates a FIIntermediaryFIAdvice
+// mockFIIntermediaryFIAdvice creates a FIIntermediaryFIAdvice
 func mockFIIntermediaryFIAdvice() *FIIntermediaryFIAdvice {
 	fiifia := NewFIIntermediaryFIAdvice()
 	fiifia.Advice.AdviceCode = AdviceCodeLetter

diff --git a/fiIntermediaryFI_test.go b/fiIntermediaryFI_test.go
@@ -1,6 +1,6 @@
 package wire
 
-//  mockFIIntermediaryFI creates a FIIntermediaryFI
+// mockFIIntermediaryFI creates a FIIntermediaryFI
 func mockFIIntermediaryFI() *FIIntermediaryFI {
 	fiifi := NewFIIntermediaryFI()
 	fiifi.FIToFI.LineOne = "Line One"

diff --git a/fiPaymentMethodToBeneficiary_test.go b/fiPaymentMethodToBeneficiary_test.go
@@ -1,6 +1,6 @@
 package wire
 
-//  mockFIPaymentMethodToBeneficiary creates a FIPaymentMethodToBeneficiary
+// mockFIPaymentMethodToBeneficiary creates a FIPaymentMethodToBeneficiary
 func mockFIPaymentMethodToBeneficiary() *FIPaymentMethodToBeneficiary {
 	pm := NewFIPaymentMethodToBeneficiary()
 	pm.PaymentMethod = "CHECK"

diff --git a/fiReceiverFI_test.go b/fiReceiverFI_test.go
@@ -1,6 +1,6 @@
 package wire
 
-//  mockFIReceiverFI creates a FIReceiverFI
+// mockFIReceiverFI creates a FIReceiverFI
 func mockFIReceiverFI() *FIReceiverFI {
 	firfi := NewFIReceiverFI()
 	firfi.FIToFI.LineOne = "Line One"

diff --git a/fieldErrors.go b/fieldErrors.go
@@ -34,6 +34,8 @@ var (
 	ErrValidYear = errors.New("is an invalid year")
 	// ErrValidCentury is returned for an invalid century
 	ErrValidCentury = errors.New("is an invalid century")
+	// ErrInvalidProperty is returned for an invalid type property
+	ErrInvalidProperty = errors.New("is an invalid property")
 
 	// SenderSupplied Tag {1500}
 

diff --git a/go.mod b/go.mod
@@ -4,6 +4,7 @@ go 1.12
 
 require (
 	github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6
+	github.com/moov-io/ach v1.0.0
 	github.com/moov-io/base v0.9.0
 	github.com/rickar/cal v1.0.1 // indirect
 	golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421