2018-08-15 17:07:18 -07:00
|
|
|
// 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.
|
|
|
|
|
|
2018-08-26 22:48:17 -07:00
|
|
|
package protoregistry_test
|
2018-08-15 17:07:18 -07:00
|
|
|
|
|
|
|
|
import (
|
|
|
|
|
"fmt"
|
|
|
|
|
"strings"
|
|
|
|
|
"testing"
|
|
|
|
|
|
|
|
|
|
"github.com/google/go-cmp/cmp"
|
|
|
|
|
"github.com/google/go-cmp/cmp/cmpopts"
|
|
|
|
|
|
2019-06-06 13:01:53 -07:00
|
|
|
"google.golang.org/protobuf/encoding/prototext"
|
2019-05-13 23:55:40 -07:00
|
|
|
pimpl "google.golang.org/protobuf/internal/impl"
|
2019-06-06 13:01:53 -07:00
|
|
|
pdesc "google.golang.org/protobuf/reflect/protodesc"
|
2019-05-13 23:55:40 -07:00
|
|
|
pref "google.golang.org/protobuf/reflect/protoreflect"
|
|
|
|
|
preg "google.golang.org/protobuf/reflect/protoregistry"
|
2018-12-26 15:57:16 -08:00
|
|
|
|
2020-01-10 23:31:25 -08:00
|
|
|
testpb "google.golang.org/protobuf/internal/testprotos/registry"
|
2019-06-06 13:01:53 -07:00
|
|
|
"google.golang.org/protobuf/types/descriptorpb"
|
2018-08-15 17:07:18 -07:00
|
|
|
)
|
|
|
|
|
|
2019-06-06 13:01:53 -07:00
|
|
|
func mustMakeFile(s string) pref.FileDescriptor {
|
|
|
|
|
pb := new(descriptorpb.FileDescriptorProto)
|
|
|
|
|
if err := prototext.Unmarshal([]byte(s), pb); err != nil {
|
|
|
|
|
panic(err)
|
|
|
|
|
}
|
|
|
|
|
fd, err := pdesc.NewFile(pb, nil)
|
|
|
|
|
if err != nil {
|
|
|
|
|
panic(err)
|
|
|
|
|
}
|
|
|
|
|
return fd
|
|
|
|
|
}
|
|
|
|
|
|
2018-08-15 17:07:18 -07:00
|
|
|
func TestFiles(t *testing.T) {
|
|
|
|
|
type (
|
|
|
|
|
file struct {
|
|
|
|
|
Path string
|
|
|
|
|
Pkg pref.FullName
|
|
|
|
|
}
|
|
|
|
|
testFile struct {
|
2019-06-06 13:01:53 -07:00
|
|
|
inFile pref.FileDescriptor
|
2018-08-15 17:07:18 -07:00
|
|
|
wantErr string
|
|
|
|
|
}
|
reflect/protoreflect: register all desciptors in Files
This change makes it such that Files now functionally registers all
descriptors in a file (not just enums, messages, extensions, and services),
but also including enum values, messages fields/oneofs, and service methods.
The ability to look up any descriptor by full name is needed to:
1) properly detect namespace conflicts on enum values
2) properly implement the relative name lookup logic in reflect/protodesc
The approach taken:
1) Assumes that a FileDescriptor has no internal name conflicts.
This will (in a future CL) be guaranteed by reflect/protodesc and
is guaranteed today by protoc for generated descriptors.
2) Observes that the only declarations that can possibly conflict
with another file are top-level declarations (i.e., enums, enum values,
messages, extensions, and services). Enum values are annoying
since they live in the same scope as the parent enum, rather than
being under the enum.
For the internal data structure of Files, we only register the top-level
declarations. This is the bare minimum needed to detect whether the file
being registered has any namespace conflicts with previously registered files.
We shift the effort to lookups, where we now need to peel off the end fragments
of a full name until we find a match in the internal registry. If a match
is found, we may need to descend into that declaration to find a nested
declaration by name.
For initialization, we modify internal/filedesc to initialize the
enum values for all top-level enums. This performance cost is offsetted
by the fact that Files.Register now avoids internally registering
nested enums, messages, and extensions.
For lookup, the cost has shifted from O(1) to O(N),
where N is the number of segments in the full name.
Top-level descriptors still have O(1) lookup times.
Nested descriptors have O(M) lookup times,
where M is the level of nesting within a single file.
Change-Id: I950163423431f04a503b6201ddcc20a62ccba017
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/183697
Reviewed-by: Damien Neil <dneil@google.com>
2019-06-21 14:25:16 -07:00
|
|
|
testFindDesc struct {
|
|
|
|
|
inName pref.FullName
|
|
|
|
|
wantFound bool
|
|
|
|
|
}
|
2018-08-15 17:07:18 -07:00
|
|
|
testRangePkg struct {
|
|
|
|
|
inPkg pref.FullName
|
|
|
|
|
wantFiles []file
|
|
|
|
|
}
|
2019-06-15 05:39:04 -07:00
|
|
|
testFindPath struct {
|
2018-08-15 17:07:18 -07:00
|
|
|
inPath string
|
|
|
|
|
wantFiles []file
|
|
|
|
|
}
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
tests := []struct {
|
2019-06-15 05:39:04 -07:00
|
|
|
files []testFile
|
reflect/protoreflect: register all desciptors in Files
This change makes it such that Files now functionally registers all
descriptors in a file (not just enums, messages, extensions, and services),
but also including enum values, messages fields/oneofs, and service methods.
The ability to look up any descriptor by full name is needed to:
1) properly detect namespace conflicts on enum values
2) properly implement the relative name lookup logic in reflect/protodesc
The approach taken:
1) Assumes that a FileDescriptor has no internal name conflicts.
This will (in a future CL) be guaranteed by reflect/protodesc and
is guaranteed today by protoc for generated descriptors.
2) Observes that the only declarations that can possibly conflict
with another file are top-level declarations (i.e., enums, enum values,
messages, extensions, and services). Enum values are annoying
since they live in the same scope as the parent enum, rather than
being under the enum.
For the internal data structure of Files, we only register the top-level
declarations. This is the bare minimum needed to detect whether the file
being registered has any namespace conflicts with previously registered files.
We shift the effort to lookups, where we now need to peel off the end fragments
of a full name until we find a match in the internal registry. If a match
is found, we may need to descend into that declaration to find a nested
declaration by name.
For initialization, we modify internal/filedesc to initialize the
enum values for all top-level enums. This performance cost is offsetted
by the fact that Files.Register now avoids internally registering
nested enums, messages, and extensions.
For lookup, the cost has shifted from O(1) to O(N),
where N is the number of segments in the full name.
Top-level descriptors still have O(1) lookup times.
Nested descriptors have O(M) lookup times,
where M is the level of nesting within a single file.
Change-Id: I950163423431f04a503b6201ddcc20a62ccba017
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/183697
Reviewed-by: Damien Neil <dneil@google.com>
2019-06-21 14:25:16 -07:00
|
|
|
findDescs []testFindDesc
|
2019-06-15 05:39:04 -07:00
|
|
|
rangePkgs []testRangePkg
|
|
|
|
|
findPaths []testFindPath
|
2018-08-15 17:07:18 -07:00
|
|
|
}{{
|
|
|
|
|
// Test that overlapping packages and files are permitted.
|
|
|
|
|
files: []testFile{
|
2019-06-06 13:01:53 -07:00
|
|
|
{inFile: mustMakeFile(`syntax:"proto2" name:"test1.proto" package:"foo.bar"`)},
|
|
|
|
|
{inFile: mustMakeFile(`syntax:"proto2" name:"foo/bar/test.proto" package:"my.test"`)},
|
|
|
|
|
{inFile: mustMakeFile(`syntax:"proto2" name:"foo/bar/test.proto" package:"foo.bar.baz"`), wantErr: "already registered"},
|
|
|
|
|
{inFile: mustMakeFile(`syntax:"proto2" name:"test2.proto" package:"my.test.package"`)},
|
2019-07-02 15:19:08 -07:00
|
|
|
{inFile: mustMakeFile(`syntax:"proto2" name:"weird" package:"foo.bar"`)},
|
2019-06-06 13:01:53 -07:00
|
|
|
{inFile: mustMakeFile(`syntax:"proto2" name:"foo/bar/baz/../test.proto" package:"my.test"`)},
|
2018-08-15 17:07:18 -07:00
|
|
|
},
|
|
|
|
|
|
|
|
|
|
rangePkgs: []testRangePkg{{
|
|
|
|
|
inPkg: "nothing",
|
|
|
|
|
}, {
|
|
|
|
|
inPkg: "",
|
|
|
|
|
}, {
|
|
|
|
|
inPkg: ".",
|
|
|
|
|
}, {
|
|
|
|
|
inPkg: "foo",
|
|
|
|
|
}, {
|
|
|
|
|
inPkg: "foo.",
|
|
|
|
|
}, {
|
|
|
|
|
inPkg: "foo..",
|
reflect/protoreflect, reflect/protoregistry: move descriptor lookup to registry
Drop the protoreflect.FileDescriptor.DescriptorByName method.
Descriptor lookup will always happen through a protoregistry.Files, which
is more generally useful (it's rare that you want to find a descriptor in a
specific file, as opposed to a package which may be composed of multiple files).
Split protoregistry.Files descriptor lookup into individual per-type functions
(enum, message, extension, service), matching the preg.Types API.
Drop the ability to look up enum values, message fields, and service methods
for now. This can be easily added later if needed, and is trivial to implement
in user code. (e.g., look up the service and then consult sd.Methods.ByName().)
Change-Id: I2b3d8ef888921a8464ba1434eddab20c7d3a458e
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172118
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-04-15 13:05:13 -07:00
|
|
|
}, {
|
|
|
|
|
inPkg: "foo.bar",
|
|
|
|
|
wantFiles: []file{
|
2019-06-15 05:39:04 -07:00
|
|
|
{"test1.proto", "foo.bar"},
|
2019-07-02 15:19:08 -07:00
|
|
|
{"weird", "foo.bar"},
|
reflect/protoreflect, reflect/protoregistry: move descriptor lookup to registry
Drop the protoreflect.FileDescriptor.DescriptorByName method.
Descriptor lookup will always happen through a protoregistry.Files, which
is more generally useful (it's rare that you want to find a descriptor in a
specific file, as opposed to a package which may be composed of multiple files).
Split protoregistry.Files descriptor lookup into individual per-type functions
(enum, message, extension, service), matching the preg.Types API.
Drop the ability to look up enum values, message fields, and service methods
for now. This can be easily added later if needed, and is trivial to implement
in user code. (e.g., look up the service and then consult sd.Methods.ByName().)
Change-Id: I2b3d8ef888921a8464ba1434eddab20c7d3a458e
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172118
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-04-15 13:05:13 -07:00
|
|
|
},
|
2018-08-15 17:07:18 -07:00
|
|
|
}, {
|
2019-06-15 05:39:04 -07:00
|
|
|
inPkg: "my.test",
|
2018-08-15 17:07:18 -07:00
|
|
|
wantFiles: []file{
|
2019-06-15 05:39:04 -07:00
|
|
|
{"foo/bar/baz/../test.proto", "my.test"},
|
|
|
|
|
{"foo/bar/test.proto", "my.test"},
|
2018-08-15 17:07:18 -07:00
|
|
|
},
|
|
|
|
|
}, {
|
|
|
|
|
inPkg: "fo",
|
|
|
|
|
}},
|
|
|
|
|
|
2019-06-15 05:39:04 -07:00
|
|
|
findPaths: []testFindPath{{
|
2018-08-15 17:07:18 -07:00
|
|
|
inPath: "nothing",
|
|
|
|
|
}, {
|
2019-07-02 15:19:08 -07:00
|
|
|
inPath: "weird",
|
2018-08-15 17:07:18 -07:00
|
|
|
wantFiles: []file{
|
2019-07-02 15:19:08 -07:00
|
|
|
{"weird", "foo.bar"},
|
2018-08-15 17:07:18 -07:00
|
|
|
},
|
|
|
|
|
}, {
|
|
|
|
|
inPath: "foo/bar/test.proto",
|
|
|
|
|
wantFiles: []file{
|
|
|
|
|
{"foo/bar/test.proto", "my.test"},
|
|
|
|
|
},
|
|
|
|
|
}},
|
|
|
|
|
}, {
|
|
|
|
|
// Test when new enum conflicts with existing package.
|
|
|
|
|
files: []testFile{{
|
2019-06-06 13:01:53 -07:00
|
|
|
inFile: mustMakeFile(`syntax:"proto2" name:"test1a.proto" package:"foo.bar.baz"`),
|
2018-08-15 17:07:18 -07:00
|
|
|
}, {
|
2019-07-02 15:19:08 -07:00
|
|
|
inFile: mustMakeFile(`syntax:"proto2" name:"test1b.proto" enum_type:[{name:"foo" value:[{name:"VALUE" number:0}]}]`),
|
2018-08-15 17:07:18 -07:00
|
|
|
wantErr: `file "test1b.proto" has a name conflict over foo`,
|
|
|
|
|
}},
|
|
|
|
|
}, {
|
|
|
|
|
// Test when new package conflicts with existing enum.
|
|
|
|
|
files: []testFile{{
|
2019-07-02 15:19:08 -07:00
|
|
|
inFile: mustMakeFile(`syntax:"proto2" name:"test2a.proto" enum_type:[{name:"foo" value:[{name:"VALUE" number:0}]}]`),
|
2018-08-15 17:07:18 -07:00
|
|
|
}, {
|
2019-06-06 13:01:53 -07:00
|
|
|
inFile: mustMakeFile(`syntax:"proto2" name:"test2b.proto" package:"foo.bar.baz"`),
|
2019-07-17 19:08:21 -07:00
|
|
|
wantErr: `file "test2b.proto" has a package name conflict over foo`,
|
2018-08-15 17:07:18 -07:00
|
|
|
}},
|
|
|
|
|
}, {
|
|
|
|
|
// Test when new enum conflicts with existing enum in same package.
|
|
|
|
|
files: []testFile{{
|
2019-07-02 15:19:08 -07:00
|
|
|
inFile: mustMakeFile(`syntax:"proto2" name:"test3a.proto" package:"foo" enum_type:[{name:"BAR" value:[{name:"VALUE" number:0}]}]`),
|
2018-08-15 17:07:18 -07:00
|
|
|
}, {
|
2019-07-02 15:19:08 -07:00
|
|
|
inFile: mustMakeFile(`syntax:"proto2" name:"test3b.proto" package:"foo" enum_type:[{name:"BAR" value:[{name:"VALUE2" number:0}]}]`),
|
2018-08-15 17:07:18 -07:00
|
|
|
wantErr: `file "test3b.proto" has a name conflict over foo.BAR`,
|
|
|
|
|
}},
|
|
|
|
|
}, {
|
|
|
|
|
files: []testFile{{
|
2019-06-06 13:01:53 -07:00
|
|
|
inFile: mustMakeFile(`
|
|
|
|
|
syntax: "proto2"
|
|
|
|
|
name: "test1.proto"
|
|
|
|
|
package: "fizz.buzz"
|
|
|
|
|
message_type: [{
|
|
|
|
|
name: "Message"
|
|
|
|
|
field: [
|
|
|
|
|
{name:"Field" number:1 label:LABEL_OPTIONAL type:TYPE_STRING oneof_index:0}
|
|
|
|
|
]
|
|
|
|
|
oneof_decl: [{name:"Oneof"}]
|
|
|
|
|
extension_range: [{start:1000 end:2000}]
|
reflect/protoreflect: register all desciptors in Files
This change makes it such that Files now functionally registers all
descriptors in a file (not just enums, messages, extensions, and services),
but also including enum values, messages fields/oneofs, and service methods.
The ability to look up any descriptor by full name is needed to:
1) properly detect namespace conflicts on enum values
2) properly implement the relative name lookup logic in reflect/protodesc
The approach taken:
1) Assumes that a FileDescriptor has no internal name conflicts.
This will (in a future CL) be guaranteed by reflect/protodesc and
is guaranteed today by protoc for generated descriptors.
2) Observes that the only declarations that can possibly conflict
with another file are top-level declarations (i.e., enums, enum values,
messages, extensions, and services). Enum values are annoying
since they live in the same scope as the parent enum, rather than
being under the enum.
For the internal data structure of Files, we only register the top-level
declarations. This is the bare minimum needed to detect whether the file
being registered has any namespace conflicts with previously registered files.
We shift the effort to lookups, where we now need to peel off the end fragments
of a full name until we find a match in the internal registry. If a match
is found, we may need to descend into that declaration to find a nested
declaration by name.
For initialization, we modify internal/filedesc to initialize the
enum values for all top-level enums. This performance cost is offsetted
by the fact that Files.Register now avoids internally registering
nested enums, messages, and extensions.
For lookup, the cost has shifted from O(1) to O(N),
where N is the number of segments in the full name.
Top-level descriptors still have O(1) lookup times.
Nested descriptors have O(M) lookup times,
where M is the level of nesting within a single file.
Change-Id: I950163423431f04a503b6201ddcc20a62ccba017
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/183697
Reviewed-by: Damien Neil <dneil@google.com>
2019-06-21 14:25:16 -07:00
|
|
|
|
|
|
|
|
enum_type: [
|
|
|
|
|
{name:"Enum" value:[{name:"EnumValue" number:0}]}
|
|
|
|
|
]
|
|
|
|
|
nested_type: [
|
|
|
|
|
{name:"Message" field:[{name:"Field" number:1 label:LABEL_OPTIONAL type:TYPE_STRING}]}
|
|
|
|
|
]
|
|
|
|
|
extension: [
|
|
|
|
|
{name:"Extension" number:1001 label:LABEL_OPTIONAL type:TYPE_STRING extendee:".fizz.buzz.Message"}
|
|
|
|
|
]
|
2019-06-06 13:01:53 -07:00
|
|
|
}]
|
|
|
|
|
enum_type: [{
|
|
|
|
|
name: "Enum"
|
reflect/protoreflect: register all desciptors in Files
This change makes it such that Files now functionally registers all
descriptors in a file (not just enums, messages, extensions, and services),
but also including enum values, messages fields/oneofs, and service methods.
The ability to look up any descriptor by full name is needed to:
1) properly detect namespace conflicts on enum values
2) properly implement the relative name lookup logic in reflect/protodesc
The approach taken:
1) Assumes that a FileDescriptor has no internal name conflicts.
This will (in a future CL) be guaranteed by reflect/protodesc and
is guaranteed today by protoc for generated descriptors.
2) Observes that the only declarations that can possibly conflict
with another file are top-level declarations (i.e., enums, enum values,
messages, extensions, and services). Enum values are annoying
since they live in the same scope as the parent enum, rather than
being under the enum.
For the internal data structure of Files, we only register the top-level
declarations. This is the bare minimum needed to detect whether the file
being registered has any namespace conflicts with previously registered files.
We shift the effort to lookups, where we now need to peel off the end fragments
of a full name until we find a match in the internal registry. If a match
is found, we may need to descend into that declaration to find a nested
declaration by name.
For initialization, we modify internal/filedesc to initialize the
enum values for all top-level enums. This performance cost is offsetted
by the fact that Files.Register now avoids internally registering
nested enums, messages, and extensions.
For lookup, the cost has shifted from O(1) to O(N),
where N is the number of segments in the full name.
Top-level descriptors still have O(1) lookup times.
Nested descriptors have O(M) lookup times,
where M is the level of nesting within a single file.
Change-Id: I950163423431f04a503b6201ddcc20a62ccba017
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/183697
Reviewed-by: Damien Neil <dneil@google.com>
2019-06-21 14:25:16 -07:00
|
|
|
value: [{name:"EnumValue" number:0}]
|
2019-06-06 13:01:53 -07:00
|
|
|
}]
|
|
|
|
|
extension: [
|
|
|
|
|
{name:"Extension" number:1000 label:LABEL_OPTIONAL type:TYPE_STRING extendee:".fizz.buzz.Message"}
|
|
|
|
|
]
|
|
|
|
|
service: [{
|
|
|
|
|
name: "Service"
|
|
|
|
|
method: [{
|
|
|
|
|
name: "Method"
|
|
|
|
|
input_type: ".fizz.buzz.Message"
|
|
|
|
|
output_type: ".fizz.buzz.Message"
|
|
|
|
|
client_streaming: true
|
|
|
|
|
server_streaming: true
|
|
|
|
|
}]
|
|
|
|
|
}]
|
|
|
|
|
`),
|
|
|
|
|
}, {
|
|
|
|
|
inFile: mustMakeFile(`
|
|
|
|
|
syntax: "proto2"
|
|
|
|
|
name: "test2.proto"
|
|
|
|
|
package: "fizz.buzz.gazz"
|
|
|
|
|
enum_type: [{
|
|
|
|
|
name: "Enum"
|
|
|
|
|
value: [{name:"EnumValue" number:0}]
|
|
|
|
|
}]
|
|
|
|
|
`),
|
|
|
|
|
}, {
|
|
|
|
|
inFile: mustMakeFile(`
|
|
|
|
|
syntax: "proto2"
|
|
|
|
|
name: "test3.proto"
|
|
|
|
|
package: "fizz.buzz"
|
|
|
|
|
enum_type: [{
|
|
|
|
|
name: "Enum1"
|
|
|
|
|
value: [{name:"EnumValue1" number:0}]
|
2018-08-15 17:07:18 -07:00
|
|
|
}, {
|
2019-06-06 13:01:53 -07:00
|
|
|
name: "Enum2"
|
|
|
|
|
value: [{name:"EnumValue2" number:0}]
|
|
|
|
|
}]
|
|
|
|
|
`),
|
2018-08-15 17:07:18 -07:00
|
|
|
}, {
|
|
|
|
|
// Make sure we can register without package name.
|
2019-06-06 13:01:53 -07:00
|
|
|
inFile: mustMakeFile(`
|
2019-07-02 15:19:08 -07:00
|
|
|
name: "weird"
|
2019-06-06 13:01:53 -07:00
|
|
|
syntax: "proto2"
|
|
|
|
|
message_type: [{
|
|
|
|
|
name: "Message"
|
|
|
|
|
nested_type: [{
|
|
|
|
|
name: "Message"
|
|
|
|
|
nested_type: [{
|
|
|
|
|
name: "Message"
|
|
|
|
|
}]
|
|
|
|
|
}]
|
|
|
|
|
}]
|
|
|
|
|
`),
|
2018-08-15 17:07:18 -07:00
|
|
|
}},
|
reflect/protoreflect: register all desciptors in Files
This change makes it such that Files now functionally registers all
descriptors in a file (not just enums, messages, extensions, and services),
but also including enum values, messages fields/oneofs, and service methods.
The ability to look up any descriptor by full name is needed to:
1) properly detect namespace conflicts on enum values
2) properly implement the relative name lookup logic in reflect/protodesc
The approach taken:
1) Assumes that a FileDescriptor has no internal name conflicts.
This will (in a future CL) be guaranteed by reflect/protodesc and
is guaranteed today by protoc for generated descriptors.
2) Observes that the only declarations that can possibly conflict
with another file are top-level declarations (i.e., enums, enum values,
messages, extensions, and services). Enum values are annoying
since they live in the same scope as the parent enum, rather than
being under the enum.
For the internal data structure of Files, we only register the top-level
declarations. This is the bare minimum needed to detect whether the file
being registered has any namespace conflicts with previously registered files.
We shift the effort to lookups, where we now need to peel off the end fragments
of a full name until we find a match in the internal registry. If a match
is found, we may need to descend into that declaration to find a nested
declaration by name.
For initialization, we modify internal/filedesc to initialize the
enum values for all top-level enums. This performance cost is offsetted
by the fact that Files.Register now avoids internally registering
nested enums, messages, and extensions.
For lookup, the cost has shifted from O(1) to O(N),
where N is the number of segments in the full name.
Top-level descriptors still have O(1) lookup times.
Nested descriptors have O(M) lookup times,
where M is the level of nesting within a single file.
Change-Id: I950163423431f04a503b6201ddcc20a62ccba017
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/183697
Reviewed-by: Damien Neil <dneil@google.com>
2019-06-21 14:25:16 -07:00
|
|
|
findDescs: []testFindDesc{
|
|
|
|
|
{inName: "fizz.buzz.message", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.Message", wantFound: true},
|
|
|
|
|
{inName: "fizz.buzz.Message.X", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.Field", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.Oneof", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.Message.Field", wantFound: true},
|
|
|
|
|
{inName: "fizz.buzz.Message.Field.X", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.Message.Oneof", wantFound: true},
|
|
|
|
|
{inName: "fizz.buzz.Message.Oneof.X", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.Message.Message", wantFound: true},
|
|
|
|
|
{inName: "fizz.buzz.Message.Message.X", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.Message.Enum", wantFound: true},
|
|
|
|
|
{inName: "fizz.buzz.Message.Enum.X", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.Message.EnumValue", wantFound: true},
|
|
|
|
|
{inName: "fizz.buzz.Message.EnumValue.X", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.Message.Extension", wantFound: true},
|
|
|
|
|
{inName: "fizz.buzz.Message.Extension.X", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.enum", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.Enum", wantFound: true},
|
|
|
|
|
{inName: "fizz.buzz.Enum.X", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.EnumValue", wantFound: true},
|
|
|
|
|
{inName: "fizz.buzz.EnumValue.X", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.Enum.EnumValue", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.Extension", wantFound: true},
|
|
|
|
|
{inName: "fizz.buzz.Extension.X", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.service", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.Service", wantFound: true},
|
|
|
|
|
{inName: "fizz.buzz.Service.X", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.Method", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.Service.Method", wantFound: true},
|
|
|
|
|
{inName: "fizz.buzz.Service.Method.X", wantFound: false},
|
|
|
|
|
|
|
|
|
|
{inName: "fizz.buzz.gazz", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.gazz.Enum", wantFound: true},
|
|
|
|
|
{inName: "fizz.buzz.gazz.EnumValue", wantFound: true},
|
|
|
|
|
{inName: "fizz.buzz.gazz.Enum.EnumValue", wantFound: false},
|
|
|
|
|
|
|
|
|
|
{inName: "fizz.buzz", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.Enum1", wantFound: true},
|
|
|
|
|
{inName: "fizz.buzz.EnumValue1", wantFound: true},
|
|
|
|
|
{inName: "fizz.buzz.Enum1.EnumValue1", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.Enum2", wantFound: true},
|
|
|
|
|
{inName: "fizz.buzz.EnumValue2", wantFound: true},
|
|
|
|
|
{inName: "fizz.buzz.Enum2.EnumValue2", wantFound: false},
|
|
|
|
|
{inName: "fizz.buzz.Enum3", wantFound: false},
|
|
|
|
|
|
|
|
|
|
{inName: "", wantFound: false},
|
|
|
|
|
{inName: "Message", wantFound: true},
|
|
|
|
|
{inName: "Message.Message", wantFound: true},
|
|
|
|
|
{inName: "Message.Message.Message", wantFound: true},
|
|
|
|
|
{inName: "Message.Message.Message.Message", wantFound: false},
|
|
|
|
|
},
|
2018-08-15 17:07:18 -07:00
|
|
|
}}
|
|
|
|
|
|
|
|
|
|
sortFiles := cmpopts.SortSlices(func(x, y file) bool {
|
|
|
|
|
return x.Path < y.Path || (x.Path == y.Path && x.Pkg < y.Pkg)
|
|
|
|
|
})
|
|
|
|
|
for _, tt := range tests {
|
|
|
|
|
t.Run("", func(t *testing.T) {
|
2018-08-26 22:48:17 -07:00
|
|
|
var files preg.Files
|
2018-08-15 17:07:18 -07:00
|
|
|
for i, tc := range tt.files {
|
2019-10-08 13:28:53 -07:00
|
|
|
gotErr := files.RegisterFile(tc.inFile)
|
2019-06-15 05:39:04 -07:00
|
|
|
if ((gotErr == nil) != (tc.wantErr == "")) || !strings.Contains(fmt.Sprint(gotErr), tc.wantErr) {
|
2018-08-15 17:07:18 -07:00
|
|
|
t.Errorf("file %d, Register() = %v, want %v", i, gotErr, tc.wantErr)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
reflect/protoreflect: register all desciptors in Files
This change makes it such that Files now functionally registers all
descriptors in a file (not just enums, messages, extensions, and services),
but also including enum values, messages fields/oneofs, and service methods.
The ability to look up any descriptor by full name is needed to:
1) properly detect namespace conflicts on enum values
2) properly implement the relative name lookup logic in reflect/protodesc
The approach taken:
1) Assumes that a FileDescriptor has no internal name conflicts.
This will (in a future CL) be guaranteed by reflect/protodesc and
is guaranteed today by protoc for generated descriptors.
2) Observes that the only declarations that can possibly conflict
with another file are top-level declarations (i.e., enums, enum values,
messages, extensions, and services). Enum values are annoying
since they live in the same scope as the parent enum, rather than
being under the enum.
For the internal data structure of Files, we only register the top-level
declarations. This is the bare minimum needed to detect whether the file
being registered has any namespace conflicts with previously registered files.
We shift the effort to lookups, where we now need to peel off the end fragments
of a full name until we find a match in the internal registry. If a match
is found, we may need to descend into that declaration to find a nested
declaration by name.
For initialization, we modify internal/filedesc to initialize the
enum values for all top-level enums. This performance cost is offsetted
by the fact that Files.Register now avoids internally registering
nested enums, messages, and extensions.
For lookup, the cost has shifted from O(1) to O(N),
where N is the number of segments in the full name.
Top-level descriptors still have O(1) lookup times.
Nested descriptors have O(M) lookup times,
where M is the level of nesting within a single file.
Change-Id: I950163423431f04a503b6201ddcc20a62ccba017
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/183697
Reviewed-by: Damien Neil <dneil@google.com>
2019-06-21 14:25:16 -07:00
|
|
|
for _, tc := range tt.findDescs {
|
|
|
|
|
d, _ := files.FindDescriptorByName(tc.inName)
|
|
|
|
|
gotFound := d != nil
|
|
|
|
|
if gotFound != tc.wantFound {
|
|
|
|
|
t.Errorf("FindDescriptorByName(%v) find mismatch: got %v, want %v", tc.inName, gotFound, tc.wantFound)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-08-15 17:07:18 -07:00
|
|
|
for _, tc := range tt.rangePkgs {
|
|
|
|
|
var gotFiles []file
|
2019-09-05 10:19:36 -07:00
|
|
|
var gotCnt int
|
|
|
|
|
wantCnt := files.NumFilesByPackage(tc.inPkg)
|
2018-08-15 17:07:18 -07:00
|
|
|
files.RangeFilesByPackage(tc.inPkg, func(fd pref.FileDescriptor) bool {
|
|
|
|
|
gotFiles = append(gotFiles, file{fd.Path(), fd.Package()})
|
2019-09-05 10:19:36 -07:00
|
|
|
gotCnt++
|
2018-08-15 17:07:18 -07:00
|
|
|
return true
|
|
|
|
|
})
|
2019-09-05 10:19:36 -07:00
|
|
|
if gotCnt != wantCnt {
|
|
|
|
|
t.Errorf("NumFilesByPackage(%v) = %v, want %v", tc.inPkg, gotCnt, wantCnt)
|
|
|
|
|
}
|
2018-08-15 17:07:18 -07:00
|
|
|
if diff := cmp.Diff(tc.wantFiles, gotFiles, sortFiles); diff != "" {
|
|
|
|
|
t.Errorf("RangeFilesByPackage(%v) mismatch (-want +got):\n%v", tc.inPkg, diff)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-06-15 05:39:04 -07:00
|
|
|
for _, tc := range tt.findPaths {
|
2018-08-15 17:07:18 -07:00
|
|
|
var gotFiles []file
|
2019-06-15 05:39:04 -07:00
|
|
|
if fd, err := files.FindFileByPath(tc.inPath); err == nil {
|
2018-08-15 17:07:18 -07:00
|
|
|
gotFiles = append(gotFiles, file{fd.Path(), fd.Package()})
|
2019-06-15 05:39:04 -07:00
|
|
|
}
|
2018-08-15 17:07:18 -07:00
|
|
|
if diff := cmp.Diff(tc.wantFiles, gotFiles, sortFiles); diff != "" {
|
2019-06-15 05:39:04 -07:00
|
|
|
t.Errorf("FindFileByPath(%v) mismatch (-want +got):\n%v", tc.inPath, diff)
|
2018-08-15 17:07:18 -07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
}
|
2018-12-26 15:57:16 -08:00
|
|
|
|
|
|
|
|
func TestTypes(t *testing.T) {
|
2019-05-01 12:29:25 -07:00
|
|
|
mt1 := pimpl.Export{}.MessageTypeOf(&testpb.Message1{})
|
|
|
|
|
et1 := pimpl.Export{}.EnumTypeOf(testpb.Enum1_ONE)
|
2019-08-08 15:45:59 -07:00
|
|
|
xt1 := testpb.E_StringField
|
|
|
|
|
xt2 := testpb.E_Message4_MessageField
|
2019-05-14 14:28:19 -07:00
|
|
|
registry := new(preg.Types)
|
2019-10-08 13:28:53 -07:00
|
|
|
if err := registry.RegisterMessage(mt1); err != nil {
|
|
|
|
|
t.Fatalf("registry.RegisterMessage(%v) returns unexpected error: %v", mt1.Descriptor().FullName(), err)
|
|
|
|
|
}
|
|
|
|
|
if err := registry.RegisterEnum(et1); err != nil {
|
|
|
|
|
t.Fatalf("registry.RegisterEnum(%v) returns unexpected error: %v", et1.Descriptor().FullName(), err)
|
|
|
|
|
}
|
|
|
|
|
if err := registry.RegisterExtension(xt1); err != nil {
|
|
|
|
|
t.Fatalf("registry.RegisterExtension(%v) returns unexpected error: %v", xt1.TypeDescriptor().FullName(), err)
|
|
|
|
|
}
|
|
|
|
|
if err := registry.RegisterExtension(xt2); err != nil {
|
|
|
|
|
t.Fatalf("registry.RegisterExtension(%v) returns unexpected error: %v", xt2.TypeDescriptor().FullName(), err)
|
2018-12-26 15:57:16 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
t.Run("FindMessageByName", func(t *testing.T) {
|
|
|
|
|
tests := []struct {
|
|
|
|
|
name string
|
|
|
|
|
messageType pref.MessageType
|
|
|
|
|
wantErr bool
|
|
|
|
|
wantNotFound bool
|
|
|
|
|
}{{
|
|
|
|
|
name: "testprotos.Message1",
|
|
|
|
|
messageType: mt1,
|
|
|
|
|
}, {
|
|
|
|
|
name: "testprotos.NoSuchMessage",
|
|
|
|
|
wantErr: true,
|
|
|
|
|
wantNotFound: true,
|
|
|
|
|
}, {
|
|
|
|
|
name: "testprotos.Enum1",
|
|
|
|
|
wantErr: true,
|
|
|
|
|
}, {
|
|
|
|
|
name: "testprotos.Enum2",
|
|
|
|
|
wantErr: true,
|
|
|
|
|
}, {
|
|
|
|
|
name: "testprotos.Enum3",
|
|
|
|
|
wantErr: true,
|
|
|
|
|
}}
|
|
|
|
|
for _, tc := range tests {
|
|
|
|
|
got, err := registry.FindMessageByName(pref.FullName(tc.name))
|
|
|
|
|
gotErr := err != nil
|
|
|
|
|
if gotErr != tc.wantErr {
|
|
|
|
|
t.Errorf("FindMessageByName(%v) = (_, %v), want error? %t", tc.name, err, tc.wantErr)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
if tc.wantNotFound && err != preg.NotFound {
|
|
|
|
|
t.Errorf("FindMessageByName(%v) got error: %v, want NotFound error", tc.name, err)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
if got != tc.messageType {
|
|
|
|
|
t.Errorf("FindMessageByName(%v) got wrong value: %v", tc.name, got)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("FindMessageByURL", func(t *testing.T) {
|
|
|
|
|
tests := []struct {
|
|
|
|
|
name string
|
|
|
|
|
messageType pref.MessageType
|
|
|
|
|
wantErr bool
|
|
|
|
|
wantNotFound bool
|
|
|
|
|
}{{
|
|
|
|
|
name: "testprotos.Message1",
|
|
|
|
|
messageType: mt1,
|
|
|
|
|
}, {
|
|
|
|
|
name: "type.googleapis.com/testprotos.Nada",
|
|
|
|
|
wantErr: true,
|
|
|
|
|
wantNotFound: true,
|
|
|
|
|
}, {
|
|
|
|
|
name: "testprotos.Enum1",
|
|
|
|
|
wantErr: true,
|
|
|
|
|
}}
|
|
|
|
|
for _, tc := range tests {
|
|
|
|
|
got, err := registry.FindMessageByURL(tc.name)
|
|
|
|
|
gotErr := err != nil
|
|
|
|
|
if gotErr != tc.wantErr {
|
|
|
|
|
t.Errorf("FindMessageByURL(%v) = (_, %v), want error? %t", tc.name, err, tc.wantErr)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
if tc.wantNotFound && err != preg.NotFound {
|
|
|
|
|
t.Errorf("FindMessageByURL(%v) got error: %v, want NotFound error", tc.name, err)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
if got != tc.messageType {
|
|
|
|
|
t.Errorf("FindMessageByURL(%v) got wrong value: %v", tc.name, got)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("FindEnumByName", func(t *testing.T) {
|
|
|
|
|
tests := []struct {
|
|
|
|
|
name string
|
|
|
|
|
enumType pref.EnumType
|
|
|
|
|
wantErr bool
|
|
|
|
|
wantNotFound bool
|
|
|
|
|
}{{
|
|
|
|
|
name: "testprotos.Enum1",
|
|
|
|
|
enumType: et1,
|
|
|
|
|
}, {
|
|
|
|
|
name: "testprotos.None",
|
|
|
|
|
wantErr: true,
|
|
|
|
|
wantNotFound: true,
|
|
|
|
|
}, {
|
|
|
|
|
name: "testprotos.Message1",
|
|
|
|
|
wantErr: true,
|
|
|
|
|
}}
|
|
|
|
|
for _, tc := range tests {
|
|
|
|
|
got, err := registry.FindEnumByName(pref.FullName(tc.name))
|
|
|
|
|
gotErr := err != nil
|
|
|
|
|
if gotErr != tc.wantErr {
|
|
|
|
|
t.Errorf("FindEnumByName(%v) = (_, %v), want error? %t", tc.name, err, tc.wantErr)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
if tc.wantNotFound && err != preg.NotFound {
|
|
|
|
|
t.Errorf("FindEnumByName(%v) got error: %v, want NotFound error", tc.name, err)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
if got != tc.enumType {
|
|
|
|
|
t.Errorf("FindEnumByName(%v) got wrong value: %v", tc.name, got)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("FindExtensionByName", func(t *testing.T) {
|
|
|
|
|
tests := []struct {
|
|
|
|
|
name string
|
|
|
|
|
extensionType pref.ExtensionType
|
|
|
|
|
wantErr bool
|
|
|
|
|
wantNotFound bool
|
|
|
|
|
}{{
|
|
|
|
|
name: "testprotos.string_field",
|
2019-05-14 14:28:19 -07:00
|
|
|
extensionType: xt1,
|
2018-12-26 15:57:16 -08:00
|
|
|
}, {
|
|
|
|
|
name: "testprotos.Message4.message_field",
|
2019-05-14 14:28:19 -07:00
|
|
|
extensionType: xt2,
|
2018-12-26 15:57:16 -08:00
|
|
|
}, {
|
|
|
|
|
name: "testprotos.None",
|
|
|
|
|
wantErr: true,
|
|
|
|
|
wantNotFound: true,
|
|
|
|
|
}, {
|
|
|
|
|
name: "testprotos.Message1",
|
|
|
|
|
wantErr: true,
|
|
|
|
|
}}
|
|
|
|
|
for _, tc := range tests {
|
|
|
|
|
got, err := registry.FindExtensionByName(pref.FullName(tc.name))
|
|
|
|
|
gotErr := err != nil
|
|
|
|
|
if gotErr != tc.wantErr {
|
|
|
|
|
t.Errorf("FindExtensionByName(%v) = (_, %v), want error? %t", tc.name, err, tc.wantErr)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
if tc.wantNotFound && err != preg.NotFound {
|
|
|
|
|
t.Errorf("FindExtensionByName(%v) got error: %v, want NotFound error", tc.name, err)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
if got != tc.extensionType {
|
|
|
|
|
t.Errorf("FindExtensionByName(%v) got wrong value: %v", tc.name, got)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("FindExtensionByNumber", func(t *testing.T) {
|
|
|
|
|
tests := []struct {
|
|
|
|
|
parent string
|
|
|
|
|
number int32
|
|
|
|
|
extensionType pref.ExtensionType
|
|
|
|
|
wantErr bool
|
|
|
|
|
wantNotFound bool
|
|
|
|
|
}{{
|
|
|
|
|
parent: "testprotos.Message1",
|
|
|
|
|
number: 11,
|
2019-05-14 14:28:19 -07:00
|
|
|
extensionType: xt1,
|
2018-12-26 15:57:16 -08:00
|
|
|
}, {
|
|
|
|
|
parent: "testprotos.Message1",
|
|
|
|
|
number: 13,
|
|
|
|
|
wantErr: true,
|
|
|
|
|
wantNotFound: true,
|
|
|
|
|
}, {
|
|
|
|
|
parent: "testprotos.Message1",
|
|
|
|
|
number: 21,
|
2019-05-14 14:28:19 -07:00
|
|
|
extensionType: xt2,
|
2018-12-26 15:57:16 -08:00
|
|
|
}, {
|
|
|
|
|
parent: "testprotos.Message1",
|
|
|
|
|
number: 23,
|
|
|
|
|
wantErr: true,
|
|
|
|
|
wantNotFound: true,
|
|
|
|
|
}, {
|
|
|
|
|
parent: "testprotos.NoSuchMessage",
|
|
|
|
|
number: 11,
|
|
|
|
|
wantErr: true,
|
|
|
|
|
wantNotFound: true,
|
|
|
|
|
}, {
|
|
|
|
|
parent: "testprotos.Message1",
|
|
|
|
|
number: 30,
|
|
|
|
|
wantErr: true,
|
|
|
|
|
wantNotFound: true,
|
|
|
|
|
}, {
|
|
|
|
|
parent: "testprotos.Message1",
|
|
|
|
|
number: 99,
|
|
|
|
|
wantErr: true,
|
|
|
|
|
wantNotFound: true,
|
|
|
|
|
}}
|
|
|
|
|
for _, tc := range tests {
|
|
|
|
|
got, err := registry.FindExtensionByNumber(pref.FullName(tc.parent), pref.FieldNumber(tc.number))
|
|
|
|
|
gotErr := err != nil
|
|
|
|
|
if gotErr != tc.wantErr {
|
|
|
|
|
t.Errorf("FindExtensionByNumber(%v, %d) = (_, %v), want error? %t", tc.parent, tc.number, err, tc.wantErr)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
if tc.wantNotFound && err != preg.NotFound {
|
|
|
|
|
t.Errorf("FindExtensionByNumber(%v, %d) got error %v, want NotFound error", tc.parent, tc.number, err)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
if got != tc.extensionType {
|
|
|
|
|
t.Errorf("FindExtensionByNumber(%v, %d) got wrong value: %v", tc.parent, tc.number, got)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
|
2019-10-03 16:38:33 -07:00
|
|
|
sortTypes := cmp.Options{
|
|
|
|
|
cmpopts.SortSlices(func(x, y pref.EnumType) bool {
|
|
|
|
|
return x.Descriptor().FullName() < y.Descriptor().FullName()
|
|
|
|
|
}),
|
|
|
|
|
cmpopts.SortSlices(func(x, y pref.MessageType) bool {
|
|
|
|
|
return x.Descriptor().FullName() < y.Descriptor().FullName()
|
|
|
|
|
}),
|
|
|
|
|
cmpopts.SortSlices(func(x, y pref.ExtensionType) bool {
|
|
|
|
|
return x.TypeDescriptor().FullName() < y.TypeDescriptor().FullName()
|
|
|
|
|
}),
|
|
|
|
|
}
|
|
|
|
|
compare := cmp.Options{
|
|
|
|
|
cmp.Comparer(func(x, y pref.EnumType) bool {
|
|
|
|
|
return x == y
|
|
|
|
|
}),
|
|
|
|
|
cmp.Comparer(func(x, y pref.ExtensionType) bool {
|
|
|
|
|
return x == y
|
|
|
|
|
}),
|
|
|
|
|
cmp.Comparer(func(x, y pref.MessageType) bool {
|
|
|
|
|
return x == y
|
|
|
|
|
}),
|
2019-05-01 12:29:25 -07:00
|
|
|
}
|
2018-12-26 15:57:16 -08:00
|
|
|
|
2019-09-05 10:19:36 -07:00
|
|
|
t.Run("RangeEnums", func(t *testing.T) {
|
2019-10-03 16:38:33 -07:00
|
|
|
want := []pref.EnumType{et1}
|
|
|
|
|
var got []pref.EnumType
|
2019-09-05 10:19:36 -07:00
|
|
|
var gotCnt int
|
|
|
|
|
wantCnt := registry.NumEnums()
|
|
|
|
|
registry.RangeEnums(func(et pref.EnumType) bool {
|
|
|
|
|
got = append(got, et)
|
|
|
|
|
gotCnt++
|
2018-12-26 15:57:16 -08:00
|
|
|
return true
|
|
|
|
|
})
|
|
|
|
|
|
2019-09-05 10:19:36 -07:00
|
|
|
if gotCnt != wantCnt {
|
|
|
|
|
t.Errorf("NumEnums() = %v, want %v", gotCnt, wantCnt)
|
|
|
|
|
}
|
|
|
|
|
if diff := cmp.Diff(want, got, sortTypes, compare); diff != "" {
|
|
|
|
|
t.Errorf("RangeEnums() mismatch (-want +got):\n%v", diff)
|
2018-12-26 15:57:16 -08:00
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
|
2019-09-05 10:19:36 -07:00
|
|
|
t.Run("RangeMessages", func(t *testing.T) {
|
2019-10-03 16:38:33 -07:00
|
|
|
want := []pref.MessageType{mt1}
|
|
|
|
|
var got []pref.MessageType
|
2019-09-05 10:19:36 -07:00
|
|
|
var gotCnt int
|
|
|
|
|
wantCnt := registry.NumMessages()
|
|
|
|
|
registry.RangeMessages(func(mt pref.MessageType) bool {
|
|
|
|
|
got = append(got, mt)
|
|
|
|
|
gotCnt++
|
2018-12-26 15:57:16 -08:00
|
|
|
return true
|
|
|
|
|
})
|
|
|
|
|
|
2019-09-05 10:19:36 -07:00
|
|
|
if gotCnt != wantCnt {
|
|
|
|
|
t.Errorf("NumMessages() = %v, want %v", gotCnt, wantCnt)
|
|
|
|
|
}
|
|
|
|
|
if diff := cmp.Diff(want, got, sortTypes, compare); diff != "" {
|
|
|
|
|
t.Errorf("RangeMessages() mismatch (-want +got):\n%v", diff)
|
2018-12-26 15:57:16 -08:00
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("RangeExtensions", func(t *testing.T) {
|
2019-10-03 16:38:33 -07:00
|
|
|
want := []pref.ExtensionType{xt1, xt2}
|
|
|
|
|
var got []pref.ExtensionType
|
2019-09-05 10:19:36 -07:00
|
|
|
var gotCnt int
|
|
|
|
|
wantCnt := registry.NumExtensions()
|
2018-12-26 15:57:16 -08:00
|
|
|
registry.RangeExtensions(func(xt pref.ExtensionType) bool {
|
|
|
|
|
got = append(got, xt)
|
2019-09-05 10:19:36 -07:00
|
|
|
gotCnt++
|
2018-12-26 15:57:16 -08:00
|
|
|
return true
|
|
|
|
|
})
|
|
|
|
|
|
2019-09-05 10:19:36 -07:00
|
|
|
if gotCnt != wantCnt {
|
|
|
|
|
t.Errorf("NumExtensions() = %v, want %v", gotCnt, wantCnt)
|
|
|
|
|
}
|
|
|
|
|
if diff := cmp.Diff(want, got, sortTypes, compare); diff != "" {
|
2018-12-26 15:57:16 -08:00
|
|
|
t.Errorf("RangeExtensions() mismatch (-want +got):\n%v", diff)
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("RangeExtensionsByMessage", func(t *testing.T) {
|
2019-10-03 16:38:33 -07:00
|
|
|
want := []pref.ExtensionType{xt1, xt2}
|
|
|
|
|
var got []pref.ExtensionType
|
2019-09-05 10:19:36 -07:00
|
|
|
var gotCnt int
|
|
|
|
|
wantCnt := registry.NumExtensionsByMessage("testprotos.Message1")
|
|
|
|
|
registry.RangeExtensionsByMessage("testprotos.Message1", func(xt pref.ExtensionType) bool {
|
2018-12-26 15:57:16 -08:00
|
|
|
got = append(got, xt)
|
2019-09-05 10:19:36 -07:00
|
|
|
gotCnt++
|
2018-12-26 15:57:16 -08:00
|
|
|
return true
|
|
|
|
|
})
|
|
|
|
|
|
2019-09-05 10:19:36 -07:00
|
|
|
if gotCnt != wantCnt {
|
|
|
|
|
t.Errorf("NumExtensionsByMessage() = %v, want %v", gotCnt, wantCnt)
|
|
|
|
|
}
|
|
|
|
|
if diff := cmp.Diff(want, got, sortTypes, compare); diff != "" {
|
2018-12-26 15:57:16 -08:00
|
|
|
t.Errorf("RangeExtensionsByMessage() mismatch (-want +got):\n%v", diff)
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
}
|
