Update tests and fix minor bugs

1 files changed, 20 insertions, 6 deletions

diff --git a/pkg/query/outputs_test.go b/pkg/query/outputs_test.go
index b5fdba7..8a1bb29 100644
--- a/pkg/query/outputs_test.go
+++ b/pkg/query/outputs_test.go
@@ -1,44 +1,58 @@
-package query
+package query_test
 
 import (
 	"errors"
 	"slices"
 	"testing"
+
+	"github.com/jpappel/atlas/pkg/query"
+)
+
+const (
+	OUT_TOK_STR      = query.OUT_TOK_STR
+	OUT_TOK_PATH     = query.OUT_TOK_PATH
+	OUT_TOK_TITLE    = query.OUT_TOK_TITLE
+	OUT_TOK_DATE     = query.OUT_TOK_DATE
+	OUT_TOK_FILETIME = query.OUT_TOK_FILETIME
+	OUT_TOK_AUTHORS  = query.OUT_TOK_AUTHORS
+	OUT_TOK_TAGS     = query.OUT_TOK_TAGS
+	OUT_TOK_LINKS    = query.OUT_TOK_LINKS
+	OUT_TOK_META     = query.OUT_TOK_META
 )
 
 func Test_parseOutputFormat(t *testing.T) {
 	tests := []struct {
 		name        string
 		formatStr   string
-		wantToks    []OutputToken
+		wantToks    []query.OutputToken
 		wantStrToks []string
 		wantErr     error
 	}{
 		{
 			"one big string",
 			"here is a string with no placeholders",
-			[]OutputToken{OUT_TOK_STR},
+			[]query.OutputToken{OUT_TOK_STR},
 			[]string{"here is a string with no placeholders"},
 			nil,
 		},
 		{
 			"default format",
 			"%p %T %d authors:%a tags:%t",
-			[]OutputToken{OUT_TOK_PATH, OUT_TOK_STR, OUT_TOK_TITLE, OUT_TOK_STR, OUT_TOK_DATE, OUT_TOK_STR, OUT_TOK_AUTHORS, OUT_TOK_STR, OUT_TOK_TAGS},
+			[]query.OutputToken{OUT_TOK_PATH, OUT_TOK_STR, OUT_TOK_TITLE, OUT_TOK_STR, OUT_TOK_DATE, OUT_TOK_STR, OUT_TOK_AUTHORS, OUT_TOK_STR, OUT_TOK_TAGS},
 			[]string{" ", " ", " authors:", " tags:"},
 			nil,
 		},
 		{
 			"literal percents",
 			"%%%p%%%T%%",
-			[]OutputToken{OUT_TOK_STR, OUT_TOK_PATH, OUT_TOK_STR, OUT_TOK_TITLE, OUT_TOK_STR},
+			[]query.OutputToken{OUT_TOK_STR, OUT_TOK_PATH, OUT_TOK_STR, OUT_TOK_TITLE, OUT_TOK_STR},
 			[]string{"%", "%", "%"},
 			nil,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			gotToks, gotStrToks, gotErr := parseOutputFormat(tt.formatStr)
+			gotToks, gotStrToks, gotErr := query.ParseOutputFormat(tt.formatStr)
 
 			if !errors.Is(gotErr, tt.wantErr) {
 				t.Errorf("Recieved unexpected error: got %v want %v", gotErr, tt.wantErr)