Skip to content

Commit 6b2050a

Browse files
committed
Fix expected result key ordering to match stackql JSON output
stackql serialises JSON keys alphabetically, so expected result strings must use the same order (location, locationType, name) to pass deep equality checks. https://claude.ai/code/session_019CH6RrcMGtdUafvyVCKCHE
1 parent 101b276 commit 6b2050a

5 files changed

Lines changed: 12 additions & 12 deletions

File tree

.github/workflows/stackql-assert-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
uses: ./
4949
with:
5050
test_query_file_path: './.github/workflows/workflow_scripts/google-example.iql'
51-
expected_results_str: '[{"name":"stackql-public-releases","location":"US","locationType":"multi-region"}]'
51+
expected_results_str: '[{"location":"US","locationType":"multi-region","name":"stackql-public-releases"}]'
5252
env:
5353
GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }}
5454

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"name":"stackql-public-releases","location":"US","locationType":"multi-region"}]
1+
[{"location":"US","locationType":"multi-region","name":"stackql-public-releases"}]

lib/tests/assert.test.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ const {checkResult, parseResult, assertResult, getExpectedResult} = require('../
33
describe('parseResult', ()=>{
44

55
it('should parsedResult correctly', ()=>{
6-
const resultString = `[{"name":"stackql-public-releases","location":"US","locationType":"multi-region"}]`
7-
const expected = [{"name":"stackql-public-releases","location":"US","locationType":"multi-region"}]
6+
const resultString = `[{"location":"US","locationType":"multi-region","name":"stackql-public-releases"}]`
7+
const expected = [{"location":"US","locationType":"multi-region","name":"stackql-public-releases"}]
88
const actual = parseResult(resultString);
99
expect(actual).toEqual(expected);
1010
})
1111
})
1212

1313
describe('getExpectedResult', ()=>{
1414
it('should return expectedResult when expectedResultStr is passed', ()=>{
15-
const expectedResultStr = `[{"name":"stackql-public-releases","location":"US","locationType":"multi-region"}]`
16-
const expectedResult = [{"name":"stackql-public-releases","location":"US","locationType":"multi-region"}]
15+
const expectedResultStr = `[{"location":"US","locationType":"multi-region","name":"stackql-public-releases"}]`
16+
const expectedResult = [{"location":"US","locationType":"multi-region","name":"stackql-public-releases"}]
1717

1818
const actual = getExpectedResult(expectedResultStr, undefined);
1919

@@ -22,7 +22,7 @@ describe('getExpectedResult', ()=>{
2222

2323
it('should return expectedResult when expectedResultFilePath is passed', ()=>{
2424
const expectedResultFilePath = 'lib/tests/success-result.json'
25-
const expectedResult = [{"name":"stackql-public-releases","location":"US","locationType":"multi-region"}]
25+
const expectedResult = [{"location":"US","locationType":"multi-region","name":"stackql-public-releases"}]
2626

2727
const actual = getExpectedResult(undefined, expectedResultFilePath);
2828

@@ -89,8 +89,8 @@ describe('assertResult', ()=>{
8989
let coreObj;
9090

9191
const ACTION_ENV = {
92-
RESULT: `[{"name":"stackql-public-releases","location":"US","locationType":"multi-region"}]`,
93-
EXPECTED_RESULTS_STR: `[{"name":"stackql-public-releases","location":"US","locationType":"multi-region"}]`,
92+
RESULT: `[{"location":"US","locationType":"multi-region","name":"stackql-public-releases"}]`,
93+
EXPECTED_RESULTS_STR: `[{"location":"US","locationType":"multi-region","name":"stackql-public-releases"}]`,
9494
EXPECTED_RESULTS_FILE_PATH: 'test.json',
9595
EXPECTED_ROWS: 1
9696
}
@@ -120,7 +120,7 @@ describe('assertResult', ()=>{
120120
});
121121

122122
it('it should setFailed when actual result is not equal to expected result', () => {
123-
process.env.RESULT= "[{\"name\":\"stackql-public-releases\",\"location\":\"EU\",\"locationType\":\"multi-region\"}]"
123+
process.env.RESULT= "[{\"location\":\"EU\",\"locationType\":\"multi-region\",\"name\":\"stackql-public-releases\"}]"
124124

125125
assertResult(coreObj)
126126

lib/tests/failed-result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"name":"stackql-public-releases","location":"EU","locationType":"multi-region"}]
1+
[{"location":"EU","locationType":"multi-region","name":"stackql-public-releases"}]

lib/tests/success-result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"name":"stackql-public-releases","location":"US","locationType":"multi-region"}]
1+
[{"location":"US","locationType":"multi-region","name":"stackql-public-releases"}]

0 commit comments

Comments
 (0)