aboutsummaryrefslogtreecommitdiffstats
path: root/conformance
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/3.8.x'Bo Yang2019-06-213-6/+0
|\
| * Change int64 json encoding to be string for php and ruby (#6251)Paul Yang2019-06-173-6/+0
| | | | | | | | | | | | | | | | * Change int64 json encoding to be string for php and ruby * Fix ruby test * Sync upb change
* | php: Fix formatting of Duration (#6155)Leonard Hecker2019-06-181-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | * php: Fixed php notices for unknown enum indices * php: Fixed formatting of Duration This fixes: * Missing nanoseconds. The nanoseconds where divided as a float and implicitly converted to a string before being passed to bcadd. This can result in a float formatted in scientific/exponential notation, which bcmath doesn't understand. * Durations are supposed to be formatted without trailing zeroes.
* | Change offset of Timestamp conformance test to distinguish from the default ↵Paul Yang2019-06-171-4/+4
| | | | | | | | | | (#6263) Fixes #4079
* | Merge branch '3.8.x' into 3.8.x-201905311515Hao Nguyen2019-05-311-5/+0
|\|
| * Custom mktime to fix issue on mac (#6118)Paul Yang2019-05-091-5/+0
| | | | | | | | | | | | * Custom mktime to fix issue on mac * Remove succeeded tests from failure list
* | Down integrate to GitHubHao Nguyen2019-05-301-8/+3
| |
* | Use runtime_error vs just exiting for some issues.Thomas Van Lenten2019-05-291-3/+8
| | | | | | | | release notes: no
* | Add a new conformance test for top level JSON null (#5966)Hao Nguyen2019-04-244-0/+5
|/ | | * Add a new conformance test for top level JSON null
* Add module for JavaLite and fix buildsHao Nguyen2019-04-091-1/+1
|
* Merge branch 'master' of https://github.com/protocolbuffers/protobuf into ↵Hao Nguyen2019-04-094-2/+50
|\ | | | | | | sync201904090622
| * Revert accidentally commitHao Nguyen2019-04-054-31/+2
| |
| * Add module for JavaLite and fix buildsHao Nguyen2019-04-051-1/+1
| |
| * Merge branch 'master' of https://github.com/protocolbuffers/protobufHao Nguyen2019-04-054-2/+50
| |\
| | * Update upb for rubyBo Yang2019-03-282-2/+0
| | |
| | * Merge branch '3.7.x' into merge-3-7-xAdam Cozzette2019-03-262-0/+50
| | |\
| | | * Replace strptime with custom implementation (#5906)Paul Yang2019-03-192-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Replace strptime with custom implementation * Fix ruby strptime * Fix test * Fix ruby conformance test * Use mktime * Remove EmptyFieldMask from failed conformance test list
| | | * Parse nested listvalue in json for ruby (#5867)Paul Yang2019-03-122-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add conformance test for nested listvalue * Fix upb for parsing repeated Value/ListValue * Add failed repeated ListValue conformance test into php failure list
| | | * Encode empty ListValue (#5857)Paul Yang2019-03-103-22/+21
| | | | | | | | | | | | | | | | | | | | | | | | * Encode empty ListValue * Update mac ruby conformance failure list
| * | | Down integrate to GithubHao Nguyen2019-04-053-1/+30
| |/ /
* / / Down integrate to GithubHao Nguyen2019-04-093-1/+30
|/ /
* | Update conformance test failuresHao Nguyen2019-03-204-7/+31
| |
* | Merge branch 'contributing' of https://github.com/haon4/protobuf into ↵Hao Nguyen2019-03-201-1/+1
|\ \ | | | | | | | | | contributing
| * | Bump target frameworks of C# programs from netcoreapp1.0 to netcoreapp2.1 ↵Sydney Acksman2019-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#5838) * Bump target frameworks from netcoreapp1.0 to netcoreapp2.2. Move global.json up to root of repo, change SDK ver to 2.2.100 Change .net core sdk in dockerfile for kokoro to ver 2.2.100 * Re-add curl install * Change all exe target to 2.1 * Fix incorrect versions in global.json and Dockerfile * Downgrade version to 2.1 to match exe targets * introduce separate testing Dockerfile for C# * revert changes to the shared Dockerfile * use netcoreapp2.1 for C# conformance tests * use language specific dockerfile for testing C# * Edit compatibility tests script to use parameters instead of file copies * install dotnet SDK on windows before running the tests * update csharp_EXTRA_DIST
* | | Down integrate to GithubHao Nguyen2019-03-208-7/+82
|/ /
* | Fix ruby continuous tests (#5853)Paul Yang2019-03-072-22/+3
| | | | | | | | | | | | * Fix ruby continuous tests * Fix compatibility test
* | Down integrate to Github (#5839)Hao Nguyen2019-03-063-42/+9
| | | | | | | | * Down integrate to github
* | Merge branch '3.7.x'Bo Yang2019-03-041-0/+2
|\|
| * Convert integer to string if field is string field in jsonBo Yang2019-01-281-0/+2
| | | | | | | | | | | | | | | | | | json_decode automatically convert numeric string to integer, so that we need to convert it back. However, this will suceed to parse invalid json data with string field set as integer even though it should have failed. Because, the failure case is less often than the succeeding case, we decided to make this change. Users should make sure their data don't use integer for string fields by themselves.
| * Default values should also be serialized for json map key/value (#5643)Paul Yang2019-01-281-1/+0
| |
* | fix conformance test for text formatYilun Chong2019-02-263-1/+14
| |
* | Merge branch 'master' into integrationYilun Chong2019-02-244-27/+27
|\ \
| * | delete all duplicate empty blanks (#5758)Xiang Dai2019-02-204-27/+27
| | | | | | | | | Signed-off-by: Xiang Dai <764524258@qq.com>
* | | down integration from internalYilun Chong2019-02-2212-51/+475
|/ /
* / Default values should also be serialized for json map key/value (#5643)Paul Yang2019-01-281-1/+0
|/
* Fix empty FieldMask json encoding/decoding (#5605)Paul Yang2019-01-223-0/+6
| | | | | | * Fix empty FieldMask json encoding/decoding * Add failed test to python's conformance failure list
* Fix Any json encoding/decoding for ruby. (#5592)Paul Yang2019-01-171-22/+1
| | | | | | * Fix Any json encoding/decoding for ruby. * Revert unnecessary changes
* Fix field mask for php in json (#5591)Paul Yang2019-01-171-10/+1
| | | | | | * Fix field mask for php in json * Update byte size
* [ObjC] add support for the TextFormat constants.Thomas Van Lenten2019-01-141-0/+10
| | | | | | | ObjC doesn't support them, but this ensure when tests are added they will be handled correctly. The conformance.proto was updated in PR #5566
* Down-integrate internal changes to github. (#5575)Yilun Chong2019-01-131-1/+2
| | | | | | * Down-integrate internal changes to github. * Fix BUILD file and regenerate csharp descritpor
* Down-integrate internal changes to github. (#5566)Yilun Chong2019-01-115-9/+75
| | | | | | | | | | | | | | * Down-integrate internal changes to github. * fix csharp conformance test * add comments in conformance.proto for text format * fix comments * fix comments, re-generated csharp file * fix comments, re-generated csharp file
* Comments on the next line will go to the next field.Thomas Van Lenten2019-01-101-4/+4
| | | | | | | | Even though the comments were indented to appear to go with the jspb case/field, protoc doesn't collect comments like that, so these "hanging" comments actually "attach" to the next thing added to each. Looking at https://github.com/protocolbuffers/protobuf/pull/5566 you see where the generated code picked up the comment on the wrong field.
* Down-integrate internal changes to github. (#5555)Yilun Chong2019-01-0810-89/+128
| | | | | | | | | | | | * Down-integrate internal changes to github. * fix python conformance test * fix csharp conformance test * add back java map_lite_test.proto's optimize for option * fix php conformance test
* Revert "Revert "Enable the ignore_unknown_field option in the Ruby unmarshal ↵Paul Yang2019-01-083-53/+96
| | | | | | | | | | | | | | options" (#5511)" (#5533) * Revert "Revert "Enable the ignore_unknown_field option in the Ruby unmarshal options" (#5511)" This reverts commit be1716a6d0346de7a990b60f4afc9aebe2e06f36. * Separate ruby conformance test on Mac * Fix shell syntax * Fix test
* [ObjC] Add the jspb cases to the switches so they are complete.Thomas Van Lenten2019-01-071-0/+12
|
* Revert "Enable the ignore_unknown_field option in the Ruby unmarshal ↵Paul Yang2018-12-261-1/+49
| | | | options" (#5511)
* Fix Any json encoding/decoding in php (#5496)Paul Yang2018-12-261-18/+0
| | | | | | * Fix Any json encoding/decoding in php * Fix comments
* Merge pull request #5373 from ebenoist/erik/unknown-fieldsJoshua Haberman2018-12-221-49/+1
|\ | | | | Enable the ignore_unknown_field option in the Ruby unmarshal options
| * Adds the ability to ignore unknown fields on parseErik Benoist2018-12-211-49/+1
| | | | | | | | | | | | This adds the ability for the MRI Ruby library to optionally pass in a ignore_unknown_fields option when decoding JSON. The functionality was added upstream in upb, this change exposes that option.
* | Add dependency to AliasedEnum in PHPHao Nguyen2018-12-191-0/+1
| |