Imported Upstream version 3.6.0

Former-commit-id: da6be194a6b1221998fc28233f2503bd61dd9d14

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

@@ -0,0 +1,32 @@
+2010-05-19  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* PeerResolverSerializationTest.cs :
+	  verify deserialized address count too.
+
+2010-04-05  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* CustomPeerResolverServiceTest.cs : enabled all disabled tests.
+
+2009-12-02  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* CustomPeerResolverServiceTest.cs :
+	  I have to disable a lot of connective tests that somehow blocks
+	  test runs. No idea why it started to happen though.
+	  (It internally uses HTTP binding, which is the indirect source of
+	  the problem here.)
+
+2009-07-14  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* PeerResolverSerializationTest.cs : fix test name/namespace.
+	  add HasBody() test.
+
+2009-05-25  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* PeerResolverSerializationTest.cs : new test for general
+	  serialization tests.
+
+2009-04-07  Atsushi Enomoto  <atsushi@ximian.com>
+
+	(bah, bad manner; no ChangeLog previously.)
+
+	* CustomPeerResolverServiceTest.cs : added contract check.

mcs/class/System.ServiceModel/Test/System.ServiceModel.PeerResolvers/CustomPeerResolverServiceTest.cs

@@ -0,0 +1,206 @@
+// 
+// CustomPeerResolverServiceTest.cs
+// 
+// Author: 
+//	 Marcos Cobena (marcoscobena@gmail.com)
+// 
+// Copyright 2007 Marcos Cobena (http://www.youcannoteatbits.org/)
+// 
+
+using System;
+using System.Collections.Generic;
+using System.ServiceModel;
+using System.ServiceModel.Description;
+using System.ServiceModel.PeerResolvers;
+using System.Text;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.ServiceModel.PeerResolvers
+{
+	[TestFixture]
+	public class CustomPeerResolverServiceTest
+	{
+		private CustomPeerResolverService cprs;
+
+		[SetUp]
+		protected void SetUp ()
+		{
+			cprs = new CustomPeerResolverService ();
+		}
+
+		[Test]
+		public void CloseTest ()
+		{
+			cprs.Open ();
+			cprs.Close ();
+		}
+
+		[Test]
+		[ExpectedException (typeof (InvalidOperationException))]
+		public void CloseTest1 ()
+		{
+			cprs.Close ();
+		}
+
+		[Test]
+		[ExpectedException (typeof (InvalidOperationException))]
+		public void GetServiceSettingsTest ()
+		{
+			ServiceSettingsResponseInfo ssri;
+
+			ssri = cprs.GetServiceSettings ();
+		}
+
+		[Test]
+		[ExpectedException (typeof (ArgumentException))]
+		public void OpenTest1 ()
+		{
+			cprs.CleanupInterval = TimeSpan.Zero;
+			cprs.Open ();
+		}
+
+		[Test]
+		[ExpectedException (typeof (ArgumentException))]
+		public void OpenTest2 ()
+		{
+			cprs.RefreshInterval = TimeSpan.Zero;
+			cprs.Open ();
+		}
+
+		[Test]
+		[ExpectedException (typeof (ArgumentException))]
+		public void OpenTest3 ()
+		{
+			cprs.CleanupInterval = TimeSpan.Zero;
+			cprs.RefreshInterval = TimeSpan.Zero;
+			cprs.Open ();
+		}
+
+		[Test]
+		[ExpectedException (typeof (InvalidOperationException))]
+		public void OpenTest4 ()
+		{
+			cprs.Open ();
+			try {
+				cprs.Open ();
+			} finally {
+				cprs.Close ();
+			}
+		}
+
+		[Test]
+		[ExpectedException (typeof (ArgumentException))]
+		public void RefreshTest ()
+		{
+			cprs.Refresh (null);
+		}
+
+		[Test]
+		[ExpectedException (typeof (InvalidOperationException))]
+		public void RefreshTest1 ()
+		{
+			cprs.Refresh (new RefreshInfo ());
+		}
+
+		//[Test]
+		//public void RefreshTest2 ()
+		//{
+		//	cprs.Open ();
+		//	cprs.Refresh(new RefreshInfo ("foo", new Guid ()));
+		//}
+
+		[Test]
+		[ExpectedException (typeof( ArgumentException))]
+		public void RegisterTest ()
+		{
+			cprs.Register (null);
+		}
+
+		[Test]
+		[ExpectedException (typeof (InvalidOperationException))]
+		public void RegisterTest1 ()
+		{
+			cprs.Register (new RegisterInfo ());
+		}
+
+		//[Test]
+		//public void RegisterTest2 ()
+		//{
+		//	cprs.Open ();
+		//	cprs.Register(new RegisterInfo ());
+		//}
+
+		[Test]
+		[ExpectedException (typeof (ArgumentException))]
+		public void ResolveTest ()
+		{
+			cprs.Resolve (null);
+		}
+
+		[Test]
+		[ExpectedException (typeof (InvalidOperationException))]
+		public void ResolveTest1 ()
+		{
+			cprs.Resolve (new ResolveInfo ());
+		}
+
+		//[Test]
+		//public void ResolveTest2 ()
+		//{
+		//	cprs.Open ();
+		//	cprs.Resolve (new ResolveInfo ());
+		//}
+
+		[Test]
+		[ExpectedException (typeof (ArgumentException))]
+		public void UnregisterTest ()
+		{
+			cprs.Unregister (null);
+		}
+
+		[Test]
+		[ExpectedException (typeof (InvalidOperationException))]
+		public void UnregisterTest1 ()
+		{
+			cprs.Unregister (new UnregisterInfo ());
+		}
+
+		//[Test]
+		//public void UnregisterTest2 ()
+		//{
+		//	cprs.Open ();
+		//	cprs.Unregister (new UnregisterInfo ());
+		//}
+
+		[Test]
+		[ExpectedException (typeof (ArgumentException))]
+		public void UpdateTest ()
+		{
+			cprs.Update (null);
+		}
+
+		[Test]
+		[ExpectedException (typeof (InvalidOperationException))]
+		public void UpdateTest1 ()
+		{
+			cprs.Update (new UpdateInfo ());
+		}
+
+		//[Test]
+		//public void UpdateTest2 ()
+		//{
+		//	cprs.Open ();
+		//	cprs.Update (new UpdateInfo ());
+		//}
+
+		[Test]
+		public void Contract ()
+		{
+			var cd = ContractDescription.GetContract (typeof (IPeerResolverContract));
+			Assert.IsNull (cd.CallbackContractType, "#1");
+			Assert.AreEqual (typeof (IPeerResolverContract), cd.ContractType, "#2");
+			Assert.AreEqual (SessionMode.Allowed, cd.SessionMode, "#3");
+		}
+	}
+}

