diff options
author | Jisi Liu <liujisi@google.com> | 2017-12-19 17:45:56 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-19 17:45:56 -0800 |
commit | d106399d39a3a5719f1e3d8b5997a4437eb83af3 (patch) | |
tree | 0b247a1d9a5fb782e432f1a17bb8eb90a4bdf24f /csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs | |
parent | 6c3c7f6d5d68433af01c5ca500978c2d69f15212 (diff) | |
parent | b308580bb1c3f87a062ac1448a3e0bdaab9d40cf (diff) | |
download | protobuf-d106399d39a3a5719f1e3d8b5997a4437eb83af3.tar.gz protobuf-d106399d39a3a5719f1e3d8b5997a4437eb83af3.tar.bz2 protobuf-d106399d39a3a5719f1e3d8b5997a4437eb83af3.zip |
Merge pull request #4072 from google/jieluo
Cherrypick for csharp, including:
Diffstat (limited to 'csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs')
-rw-r--r-- | csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs b/csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs index 8b153d69..5694754e 100644 --- a/csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs +++ b/csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs @@ -638,7 +638,7 @@ namespace Google.Protobuf }
[Test]
- public void IgnoreUnknownFields_RealDataStillRead()
+ public void DiscardUnknownFields_RealDataStillRead()
{
var message = SampleMessages.CreateFullTestAllTypes();
var stream = new MemoryStream();
@@ -652,16 +652,18 @@ namespace Google.Protobuf stream.Position = 0;
var parsed = TestAllTypes.Parser.ParseFrom(stream);
- Assert.AreEqual(message, parsed);
+ // TODO(jieluo): Add test back when DiscardUnknownFields API is supported.
+ // Assert.AreEqual(message, parsed);
}
[Test]
- public void IgnoreUnknownFields_AllTypes()
+ public void DiscardUnknownFields_AllTypes()
{
// Simple way of ensuring we can skip all kinds of fields.
var data = SampleMessages.CreateFullTestAllTypes().ToByteArray();
var empty = Empty.Parser.ParseFrom(data);
- Assert.AreEqual(new Empty(), empty);
+ // TODO(jieluo): Add test back when DiscardUnknownFields API is supported.
+ // Assert.AreNotEqual(new Empty(), empty);
}
// This was originally seen as a conformance test failure.
@@ -719,5 +721,16 @@ namespace Google.Protobuf JsonFormatter.Default.Format(message, writer);
Assert.AreEqual("{ \"c\": 31 }", writer.ToString());
}
+
+ [Test]
+ public void NaNComparisons()
+ {
+ var message1 = new TestAllTypes { SingleDouble = SampleNaNs.Regular };
+ var message2 = new TestAllTypes { SingleDouble = SampleNaNs.PayloadFlipped };
+ var message3 = new TestAllTypes { SingleDouble = SampleNaNs.Regular };
+
+ EqualityTester.AssertInequality(message1, message2);
+ EqualityTester.AssertEquality(message1, message3);
+ }
}
}
\ No newline at end of file |