test: improve parse coverage

Author: howeyc

include_test.go

@@ -33,3 +33,17 @@ func TestIncludeUnbalanced(t *testing.T) {
 		t.Fatal(err)
 	}
 }
+
+func TestIncludeNonExistant(t *testing.T) {
+	_, err := ParseLedgerFile("testdata/ledgerRootNonExist.dat")
+	if err.Error() != "testdata/ledgerRootNonExist.dat:3: Unable to include file(ledger-xxxxx.dat): not found" {
+		t.Fatal(err)
+	}
+}
+
+func TestNonExistant(t *testing.T) {
+	_, err := ParseLedgerFile("testdata/ledger-xxxxx.dat")
+	if err.Error() != "open testdata/ledger-xxxxx.dat: no such file or directory" {
+		t.Fatal(err)
+	}
+}

parse.go

@@ -2,6 +2,7 @@ package ledger
 
 import (
 	"bufio"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -69,6 +70,8 @@ func ParseLedgerAsync(ledgerReader io.Reader) (c chan *Transaction, e chan error
 		})
 
 		e <- nil
+		close(c)
+		close(e)
 	}()
 	return c, e
 }
@@ -128,17 +131,13 @@ func parseLedger(filename string, ledgerReader io.Reader, callback func(t *Trans
 		case "account":
 			lp.parseAccount(after)
 		case "include":
-			paths, perr := filepath.Glob(filepath.Join(filepath.Dir(lp.filename), after))
-			if perr != nil {
-				callback(nil, fmt.Errorf("%s:%d: Unable to parse include directive: %w", lp.filename, lp.lineCount, perr))
-				return
+			paths, _ := filepath.Glob(filepath.Join(filepath.Dir(lp.filename), after))
+			if len(paths) < 1 {
+				callback(nil, fmt.Errorf("%s:%d: Unable to include file(%s): %w", lp.filename, lp.lineCount, after, errors.New("not found")))
+				return true
 			}
 			for _, incpath := range paths {
-				ifile, ierr := os.Open(incpath)
-				if ierr != nil {
-					callback(nil, fmt.Errorf("%s:%d: Unable to include file(%s): %w", lp.filename, lp.lineCount, incpath, ierr))
-					return true
-				}
+				ifile, _ := os.Open(incpath)
 				defer ifile.Close()
 				if parseLedger(incpath, ifile, callback) {
 					return true

parse_test.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	"sync"
 	"testing"
 	"time"
 
@@ -42,6 +43,24 @@ var testCases = []testCase{
 		},
 		nil,
 	},
+	{
+		"bad payee line",
+		`1970/01/01Payee
+	Expense/test  (123 * 3)
+	Assets      123
+`,
+		nil,
+		errors.New(":1: Unable to parse transaction: Unable to parse payee line: 1970/01/01Payee"),
+	},
+	{
+		"bad payee date",
+		`1970/02/31 Payee
+	Expense/test  (123 * 3)
+	Assets      123
+`,
+		nil,
+		errors.New(`:1: Unable to parse transaction: Unable to parse date(1970/02/31): parsing time "1970/02/31": extra text: "1970/02/31"`),
+	},
 	{
 		"unbalanced error",
 		`1970/01/01 Payee
@@ -452,6 +471,52 @@ func TestParseLedger(t *testing.T) {
 	}
 }
 
+func TestParseLedgerAsync(t *testing.T) {
+	buf := bytes.NewBufferString(`; test
+account bam:bam
+	subacc line  ; sub comment
+	another subacc line
+
+1970/01/01 Payee
+	Assets       50
+	Expenses
+
+1970/02/30 Error  ; oops
+	Assets   30
+	Expenses
+
+1970/01/01bbafafdaf;bad comment
+	Assets 20
+	Expenses
+
+account endofledger`)
+
+	tc, ec := ParseLedgerAsync(buf)
+
+	var trans []*Transaction
+	var errors []error
+
+	var wg sync.WaitGroup
+	wg.Add(2)
+	go func() {
+		for t := range tc {
+			trans = append(trans, t)
+		}
+		wg.Done()
+	}()
+	go func() {
+		for e := range ec {
+			errors = append(errors, e)
+		}
+		wg.Done()
+	}()
+	wg.Wait()
+
+	if len(trans) < 1 || len(errors) < 1 {
+		t.Error("async parse failed")
+	}
+}
+
 func BenchmarkParseLedger(b *testing.B) {
 	for n := 0; n < b.N; n++ {
 		_, _ = ParseLedgerFile("testdata/ledgerBench.dat")