From 8b46ed1c04455a6056497ce4dfd23c1a547b4b1a Mon Sep 17 00:00:00 2001
From: Adam Shannon <adamkshannon@gmail.com>
Date: Fri, 30 Jun 2023 10:51:22 -0500
Subject: [PATCH] test: fixup when running on windows

---
 cmd/writeACH/main.go      | 23 ++++++++++++-----------
 cmd/writeACH/main_test.go | 26 ++++++++------------------
 reader_test.go            |  8 +++++++-
 3 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/cmd/writeACH/main.go b/cmd/writeACH/main.go
index 6efc70630..fe8d91f9b 100644
--- a/cmd/writeACH/main.go
+++ b/cmd/writeACH/main.go
@@ -98,23 +98,24 @@ func write(path string) {
 		for i := 0; i < 1250; i++ {
 			entrySeq = entrySeq + 1
 
-			entryEntrySeq := ach.NewEntryDetail()
-			entryEntrySeq.TransactionCode = ach.CheckingCredit
-			entryEntrySeq.SetRDFI("231380104")
-			entryEntrySeq.DFIAccountNumber = randomdata.StringNumber(10, "")
-			entryEntrySeq.IndividualName = randomdata.FullName(randomdata.RandomGender)
-			entryEntrySeq.SetTraceNumber(bh.ODFIIdentification, entrySeq)
-			entryEntrySeq.IdentificationNumber = "#" + randomdata.StringNumber(6, "") + "#"
-			entryEntrySeq.Category = ach.CategoryForward
-			entryEntrySeq.AddendaRecordIndicator = 1
+			entryDetail := ach.NewEntryDetail()
+			entryDetail.TransactionCode = ach.CheckingCredit
+			entryDetail.SetRDFI("231380104")
+			entryDetail.DFIAccountNumber = randomdata.StringNumber(10, "")
+			entryDetail.IndividualName = randomdata.FullName(randomdata.RandomGender)
+			entryDetail.SetTraceNumber(bh.ODFIIdentification, entrySeq)
+			entryDetail.IdentificationNumber = "#" + randomdata.StringNumber(6, "") + "#"
+			entryDetail.Category = ach.CategoryForward
+			entryDetail.AddendaRecordIndicator = 1
+			entryDetail.Amount = 10023
 
 			// Add addenda record for an entry
 			addendaEntrySeq := ach.NewAddenda05()
 			addendaEntrySeq.PaymentRelatedInformation = randomdata.SillyName() + " bonus pay for amazing work on #OSS"
-			entryEntrySeq.AddAddenda05(addendaEntrySeq)
+			entryDetail.AddAddenda05(addendaEntrySeq)
 
 			// Add entries
-			batch.AddEntry(entryEntrySeq)
+			batch.AddEntry(entryDetail)
 
 		}
 
diff --git a/cmd/writeACH/main_test.go b/cmd/writeACH/main_test.go
index 36de438da..127b14330 100644
--- a/cmd/writeACH/main_test.go
+++ b/cmd/writeACH/main_test.go
@@ -18,34 +18,24 @@
 package main
 
 import (
+	"fmt"
 	"os"
+	"path/filepath"
 	"testing"
+	"time"
 )
 
-// TestFileCreate tests creating an ACH File
 func TestFileWrite(t *testing.T) {
-	testFileWrite(t)
-}
-
-/*//BenchmarkTestFileCreate benchmarks creating an ACH File
-func BenchmarkTestFileWrite(b *testing.B) {
-	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
-		testFileWrite(b)
-	}
-}*/
-
-// FileCreate creates an ACH File
-func testFileWrite(t testing.TB) {
-	filename, err := os.MkdirTemp("", "ach-writeACH-test")
+	dir, err := os.MkdirTemp("", "ach-writeACH-test")
 	if err != nil {
 		t.Fatal(err.Error())
 	}
-	defer os.Remove(filename)
+	defer os.RemoveAll(dir)
 
-	write(filename)
+	path := filepath.Join(dir, fmt.Sprintf("%s.ach", time.Now().UTC().Format("200601021504")))
+	write(path)
 
-	s, err := os.Stat(filename)
+	s, err := os.Stat(path)
 	if err != nil {
 		t.Fatal(err.Error())
 	}
diff --git a/reader_test.go b/reader_test.go
index 980e4272c..28cabcd0f 100644
--- a/reader_test.go
+++ b/reader_test.go
@@ -24,6 +24,7 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"testing"
 
@@ -2048,7 +2049,12 @@ func TestReadFile_SkipValidation(t *testing.T) {
 
 	// checking output
 	var buf bytes.Buffer
-	if err := NewWriter(&buf).Write(&f); err != nil {
+	w := NewWriter(&buf)
+	if runtime.GOOS == "windows" {
+		w.LineEnding = "\r\n"
+	}
+	err = w.Write(&f)
+	if err != nil {
 		t.Errorf("%T: %s", err, err)
 	}
 	output := strings.TrimSpace(buf.String())