Skip to content

P
protobuf
Unverified Commit 058d5b0d authored by Jan Tattermusch's avatar Jan Tattermusch Committed by GitHub
Browse files
Options

Merge pull request #6910 from ObsidianMinor/csharp/conformance-failures 

Fix conformance test failures for Google.Protobuf
parents 96e9ff38 77d33734
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 36 deletions
conformance/failure_list_csharp.txt
View file @ 058d5b0d
Recommended.Proto2.ProtobufInput.ValidDataRepeated.BOOL.PackedInput.PackedOutput.ProtobufOutput
Recommended.Proto2.ProtobufInput.ValidDataRepeated.BOOL.PackedInput.UnpackedOutput.ProtobufOutput
Recommended.Proto2.ProtobufInput.ValidDataRepeated.BOOL.UnpackedInput.DefaultOutput.ProtobufOutput
Recommended.Proto2.ProtobufInput.ValidDataRepeated.BOOL.UnpackedInput.PackedOutput.ProtobufOutput
Recommended.Proto2.ProtobufInput.ValidDataRepeated.BOOL.UnpackedInput.UnpackedOutput.ProtobufOutput
Recommended.Proto2.ProtobufInput.ValidDataScalarBinary.BOOL[4].ProtobufOutput
Recommended.Proto2.ProtobufInput.ValidDataScalarBinary.BOOL[6].ProtobufOutput
Recommended.Proto3.ProtobufInput.ValidDataRepeated.BOOL.PackedInput.DefaultOutput.ProtobufOutput
Recommended.Proto3.ProtobufInput.ValidDataRepeated.BOOL.PackedInput.PackedOutput.ProtobufOutput
Recommended.Proto3.ProtobufInput.ValidDataRepeated.BOOL.PackedInput.UnpackedOutput.ProtobufOutput
Recommended.Proto3.ProtobufInput.ValidDataRepeated.BOOL.UnpackedInput.DefaultOutput.ProtobufOutput
Recommended.Proto3.ProtobufInput.ValidDataRepeated.BOOL.UnpackedInput.PackedOutput.ProtobufOutput
Recommended.Proto3.ProtobufInput.ValidDataRepeated.BOOL.UnpackedInput.UnpackedOutput.ProtobufOutput
Recommended.Proto3.ProtobufInput.ValidDataScalarBinary.BOOL[4].ProtobufOutput
Recommended.Proto3.ProtobufInput.ValidDataScalarBinary.BOOL[6].ProtobufOutput
Required.Proto2.ProtobufInput.RepeatedScalarSelectsLast.BOOL.ProtobufOutput
Required.Proto2.ProtobufInput.ValidDataRepeated.BOOL.PackedInput.ProtobufOutput
Required.Proto2.ProtobufInput.ValidDataRepeated.BOOL.UnpackedInput.ProtobufOutput
Required.Proto2.ProtobufInput.ValidDataScalar.BOOL[4].ProtobufOutput
Required.Proto2.ProtobufInput.ValidDataScalar.BOOL[6].ProtobufOutput
Required.Proto3.ProtobufInput.RepeatedScalarSelectsLast.BOOL.JsonOutput
Required.Proto3.ProtobufInput.RepeatedScalarSelectsLast.BOOL.ProtobufOutput
Required.Proto3.ProtobufInput.ValidDataRepeated.BOOL.PackedInput.JsonOutput
Required.Proto3.ProtobufInput.ValidDataRepeated.BOOL.PackedInput.ProtobufOutput
Required.Proto3.ProtobufInput.ValidDataRepeated.BOOL.UnpackedInput.JsonOutput
Required.Proto3.ProtobufInput.ValidDataRepeated.BOOL.UnpackedInput.ProtobufOutput
Required.Proto3.ProtobufInput.ValidDataScalar.BOOL[4].JsonOutput
Required.Proto3.ProtobufInput.ValidDataScalar.BOOL[4].ProtobufOutput
Required.Proto3.ProtobufInput.ValidDataScalar.BOOL[6].JsonOutput
Required.Proto3.ProtobufInput.ValidDataScalar.BOOL[6].ProtobufOutput
Recommended.Proto2.ProtobufInput.ValidDataRepeated.BOOL.PackedInput.DefaultOutput.ProtobufOutput
Recommended.Proto3.JsonInput.BytesFieldBase64Url.JsonOutput Recommended.Proto3.JsonInput.BytesFieldBase64Url.JsonOutput
Recommended.Proto3.JsonInput.BytesFieldBase64Url.ProtobufOutput Recommended.Proto3.JsonInput.BytesFieldBase64Url.ProtobufOutput
csharp/src/Google.Protobuf.Conformance/Program.cs
View file @ 058d5b0d
...@@ -143,7 +143,7 @@ namespace Google.Protobuf.Conformance ...@@ -143,7 +143,7 @@ namespace Google.Protobuf.Conformance
case global::Conformance.WireFormat.Protobuf: case global::Conformance.WireFormat.Protobuf:
return new ConformanceResponse { ProtobufPayload = message.ToByteString() }; return new ConformanceResponse { ProtobufPayload = message.ToByteString() };
default: default:
throw new Exception("Unsupported request output format: " + request.PayloadCase); throw new Exception("Unsupported request output format: " + request.RequestedOutputFormat);
} }
} }
catch (InvalidOperationException e) catch (InvalidOperationException e)
......
csharp/src/Google.Protobuf/CodedInputStream.cs
View file @ 058d5b0d
...@@ -577,7 +577,7 @@ namespace Google.Protobuf ...@@ -577,7 +577,7 @@ namespace Google.Protobuf
/// </summary> /// </summary>
public bool ReadBool() public bool ReadBool()
{ {
return ReadRawVarint32() != 0; return ReadRawVarint64() != 0;
} }
/// <summary> /// <summary>
...@@ -845,7 +845,7 @@ namespace Google.Protobuf ...@@ -845,7 +845,7 @@ namespace Google.Protobuf
internal static bool? ReadBoolWrapper(CodedInputStream input) internal static bool? ReadBoolWrapper(CodedInputStream input)
{ {
return ReadUInt32Wrapper(input) != 0; return ReadUInt64Wrapper(input) != 0;
} }
internal static uint? ReadUInt32Wrapper(CodedInputStream input) internal static uint? ReadUInt32Wrapper(CodedInputStream input)
...@@ -1654,4 +1654,4 @@ namespace Google.Protobuf ...@@ -1654,4 +1654,4 @@ namespace Google.Protobuf
} }
#endregion #endregion
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment