CLOUDP-250827: renaming data files (#41)

andreaangiolillo · web-flow · commit 16b9cead21a0 · 2024-05-28T11:45:08.000+01:00
diff --git a/tools/cli/internal/cli/merge/merge_test.go b/tools/cli/internal/cli/merge/merge_test.go
@@ -90,7 +90,7 @@ func TestOpts_PreRunE(t *testing.T) {
 		},
 		{
 			wantErr:       require.NoError,
-			basePath:      "../../../test/data/valid_base_spec.json",
+			basePath:      "../../../test/data/base_spec.json",
 			name:          "Successful",
 			externalPaths: []string{"test"},
 		},
diff --git a/tools/cli/test/data/apiregistry_spec.json b/tools/cli/test/data/apiregistry_spec.json
@@ -28,7 +28,7 @@
         "operationId": "getOpenApiInfo",
         "parameters": [
           {
-            "$ref": "valid_base_spec.json#/components/parameters/pretty"
+            "$ref": "base_spec.json#/components/parameters/pretty"
           }
         ],
         "responses": {
@@ -53,7 +53,7 @@
             }
           },
           "500": {
-            "$ref": "valid_base_spec.json#/components/responses/internalServerError"
+            "$ref": "base_spec.json#/components/responses/internalServerError"
           }
         }
       }
diff --git a/tools/cli/test/data/authn_spec.json b/tools/cli/test/data/authn_spec.json
@@ -28,7 +28,7 @@
         "operationId": "getOpenApiInfo",
         "parameters": [
           {
-            "$ref": "valid_base_spec.json#/components/parameters/pretty"
+            "$ref": "base_spec.json#/components/parameters/pretty"
           }
         ],
         "responses": {
@@ -53,7 +53,7 @@
             }
           },
           "500": {
-            "$ref": "valid_base_spec.json#/components/responses/internalServerError"
+            "$ref": "base_spec.json#/components/responses/internalServerError"
           }
         }
       }
diff --git a/tools/cli/test/data/base_spec.json b/tools/cli/test/data/base_spec.json
diff --git a/tools/cli/test/data/duplicated_path_apiregistry_spec.json b/tools/cli/test/data/duplicated_path_apiregistry_spec.json
@@ -28,7 +28,7 @@
         "operationId": "getOpenApiInfo",
         "parameters": [
           {
-            "$ref": "valid_base_spec.json#/components/parameters/pretty"
+            "$ref": "base_spec.json#/components/parameters/pretty"
           }
         ],
         "responses": {
@@ -53,7 +53,7 @@
             }
           },
           "500": {
-            "$ref": "valid_base_spec.json#/components/responses/internalServerError"
+            "$ref": "base_spec.json#/components/responses/internalServerError"
           }
         }
       }
@@ -66,7 +66,7 @@
         "operationId": "getOpenApiInfo",
         "parameters": [
           {
-            "$ref": "valid_base_spec.json#/components/parameters/pretty"
+            "$ref": "base_spec.json#/components/parameters/pretty"
           }
         ],
         "responses": {
@@ -91,7 +91,7 @@
             }
           },
           "500": {
-            "$ref": "valid_base_spec.json#/components/responses/internalServerError"
+            "$ref": "base_spec.json#/components/responses/internalServerError"
           }
         }
       }
diff --git a/tools/cli/test/data/duplicated_tag_authn_spec.json b/tools/cli/test/data/duplicated_tag_authn_spec.json
@@ -28,7 +28,7 @@
         "operationId": "getOpenApiInfo",
         "parameters": [
           {
-            "$ref": "valid_base_spec.json#/components/parameters/pretty"
+            "$ref": "base_spec.json#/components/parameters/pretty"
           }
         ],
         "responses": {
@@ -53,7 +53,7 @@
             }
           },
           "500": {
-            "$ref": "valid_base_spec.json#/components/responses/internalServerError"
+            "$ref": "base_spec.json#/components/responses/internalServerError"
           }
         }
       }
diff --git a/tools/cli/test/data/not_identical_component_apiregistry_spec.json b/tools/cli/test/data/not_identical_component_apiregistry_spec.json
@@ -28,7 +28,7 @@
         "operationId": "getOpenApiInfo",
         "parameters": [
           {
-            "$ref": "valid_base_spec.json#/components/parameters/pretty"
+            "$ref": "base_spec.json#/components/parameters/pretty"
           }
         ],
         "responses": {
@@ -53,7 +53,7 @@
             }
           },
           "500": {
-            "$ref": "valid_base_spec.json#/components/responses/internalServerError"
+            "$ref": "base_spec.json#/components/responses/internalServerError"
           }
         }
       }
diff --git a/tools/cli/test/e2e/cli/cli.go b/tools/cli/test/e2e/cli/cli.go
@@ -20,23 +20,23 @@ func NewBin() (string, error) {
 }
 
 func NewBaseSpec() (string, error) {
-	cliPath, err := filepath.Abs("../../data/valid_base_spec.json")
+	cliPath, err := filepath.Abs("../../data/base_spec.json")
 	if err != nil {
 		return "", err
 	}
 	return cliPath, nil
 }
 
