X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Runtime.Remoting%2FTest%2FHttpCalls.cs;h=439aa6ea14ea0c899cd70090c629bef24bf3bf80;hb=fd556a44fef6fad7693fad94694d050e300b4f3f;hp=4e3cf32b7c5c374407b91e44533d732a90cd5ce6;hpb=1c14f1ee6d701510c15499d71fc2b324151a8629;p=mono.git

diff --git a/mcs/class/System.Runtime.Remoting/Test/HttpCalls.cs b/mcs/class/System.Runtime.Remoting/Test/HttpCalls.cs
index 4e3cf32b7c5..439aa6ea14e 100644
--- 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);
-		}
-	}
-}
-
+//
+// MonoTests.Remoting.HttpCalls.cs
+//
+// Author: Lluis Sanchez Gual (lluis@ximian.com)
+//
+// 2003 (C) Copyright, Ximian, Inc.
+//
+
+using System;
+using System.Collections;
+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 ();
+		}
+	}
+	
+	//[TestFixture]
+	public class HttpBinarySyncCallTest : SyncCallTest
+	{
+		public override ChannelManager CreateChannelManager ()
+		{
+			return new HttpChannelManager ();
+		}
+	}
+
+	[Serializable]
+	public class HttpChannelManager : ChannelManager
+	{
+		public override IChannelSender CreateClientChannel ()
+		{
+			Hashtable options = new Hashtable ();
+			options ["timeout"] = 10000; // 10s
+			return new HttpClientChannel (options, null);
+		}
+
+		public override IChannelReceiver CreateServerChannel ()
+		{
+			return new HttpChannel (0);
+		}
+	}
+	
+	[Serializable]
+	public class HttpBinaryChannelManager : ChannelManager
+	{
+		public override IChannelSender CreateClientChannel ()
+		{
+			Hashtable options = new Hashtable ();
+			options ["timeout"] = 10000; // 10s
+			options ["name"] = "binary http channel";
+			return new HttpClientChannel (options,  new BinaryClientFormatterSinkProvider ());
+		}
+
+		public override IChannelReceiver CreateServerChannel ()
+		{
+			return new HttpChannel (0);
+		}
+	}
+}
+