-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updated set of unit tests and unit test protos.
This commit includes changes to the C#-specific protos, and rebuilt versions of the "stock" protos. The stock protos have been locally updated to have a specific C# namespace, but this is expected to change soon, so hasn't been committed. Four areas are currently not tested: 1) Serialization - we may restore this at some point, possibly optionally. 2) Services - currently nothing is generated for this; will need to see how it interacts with GRPC 3) Fields beginning with _{digit} - see protocolbuffers/protobuf#308 4) Fields with names which conflict with the declaring type in nasty ways - see protocolbuffers/protobuf#309
- Loading branch information
Showing
67 changed files
with
164,903 additions
and
93,042 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,29 +1,30 @@ | ||
syntax = "proto2"; | ||
|
||
// Additional options required for C# generation. File from copyright | ||
// line onwards is as per original distribution. | ||
import "google/protobuf/csharp_options.proto"; | ||
import "google/protobuf/unittest.proto"; | ||
import "google/protobuf/unittest_custom_options.proto"; | ||
option (google.protobuf.csharp_file_options).namespace = "Google.ProtocolBuffers.TestProtos"; | ||
option (google.protobuf.csharp_file_options).umbrella_classname = "UnitTestGenericServices"; | ||
|
||
option (google.protobuf.csharp_file_options).service_generator_type = GENERIC; | ||
option csharp_namespace = "Google.ProtocolBuffers.TestProtos"; | ||
|
||
// option (google.protobuf.csharp_file_options).service_generator_type = GENERIC; | ||
|
||
// We don't put this in a package within proto2 because we need to make sure | ||
// that the generated code doesn't depend on being in the proto2 namespace. | ||
package protobuf_unittest; | ||
|
||
// We don't put this in a package within proto2 because we need to make sure | ||
// that the generated code doesn't depend on being in the proto2 namespace. | ||
package protobuf_unittest; | ||
|
||
option optimize_for = SPEED; | ||
|
||
service TestGenericService { | ||
rpc Foo(FooRequest) returns (FooResponse); | ||
rpc Bar(BarRequest) returns (BarResponse); | ||
} | ||
|
||
service TestGenericServiceWithCustomOptions { | ||
option (service_opt1) = -9876543210; | ||
|
||
rpc Foo(CustomOptionFooRequest) returns (CustomOptionFooResponse) { | ||
option (method_opt1) = METHODOPT1_VAL2; | ||
} | ||
} | ||
|
||
|
||
service TestGenericServiceWithCustomOptions { | ||
option (service_opt1) = -9876543210; | ||
|
||
rpc Foo(CustomOptionFooRequest) returns (CustomOptionFooResponse) { | ||
option (method_opt1) = METHODOPT1_VAL2; | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.