Skip to content

Commit cbbc057

Browse files
committed
Fix singular/plural wording and add test
1 parent 30b30d6 commit cbbc057

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed

go/extractor/diagnostics/diagnostics.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,8 @@ func EmitPrivateRegistryUsed(writer DiagnosticsWriter, configs []string) {
581581
"go/autobuilder/analysis-using-private-registries",
582582
"Go extraction used private package registries",
583583
fmt.Sprintf(
584-
"Go was extracted using the following private package registrie%s:\n\n%s\n",
585-
plural(len(lines), "", "s"),
584+
"Go was extracted using the following private package registr%s:\n\n%s\n",
585+
plural(len(lines), "y", "ies"),
586586
strings.Join(lines, "\n")),
587587
severityNote,
588588
fullVisibility,

go/extractor/diagnostics/diagnostics_test.go

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,28 @@ func Test_EmitCannotFindPackages_Actions(t *testing.T) {
8484
assert.Contains(t, d.MarkdownMessage, "If any of the packages are already present in the repository")
8585
}
8686

87-
func Test_EmitPrivateRegistryUsed(t *testing.T) {
87+
func Test_EmitPrivateRegistryUsed_Single(t *testing.T) {
88+
writer := newMemoryDiagnosticsWriter()
89+
90+
testItems := []string{
91+
"* https://github.com/github/example (Git Source)",
92+
}
93+
94+
EmitPrivateRegistryUsed(writer, testItems)
95+
96+
assert.Len(t, writer.diagnostics, 1, "Expected one diagnostic to be emitted")
97+
98+
d := writer.diagnostics[0]
99+
assert.Equal(t, d.Source.Id, "go/autobuilder/analysis-using-private-registries")
100+
assert.Equal(t, d.Severity, string(severityNote))
101+
assert.Contains(t, d.MarkdownMessage, "following private package registry")
102+
103+
for i := range testItems {
104+
assert.Contains(t, d.MarkdownMessage, testItems[i])
105+
}
106+
}
107+
108+
func Test_EmitPrivateRegistryUsed_Multiple(t *testing.T) {
88109
writer := newMemoryDiagnosticsWriter()
89110

90111
testItems := []string{
@@ -99,6 +120,7 @@ func Test_EmitPrivateRegistryUsed(t *testing.T) {
99120
d := writer.diagnostics[0]
100121
assert.Equal(t, d.Source.Id, "go/autobuilder/analysis-using-private-registries")
101122
assert.Equal(t, d.Severity, string(severityNote))
123+
assert.Contains(t, d.MarkdownMessage, "following private package registries")
102124

103125
for i := range testItems {
104126
assert.Contains(t, d.MarkdownMessage, testItems[i])

0 commit comments

Comments
 (0)