Merge pull request #64128 from yujuhong/conformance-txt

test/conformance/walk.go

@@ -176,10 +176,11 @@ func (v *visitor) emit(arg ast.Expr) {
 			return
 		}
 
+		at.Value = normalizeTestName(at.Value)
 		if *confDoc {
 			v.convertToConformanceData(at)
 		} else {
-			fmt.Printf("%s: %s\n", v.FileSet.Position(at.Pos()).Filename, at.Value)
+			fmt.Printf("%s: %q\n", v.FileSet.Position(at.Pos()).Filename, at.Value)
 		}
 	default:
 		v.failf(at, "framework.ConformanceIt() called with non-literal argument")
@@ -197,6 +198,18 @@ func (v *visitor) getDescription(value string) string {
 		" " + strings.Trim(value, "\"")
 }
 
+var (
+	regexTag = regexp.MustCompile(`(\[[a-zA-Z0-9:-]+\])`)
+)
+
+// normalizeTestName removes tags (e.g., [Feature:Foo]), double quotes and trim
+// the spaces to normalize the test name.
+func normalizeTestName(s string) string {
+	r := regexTag.ReplaceAllString(s, "")
+	r = strings.Trim(r, "\"")
+	return strings.TrimSpace(r)
+}
+
 // funcName converts a selectorExpr with two idents into a string,
 // x.y -> "x.y"
 func funcName(n ast.Expr) string {

test/conformance/walk_test.go

@@ -93,3 +93,25 @@ func TestConformance(t *testing.T) {
 		}
 	}
 }
+
+func TestNormalizeTestNames(t *testing.T) {
+	testCases := []struct {
+		rawName        string
+		normalizedName string
+	}{
+		{
+			"should have monotonically increasing restart count  [Slow]",
+			"should have monotonically increasing restart count",
+		},
+		{
+			" should check is all data is printed  ",
+			"should check is all data is printed",
+		},
+	}
+	for i, tc := range testCases {
+		actualName := normalizeTestName(tc.rawName)
+		if actualName != tc.normalizedName {
+			t.Errorf("test case[%d]: expected normalized name %q, got %q", i, tc.normalizedName, actualName)
+		}
+	}
+}