chore: minor e2e improvements (#91)

Author: blva

tools/cli/test/e2e/cli/cli.go

@@ -64,34 +64,13 @@ func NewDuplicatedTagAuthNSpecPath(t *testing.T) string {
 	return cliPath
 }
 
-func NewAtlasYAMLBaseSpecPath(t *testing.T, folder string) string {
-	t.Helper()
-	cliPath, err := filepath.Abs("../../data/split/" + folder + "/openapi-v2.yaml")
-	require.NoError(t, err)
-	return cliPath
-}
-
-func NewAtlasJSONBaseSpecPath(t *testing.T, folder string) string {
-	t.Helper()
-	cliPath, err := filepath.Abs("../../data/split/" + folder + "/openapi-v2.json")
-	require.NoError(t, err)
-	return cliPath
-}
-
 func NewValidAtlasSpecPath(t *testing.T, version, folder string) string {
 	t.Helper()
 	cliPath, err := filepath.Abs("../../data/split/" + folder + "/openapi-v2-" + version + ".json")
 	require.NoError(t, err)
 	return cliPath
 }
 
-func NewValidAtlasSpecWithExtensionsPath(t *testing.T, folder string) string {
-	t.Helper()
-	cliPath, err := filepath.Abs("../../data/split/" + folder + "/openapi-mms-extensions.json")
-	require.NoError(t, err)
-	return cliPath
-}
-
 func newOpenAPISpec(t *testing.T, path string) *openapi3.T {
 	t.Helper()
 	absPath, err := filepath.Abs(path)

tools/cli/test/e2e/cli/split_test.go

@@ -17,74 +17,66 @@ var versions = []string{"2023-01-01", "2023-02-01", "2023-10-01", "2023-11-15",
 
 func TestSplitVersions(t *testing.T) {
 	cliPath := NewBin(t)
+	testCases := map[string]struct {
+		format   string
+		specType string
+		env      string
+	}{
+		"Split filtered specs json dev": {
+			format:   "json",
+			specType: "filtered",
+			env:      "dev",
+		},
+		"Split filtered specs yaml dev": {
+
+			format:   "yaml",
+			specType: "filtered",
+			env:      "dev",
+		},
+		"Split not-filtered specs json dev": {
+			format:   "json",
+			specType: "not-filtered",
+			env:      "dev",
+		},
+	}
 
-	t.Run("Split valid specs json dev", func(t *testing.T) {
-		devFolder := "dev"
-		base := NewAtlasJSONBaseSpecPath(t, devFolder)
-		cmd := exec.Command(cliPath,
-			"split",
-			"-s",
-			base,
-			"-o",
-			getOutputFolder(t, devFolder)+"/output.json",
-		)
-
-		var o, e bytes.Buffer
-		cmd.Stdout = &o
-		cmd.Stderr = &e
-		require.NoError(t, cmd.Run(), e.String())
-
-		for _, version := range versions {
-			validateFiles(t, version, devFolder)
-		}
-	})
-
-	t.Run("Split valid specs yaml dev", func(t *testing.T) {
-		devFolder := "dev"
-		base := NewAtlasYAMLBaseSpecPath(t, devFolder)
-		cmd := exec.Command(cliPath,
-			"split",
-			"-s",
-			base,
-			"-o",
-			getOutputFolder(t, devFolder)+"/output.yaml",
-		)
-
-		var o, e bytes.Buffer
-		cmd.Stdout = &o
-		cmd.Stderr = &e
-		require.NoError(t, cmd.Run(), e.String())
-
-		for _, version := range versions {
-			validateFiles(t, version, devFolder)
-		}
-	})
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+			folder := tc.env
+			base := getInputFolder(t, tc.specType, tc.format, folder)
+			cmd := exec.Command(cliPath,
+				"split",
+				"-s",
+				base,
+				"-o",
+				getOutputFolder(t, folder)+"/output."+tc.format,
+				"--env",
+				tc.env,
+			)
+
+			var o, e bytes.Buffer
+			cmd.Stdout = &o
+			cmd.Stderr = &e
+			require.NoError(t, cmd.Run(), e.String())
+
+			for _, version := range versions {
+				validateFiles(t, version, folder)
+			}
+		})
+	}
 }
-func TestSplitEnvironments(t *testing.T) {
-	cliPath := NewBin(t)
 
-	t.Run("Split valid specs with env=dev", func(t *testing.T) {
-		prodFolder := "dev"
-		base := NewValidAtlasSpecWithExtensionsPath(t, prodFolder)
-		cmd := exec.Command(cliPath,
-			"split",
-			"-s",
-			base,
-			"-o",
-			getOutputFolder(t, prodFolder)+"/output.json",
-			"--env",
-			"dev",
-		)
-
-		var o, e bytes.Buffer
-		cmd.Stdout = &o
-		cmd.Stderr = &e
-		require.NoError(t, cmd.Run(), e.String())
-
-		for _, version := range versions {
-			validateFiles(t, version, prodFolder)
-		}
-	})
+func getInputFolder(t *testing.T, specType, format, folder string) string {
+	t.Helper()
+	if specType == "not-filtered" {
+		cliPath, err := filepath.Abs("../../data/split/" + folder + "/openapi-mms-extensions.json")
+		require.NoError(t, err)
+		return cliPath
+	}
+
+	cliPath, err := filepath.Abs("../../data/split/" + folder + "/openapi-v2." + format)
+	require.NoError(t, err)
+	return cliPath
 }
 
 func getOutputFolder(t *testing.T, subFolder string) string {
@@ -116,7 +108,7 @@ func ValidateVersionedSpec(t *testing.T, correctSpecPath, generatedSpecPath stri
 	require.NoError(t, err)
 
 	message := "Generated spec is not equal to the correct spec for path: " + correctSpecPath + "\n\n" +
-		"oasdiff diff --max-circular-dep 15 " + correctSpecPath + " " + generatedSpecPath + " > diff.yaml"
+		"oasdiff diff --max-circular-dep 15 " + correctSpecPath + " " + generatedSpecPath + " > diff.yaml\n"
 
 	if d.Empty() {
 		return