diff options
| author | csharptest <roger@csharptest.net> | 2012-10-14 23:03:24 -0500 |
|---|---|---|
| committer | rogerk <devnull@localhost> | 2012-10-14 23:03:24 -0500 |
| commit | c9bce45a01cc8861ec7c88e84d947ed6ebc8f7d1 (patch) | |
| tree | 67b0bed46bb50ec47a383fc355db4a73d568b482 /src/ProtocolBuffers.Test | |
| parent | 9f787cc64e47333ea717681c874843b44fee60e7 (diff) | |
| download | protobuf-c9bce45a01cc8861ec7c88e84d947ed6ebc8f7d1.tar.gz protobuf-c9bce45a01cc8861ec7c88e84d947ed6ebc8f7d1.tar.bz2 protobuf-c9bce45a01cc8861ec7c88e84d947ed6ebc8f7d1.zip | |
Portability Changes -
Removing uses of Enum to IConvertible from CodedIOStreams,
Removed MessageStreamIterator.FromFile on non-client profiles,
Removed use of Path.GetFileName,
Removed uses of Converter<T1, T2> delegate,
Removed Guid/DispId options from test protos
Diffstat (limited to 'src/ProtocolBuffers.Test')
| -rw-r--r-- | src/ProtocolBuffers.Test/DeprecatedMemberTest.cs | 2 | ||||
| -rw-r--r-- | src/ProtocolBuffers.Test/GeneratedBuilderTest.cs | 4 | ||||
| -rw-r--r-- | src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs | 13 |
3 files changed, 9 insertions, 10 deletions
diff --git a/src/ProtocolBuffers.Test/DeprecatedMemberTest.cs b/src/ProtocolBuffers.Test/DeprecatedMemberTest.cs index 6035c405..0901f043 100644 --- a/src/ProtocolBuffers.Test/DeprecatedMemberTest.cs +++ b/src/ProtocolBuffers.Test/DeprecatedMemberTest.cs @@ -10,7 +10,7 @@ namespace Google.ProtocolBuffers [TestClass]
public class DeprecatedMemberTest
{
- private static void AssertIsDeprecated(ICustomAttributeProvider member)
+ private static void AssertIsDeprecated(MemberInfo member)
{
Assert.IsNotNull(member);
Assert.IsTrue(member.IsDefined(typeof(ObsoleteAttribute), false), "Member not obsolete: " + member);
diff --git a/src/ProtocolBuffers.Test/GeneratedBuilderTest.cs b/src/ProtocolBuffers.Test/GeneratedBuilderTest.cs index cd870054..1dcb1c21 100644 --- a/src/ProtocolBuffers.Test/GeneratedBuilderTest.cs +++ b/src/ProtocolBuffers.Test/GeneratedBuilderTest.cs @@ -54,7 +54,9 @@ namespace Google.ProtocolBuffers b.AddRangeRepeatedForeignEnum(new OneTimeEnumerator<ForeignEnum>(ForeignEnum.FOREIGN_BAR));
}
- private static void AssertThrows<T>(System.Threading.ThreadStart method) where T : Exception
+ private delegate void TestMethod();
+
+ private static void AssertThrows<T>(TestMethod method) where T : Exception
{
try
{
diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs index 8830b82d..ecffc6f8 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs @@ -39,12 +39,11 @@ namespace Google.ProtocolBuffers.TestProtos { "dHMYASADKAsyGi5TZWFyY2hSZXNwb25zZS5SZXN1bHRJdGVtGicKClJlc3Vs" +
"dEl0ZW0SCwoDdXJsGAEgAigJEgwKBG5hbWUYAiABKAkiUgoTUmVmaW5lU2Vh" +
"cmNoUmVxdWVzdBIQCghDcml0ZXJpYRgBIAMoCRIpChBwcmV2aW91c19yZXN1" +
- "bHRzGAIgAigLMg8uU2VhcmNoUmVzcG9uc2UypQEKDVNlYXJjaFNlcnZpY2US" +
- "MAoGU2VhcmNoEg4uU2VhcmNoUmVxdWVzdBoPLlNlYXJjaFJlc3BvbnNlIgXC" +
- "PgIIBRI1CgxSZWZpbmVTZWFyY2gSFC5SZWZpbmVTZWFyY2hSZXF1ZXN0Gg8u" +
- "U2VhcmNoUmVzcG9uc2UaK8I+KAome0E2NUYwOTI1LUZEMTEtNGY5NC1CMTY2" +
- "LTg5QUM0RjAyNzIwNX1CP0gBwj46CiFHb29nbGUuUHJvdG9jb2xCdWZmZXJz" +
- "LlRlc3RQcm90b3MSElVuaXRUZXN0UnBjSW50ZXJvcIgOAw==");
+ "bHRzGAIgAigLMg8uU2VhcmNoUmVzcG9uc2UycQoNU2VhcmNoU2VydmljZRIp" +
+ "CgZTZWFyY2gSDi5TZWFyY2hSZXF1ZXN0Gg8uU2VhcmNoUmVzcG9uc2USNQoM" +
+ "UmVmaW5lU2VhcmNoEhQuUmVmaW5lU2VhcmNoUmVxdWVzdBoPLlNlYXJjaFJl" +
+ "c3BvbnNlQj9IAcI+OgohR29vZ2xlLlByb3RvY29sQnVmZmVycy5UZXN0UHJv" +
+ "dG9zEhJVbml0VGVzdFJwY0ludGVyb3CIDgM=");
pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) {
descriptor = root;
internal__static_SearchRequest__Descriptor = Descriptor.MessageTypes[0];
@@ -1352,9 +1351,7 @@ namespace Google.ProtocolBuffers.TestProtos { #endregion
#region Services
- [global::System.Runtime.InteropServices.GuidAttribute("a65f0925-fd11-4f94-b166-89ac4f027205")]
public partial interface ISearchService {
- [global::System.Runtime.InteropServices.DispId(5)]
global::Google.ProtocolBuffers.TestProtos.SearchResponse Search(global::Google.ProtocolBuffers.TestProtos.SearchRequest searchRequest);
global::Google.ProtocolBuffers.TestProtos.SearchResponse RefineSearch(global::Google.ProtocolBuffers.TestProtos.RefineSearchRequest refineSearchRequest);
}
|