diff options
Diffstat (limited to 'csharp/src/ProtocolBuffers.Test')
4 files changed, 1 insertions, 202 deletions
diff --git a/csharp/src/ProtocolBuffers.Test/CSharpOptionsTest.cs b/csharp/src/ProtocolBuffers.Test/CSharpOptionsTest.cs deleted file mode 100644 index 752d9a0c..00000000 --- a/csharp/src/ProtocolBuffers.Test/CSharpOptionsTest.cs +++ /dev/null @@ -1,127 +0,0 @@ -#region Copyright notice and license
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc. All rights reserved.
-// http://github.com/jskeet/dotnet-protobufs/
-// Original C++/Java/Python code:
-// http://code.google.com/p/protobuf/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#endregion
-
-using Google.ProtocolBuffers.DescriptorProtos;
-using Google.ProtocolBuffers.Descriptors;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Google.ProtocolBuffers
-{
- [TestClass]
- public class DescriptorUtilTest
- {
- [TestMethod]
- public void ExplicitNamespace()
- {
- FileDescriptorProto proto = new FileDescriptorProto.Builder
- {
- Name = "x",
- Package = "pack",
- Options =
- new FileOptions.Builder().SetExtension(
- CSharpOptions.CSharpFileOptions,
- new CSharpFileOptions.Builder {Namespace = "Foo.Bar"}.Build()).
- Build()
- }.Build();
- FileDescriptor descriptor = FileDescriptor.BuildFrom(proto, null);
- Assert.AreEqual("Foo.Bar", descriptor.CSharpOptions.Namespace);
- }
-
- [TestMethod]
- public void NoNamespaceFallsBackToPackage()
- {
- FileDescriptorProto proto = new FileDescriptorProto.Builder {Name = "x", Package = "pack"}.Build();
- FileDescriptor descriptor = FileDescriptor.BuildFrom(proto, null);
- Assert.AreEqual("pack", descriptor.CSharpOptions.Namespace);
- }
-
- [TestMethod]
- public void NoNamespaceOrPackageFallsBackToEmptyString()
- {
- FileDescriptorProto proto = new FileDescriptorProto.Builder {Name = "x"}.Build();
- FileDescriptor descriptor = FileDescriptor.BuildFrom(proto, null);
- Assert.AreEqual("", descriptor.CSharpOptions.Namespace);
- }
-
- [TestMethod]
- public void ExplicitlyNamedFileClass()
- {
- FileDescriptorProto proto = new FileDescriptorProto.Builder
- {
- Name = "x",
- Options =
- new FileOptions.Builder().SetExtension(
- CSharpOptions.CSharpFileOptions,
- new CSharpFileOptions.Builder {UmbrellaClassname = "Foo"}.Build())
- .Build()
- }.Build();
- FileDescriptor descriptor = FileDescriptor.BuildFrom(proto, null);
- Assert.AreEqual("Foo", descriptor.CSharpOptions.UmbrellaClassname);
- }
-
- [TestMethod]
- public void ImplicitFileClassWithProtoSuffix()
- {
- FileDescriptorProto proto = new FileDescriptorProto.Builder {Name = "foo_bar.proto"}.Build();
- FileDescriptor descriptor = FileDescriptor.BuildFrom(proto, null);
- Assert.AreEqual("FooBar", descriptor.CSharpOptions.UmbrellaClassname);
- }
-
- [TestMethod]
- public void ImplicitFileClassWithProtoDevelSuffix()
- {
- FileDescriptorProto proto = new FileDescriptorProto.Builder {Name = "foo_bar.protodevel"}.Build();
- FileDescriptor descriptor = FileDescriptor.BuildFrom(proto, null);
- Assert.AreEqual("FooBar", descriptor.CSharpOptions.UmbrellaClassname);
- }
-
- [TestMethod]
- public void ImplicitFileClassWithNoSuffix()
- {
- FileDescriptorProto proto = new FileDescriptorProto.Builder {Name = "foo_bar"}.Build();
- FileDescriptor descriptor = FileDescriptor.BuildFrom(proto, null);
- Assert.AreEqual("FooBar", descriptor.CSharpOptions.UmbrellaClassname);
- }
-
- [TestMethod]
- public void ImplicitFileClassWithDirectoryStructure()
- {
- FileDescriptorProto proto = new FileDescriptorProto.Builder {Name = "x/y/foo_bar"}.Build();
- FileDescriptor descriptor = FileDescriptor.BuildFrom(proto, null);
- Assert.AreEqual("FooBar", descriptor.CSharpOptions.UmbrellaClassname);
- }
- }
-}
\ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/Descriptors/MessageDescriptorTest.cs b/csharp/src/ProtocolBuffers.Test/Descriptors/MessageDescriptorTest.cs deleted file mode 100644 index 79033e6e..00000000 --- a/csharp/src/ProtocolBuffers.Test/Descriptors/MessageDescriptorTest.cs +++ /dev/null @@ -1,72 +0,0 @@ -#region Copyright notice and license
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc. All rights reserved.
-// http://github.com/jskeet/dotnet-protobufs/
-// Original C++/Java/Python code:
-// http://code.google.com/p/protobuf/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#endregion
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Google.ProtocolBuffers.TestProtos;
-
-namespace Google.ProtocolBuffers.Descriptors
-{
- [TestClass]
- public class MessageDescriptorTest
- {
- [TestMethod]
- public void FindPropertyWithDefaultName()
- {
- Assert.AreSame(OptionsMessage.Descriptor.FindFieldByNumber(OptionsMessage.NormalFieldNumber),
- OptionsMessage.Descriptor.FindFieldByPropertyName("Normal"));
- }
-
- [TestMethod]
- public void FindPropertyWithAutoModifiedName()
- {
- Assert.AreSame(OptionsMessage.Descriptor.FindFieldByNumber(OptionsMessage.OptionsMessage_FieldNumber),
- OptionsMessage.Descriptor.FindFieldByPropertyName("OptionsMessage_"));
- }
-
- [TestMethod]
- public void FindPropertyWithCustomizedName()
- {
- Assert.AreSame(OptionsMessage.Descriptor.FindFieldByNumber(OptionsMessage.CustomNameFieldNumber),
- OptionsMessage.Descriptor.FindFieldByPropertyName("CustomName"));
- }
-
- [TestMethod]
- public void FindPropertyWithInvalidName()
- {
- Assert.IsNull(OptionsMessage.Descriptor.FindFieldByPropertyName("Bogus"));
- }
- }
-}
\ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs b/csharp/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs index cea5da58..b443ea3a 100644 --- a/csharp/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs +++ b/csharp/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs @@ -32,4 +32,4 @@ using System.Runtime.InteropServices; // We don't really need CLSCompliance, but if the assembly builds with no warnings,
// that means the generator is okay.
-[assembly: CLSCompliant(true)]
\ No newline at end of file +[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 267fedc0..0dcdd1e6 100644 --- a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj +++ b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj @@ -86,10 +86,8 @@ <Compile Include="TestResources.cs" />
<Compile Include="TestRpcForMimeTypes.cs" />
<Compile Include="TestReaderForUrlEncoded.cs" />
- <Compile Include="CSharpOptionsTest.cs" />
<Compile Include="DeprecatedMemberTest.cs" />
<Compile Include="DescriptorsTest.cs" />
- <Compile Include="Descriptors\MessageDescriptorTest.cs" />
<Compile Include="DynamicMessageTest.cs" />
<Compile Include="ExtendableMessageTest.cs" />
<Compile Include="GeneratedBuilderTest.cs" />
|