test-label-analyzer: align filter expressions with review feedback

Signed-off-by: Avnish Jaltare <avnishjaltare8@gmail.com>

Author: Maximus-08

robots/test-label-analyzer/cmd/filter/expressions.go

@@ -22,6 +22,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"regexp"
 	"sort"
 	"strings"
 
@@ -41,7 +42,7 @@ var filterExpressionsOpts = &filterExpressionsOptions{}
 // JSON output as input and emitting filter expressions for both Ginkgo v1 text filters and
 // Ginkgo v2 label filters.
 var expressionsCmd = &cobra.Command{
-	Use:   "expressions",
+	Use:   "expressions <matching-tests.json>",
 	Short: "Generates Ginkgo filter expressions from matching tests",
 	Long: `Generates expressions that can be used with Ginkgo's --filter/--skip (v1) and --label-filter (v2) flags.
 
@@ -145,23 +146,18 @@ func buildExpressions(matches matchingTests) expressionsOutput {
 	if len(testNames) > 0 {
 		parts := make([]string, 0, len(testNames))
 		for _, name := range testNames {
-			// Escape quotes inside names to keep expression simple.
-			escaped := strings.ReplaceAll(name, `"`, `\"`)
-			escaped = strings.ReplaceAll(escaped, `'`, `\'`)
-			parts = append(parts, fmt.Sprintf("'%s'", escaped))
+			parts = append(parts, regexp.QuoteMeta(name))
 		}
-		filterExpr = strings.Join(parts, " || ")
+		filterExpr = strings.Join(parts, "|")
 	}
 
 	var labelExpr string
 	if len(reasons) > 0 {
 		parts := make([]string, 0, len(reasons))
 		for _, r := range reasons {
-			escaped := strings.ReplaceAll(r, `"`, `\"`)
-			escaped = strings.ReplaceAll(escaped, `'`, `\'`)
-			parts = append(parts, fmt.Sprintf("'%s'", escaped))
+			parts = append(parts, r)
 		}
-		labelExpr = strings.Join(parts, " || ")
+		labelExpr = strings.Join(parts, "||")
 	}
 
 	return expressionsOutput{

robots/test-label-analyzer/cmd/filter/expressions_test.go

@@ -19,8 +19,6 @@
 package filter
 
 import (
-	"strings"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
@@ -38,13 +36,13 @@ var _ = Describe("expressions", func() {
 			matches := matchingTests{
 				{
 					Id:       "id-1",
-					Reason:   "Quarantine",
+					Reason:   "sig-network",
 					Version:  "",
 					TestName: "test A",
 				},
 				{
 					Id:       "id-2",
-					Reason:   "Quarantine",
+					Reason:   "sig-storage",
 					Version:  "",
 					TestName: "test B",
 				},
@@ -53,13 +51,8 @@ var _ = Describe("expressions", func() {
 			out := buildExpressions(matches)
 
 			Expect(out.Skip).To(BeEmpty())
-
-			// Filter should mention both test names
-			Expect(out.Filter).To(ContainSubstring("test A"))
-			Expect(out.Filter).To(ContainSubstring("test B"))
-
-			// LabelFilter should mention the reason once
-			Expect(strings.Count(out.LabelFilter, "Quarantine")).To(Equal(1))
+			Expect(out.Filter).To(Equal("test A|test B"))
+			Expect(out.LabelFilter).To(Equal("sig-network||sig-storage"))
 		})
 	})
 })