From a993190368768b73159edef7fc5cd1275289ebd3 Mon Sep 17 00:00:00 2001 From: Chris Wendt Date: Thu, 7 Oct 2021 14:00:26 -0600 Subject: [PATCH] codeintel-qa: more descriptive failure message (#25806) --- dev/codeintel-qa/cmd/query/queries.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dev/codeintel-qa/cmd/query/queries.go b/dev/codeintel-qa/cmd/query/queries.go index 3ce073d5f0b..a2d37fb44ab 100644 --- a/dev/codeintel-qa/cmd/query/queries.go +++ b/dev/codeintel-qa/cmd/query/queries.go @@ -18,20 +18,20 @@ func buildQueries() <-chan queryFunc { for _, testCase := range testCases { // Definition returns defintion - fns <- makeTestFunc(queryDefinitions, testCase.Definition, []Location{testCase.Definition}) + fns <- makeTestFunc("def -> def", queryDefinitions, testCase.Definition, []Location{testCase.Definition}) // References return definition for _, reference := range testCase.References { - fns <- makeTestFunc(queryDefinitions, reference, []Location{testCase.Definition}) + fns <- makeTestFunc("refs -> def", queryDefinitions, reference, []Location{testCase.Definition}) } // Definition returns references - fns <- makeTestFunc(queryReferences, testCase.Definition, testCase.References) + fns <- makeTestFunc("def -> refs", queryReferences, testCase.Definition, testCase.References) // References return references if queryReferencesOfReferences { for _, reference := range testCase.References { - fns <- makeTestFunc(queryReferences, reference, testCase.References) + fns <- makeTestFunc("refs -> refs", queryReferences, reference, testCase.References) } } } @@ -46,7 +46,7 @@ type testFunc func(ctx context.Context, location Location) ([]Location, error) // source, then compares the result against the set of expected locations. This function // depends on the flags provided by the user to alter the behavior of the testing // functions. -func makeTestFunc(f testFunc, source Location, expectedLocations []Location) func(ctx context.Context) error { +func makeTestFunc(name string, f testFunc, source Location, expectedLocations []Location) func(ctx context.Context) error { return func(ctx context.Context) error { locations, err := f(ctx, source) if err != nil { @@ -57,7 +57,7 @@ func makeTestFunc(f testFunc, source Location, expectedLocations []Location) fun sortLocations(locations) if diff := cmp.Diff(expectedLocations, locations); diff != "" { - return errors.Errorf("unexpected locations (-want +got):\n%s", diff) + return errors.Errorf("%s: starting at location\n\n %+v\n\ngot unexpected locations (-want +got):\n%s", name, source, diff) } }