test: collect all testdata into a single directory

Signed-off-by: Andres Taylor <[email protected]>

Author: systay

go/data/query_log_parse_test.go

@@ -23,14 +23,14 @@ import (
 )
 
 func TestParseMySQLQueryLog(t *testing.T) {
-	loader := MySQLLogLoader{}.Load("./testdata/mysql.query.log")
+	loader := MySQLLogLoader{}.Load("../testdata/mysql.query.log")
 	gotQueries, err := makeSlice(loader)
 	require.NoError(t, err)
 	require.Equal(t, 1517, len(gotQueries), "expected 1517 queries") //nolint:testifylint // too many elements for the output to be readable
 }
 
 func TestSmallSnippet(t *testing.T) {
-	loader := MySQLLogLoader{}.Load("./testdata/mysql.small-query.log")
+	loader := MySQLLogLoader{}.Load("../testdata/mysql.small-query.log")
 	gotQueries, err := makeSlice(loader)
 	require.NoError(t, err)
 	expected := []Query{

go/data/slow_query_log_loader_test.go

@@ -23,7 +23,7 @@ import (
 )
 
 func TestLoadSlowQueryLogWithMetadata(t *testing.T) {
-	loader := SlowQueryLogLoader{}.Load("./testdata/slow_query_log")
+	loader := SlowQueryLogLoader{}.Load("../testdata/slow_query_log")
 	queries, err := makeSlice(loader)
 	require.NoError(t, err)
 

go/data/vtgate_log_parse_test.go

@@ -25,19 +25,19 @@ import (
 )
 
 func TestParseVtGateQueryLogRedacted(t *testing.T) {
-	loader := VtGateLogLoader{NeedsBindVars: true}.Load("./testdata/vtgate.query.log.redacted")
+	loader := VtGateLogLoader{NeedsBindVars: true}.Load("../testdata/vtgate.query.log.redacted")
 	_, err := makeSlice(loader)
 	require.EqualError(t, err, "line 1: query has redacted bind variables, cannot parse them")
 }
 
 func TestParseVtGateQueryLog(t *testing.T) {
-	loader := VtGateLogLoader{NeedsBindVars: true}.Load("./testdata/vtgate.query.log")
+	loader := VtGateLogLoader{NeedsBindVars: true}.Load("../testdata/vtgate.query.log")
 	gotQueries, err := makeSlice(loader)
 	require.NoError(t, err)
 
 	require.Len(t, gotQueries, 25)
 
-	expect, err := os.ReadFile("./testdata/vtgate.query.log.parsed.bv.txt")
+	expect, err := os.ReadFile("../testdata/vtgate.query.log.parsed.bv.txt")
 	require.NoError(t, err)
 
 	var got []string
@@ -49,12 +49,12 @@ func TestParseVtGateQueryLog(t *testing.T) {
 }
 
 func TestParseVtGateQueryLogNoBindVars(t *testing.T) {
-	loader := VtGateLogLoader{NeedsBindVars: false}.Load("./testdata/vtgate.query.log")
+	loader := VtGateLogLoader{NeedsBindVars: false}.Load("../testdata/vtgate.query.log")
 	gotQueries, err := makeSlice(loader)
 	require.NoError(t, err)
 	require.Len(t, gotQueries, 25)
 
-	expect, err := os.ReadFile("./testdata/vtgate.query.log.parsed.txt")
+	expect, err := os.ReadFile("../testdata/vtgate.query.log.parsed.txt")
 	require.NoError(t, err)
 
 	var got []string

go/keys/keys_test.go

@@ -37,28 +37,28 @@ func TestKeys(t *testing.T) {
 				FileName: "../../t/tpch_failing_queries.test",
 				Loader:   data.SlowQueryLogLoader{},
 			},
-			expectedFile: "../summarize/testdata/keys-log.json",
+			expectedFile: "../testdata/keys-log.json",
 		},
 		{
 			cfg: Config{
-				FileName: "../data/testdata/vtgate.query.log",
+				FileName: "../testdata/vtgate.query.log",
 				Loader:   data.VtGateLogLoader{NeedsBindVars: false},
 			},
-			expectedFile: "../summarize/testdata/keys-log-vtgate.json",
+			expectedFile: "../testdata/keys-log-vtgate.json",
 		},
 		{
 			cfg: Config{
-				FileName: "../data/testdata/slow_query_log",
+				FileName: "../testdata/slow_query_log",
 				Loader:   data.SlowQueryLogLoader{},
 			},
-			expectedFile: "../summarize/testdata/slow-query-log.json",
+			expectedFile: "../testdata/slow-query-log.json",
 		},
 		{
 			cfg: Config{
-				FileName: "../data/testdata/bigger_slow_query_log.log",
+				FileName: "../testdata/bigger_slow_query_log.log",
 				Loader:   data.SlowQueryLogLoader{},
 			},
-			expectedFile: "./testdata/bigger_slow_query_log.json",
+			expectedFile: "../testdata/bigger_slow_query_log.json",
 		},
 	}
 

go/summarize/reading.go

@@ -18,6 +18,8 @@ package summarize
 
 import (
 	"encoding/json"
+	"errors"
+	"fmt"
 	"io"
 	"os"
 	"sort"
@@ -26,11 +28,11 @@ import (
 	"github.com/vitessio/vt/go/keys"
 )
 
-func readTraceFile(fileName string) readingSummary {
+func readTraceFile(fileName string) (readingSummary, error) {
 	// Open the JSON file
 	file, err := os.Open(fileName)
 	if err != nil {
-		exit("Error opening file: " + err.Error())
+		return readingSummary{}, fmt.Errorf("error opening file: %w", err)
 	}
 	defer file.Close()
 
@@ -39,13 +41,12 @@ func readTraceFile(fileName string) readingSummary {
 	// Determine the type based on the first delimiter of the JSON file
 	switch val {
 	case json.Delim('['):
-		return readTracedQueryFile(decoder, fileName)
+		return readTracedQueryFile(decoder, fileName), nil
 	case json.Delim('{'):
-		return readAnalysedQueryFile(decoder, fileName)
+		return readAnalysedQueryFile(decoder, fileName), nil
 	}
 
-	exit("Unknown file format")
-	panic("unreachable")
+	return readingSummary{}, errors.New("unknown file format")
 }
 
 func getDecoderAndDelim(file *os.File) (*json.Decoder, json.Delim) {

go/summarize/summarize-keys_test.go

@@ -70,16 +70,17 @@ func TestSummarizeKeysFile(t *testing.T) {
 		inputFile    string
 		expectedFile string
 	}{
-		{"testdata/keys-log.json", "testdata/keys-summary.md"},
-		{"../keys/testdata/bigger_slow_query_log.json", "testdata/bigger_slow_log.md"},
+		{"keys-log.json", "keys-summary.md"},
+		{"bigger_slow_query_log.json", "bigger_slow_log.md"},
 	}
 
 	for _, tt := range tests {
 		t.Run(fmt.Sprintf("input: %s, expected: %s", tt.inputFile, tt.expectedFile), func(t *testing.T) {
-			file := readTraceFile(tt.inputFile)
+			file, err := readTraceFile("../testdata/" + tt.inputFile)
+			require.NoError(t, err)
 			sb := &strings.Builder{}
 			printKeysSummary(sb, file, time.Date(2024, time.January, 1, 1, 2, 3, 0, time.UTC))
-			expected, err := os.ReadFile(tt.expectedFile)
+			expected, err := os.ReadFile("../testdata/" + tt.expectedFile)
 			require.NoError(t, err)
 			require.Equal(t, string(expected), sb.String())
 		})

go/summarize/summarize.go

@@ -41,8 +41,12 @@ type (
 
 func Run(args []string) {
 	traces := make([]readingSummary, len(args))
+	var err error
 	for i, arg := range args {
-		traces[i] = readTraceFile(arg)
+		traces[i], err = readTraceFile(arg)
+		if err != nil {
+			exit(err.Error())
+		}
 	}
 
 	firstTrace := traces[0]

go/summarize/summarize_test.go

@@ -20,6 +20,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/stretchr/testify/assert"
 )
 
@@ -183,7 +185,8 @@ Summary:
 }
 
 func TestSummarizeTraceFile(t *testing.T) {
-	file := readTraceFile("testdata/trace-log.json")
+	file, err := readTraceFile("../testdata/trace-log.json")
+	require.NoError(t, err)
 	sb := &strings.Builder{}
 	printTraceSummary(sb, 80, noHighlight, file)
 	expected := `Query: INSERT INTO region (R_REGIONKEY, R_NAME, R_COMMENT) VALUES (1, 'ASIA',...

go/summarize/testdata/bigger_slow_log.md go/testdata/bigger_slow_log.md

@@ -1,7 +1,7 @@
 # Query Analysis Report
 
 **Date of Analysis**: 2024-01-01 01:02:03  
-**Analyzed File**: `../keys/testdata/bigger_slow_query_log.json`
+**Analyzed File**: `../testdata/bigger_slow_query_log.json`
 
 ## Tables
 |Table Name|Reads|Writes|

go/keys/testdata/bigger_slow_query_log.json go/testdata/bigger_slow_query_log.json

@@ -1,7 +1,7 @@
 # Query Analysis Report
 
 **Date of Analysis**: 2024-01-01 01:02:03  
-**Analyzed File**: `testdata/keys-log.json`
+**Analyzed File**: `../testdata/keys-log.json`
 
 ## Tables
 |Table Name|Reads|Writes|