passing again

bufbuild · Dec 20, 2023 · 9d260c8 · 9d260c8
1 parent e1d3d81
commit 9d260c8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/private/bufpkg/bufanalysis/bufanalysistesting/bufanalysistesting_test.go b/private/bufpkg/bufanalysis/bufanalysistesting/bufanalysistesting_test.go
@@ -125,10 +125,10 @@ path/to/file.proto(2,1) : error FOO : Hello.
 	)
 	require.NoError(t, err)
 	assert.Equal(t,
-		`::error file=path/to/file.proto,line=1,endLine=1::Hello.
-::error file=path/to/file.proto,line=2,col=1,endLine=2,endColumn=1::Hello.
+		`::error file=<input>::Hello.
 ::error file=path/to/file.proto::Hello.
-::error file=<input>::Hello.
+::error file=path/to/file.proto,line=1,endLine=1::Hello.
+::error file=path/to/file.proto,line=2,col=1,endLine=2,endColumn=1::Hello.
 `,
 		sb.String(),
 	)

diff --git a/private/bufpkg/bufcheck/bufbreaking/bufbreaking_test.go b/private/bufpkg/bufcheck/bufbreaking/bufbreaking_test.go
@@ -296,8 +296,6 @@ func TestRunBreakingFieldSameType(t *testing.T) {
 		t,
 		"breaking_field_same_type",
 		bufanalysistesting.NewFileAnnotationNoLocation(t, "1.proto", "FIELD_SAME_TYPE"),
-		bufanalysistesting.NewFileAnnotationNoLocation(t, "1.proto", "FIELD_SAME_TYPE"),
-		bufanalysistesting.NewFileAnnotationNoLocation(t, "1.proto", "FIELD_SAME_TYPE"),
 		bufanalysistesting.NewFileAnnotation(t, "1.proto", 8, 12, 8, 17, "FIELD_SAME_TYPE"),
 		bufanalysistesting.NewFileAnnotation(t, "1.proto", 9, 12, 9, 15, "FIELD_SAME_TYPE"),
 		bufanalysistesting.NewFileAnnotation(t, "1.proto", 11, 3, 11, 6, "FIELD_SAME_TYPE"),
@@ -480,7 +478,6 @@ func TestRunBreakingMessageSameValues(t *testing.T) {
 		t,
 		"breaking_message_same_values",
 		bufanalysistesting.NewFileAnnotationNoLocation(t, "1.proto", "MESSAGE_SAME_MESSAGE_SET_WIRE_FORMAT"),
-		bufanalysistesting.NewFileAnnotationNoLocation(t, "1.proto", "MESSAGE_SAME_MESSAGE_SET_WIRE_FORMAT"),
 		bufanalysistesting.NewFileAnnotation(t, "1.proto", 6, 3, 6, 42, "MESSAGE_SAME_MESSAGE_SET_WIRE_FORMAT"),
 		bufanalysistesting.NewFileAnnotation(t, "1.proto", 7, 3, 7, 49, "MESSAGE_NO_REMOVE_STANDARD_DESCRIPTOR_ACCESSOR"),
 		bufanalysistesting.NewFileAnnotation(t, "1.proto", 13, 7, 13, 53, "MESSAGE_NO_REMOVE_STANDARD_DESCRIPTOR_ACCESSOR"),
@@ -489,7 +486,6 @@ func TestRunBreakingMessageSameValues(t *testing.T) {
 		bufanalysistesting.NewFileAnnotation(t, "1.proto", 24, 5, 24, 43, "MESSAGE_SAME_MESSAGE_SET_WIRE_FORMAT"),
 		bufanalysistesting.NewFileAnnotation(t, "1.proto", 27, 3, 27, 49, "MESSAGE_NO_REMOVE_STANDARD_DESCRIPTOR_ACCESSOR"),
 		bufanalysistesting.NewFileAnnotationNoLocation(t, "2.proto", "MESSAGE_SAME_MESSAGE_SET_WIRE_FORMAT"),
-		bufanalysistesting.NewFileAnnotationNoLocation(t, "2.proto", "MESSAGE_SAME_MESSAGE_SET_WIRE_FORMAT"),
 		bufanalysistesting.NewFileAnnotation(t, "2.proto", 6, 3, 6, 49, "MESSAGE_NO_REMOVE_STANDARD_DESCRIPTOR_ACCESSOR"),
 		bufanalysistesting.NewFileAnnotation(t, "2.proto", 10, 3, 10, 49, "MESSAGE_NO_REMOVE_STANDARD_DESCRIPTOR_ACCESSOR"),
 	)