2009-12-03 Astushi Enomoto <[email protected]>

	* System.ServiceModel_test.dll.sources:
	  added HttpsTransportBindingElementTest.cs.

	* HttpsTransportBindingElement.cs, HttpChannelListener.cs :
	  added URI scheme check.

	* HttpsTransportBindingElementTest.cs : new test.


svn path=/trunk/mcs/; revision=147538

mcs/class/System.ServiceModel/ChangeLog

@@ -1,3 +1,8 @@
+2009-12-03  Astushi Enomoto  <[email protected]>
+
+	* System.ServiceModel_test.dll.sources:
+	  added HttpsTransportBindingElementTest.cs.
+
 2009-11-26  Astushi Enomoto  <[email protected]>
 
 	* net_2_1_raw_System.ServiceModel.dll.sources : fix file name case,

mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog

@@ -1,3 +1,8 @@
+2009-12-03  Atsushi Enomoto  <[email protected]>
+
+	* HttpsTransportBindingElement.cs, HttpChannelListener.cs :
+	  added URI scheme check.
+
 2009-12-03  Atsushi Enomoto  <[email protected]>
 
 	* TransportSecurityBindingElement.cs : fix 2.1 build.

mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpChannelListener.cs

@@ -110,6 +110,11 @@ namespace System.ServiceModel.Channels
 			BindingContext context)
 			: base (context)
 		{
+			// The null Uri check looks weird, but it seems the listener can be built without it.
+			// See HttpTransportBindingElementTest.BuildChannelListenerWithoutListenUri().
+			if (Uri != null && source.Scheme != Uri.Scheme)
+				throw new ArgumentException (String.Format ("Requested listen uri scheme must be {0}, but was {1}.", source.Scheme, Uri.Scheme));
+
 			foreach (BindingElement be in context.RemainingBindingElements) {
 				MessageEncodingBindingElement mbe = be as MessageEncodingBindingElement;
 				if (mbe != null) {

mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpsTransportBindingElement.cs

@@ -62,15 +62,10 @@ namespace System.ServiceModel.Channels
 			get { return Uri.UriSchemeHttps; }
 		}
 
-		[MonoTODO]
 		public override IChannelFactory<TChannel> BuildChannelFactory<TChannel> (
 			BindingContext context)
 		{
-#if NET_2_1
 			return base.BuildChannelFactory <TChannel> (context);
-#else
-			throw new NotImplementedException ();
-#endif
 		}
 
 #if !NET_2_1
@@ -79,7 +74,7 @@ namespace System.ServiceModel.Channels
 			BuildChannelListener<TChannel> (
 			BindingContext context)
 		{
-			throw new NotImplementedException ();
+			return base.BuildChannelListener <TChannel> (context);
 		}
 #endif
 

mcs/class/System.ServiceModel/System.ServiceModel_test.dll.sources

@@ -17,6 +17,7 @@ System.ServiceModel.Channels/HandlerBodyWriter.cs
 System.ServiceModel.Channels/HandlerTransportBindingElement.cs
 System.ServiceModel.Channels/HttpRequestMessagePropertyTest.cs
 System.ServiceModel.Channels/HttpTransportBindingElementTest.cs
+System.ServiceModel.Channels/HttpsTransportBindingElementTest.cs
 System.ServiceModel.Channels/InterceptorBindingElement.cs
 System.ServiceModel.Channels/InvalidBindingElement.cs
 System.ServiceModel.Channels/LocalClientSecuritySettingsTest.cs

mcs/class/System.ServiceModel/Test/System.ServiceModel.Channels/ChangeLog

@@ -1,3 +1,7 @@
+2009-12-03  Atsushi Enomoto  <[email protected]>
+
+	* HttpsTransportBindingElementTest.cs : new test.
+
 2009-09-14  Atsushi Enomoto  <[email protected]>
 
 	* MessagePropertiesTest.cs : new test.

mcs/class/System.ServiceModel/Test/System.ServiceModel.Channels/HttpsTransportBindingElementTest.cs

@@ -0,0 +1,66 @@
+//
+// HttpTransportBindingElementTest.cs
+//
+// Author:
+//	Atsushi Enomoto <[email protected]>
+//
+// Copyright (C) 2005 Novell, Inc.  http://www.novell.com
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Net;
+using System.Net.Security;
+using System.Reflection;
+using System.ServiceModel;
+using System.ServiceModel.Channels;
+using System.ServiceModel.Description;
+using System.Threading;
+using System.Xml;
+using NUnit.Framework;
+
+namespace MonoTests.System.ServiceModel.Channels
+{
+	[TestFixture]
+	public class HttpsTransportBindingElementTest
+	{
+		[Test]
+		[ExpectedException (typeof (ArgumentException))]
+		public void BuildChannelFactoryForHttpEndpoint ()
+		{
+			var b = new BasicHttpBinding ();
+			b.Security.Mode = BasicHttpSecurityMode.Transport;
+			var cf = b.BuildChannelFactory<IRequestChannel> ();
+			cf.Open ();
+			cf.CreateChannel (new EndpointAddress ("http://localhost:8080"));
+		}
+
+		[Test]
+		[ExpectedException (typeof (ArgumentException))]
+		public void BuildChannelListenerForHttpEndpoint ()
+		{
+			var b = new BasicHttpBinding ();
+			b.Security.Mode = BasicHttpSecurityMode.Transport;
+			b.BuildChannelListener<IReplyChannel> (new Uri ("http://localhost:8080"));
+		}
+	}
+}