internal/testprotos/legacy: rename and regenerate
Avoid dots and dashes in the directory to avoid issues on
build systems that cannot support them well.
Change-Id: I7ea5e6ce0b16c7158c7e53bcf5c3c1a334fe4718
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/214342
Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/internal/filedesc/build_test.go b/internal/filedesc/build_test.go
index 3170ee2..c25216f 100644
--- a/internal/filedesc/build_test.go
+++ b/internal/filedesc/build_test.go
@@ -45,16 +45,18 @@
visitFields(want.ProtoReflect(), func(field protoreflect.FieldDescriptor) {
seen[field.FullName()] = true
})
+ descFile := new(descriptorpb.DescriptorProto).ProtoReflect().Descriptor().ParentFile()
+ descPkg := descFile.Package()
ignore := map[protoreflect.FullName]bool{
// The protoreflect descriptors don't include source info.
- "google.protobuf.FileDescriptorProto.source_code_info": true,
- "google.protobuf.FileDescriptorProto.syntax": true,
+ descPkg.Append("FileDescriptorProto.source_code_info"): true,
+ descPkg.Append("FileDescriptorProto.syntax"): true,
// TODO: Test oneof and extension options. Testing these requires extending the
// options messages (because they contain no user-settable fields), but importing
// decriptor.proto from test.proto currently causes an import cycle. Add test
// cases when that import cycle has been fixed.
- "google.protobuf.OneofDescriptorProto.options": true,
+ descPkg.Append("OneofDescriptorProto.options"): true,
}
for _, messageName := range []protoreflect.Name{
"FileDescriptorProto",
@@ -63,10 +65,8 @@
"OneofDescriptorProto",
"EnumDescriptorProto",
"EnumValueDescriptorProto",
- "ServiceDescriptorProto",
- "MethodDescriptorProto",
} {
- message := descriptorpb.File_google_protobuf_descriptor_proto.Messages().ByName(messageName)
+ message := descFile.Messages().ByName(messageName)
for i, fields := 0, message.Fields(); i < fields.Len(); i++ {
if name := fields.Get(i).FullName(); !seen[name] && !ignore[name] {
t.Errorf("No test for descriptor field: %v", name)