mcs/class/System.ServiceModel/Test/System.ServiceModel.PeerResolvers/PeerResolverSerializationTest.cs

@@ -0,0 +1,102 @@
+//
+// PeerResolversSerializationTest.cs
+//
+// Author:
+//	Atsushi Enomoto <atsushi@ximian.com>
+//
+// Copyright (C) 2009 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.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Net;
+using System.Runtime.Serialization;
+using System.ServiceModel;
+using System.ServiceModel.Channels;
+using System.ServiceModel.PeerResolvers;
+using System.Xml;
+using NUnit.Framework;
+
+namespace MonoTests.System.ServiceModel.PeerResolvers
+{
+
+[TestFixture]
+public class PeerResolverSerializationTest
+{
+	[Test]
+	public void HasBody ()
+	{
+		Assert.IsTrue (new RegisterInfo ().HasBody (), "#1");
+		Assert.IsTrue (new RegisterResponseInfo ().HasBody (), "#2");
+		Assert.IsTrue (new ResolveInfo ().HasBody (), "#3");
+		Assert.IsTrue (new ResolveResponseInfo ().HasBody (), "#4");
+		Assert.IsTrue (new RefreshInfo ().HasBody (), "#5");
+		Assert.IsTrue (new RefreshResponseInfo ().HasBody (), "#6");
+	}
+
+	[Test]
+	public void ResolveResponseInfo ()
+	{
+		var ser = new DataContractSerializer (typeof (ResolveResponseInfo));
+		var rri = new ResolveResponseInfo ();
+		var pna = new PeerNodeAddress (
+			new EndpointAddress ("http://localhost:8080"),
+			new ReadOnlyCollection<IPAddress> (new IPAddress [0]));
+		rri.Addresses = new List<PeerNodeAddress> ();
+		rri.Addresses.Add (pna);
+		var sw = new StringWriter ();
+		using (var xw = XmlWriter.Create (sw))
+			ser.WriteObject (xw, rri);
+		rri = (ResolveResponseInfo) ser.ReadObject (XmlReader.Create (new StringReader (sw.ToString ())));
+		Assert.AreEqual (1, rri.Addresses.Count, "#1");
+	}
+}
+
+/*
+[DataContract]
+public class ResolveResponseInfo
+{
+	public ResolveResponseInfo ()
+	{
+		Addresses = new List<PeerNodeAddress> ();
+	}
+
+	[DataMember]
+	public IList<PeerNodeAddress> Addresses { get; set; }
+}
+
+public class PeerNodeAddress
+{
+	public PeerNodeAddress (EndpointAddress ea, IList<IPAddress> al)
+	{
+		Endpoint = ea;
+		Addresses = al;
+	}
+
+	public EndpointAddress Endpoint { get; set; }
+	public IList<IPAddress> Addresses { get; set; }
+}
+*/
+
+}