-func NewValidAPIRegistrySpec() (string, error) {
-	cliPath, err := filepath.Abs("../../data/valid_apiregistry_spec.json")
+func NewAPIRegistrySpec() (string, error) {
+	cliPath, err := filepath.Abs("../../data/apiregistry_spec.json")
 	if err != nil {
 		return "", err
 	}
 	return cliPath, nil
 }
 
-func NewValidAuthNSpec() (string, error) {
-	cliPath, err := filepath.Abs("../../data/valid_authn_spec.json")
+func NewAuthNSpec() (string, error) {
+	cliPath, err := filepath.Abs("../../data/authn_spec.json")
 	if err != nil {
 		return "", err
 	}
diff --git a/tools/cli/test/e2e/cli/merge_test.go b/tools/cli/test/e2e/cli/merge_test.go
@@ -17,7 +17,7 @@ func TestMerge(t *testing.T) {
 	t.Run("Merge valid specs", func(t *testing.T) {
 		base, err := NewBaseSpec()
 		require.NoError(t, err)
-		external, err := NewValidAPIRegistrySpec()
+		external, err := NewAPIRegistrySpec()
 		require.NoError(t, err)
 
 		cmd := exec.Command(cliPath,
@@ -43,7 +43,7 @@ func TestMerge(t *testing.T) {
 		require.NoError(t, err)
 		apiRegistrySpec, err := NewDuplicatedPathAPIRegistrySpec()
 		require.NoError(t, err)
-		authnSpec, err := NewValidAuthNSpec()
+		authnSpec, err := NewAuthNSpec()
 		require.NoError(t, err)
 
 		cmd := exec.Command(cliPath,
@@ -66,7 +66,7 @@ func TestMerge(t *testing.T) {
 	t.Run("Expecting Error: Merge duplicated tag", func(t *testing.T) {
 		base, err := NewBaseSpec()
 		require.NoError(t, err)
-		apiRegistrySpec, err := NewValidAPIRegistrySpec()
+		apiRegistrySpec, err := NewAPIRegistrySpec()
 		require.NoError(t, err)
 		authnSpec, err := NewDuplicatedTagAuthNSpec()
 		require.NoError(t, err)
@@ -93,7 +93,7 @@ func TestMerge(t *testing.T) {
 		require.NoError(t, err)
 		apiRegistrySpec, err := NewNotIdenticalComponentPIRegistrySpec()
 		require.NoError(t, err)
-		authnSpec, err := NewValidAuthNSpec()
+		authnSpec, err := NewAuthNSpec()
 		require.NoError(t, err)
 
 		cmd := exec.Command(cliPath,

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ func TestOpts_PreRunE(t *testing.T) {`
`90`	`90`	`},`
`91`	`91`	`{`
`92`	`92`	`wantErr: require.NoError,`
`93`		`- basePath: "../../../test/data/valid_base_spec.json",`
	`93`	`+ basePath: "../../../test/data/base_spec.json",`
`94`	`94`	`name: "Successful",`
`95`	`95`	`externalPaths: []string{"test"},`
`96`	`96`	`},`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`"operationId": "getOpenApiInfo",`
`29`	`29`	`"parameters": [`
`30`	`30`	`{`
`31`		`- "$ref": "valid_base_spec.json#/components/parameters/pretty"`
	`31`	`+ "$ref": "base_spec.json#/components/parameters/pretty"`
`32`	`32`	`}`
`33`	`33`	`],`
`34`	`34`	`"responses": {`
`@@ -53,7 +53,7 @@`
`53`	`53`	`}`
`54`	`54`	`},`
`55`	`55`	`"500": {`
`56`		`- "$ref": "valid_base_spec.json#/components/responses/internalServerError"`
	`56`	`+ "$ref": "base_spec.json#/components/responses/internalServerError"`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,23 +20,23 @@ func NewBin() (string, error) {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`func NewBaseSpec() (string, error) {`
`23`		`- cliPath, err := filepath.Abs("../../data/valid_base_spec.json")`
	`23`	`+ cliPath, err := filepath.Abs("../../data/base_spec.json")`
`24`	`24`	`if err != nil {`
`25`	`25`	`return "", err`
`26`	`26`	`}`
`27`	`27`	`return cliPath, nil`
`28`	`28`	`}`
`29`	`29`
`30`		`-func NewValidAPIRegistrySpec() (string, error) {`
`31`		`- cliPath, err := filepath.Abs("../../data/valid_apiregistry_spec.json")`
	`30`	`+func NewAPIRegistrySpec() (string, error) {`
	`31`	`+ cliPath, err := filepath.Abs("../../data/apiregistry_spec.json")`
`32`	`32`	`if err != nil {`
`33`	`33`	`return "", err`
`34`	`34`	`}`
`35`	`35`	`return cliPath, nil`
`36`	`36`	`}`
`37`	`37`
`38`		`-func NewValidAuthNSpec() (string, error) {`
`39`		`- cliPath, err := filepath.Abs("../../data/valid_authn_spec.json")`
	`38`	`+func NewAuthNSpec() (string, error) {`
	`39`	`+ cliPath, err := filepath.Abs("../../data/authn_spec.json")`
`40`	`40`	`if err != nil {`
`41`	`41`	`return "", err`
`42`	`42`	`}`