Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix(e2e): Results json compare (index out of range) #5209

Merged
merged 4 commits into from
Apr 26, 2022
Merged

Fix(e2e): Results json compare (index out of range) #5209

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad85d08
fix(script): queries validator files filtering
cxlucas Apr 18, 2022
74a178a
Merge branch 'master' of https://github.com/Checkmarx/kics
cxlucas Apr 18, 2022
41c3516
Merge branch 'master' of https://github.com/Checkmarx/kics
cxlucas Apr 19, 2022
4306daf
fix(e2e): added validation for query name & results in json file
cxlucas Apr 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions e2e/utils/json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,17 @@ func setFields(t *testing.T, expect, actual []string, expectFileName, actualFile
for i := range actualI.Queries {
actualQuery := actualI.Queries[i]
expectQuery := expectI.Queries[i]

require.Equal(t, actualQuery.QueryName, expectQuery.QueryName,
"Expected Result queries doesn't match the actual result queries [in the index: %d]."+
"\nExpected File: 'fixtures/%s'.\nActual File: 'output/%s'.",
i, expectFileName, actualFileName)

require.Equal(t, len(actualQuery.Files), len(expectQuery.Files),
"Expected query results doesn't match the actual query results [query: %s]."+
"\nExpected File: 'fixtures/%s'.\nActual File: 'output/%s'.",
actualQuery.QueryName, expectFileName, actualFileName)

for j := range actualI.Queries[i].Files {
actualQuery.Files[j].FileName = ""
expectQuery.Files[j].FileName = ""
Expand Down