internal/impl: move legacy files into impl
The internal/legacy package was originally separated out from internal/impl
to avoid a cyclic dependency on descriptor proto. However, the dependency
that legacy has on descriptor has long been dropped such that we can
now merge the two packages together again.
All legacy related logic are in a file with a legacy prefix.
Change-Id: I2424fc0f50721696ad06fa7cebb9bdd0babea13c
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/178542
Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/internal/impl/legacy_file_test.go b/internal/impl/legacy_file_test.go
new file mode 100644
index 0000000..d4c5890
--- /dev/null
+++ b/internal/impl/legacy_file_test.go
@@ -0,0 +1,466 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package impl_test
+
+import (
+ "bytes"
+ "compress/gzip"
+ "io/ioutil"
+ "reflect"
+ "testing"
+
+ "github.com/google/go-cmp/cmp"
+ "google.golang.org/protobuf/internal/impl"
+ "google.golang.org/protobuf/internal/pragma"
+ "google.golang.org/protobuf/proto"
+ pdesc "google.golang.org/protobuf/reflect/protodesc"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
+
+ proto2_20160225 "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v0.0.0-20160225-2fc053c5"
+ proto2_20160519 "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v0.0.0-20160519-a4ab9ec5"
+ proto2_20180125 "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v1.0.0-20180125-92554152"
+ proto2_20180430 "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v1.1.0-20180430-b4deda09"
+ proto2_20180814 "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v1.2.0-20180814-aa810b61"
+ proto2_20181126 "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v1.2.1-20181126-8d0c54c1"
+ proto3_20160225 "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v0.0.0-20160225-2fc053c5"
+ proto3_20160519 "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v0.0.0-20160519-a4ab9ec5"
+ proto3_20180125 "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v1.0.0-20180125-92554152"
+ proto3_20180430 "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v1.1.0-20180430-b4deda09"
+ proto3_20180814 "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v1.2.0-20180814-aa810b61"
+ proto3_20181126 "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v1.2.1-20181126-8d0c54c1"
+ "google.golang.org/protobuf/types/descriptorpb"
+)
+
+func mustLoadFileDesc(b []byte, _ []int) pref.FileDescriptor {
+ zr, err := gzip.NewReader(bytes.NewReader(b))
+ if err != nil {
+ panic(err)
+ }
+ b, err = ioutil.ReadAll(zr)
+ if err != nil {
+ panic(err)
+ }
+ p := new(descriptorpb.FileDescriptorProto)
+ err = proto.UnmarshalOptions{DiscardUnknown: true}.Unmarshal(b, p)
+ if err != nil {
+ panic(err)
+ }
+ fd, err := pdesc.NewFile(p, nil)
+ if err != nil {
+ panic(err)
+ }
+ return fd
+}
+
+func TestDescriptor(t *testing.T) {
+ var tests []struct{ got, want pref.Descriptor }
+
+ fileDescP2_20160225 := mustLoadFileDesc(new(proto2_20160225.Message).Descriptor())
+ tests = append(tests, []struct{ got, want pref.Descriptor }{{
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto2_20160225.SiblingEnum(0))),
+ want: fileDescP2_20160225.Enums().ByName("SiblingEnum"),
+ }, {
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto2_20160225.Message_ChildEnum(0))),
+ want: fileDescP2_20160225.Messages().ByName("Message").Enums().ByName("ChildEnum"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20160225.SiblingMessage))),
+ want: fileDescP2_20160225.Messages().ByName("SiblingMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20160225.Message_ChildMessage))),
+ want: fileDescP2_20160225.Messages().ByName("Message").Messages().ByName("ChildMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20160225.Message))),
+ want: fileDescP2_20160225.Messages().ByName("Message"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20160225.Message_NamedGroup))),
+ want: fileDescP2_20160225.Messages().ByName("Message").Messages().ByName("NamedGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20160225.Message_OptionalGroup))),
+ want: fileDescP2_20160225.Messages().ByName("Message").Messages().ByName("OptionalGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20160225.Message_RequiredGroup))),
+ want: fileDescP2_20160225.Messages().ByName("Message").Messages().ByName("RequiredGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20160225.Message_RepeatedGroup))),
+ want: fileDescP2_20160225.Messages().ByName("Message").Messages().ByName("RepeatedGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20160225.Message_OneofGroup))),
+ want: fileDescP2_20160225.Messages().ByName("Message").Messages().ByName("OneofGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20160225.Message_ExtensionOptionalGroup))),
+ want: fileDescP2_20160225.Messages().ByName("Message").Messages().ByName("ExtensionOptionalGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20160225.Message_ExtensionRepeatedGroup))),
+ want: fileDescP2_20160225.Messages().ByName("Message").Messages().ByName("ExtensionRepeatedGroup"),
+ }}...)
+
+ fileDescP3_20160225 := mustLoadFileDesc(new(proto3_20160225.Message).Descriptor())
+ tests = append(tests, []struct{ got, want pref.Descriptor }{{
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto3_20160225.SiblingEnum(0))),
+ want: fileDescP3_20160225.Enums().ByName("SiblingEnum"),
+ }, {
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto3_20160225.Message_ChildEnum(0))),
+ want: fileDescP3_20160225.Messages().ByName("Message").Enums().ByName("ChildEnum"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto3_20160225.SiblingMessage))),
+ want: fileDescP3_20160225.Messages().ByName("SiblingMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto3_20160225.Message_ChildMessage))),
+ want: fileDescP3_20160225.Messages().ByName("Message").Messages().ByName("ChildMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto3_20160225.Message))),
+ want: fileDescP3_20160225.Messages().ByName("Message"),
+ }}...)
+
+ fileDescP2_20160519 := mustLoadFileDesc(new(proto2_20160519.Message).Descriptor())
+ tests = append(tests, []struct{ got, want pref.Descriptor }{{
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto2_20160519.SiblingEnum(0))),
+ want: fileDescP2_20160519.Enums().ByName("SiblingEnum"),
+ }, {
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto2_20160519.Message_ChildEnum(0))),
+ want: fileDescP2_20160519.Messages().ByName("Message").Enums().ByName("ChildEnum"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20160519.SiblingMessage))),
+ want: fileDescP2_20160519.Messages().ByName("SiblingMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20160519.Message_ChildMessage))),
+ want: fileDescP2_20160519.Messages().ByName("Message").Messages().ByName("ChildMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20160519.Message))),
+ want: fileDescP2_20160519.Messages().ByName("Message"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20160519.Message_NamedGroup))),
+ want: fileDescP2_20160519.Messages().ByName("Message").Messages().ByName("NamedGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20160519.Message_OptionalGroup))),
+ want: fileDescP2_20160519.Messages().ByName("Message").Messages().ByName("OptionalGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20160519.Message_RequiredGroup))),
+ want: fileDescP2_20160519.Messages().ByName("Message").Messages().ByName("RequiredGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20160519.Message_RepeatedGroup))),
+ want: fileDescP2_20160519.Messages().ByName("Message").Messages().ByName("RepeatedGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20160519.Message_OneofGroup))),
+ want: fileDescP2_20160519.Messages().ByName("Message").Messages().ByName("OneofGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20160519.Message_ExtensionOptionalGroup))),
+ want: fileDescP2_20160519.Messages().ByName("Message").Messages().ByName("ExtensionOptionalGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20160519.Message_ExtensionRepeatedGroup))),
+ want: fileDescP2_20160519.Messages().ByName("Message").Messages().ByName("ExtensionRepeatedGroup"),
+ }}...)
+
+ fileDescP3_20160519 := mustLoadFileDesc(new(proto3_20160519.Message).Descriptor())
+ tests = append(tests, []struct{ got, want pref.Descriptor }{{
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto3_20160519.SiblingEnum(0))),
+ want: fileDescP3_20160519.Enums().ByName("SiblingEnum"),
+ }, {
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto3_20160519.Message_ChildEnum(0))),
+ want: fileDescP3_20160519.Messages().ByName("Message").Enums().ByName("ChildEnum"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto3_20160519.SiblingMessage))),
+ want: fileDescP3_20160519.Messages().ByName("SiblingMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto3_20160519.Message_ChildMessage))),
+ want: fileDescP3_20160519.Messages().ByName("Message").Messages().ByName("ChildMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto3_20160519.Message))),
+ want: fileDescP3_20160519.Messages().ByName("Message"),
+ }}...)
+
+ fileDescP2_20180125 := mustLoadFileDesc(new(proto2_20180125.Message).Descriptor())
+ tests = append(tests, []struct{ got, want pref.Descriptor }{{
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto2_20180125.SiblingEnum(0))),
+ want: fileDescP2_20180125.Enums().ByName("SiblingEnum"),
+ }, {
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto2_20180125.Message_ChildEnum(0))),
+ want: fileDescP2_20180125.Messages().ByName("Message").Enums().ByName("ChildEnum"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180125.SiblingMessage))),
+ want: fileDescP2_20180125.Messages().ByName("SiblingMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180125.Message_ChildMessage))),
+ want: fileDescP2_20180125.Messages().ByName("Message").Messages().ByName("ChildMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180125.Message))),
+ want: fileDescP2_20180125.Messages().ByName("Message"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180125.Message_NamedGroup))),
+ want: fileDescP2_20180125.Messages().ByName("Message").Messages().ByName("NamedGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180125.Message_OptionalGroup))),
+ want: fileDescP2_20180125.Messages().ByName("Message").Messages().ByName("OptionalGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180125.Message_RequiredGroup))),
+ want: fileDescP2_20180125.Messages().ByName("Message").Messages().ByName("RequiredGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180125.Message_RepeatedGroup))),
+ want: fileDescP2_20180125.Messages().ByName("Message").Messages().ByName("RepeatedGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180125.Message_OneofGroup))),
+ want: fileDescP2_20180125.Messages().ByName("Message").Messages().ByName("OneofGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180125.Message_ExtensionOptionalGroup))),
+ want: fileDescP2_20180125.Messages().ByName("Message").Messages().ByName("ExtensionOptionalGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180125.Message_ExtensionRepeatedGroup))),
+ want: fileDescP2_20180125.Messages().ByName("Message").Messages().ByName("ExtensionRepeatedGroup"),
+ }}...)
+
+ fileDescP3_20180125 := mustLoadFileDesc(new(proto3_20180125.Message).Descriptor())
+ tests = append(tests, []struct{ got, want pref.Descriptor }{{
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto3_20180125.SiblingEnum(0))),
+ want: fileDescP3_20180125.Enums().ByName("SiblingEnum"),
+ }, {
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto3_20180125.Message_ChildEnum(0))),
+ want: fileDescP3_20180125.Messages().ByName("Message").Enums().ByName("ChildEnum"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto3_20180125.SiblingMessage))),
+ want: fileDescP3_20180125.Messages().ByName("SiblingMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto3_20180125.Message_ChildMessage))),
+ want: fileDescP3_20180125.Messages().ByName("Message").Messages().ByName("ChildMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto3_20180125.Message))),
+ want: fileDescP3_20180125.Messages().ByName("Message"),
+ }}...)
+
+ fileDescP2_20180430 := mustLoadFileDesc(new(proto2_20180430.Message).Descriptor())
+ tests = append(tests, []struct{ got, want pref.Descriptor }{{
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto2_20180430.SiblingEnum(0))),
+ want: fileDescP2_20180430.Enums().ByName("SiblingEnum"),
+ }, {
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto2_20180430.Message_ChildEnum(0))),
+ want: fileDescP2_20180430.Messages().ByName("Message").Enums().ByName("ChildEnum"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180430.SiblingMessage))),
+ want: fileDescP2_20180430.Messages().ByName("SiblingMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180430.Message_ChildMessage))),
+ want: fileDescP2_20180430.Messages().ByName("Message").Messages().ByName("ChildMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180430.Message))),
+ want: fileDescP2_20180430.Messages().ByName("Message"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180430.Message_NamedGroup))),
+ want: fileDescP2_20180430.Messages().ByName("Message").Messages().ByName("NamedGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180430.Message_OptionalGroup))),
+ want: fileDescP2_20180430.Messages().ByName("Message").Messages().ByName("OptionalGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180430.Message_RequiredGroup))),
+ want: fileDescP2_20180430.Messages().ByName("Message").Messages().ByName("RequiredGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180430.Message_RepeatedGroup))),
+ want: fileDescP2_20180430.Messages().ByName("Message").Messages().ByName("RepeatedGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180430.Message_OneofGroup))),
+ want: fileDescP2_20180430.Messages().ByName("Message").Messages().ByName("OneofGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180430.Message_ExtensionOptionalGroup))),
+ want: fileDescP2_20180430.Messages().ByName("Message").Messages().ByName("ExtensionOptionalGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180430.Message_ExtensionRepeatedGroup))),
+ want: fileDescP2_20180430.Messages().ByName("Message").Messages().ByName("ExtensionRepeatedGroup"),
+ }}...)
+
+ fileDescP3_20180430 := mustLoadFileDesc(new(proto3_20180430.Message).Descriptor())
+ tests = append(tests, []struct{ got, want pref.Descriptor }{{
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto3_20180430.SiblingEnum(0))),
+ want: fileDescP3_20180430.Enums().ByName("SiblingEnum"),
+ }, {
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto3_20180430.Message_ChildEnum(0))),
+ want: fileDescP3_20180430.Messages().ByName("Message").Enums().ByName("ChildEnum"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto3_20180430.SiblingMessage))),
+ want: fileDescP3_20180430.Messages().ByName("SiblingMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto3_20180430.Message_ChildMessage))),
+ want: fileDescP3_20180430.Messages().ByName("Message").Messages().ByName("ChildMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto3_20180430.Message))),
+ want: fileDescP3_20180430.Messages().ByName("Message"),
+ }}...)
+
+ fileDescP2_20180814 := mustLoadFileDesc(new(proto2_20180814.Message).Descriptor())
+ tests = append(tests, []struct{ got, want pref.Descriptor }{{
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto2_20180814.SiblingEnum(0))),
+ want: fileDescP2_20180814.Enums().ByName("SiblingEnum"),
+ }, {
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto2_20180814.Message_ChildEnum(0))),
+ want: fileDescP2_20180814.Messages().ByName("Message").Enums().ByName("ChildEnum"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180814.SiblingMessage))),
+ want: fileDescP2_20180814.Messages().ByName("SiblingMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180814.Message_ChildMessage))),
+ want: fileDescP2_20180814.Messages().ByName("Message").Messages().ByName("ChildMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180814.Message))),
+ want: fileDescP2_20180814.Messages().ByName("Message"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180814.Message_NamedGroup))),
+ want: fileDescP2_20180814.Messages().ByName("Message").Messages().ByName("NamedGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180814.Message_OptionalGroup))),
+ want: fileDescP2_20180814.Messages().ByName("Message").Messages().ByName("OptionalGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180814.Message_RequiredGroup))),
+ want: fileDescP2_20180814.Messages().ByName("Message").Messages().ByName("RequiredGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180814.Message_RepeatedGroup))),
+ want: fileDescP2_20180814.Messages().ByName("Message").Messages().ByName("RepeatedGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180814.Message_OneofGroup))),
+ want: fileDescP2_20180814.Messages().ByName("Message").Messages().ByName("OneofGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180814.Message_ExtensionOptionalGroup))),
+ want: fileDescP2_20180814.Messages().ByName("Message").Messages().ByName("ExtensionOptionalGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20180814.Message_ExtensionRepeatedGroup))),
+ want: fileDescP2_20180814.Messages().ByName("Message").Messages().ByName("ExtensionRepeatedGroup"),
+ }}...)
+
+ fileDescP3_20180814 := mustLoadFileDesc(new(proto3_20180814.Message).Descriptor())
+ tests = append(tests, []struct{ got, want pref.Descriptor }{{
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto3_20180814.SiblingEnum(0))),
+ want: fileDescP3_20180814.Enums().ByName("SiblingEnum"),
+ }, {
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto3_20180814.Message_ChildEnum(0))),
+ want: fileDescP3_20180814.Messages().ByName("Message").Enums().ByName("ChildEnum"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto3_20180814.SiblingMessage))),
+ want: fileDescP3_20180814.Messages().ByName("SiblingMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto3_20180814.Message_ChildMessage))),
+ want: fileDescP3_20180814.Messages().ByName("Message").Messages().ByName("ChildMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto3_20180814.Message))),
+ want: fileDescP3_20180814.Messages().ByName("Message"),
+ }}...)
+
+ fileDescP2_20181126 := mustLoadFileDesc(new(proto2_20181126.Message).Descriptor())
+ tests = append(tests, []struct{ got, want pref.Descriptor }{{
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto2_20181126.SiblingEnum(0))),
+ want: fileDescP2_20181126.Enums().ByName("SiblingEnum"),
+ }, {
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto2_20181126.Message_ChildEnum(0))),
+ want: fileDescP2_20181126.Messages().ByName("Message").Enums().ByName("ChildEnum"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20181126.SiblingMessage))),
+ want: fileDescP2_20181126.Messages().ByName("SiblingMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20181126.Message_ChildMessage))),
+ want: fileDescP2_20181126.Messages().ByName("Message").Messages().ByName("ChildMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20181126.Message))),
+ want: fileDescP2_20181126.Messages().ByName("Message"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20181126.Message_NamedGroup))),
+ want: fileDescP2_20181126.Messages().ByName("Message").Messages().ByName("NamedGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20181126.Message_OptionalGroup))),
+ want: fileDescP2_20181126.Messages().ByName("Message").Messages().ByName("OptionalGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20181126.Message_RequiredGroup))),
+ want: fileDescP2_20181126.Messages().ByName("Message").Messages().ByName("RequiredGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20181126.Message_RepeatedGroup))),
+ want: fileDescP2_20181126.Messages().ByName("Message").Messages().ByName("RepeatedGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20181126.Message_OneofGroup))),
+ want: fileDescP2_20181126.Messages().ByName("Message").Messages().ByName("OneofGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20181126.Message_ExtensionOptionalGroup))),
+ want: fileDescP2_20181126.Messages().ByName("Message").Messages().ByName("ExtensionOptionalGroup"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto2_20181126.Message_ExtensionRepeatedGroup))),
+ want: fileDescP2_20181126.Messages().ByName("Message").Messages().ByName("ExtensionRepeatedGroup"),
+ }}...)
+
+ fileDescP3_20181126 := mustLoadFileDesc(new(proto3_20181126.Message).Descriptor())
+ tests = append(tests, []struct{ got, want pref.Descriptor }{{
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto3_20181126.SiblingEnum(0))),
+ want: fileDescP3_20181126.Enums().ByName("SiblingEnum"),
+ }, {
+ got: impl.LegacyLoadEnumDesc(reflect.TypeOf(proto3_20181126.Message_ChildEnum(0))),
+ want: fileDescP3_20181126.Messages().ByName("Message").Enums().ByName("ChildEnum"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto3_20181126.SiblingMessage))),
+ want: fileDescP3_20181126.Messages().ByName("SiblingMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto3_20181126.Message_ChildMessage))),
+ want: fileDescP3_20181126.Messages().ByName("Message").Messages().ByName("ChildMessage"),
+ }, {
+ got: impl.LegacyLoadMessageDesc(reflect.TypeOf(new(proto3_20181126.Message))),
+ want: fileDescP3_20181126.Messages().ByName("Message"),
+ }}...)
+
+ // TODO: We need a test package to compare descriptors.
+ type list interface {
+ Len() int
+ pragma.DoNotImplement
+ }
+ opts := cmp.Options{
+ cmp.Transformer("", func(x list) []interface{} {
+ out := make([]interface{}, x.Len())
+ v := reflect.ValueOf(x)
+ for i := 0; i < x.Len(); i++ {
+ m := v.MethodByName("Get")
+ out[i] = m.Call([]reflect.Value{reflect.ValueOf(i)})[0].Interface()
+ }
+ return out
+ }),
+ cmp.Transformer("", func(x pref.Descriptor) map[string]interface{} {
+ out := make(map[string]interface{})
+ v := reflect.ValueOf(x)
+ for i := 0; i < v.NumMethod(); i++ {
+ name := v.Type().Method(i).Name
+ if m := v.Method(i); m.Type().NumIn() == 0 && m.Type().NumOut() == 1 {
+ switch name {
+ case "ParentFile":
+ // Ignore parent file to avoid recursive cycle.
+ case "Index":
+ // Ignore index since legacy descriptors have no parent.
+ case "Options":
+ // Ignore descriptor options since protos are not cmperable.
+ case "Enums", "Messages", "Extensions":
+ // Ignore nested message and enum declarations since
+ // legacy descriptors are all created standalone.
+ case "HasJSONName":
+ // Ignore this since the semantics of the field has
+ // changed across protoc and protoc-gen-go releases.
+ case "ContainingOneof", "ContainingMessage", "Enum", "Message":
+ // Avoid descending into a dependency to avoid a cycle.
+ // Just record the full name if available.
+ //
+ // TODO: Cycle support in cmp would be useful here.
+ v := m.Call(nil)[0]
+ if !v.IsNil() {
+ out[name] = v.Interface().(pref.Descriptor).FullName()
+ }
+ case "Oneof", "Extendee":
+ // TODO: Remove this.
+ default:
+ out[name] = m.Call(nil)[0].Interface()
+ }
+ }
+ }
+ return out
+ }),
+ cmp.Transformer("", func(v pref.Value) interface{} {
+ return v.Interface()
+ }),
+ }
+
+ for _, tt := range tests {
+ t.Run(string(tt.want.FullName()), func(t *testing.T) {
+ if diff := cmp.Diff(&tt.want, &tt.got, opts); diff != "" {
+ t.Errorf("descriptor mismatch (-want, +got):\n%s", diff)
+ }
+ })
+ }
+}