diff options
author | Jon Skeet <skeet@pobox.com> | 2015-04-29 20:59:44 +0100 |
---|---|---|
committer | Jon Skeet <skeet@pobox.com> | 2015-04-29 20:59:44 +0100 |
commit | a449f66bdb50f3e898889705945fb1ac6b105469 (patch) | |
tree | 87a1bb05e7a05d5fc0b2eb5046f637e64b0b3ec2 /csharp/src/ProtocolBuffers.Test | |
parent | 32ead755d1f97e414f4a50edb7d9f1ebd9cab562 (diff) | |
parent | 0e916d09a3fa272399b38f09b5509e0e2445e7fb (diff) | |
download | protobuf-a449f66bdb50f3e898889705945fb1ac6b105469.tar.gz protobuf-a449f66bdb50f3e898889705945fb1ac6b105469.tar.bz2 protobuf-a449f66bdb50f3e898889705945fb1ac6b105469.zip |
Merge pull request #317 from jskeet/csharp
Tidying up the C# runtime project
Diffstat (limited to 'csharp/src/ProtocolBuffers.Test')
4 files changed, 0 insertions, 203 deletions
diff --git a/csharp/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs b/csharp/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs index b443ea3a..bfa1f05e 100644 --- a/csharp/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs +++ b/csharp/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs @@ -28,8 +28,3 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("2.4.1.555")]
[assembly: AssemblyVersion("2.4.1.555")]
-
-// We don't really need CLSCompliance, but if the assembly builds with no warnings,
-// that means the generator is okay.
-
-[assembly: CLSCompliant(false)]
\ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj index b11b1ad8..5702c011 100644 --- a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj +++ b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj @@ -81,7 +81,6 @@ <Compile Include="Compatibility\TestResources.cs" />
<Compile Include="Compatibility\TextCompatibilityTests.cs" />
<Compile Include="Compatibility\XmlCompatibilityTests.cs" />
- <Compile Include="SerializableAttribute.cs" />
<Compile Include="TestProtos\GoogleSize.cs" />
<Compile Include="TestProtos\GoogleSpeed.cs" />
<Compile Include="TestProtos\Unittest.cs" />
@@ -112,7 +111,6 @@ <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ReflectionTester.cs" />
<Compile Include="ReusableBuilderTest.cs" />
- <Compile Include="SerializableTest.cs" />
<Compile Include="TestCornerCases.cs" />
<Compile Include="TestMimeMessageFormats.cs" />
<Compile Include="TestUtil.cs" />
diff --git a/csharp/src/ProtocolBuffers.Test/SerializableAttribute.cs b/csharp/src/ProtocolBuffers.Test/SerializableAttribute.cs deleted file mode 100644 index 0553762b..00000000 --- a/csharp/src/ProtocolBuffers.Test/SerializableAttribute.cs +++ /dev/null @@ -1,12 +0,0 @@ -#if NOSERIALIZABLE && !COMPACT_FRAMEWORK
-
-namespace System
-{
- [AttributeUsage(AttributeTargets.Class)]
- public class SerializableAttribute : Attribute
- {
- public SerializableAttribute () : base() { }
- }
-}
-
-#endif
diff --git a/csharp/src/ProtocolBuffers.Test/SerializableTest.cs b/csharp/src/ProtocolBuffers.Test/SerializableTest.cs deleted file mode 100644 index da5b0b51..00000000 --- a/csharp/src/ProtocolBuffers.Test/SerializableTest.cs +++ /dev/null @@ -1,184 +0,0 @@ -#if !NOSERIALIZABLE
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.Hosting;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Formatters.Binary;
-using System.Text;
-using Google.ProtocolBuffers.TestProtos;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Google.ProtocolBuffers
-{
- [TestClass]
- public class SerializableTest
- {
- /// <summary>
- /// Just keep it from even compiling if we these objects don't implement the expected interface.
- /// </summary>
- public static readonly ISerializable CompileTimeCheckSerializableMessage = TestXmlMessage.DefaultInstance;
- public static readonly ISerializable CompileTimeCheckSerializableBuilder = new TestXmlMessage.Builder();
-
- [TestMethod]
- [Ignore] // Serialization hasn't been reimplemented yet
- public void TestPlainMessage()
- {
- TestXmlMessage message = TestXmlMessage.CreateBuilder()
- .SetValid(true)
- .SetText("text")
- .AddTextlines("a")
- .AddTextlines("b")
- .AddTextlines("c")
- .SetNumber(0x1010101010)
- .AddNumbers(1)
- .AddNumbers(2)
- .AddNumbers(3)
- .SetChild(TestXmlChild.CreateBuilder()
- .AddOptions(EnumOptions.ONE)
- .SetBinary(ByteString.CopyFrom(new byte[1])))
- .AddChildren(TestXmlMessage.Types.Children.CreateBuilder()
- .AddOptions(EnumOptions.TWO)
- .SetBinary(ByteString.CopyFrom(new byte[2])))
- .AddChildren(TestXmlMessage.Types.Children.CreateBuilder()
- .AddOptions(EnumOptions.THREE)
- .SetBinary(ByteString.CopyFrom(new byte[3])))
- .Build();
-
- MemoryStream ms = new MemoryStream();
- new BinaryFormatter().Serialize(ms, message);
-
- ms.Position = 0;
- TestXmlMessage copy = (TestXmlMessage)new BinaryFormatter().Deserialize(ms);
-
- Assert.AreEqual(message, copy);
- }
-
- [TestMethod]
- [Ignore] // Serialization hasn't been reimplemented yet
- public void TestMessageWithExtensions()
- {
- TestXmlMessage message = TestXmlMessage.CreateBuilder()
- .SetValid(true)
- .SetText("text")
- .AddTextlines("a")
- .AddTextlines("b")
- .AddTextlines("c")
- .SetNumber(0x1010101010)
- .AddNumbers(1)
- .AddNumbers(2)
- .AddNumbers(3)
- .SetChild(TestXmlChild.CreateBuilder()
- .AddOptions(EnumOptions.ONE)
- .SetBinary(ByteString.CopyFrom(new byte[1])))
- .AddChildren(TestXmlMessage.Types.Children.CreateBuilder()
- .AddOptions(EnumOptions.TWO)
- .SetBinary(ByteString.CopyFrom(new byte[2])))
- .AddChildren(TestXmlMessage.Types.Children.CreateBuilder()
- .AddOptions(EnumOptions.THREE)
- .SetBinary(ByteString.CopyFrom(new byte[3])))
- .SetExtension(UnittestExtrasXmltest.ExtensionText, " extension text value ! ")
- .SetExtension(UnittestExtrasXmltest.ExtensionMessage, new TestXmlExtension.Builder().SetNumber(42).Build())
- .AddExtension(UnittestExtrasXmltest.ExtensionNumber, 100)
- .AddExtension(UnittestExtrasXmltest.ExtensionNumber, 101)
- .AddExtension(UnittestExtrasXmltest.ExtensionNumber, 102)
- .SetExtension(UnittestExtrasXmltest.ExtensionEnum, EnumOptions.ONE)
- .Build();
-
- ExtensionRegistry registry = ExtensionRegistry.CreateInstance();
- UnittestExtrasXmltest.RegisterAllExtensions(registry);
-
- MemoryStream ms = new MemoryStream();
- new BinaryFormatter().Serialize(ms, message);
-
- ms.Position = 0;
- //you need to provide the extension registry as context to the serializer
- BinaryFormatter bff = new BinaryFormatter(null, new StreamingContext(StreamingContextStates.All, registry));
- TestXmlMessage copy = (TestXmlMessage)bff.Deserialize(ms);
-
- // And all extensions will be defined.
- Assert.AreEqual(message, copy);
- }
-
- [TestMethod]
- [Ignore] // Serialization hasn't been reimplemented yet
- public void TestPlainBuilder()
- {
- TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder()
- .SetValid(true)
- .SetText("text")
- .AddTextlines("a")
- .AddTextlines("b")
- .AddTextlines("c")
- .SetNumber(0x1010101010)
- .AddNumbers(1)
- .AddNumbers(2)
- .AddNumbers(3)
- .SetChild(TestXmlChild.CreateBuilder()
- .AddOptions(EnumOptions.ONE)
- .SetBinary(ByteString.CopyFrom(new byte[1])))
- .AddChildren(TestXmlMessage.Types.Children.CreateBuilder()
- .AddOptions(EnumOptions.TWO)
- .SetBinary(ByteString.CopyFrom(new byte[2])))
- .AddChildren(TestXmlMessage.Types.Children.CreateBuilder()
- .AddOptions(EnumOptions.THREE)
- .SetBinary(ByteString.CopyFrom(new byte[3])))
- ;
-
- MemoryStream ms = new MemoryStream();
- new BinaryFormatter().Serialize(ms, builder);
-
- ms.Position = 0;
- TestXmlMessage.Builder copy = (TestXmlMessage.Builder)new BinaryFormatter().Deserialize(ms);
-
- Assert.AreEqual(builder.Build(), copy.Build());
- }
-
- [TestMethod]
- [Ignore] // Serialization hasn't been reimplemented yet
- public void TestBuilderWithExtensions()
- {
- TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder()
- .SetValid(true)
- .SetText("text")
- .AddTextlines("a")
- .AddTextlines("b")
- .AddTextlines("c")
- .SetNumber(0x1010101010)
- .AddNumbers(1)
- .AddNumbers(2)
- .AddNumbers(3)
- .SetChild(TestXmlChild.CreateBuilder()
- .AddOptions(EnumOptions.ONE)
- .SetBinary(ByteString.CopyFrom(new byte[1])))
- .AddChildren(TestXmlMessage.Types.Children.CreateBuilder()
- .AddOptions(EnumOptions.TWO)
- .SetBinary(ByteString.CopyFrom(new byte[2])))
- .AddChildren(TestXmlMessage.Types.Children.CreateBuilder()
- .AddOptions(EnumOptions.THREE)
- .SetBinary(ByteString.CopyFrom(new byte[3])))
- .SetExtension(UnittestExtrasXmltest.ExtensionText, " extension text value ! ")
- .SetExtension(UnittestExtrasXmltest.ExtensionMessage, new TestXmlExtension.Builder().SetNumber(42).Build())
- .AddExtension(UnittestExtrasXmltest.ExtensionNumber, 100)
- .AddExtension(UnittestExtrasXmltest.ExtensionNumber, 101)
- .AddExtension(UnittestExtrasXmltest.ExtensionNumber, 102)
- .SetExtension(UnittestExtrasXmltest.ExtensionEnum, EnumOptions.ONE)
- ;
-
- ExtensionRegistry registry = ExtensionRegistry.CreateInstance();
- UnittestExtrasXmltest.RegisterAllExtensions(registry);
-
- MemoryStream ms = new MemoryStream();
- new BinaryFormatter().Serialize(ms, builder);
-
- ms.Position = 0;
- //you need to provide the extension registry as context to the serializer
- BinaryFormatter bff = new BinaryFormatter(null, new StreamingContext(StreamingContextStates.All, registry));
- TestXmlMessage.Builder copy = (TestXmlMessage.Builder)bff.Deserialize(ms);
-
- // And all extensions will be defined.
- Assert.AreEqual(builder.Build(), copy.Build());
- }
- }
-}
-#endif
\ No newline at end of file |