Merge pull request #1323 from StephenMcConnel/bug-23591

[mono.git] / mcs / class / System.Runtime.Remoting / Test / HttpCalls.cs

diff --git a/mcs/class/System.Runtime.Remoting/Test/HttpCalls.cs b/mcs/class/System.Runtime.Remoting/Test/HttpCalls.cs
index 4e3cf32b7c5c374407b91e44533d732a90cd5ce6..439aa6ea14ea0c899cd70090c629bef24bf3bf80 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/Test/HttpCalls.cs
+++ b/mcs/class/System.Runtime.Remoting/Test/HttpCalls.cs
@@ -1,67 +1,96 @@
-//
-// MonoTests.Remoting.HttpCalls.cs
-//
-// Author: Lluis Sanchez Gual (lluis@ximian.com)
-//
-// 2003 (C) Copyright, Ximian, Inc.
-//
-
-using System;
-using System.Runtime.Remoting;
-using System.Runtime.Remoting.Channels;
-using System.Runtime.Remoting.Channels.Http;
-using NUnit.Framework;
-
-namespace MonoTests.Remoting
-{
-       [TestFixture]
-       public class HttpSyncCallTest : SyncCallTest
-       {
-               public override ChannelManager CreateChannelManager ()
-               {
-                       return new HttpChannelManager ();
-               }
-       }
-
-       [TestFixture]
-       public class HttpAsyncCallTest : AsyncCallTest
-       {
-               public override ChannelManager CreateChannelManager ()
-               {
-                       return new HttpChannelManager ();
-               }
-       }
-
-       [TestFixture]
-       public class HttpReflectionCallTest : ReflectionCallTest
-       {
-               public override ChannelManager CreateChannelManager ()
-               {
-                       return new HttpChannelManager ();
-               }
-       }
-
-       [TestFixture]
-       public class HttpDelegateCallTest : DelegateCallTest
-       {
-               public override ChannelManager CreateChannelManager ()
-               {
-                       return new HttpChannelManager ();
-               }
-       }
-
-       [Serializable]
-       public class HttpChannelManager : ChannelManager
-       {
-               public override IChannelSender CreateClientChannel ()
-               {
-                       return new HttpChannel ();
-               }
-
-               public override IChannelReceiver CreateServerChannel ()
-               {
-                       return new HttpChannel (0);
-               }
-       }
-}
-
+//\r
+// MonoTests.Remoting.HttpCalls.cs\r
+//\r
+// Author: Lluis Sanchez Gual (lluis@ximian.com)\r
+//\r
+// 2003 (C) Copyright, Ximian, Inc.\r
+//\r
+\r
+using System;\r
+using System.Collections;\r
+using System.Runtime.Remoting;\r
+using System.Runtime.Remoting.Channels;\r
+using System.Runtime.Remoting.Channels.Http;\r
+using NUnit.Framework;\r
+\r
+namespace MonoTests.Remoting\r
+{\r
+       //[TestFixture]\r
+       public class HttpSyncCallTest : SyncCallTest\r
+       {\r
+               public override ChannelManager CreateChannelManager ()\r
+               {\r
+                       return new HttpChannelManager ();\r
+               }\r
+       }\r
+\r
+       //[TestFixture]\r
+       public class HttpAsyncCallTest : AsyncCallTest\r
+       {\r
+               public override ChannelManager CreateChannelManager ()\r
+               {\r
+                       return new HttpChannelManager ();\r
+               }\r
+       }\r
+\r
+       //[TestFixture]\r
+       public class HttpReflectionCallTest : ReflectionCallTest\r
+       {\r
+               public override ChannelManager CreateChannelManager ()\r
+               {\r
+                       return new HttpChannelManager ();\r
+               }\r
+       }\r
+\r
+       //[TestFixture]\r
+       public class HttpDelegateCallTest : DelegateCallTest\r
+       {\r
+               public override ChannelManager CreateChannelManager ()\r
+               {\r
+                       return new HttpChannelManager ();\r
+               }\r
+       }\r
+       \r
+       //[TestFixture]\r
+       public class HttpBinarySyncCallTest : SyncCallTest\r
+       {\r
+               public override ChannelManager CreateChannelManager ()\r
+               {\r
+                       return new HttpChannelManager ();\r
+               }\r
+       }\r
+\r
+       [Serializable]\r
+       public class HttpChannelManager : ChannelManager\r
+       {\r
+               public override IChannelSender CreateClientChannel ()\r
+               {\r
+                       Hashtable options = new Hashtable ();\r
+                       options ["timeout"] = 10000; // 10s\r
+                       return new HttpClientChannel (options, null);\r
+               }\r
+\r
+               public override IChannelReceiver CreateServerChannel ()\r
+               {\r
+                       return new HttpChannel (0);\r
+               }\r
+       }\r
+       \r
+       [Serializable]\r
+       public class HttpBinaryChannelManager : ChannelManager\r
+       {\r
+               public override IChannelSender CreateClientChannel ()\r
+               {\r
+                       Hashtable options = new Hashtable ();\r
+                       options ["timeout"] = 10000; // 10s\r
+                       options ["name"] = "binary http channel";\r
+                       return new HttpClientChannel (options,  new BinaryClientFormatterSinkProvider ());\r
+               }\r
+\r
+               public override IChannelReceiver CreateServerChannel ()\r
+               {\r
+                       return new HttpChannel (0);\r
+               }\r
+       }\r
+}\r
+\r