From 16feaf15e23a1bdca602f77b4c68940c1b0366e0 Mon Sep 17 00:00:00 2001 From: Tom Hvitved Date: Mon, 7 Oct 2024 09:22:39 +0200 Subject: [PATCH] Go: Update expected test output --- .../test/library-tests/semmle/go/PrintAst/PrintAst.expected | 6 +++--- .../semmle/go/PrintAst/PrintAstExcludeComments.expected | 6 +++--- .../semmle/go/PrintAst/PrintAstNestedFunction.expected | 6 +++--- .../semmle/go/PrintAst/PrintAstRestrictFile.expected | 2 +- .../semmle/go/PrintAst/PrintAstRestrictFunction.expected | 6 +++--- .../test/query-tests/Diagnostics/ExtractionErrors.expected | 4 ++-- .../Diagnostics/SuccessfullyExtractedFiles.expected | 1 - 7 files changed, 15 insertions(+), 16 deletions(-) diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected index eb792c7028e..41815e473a0 100644 --- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected +++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected @@ -1,9 +1,9 @@ go.mod: -# 0| [GoModFile] library-tests/semmle/go/PrintAst/go.mod +# 0| [GoModFile] go.mod # 1| 0: [GoModModuleLine] go.mod module line # 3| 1: [GoModGoLine] go.mod go line input.go: -# 0| [GoFile] library-tests/semmle/go/PrintAst/input.go +# 0| [GoFile] input.go # 1| package: [Ident] main # 5| 1: [CommentGroup] comment group # 5| 0: [SlashSlashComment] comment @@ -597,7 +597,7 @@ input.go: # 145| Type = []int # 145| 1: [BlockStmt] block statement other.go: -# 0| [GoFile] library-tests/semmle/go/PrintAst/other.go +# 0| [GoFile] other.go # 1| package: [Ident] main # 3| 1: [FuncDecl] function declaration # 3| 0: [FunctionName, Ident] main diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.expected b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.expected index e0777268f04..570ce08f239 100644 --- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.expected +++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.expected @@ -1,9 +1,9 @@ go.mod: -# 0| [GoModFile] library-tests/semmle/go/PrintAst/go.mod +# 0| [GoModFile] go.mod # 1| 0: [GoModModuleLine] go.mod module line # 3| 1: [GoModGoLine] go.mod go line input.go: -# 0| [GoFile] library-tests/semmle/go/PrintAst/input.go +# 0| [GoFile] input.go # 1| package: [Ident] main # 3| 1: [ImportDecl] import declaration # 3| 0: [ImportSpec] import specifier @@ -577,7 +577,7 @@ input.go: # 145| Type = []int # 145| 1: [BlockStmt] block statement other.go: -# 0| [GoFile] library-tests/semmle/go/PrintAst/other.go +# 0| [GoFile] other.go # 1| package: [Ident] main # 3| 1: [FuncDecl] function declaration # 3| 0: [FunctionName, Ident] main diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstNestedFunction.expected b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstNestedFunction.expected index 7a04ffd637c..c8a01b1ba97 100644 --- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstNestedFunction.expected +++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstNestedFunction.expected @@ -1,9 +1,9 @@ go.mod: -# 0| [GoModFile] library-tests/semmle/go/PrintAst/go.mod +# 0| [GoModFile] go.mod # 1| 0: [GoModModuleLine] go.mod module line # 3| 1: [GoModGoLine] go.mod go line input.go: -# 0| [GoFile] library-tests/semmle/go/PrintAst/input.go +# 0| [GoFile] input.go # 1| package: [Ident] main # 5| 1: [CommentGroup] comment group # 5| 0: [SlashSlashComment] comment @@ -29,7 +29,7 @@ input.go: # 3| 0: [ImportSpec] import specifier # 3| 0: [StringLit] "fmt" other.go: -# 0| [GoFile] library-tests/semmle/go/PrintAst/other.go +# 0| [GoFile] other.go # 1| package: [Ident] main # 8| 1: [FuncDecl] function declaration # 8| 0: [FunctionName, Ident] hasNested diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFile.expected b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFile.expected index 3df7749557d..1981fde0357 100644 --- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFile.expected +++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFile.expected @@ -1,5 +1,5 @@ other.go: -# 0| [GoFile] library-tests/semmle/go/PrintAst/other.go +# 0| [GoFile] other.go # 1| package: [Ident] main # 3| 1: [FuncDecl] function declaration # 3| 0: [FunctionName, Ident] main diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFunction.expected b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFunction.expected index 85f2335d5b0..5783960cedc 100644 --- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFunction.expected +++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFunction.expected @@ -1,9 +1,9 @@ go.mod: -# 0| [GoModFile] library-tests/semmle/go/PrintAst/go.mod +# 0| [GoModFile] go.mod # 1| 0: [GoModModuleLine] go.mod module line # 3| 1: [GoModGoLine] go.mod go line input.go: -# 0| [GoFile] library-tests/semmle/go/PrintAst/input.go +# 0| [GoFile] input.go # 1| package: [Ident] main # 5| 1: [CommentGroup] comment group # 5| 0: [SlashSlashComment] comment @@ -29,7 +29,7 @@ input.go: # 3| 0: [ImportSpec] import specifier # 3| 0: [StringLit] "fmt" other.go: -# 0| [GoFile] library-tests/semmle/go/PrintAst/other.go +# 0| [GoFile] other.go # 1| package: [Ident] main # 6| 1: [FuncDecl] function declaration # 6| 0: [FunctionName, Ident] g diff --git a/go/ql/test/query-tests/Diagnostics/ExtractionErrors.expected b/go/ql/test/query-tests/Diagnostics/ExtractionErrors.expected index b3a9e8631f0..c5afba4d05d 100644 --- a/go/ql/test/query-tests/Diagnostics/ExtractionErrors.expected +++ b/go/ql/test/query-tests/Diagnostics/ExtractionErrors.expected @@ -1,5 +1,5 @@ -| Extraction failed in query-tests/Diagnostics/badimport.go with error invalid import path (invalid character U+007B '{') | 2 | -| Extraction failed in query-tests/Diagnostics/type.go with error cannot use v (variable of type V) as T value in argument to takesT | 2 | +| Extraction failed in badimport.go with error invalid import path (invalid character U+007B '{') | 2 | +| Extraction failed in type.go with error cannot use v (variable of type V) as T value in argument to takesT | 2 | | Extraction failed with error expected ';', found wnvwun | 2 | | Extraction failed with error expected 'IDENT', found newline | 2 | | Extraction failed with error expected 'package', found avvu | 2 | diff --git a/go/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected b/go/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected index f038c938c6d..999b4a4eb4f 100644 --- a/go/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected +++ b/go/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected @@ -1,4 +1,3 @@ -| ../../go.mod:0:0:0:0 | ../../go.mod | | | badimport.go:0:0:0:0 | badimport.go | | | type.go:0:0:0:0 | type.go | | | util.go:0:0:0:0 | util.go | |