diff options
| author | csharptest <roger@csharptest.net> | 2012-10-14 15:12:29 -0500 |
|---|---|---|
| committer | rogerk <devnull@localhost> | 2012-10-14 15:12:29 -0500 |
| commit | 945bd1d516d94389a1f3d4b29e754fcd345ce955 (patch) | |
| tree | 5d6e818790c44b54a6c1a68a649ed0c817b25ddc /src/ProtocolBuffers.Test/DescriptorsTest.cs | |
| parent | 5cda54bd8b7269cf8f48ff7af28acfd4783c5a45 (diff) | |
| download | protobuf-945bd1d516d94389a1f3d4b29e754fcd345ce955.tar.gz protobuf-945bd1d516d94389a1f3d4b29e754fcd345ce955.tar.bz2 protobuf-945bd1d516d94389a1f3d4b29e754fcd345ce955.zip | |
Working to reduce number of conditional complication directives, and migrate towards feature-based condtions rather than platform-based
Diffstat (limited to 'src/ProtocolBuffers.Test/DescriptorsTest.cs')
| -rw-r--r-- | src/ProtocolBuffers.Test/DescriptorsTest.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/ProtocolBuffers.Test/DescriptorsTest.cs b/src/ProtocolBuffers.Test/DescriptorsTest.cs index 5cf79e3b..ca10c621 100644 --- a/src/ProtocolBuffers.Test/DescriptorsTest.cs +++ b/src/ProtocolBuffers.Test/DescriptorsTest.cs @@ -229,7 +229,6 @@ namespace Google.ProtocolBuffers Assert.IsFalse(repeatedField.IsRequired);
Assert.IsTrue(repeatedField.IsRepeated);
}
-#if !SILVERLIGHT
[TestMethod]
public void FieldDescriptorDefault()
{
@@ -240,13 +239,12 @@ namespace Google.ProtocolBuffers Assert.AreEqual<object>(41, d.FindDescriptor<FieldDescriptor>("default_int32").DefaultValue);
d = TestExtremeDefaultValues.Descriptor;
- Assert.AreEqual<object>(
- ByteString.CopyFrom("\u0000\u0001\u0007\b\f\n\r\t\u000b\\\'\"\u00fe", Encoding.GetEncoding("iso-8859-1")),
+ Assert.AreEqual<object>(TestExtremeDefaultValues.DefaultInstance.EscapedBytes,
d.FindDescriptor<FieldDescriptor>("escaped_bytes").DefaultValue);
+
Assert.AreEqual<object>(uint.MaxValue, d.FindDescriptor<FieldDescriptor>("large_uint32").DefaultValue);
Assert.AreEqual<object>(ulong.MaxValue, d.FindDescriptor<FieldDescriptor>("large_uint64").DefaultValue);
}
-#endif
[TestMethod]
public void EnumDescriptor()
{
|