revised

GoogleCloudPlatform · Nov 21, 2024 · 7a78267 · 7a78267
1 parent 3c0d23b
commit 7a78267
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/infra/blueprint-test/pkg/golden/golden.go b/infra/blueprint-test/pkg/golden/golden.go
@@ -158,8 +158,8 @@ func (g *GoldenFile) JSONEq(a *assert.Assertions, got gjson.Result, jsonPath str
 	a.Equal(gfData, gotData, fmt.Sprintf("expected %s to match fixture %s", jsonPath, gfData))
 }
 
-// JSONEqs asserts that json content in jsonPaths for got and goldenfile are the same
-func (g *GoldenFile) JSONEqs(a *assert.Assertions, got gjson.Result, jsonPaths []string) {
+// JSONPathEqs asserts that json content in jsonPaths for got and goldenfile are the same
+func (g *GoldenFile) JSONPathEqs(a *assert.Assertions, got gjson.Result, jsonPaths []string) {
 	var wg sync.WaitGroup
 	wg.Add(len(jsonPaths))
 	for _, path := range jsonPaths {

diff --git a/infra/blueprint-test/pkg/golden/golden_test.go b/infra/blueprint-test/pkg/golden/golden_test.go
@@ -156,7 +156,9 @@ func TestJSONEqs(t *testing.T) {
 			defer os.Unsetenv(gfUpdateEnvVar)
 			got := NewOrUpdate(t, tt.data, tt.opts...)
 			defer os.Remove(got.GetName())
-			got.JSONEqs(assert, utils.ParseJSONResult(t, tt.want), tt.eqPaths)
+			got.JSONPathEqs(assert, utils.ParseJSONResult(t, tt.data), tt.eqPaths)
+			multipathQuery := fmt.Sprintf("{%s}", strings.Join(tt.eqPaths, ","))
+			assert.JSONEq(tt.want, got.GetJSON().Get(multipathQuery).String())
 		})
 	}
 }