Recent ContractDescription fix uncovered wrong contracts in discovery.

6 files changed, 4 insertions, 177 deletions

diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Version11/IDiscoveryTargetContract11.cs b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Version11/IDiscoveryTargetContract11.cs
index 73eb01348b4..323dddf4562 100644
--- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Version11/IDiscoveryTargetContract11.cs
+++ b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Version11/IDiscoveryTargetContract11.cs
@@ -41,21 +41,11 @@ namespace System.ServiceModel.Discovery.Version11
 
 		void EndFind (IAsyncResult result);
 
-		[OperationContract (Name = "ProbeMatches11", Action = MessageContracts11.ProbeMatchAction, AsyncPattern = true, IsOneWay = true)]
-		IAsyncResult BeginReplyFind (MessageContracts11.FindResponse message, AsyncCallback callback, object state);
-
-		void EndReplyFind (IAsyncResult result);
-
 		[OperationContract (Name = "Resolve11", Action = MessageContracts11.ResolveAction, AsyncPattern = true, IsOneWay = true)]
 		IAsyncResult BeginResolve (MessageContracts11.ResolveRequest message, AsyncCallback callback, object state);
 
 		void EndResolve (IAsyncResult result);
 
-		[OperationContract (Name = "ResolveMatches11", Action = MessageContracts11.ResolveMatchAction, AsyncPattern = true, IsOneWay = true)]
-		IAsyncResult BeginReplyResolve (MessageContracts11.ResolveResponse message, AsyncCallback callback, object state);
-
-		void EndReplyResolve (IAsyncResult result);
-
 		[OperationContract (Name = "Hello11", Action = MessageContracts11.HelloAction, IsOneWay = true, AsyncPattern = true)]
 		IAsyncResult BeginOnlineAnnouncement (MessageContracts11.OnlineAnnouncement message, AsyncCallback callback, object state);
 
diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.VersionApril2005/IDiscoveryTargetContractApril2005.cs b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.VersionApril2005/IDiscoveryTargetContractApril2005.cs
index baf40512398..f869fc19328 100644
--- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.VersionApril2005/IDiscoveryTargetContractApril2005.cs
+++ b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.VersionApril2005/IDiscoveryTargetContractApril2005.cs
@@ -41,21 +41,11 @@ namespace System.ServiceModel.Discovery.VersionApril2005
 
 		void EndFind (IAsyncResult result);
 
-		[OperationContract (Name = "ProbeMatchesApril2005", Action = MessageContractsApril2005.ProbeMatchAction, AsyncPattern = true, IsOneWay = true)]
-		IAsyncResult BeginReplyFind (MessageContractsApril2005.FindResponse message, AsyncCallback callback, object state);
-
-		void EndReplyFind (IAsyncResult result);
-
 		[OperationContract (Name = "ResolveApril2005", Action = MessageContractsApril2005.ResolveAction, AsyncPattern = true, IsOneWay = true)]
 		IAsyncResult BeginResolve (MessageContractsApril2005.ResolveRequest message, AsyncCallback callback, object state);
 
 		void EndResolve (IAsyncResult result);
 
-		[OperationContract (Name = "ResolveMatchesApril2005", Action = MessageContractsApril2005.ResolveMatchAction, AsyncPattern = true, IsOneWay = true)]
-		IAsyncResult BeginReplyResolve (MessageContractsApril2005.ResolveResponse message, AsyncCallback callback, object state);
-
-		void EndReplyResolve (IAsyncResult result);
-
 		[OperationContract (Name = "HelloApril2005", Action = MessageContractsApril2005.HelloAction, IsOneWay = true, AsyncPattern = true)]
 		IAsyncResult BeginOnlineAnnouncement (MessageContractsApril2005.OnlineAnnouncement message, AsyncCallback callback, object state);
 
diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.VersionCD1/IDiscoveryTargetContractCD1.cs b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.VersionCD1/IDiscoveryTargetContractCD1.cs
index a8f65de7390..187d1ceb971 100644
--- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.VersionCD1/IDiscoveryTargetContractCD1.cs
+++ b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.VersionCD1/IDiscoveryTargetContractCD1.cs
@@ -41,21 +41,11 @@ namespace System.ServiceModel.Discovery.VersionCD1
 
 		void EndFind (IAsyncResult result);
 
-		[OperationContract (Name = "ProbeMatchesCD1", Action = MessageContractsCD1.ProbeMatchAction, AsyncPattern = true, IsOneWay = true)]
-		IAsyncResult BeginReplyFind (MessageContractsCD1.FindResponse message, AsyncCallback callback, object state);
-
-		void EndReplyFind (IAsyncResult result);
-
 		[OperationContract (Name = "ResolveCD1", Action = MessageContractsCD1.ResolveAction, AsyncPattern = true, IsOneWay = true)]
 		IAsyncResult BeginResolve (MessageContractsCD1.ResolveRequest message, AsyncCallback callback, object state);
 
 		void EndResolve (IAsyncResult result);
 
-		[OperationContract (Name = "ResolveMatchesCD1", Action = MessageContractsCD1.ResolveMatchAction, AsyncPattern = true, IsOneWay = true)]
-		IAsyncResult BeginReplyResolve (MessageContractsCD1.ResolveResponse message, AsyncCallback callback, object state);
-
-		void EndReplyResolve (IAsyncResult result);
-
 		[OperationContract (Name = "HelloCD1", Action = MessageContractsCD1.HelloAction, IsOneWay = true, AsyncPattern = true)]
 		IAsyncResult BeginOnlineAnnouncement (MessageContractsCD1.OnlineAnnouncement message, AsyncCallback callback, object state);
 
diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery/DiscoveryProxy.cs b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery/DiscoveryProxy.cs
index 46c4143e3fa..f430885380b 100755
--- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery/DiscoveryProxy.cs
+++ b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery/DiscoveryProxy.cs
@@ -144,18 +144,6 @@ namespace System.ServiceModel.Discovery
 			OnEndFind (result);
 		}
 
-		IAsyncResult IDiscoveryTargetContract11.BeginReplyFind (MessageContracts11.FindResponse message, AsyncCallback callback, object state)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
-		void IDiscoveryTargetContract11.EndReplyFind (IAsyncResult result)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
 		IAsyncResult IDiscoveryTargetContract11.BeginResolve (MessageContracts11.ResolveRequest message, AsyncCallback callback, object state)
 		{
 			return OnBeginResolve (message.Body.ToResolveCriteria (), callback, state);
@@ -166,18 +154,6 @@ namespace System.ServiceModel.Discovery
 			OnEndResolve (result);
 		}
 
-		IAsyncResult IDiscoveryTargetContract11.BeginReplyResolve (MessageContracts11.ResolveResponse message, AsyncCallback callback, object state)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
-		void IDiscoveryTargetContract11.EndReplyResolve (IAsyncResult result)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
 		IAsyncResult IDiscoveryTargetContract11.BeginOnlineAnnouncement (MessageContracts11.OnlineAnnouncement msg, AsyncCallback callback, object state)
 		{
 			var edm = msg.EndpointDiscoveryMetadata != null ? msg.EndpointDiscoveryMetadata.ToEndpointDiscoveryMetadata () : null;
@@ -200,18 +176,6 @@ namespace System.ServiceModel.Discovery
 			OnEndFind (result);
 		}
 
-		IAsyncResult IDiscoveryTargetContractApril2005.BeginReplyFind (MessageContractsApril2005.FindResponse message, AsyncCallback callback, object state)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
-		void IDiscoveryTargetContractApril2005.EndReplyFind (IAsyncResult result)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
 		IAsyncResult IDiscoveryTargetContractApril2005.BeginResolve (MessageContractsApril2005.ResolveRequest message, AsyncCallback callback, object state)
 		{
 			return OnBeginResolve (message.Body.ToResolveCriteria (), callback, state);
@@ -222,18 +186,6 @@ namespace System.ServiceModel.Discovery
 			OnEndResolve (result);
 		}
 
-		IAsyncResult IDiscoveryTargetContractApril2005.BeginReplyResolve (MessageContractsApril2005.ResolveResponse message, AsyncCallback callback, object state)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
-		void IDiscoveryTargetContractApril2005.EndReplyResolve (IAsyncResult result)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
 		IAsyncResult IDiscoveryTargetContractApril2005.BeginOnlineAnnouncement (MessageContractsApril2005.OnlineAnnouncement msg, AsyncCallback callback, object state)
 		{
 			var edm = msg.EndpointDiscoveryMetadata != null ? msg.EndpointDiscoveryMetadata.ToEndpointDiscoveryMetadata () : null;
@@ -256,18 +208,6 @@ namespace System.ServiceModel.Discovery
 			OnEndFind (result);
 		}
 
-		IAsyncResult IDiscoveryTargetContractCD1.BeginReplyFind (MessageContractsCD1.FindResponse message, AsyncCallback callback, object state)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
-		void IDiscoveryTargetContractCD1.EndReplyFind (IAsyncResult result)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
 		IAsyncResult IDiscoveryTargetContractCD1.BeginResolve (MessageContractsCD1.ResolveRequest message, AsyncCallback callback, object state)
 		{
 			return OnBeginResolve (message.Body.ToResolveCriteria (), callback, state);
@@ -278,18 +218,6 @@ namespace System.ServiceModel.Discovery
 			OnEndResolve (result);
 		}
 
-		IAsyncResult IDiscoveryTargetContractCD1.BeginReplyResolve (MessageContractsCD1.ResolveResponse message, AsyncCallback callback, object state)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
-		void IDiscoveryTargetContractCD1.EndReplyResolve (IAsyncResult result)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
 		IAsyncResult IDiscoveryTargetContractCD1.BeginOnlineAnnouncement (MessageContractsCD1.OnlineAnnouncement msg, AsyncCallback callback, object state)
 		{
 			var edm = msg.EndpointDiscoveryMetadata != null ? msg.EndpointDiscoveryMetadata.ToEndpointDiscoveryMetadata () : null;
diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery/DiscoveryService.cs b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery/DiscoveryService.cs
index 428de8cf55f..4e9b2c64f07 100755
--- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery/DiscoveryService.cs
+++ b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery/DiscoveryService.cs
@@ -189,18 +189,6 @@ namespace System.ServiceModel.Discovery
 			cb.ReplyFind (CreateFindResponse11 ());
 		}
 
-		IAsyncResult IDiscoveryTargetContract11.BeginReplyFind (MessageContracts11.FindResponse message, AsyncCallback callback, object state)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
-		void IDiscoveryTargetContract11.EndReplyFind (IAsyncResult result)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
 		IAsyncResult IDiscoveryTargetContract11.BeginResolve (MessageContracts11.ResolveRequest message, AsyncCallback callback, object state)
 		{
 			return OnBeginResolve (message.Body.ToResolveCriteria (), callback, state);
@@ -211,18 +199,6 @@ namespace System.ServiceModel.Discovery
 			OnEndResolve (result);
 		}
 
-		IAsyncResult IDiscoveryTargetContract11.BeginReplyResolve (MessageContracts11.ResolveResponse message, AsyncCallback callback, object state)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
-		void IDiscoveryTargetContract11.EndReplyResolve (IAsyncResult result)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
 		IAsyncResult IDiscoveryTargetContract11.BeginOnlineAnnouncement (MessageContracts11.OnlineAnnouncement message, AsyncCallback callback, object state)
 		{
 			// is it expected to be invoked??
@@ -249,18 +225,6 @@ namespace System.ServiceModel.Discovery
 			cb.ReplyFind (CreateFindResponseApril2005 ());
 		}
 
-		IAsyncResult IDiscoveryTargetContractApril2005.BeginReplyFind (MessageContractsApril2005.FindResponse message, AsyncCallback callback, object state)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
-		void IDiscoveryTargetContractApril2005.EndReplyFind (IAsyncResult result)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
 		IAsyncResult IDiscoveryTargetContractApril2005.BeginResolve (MessageContractsApril2005.ResolveRequest message, AsyncCallback callback, object state)
 		{
 			return OnBeginResolve (message.Body.ToResolveCriteria (), callback, state);
@@ -271,18 +235,6 @@ namespace System.ServiceModel.Discovery
 			OnEndResolve (result);
 		}
 
-		IAsyncResult IDiscoveryTargetContractApril2005.BeginReplyResolve (MessageContractsApril2005.ResolveResponse message, AsyncCallback callback, object state)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
-		void IDiscoveryTargetContractApril2005.EndReplyResolve (IAsyncResult result)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
 		IAsyncResult IDiscoveryTargetContractApril2005.BeginOnlineAnnouncement (MessageContractsApril2005.OnlineAnnouncement message, AsyncCallback callback, object state)
 		{
 			// is it expected to be invoked??
@@ -309,18 +261,6 @@ namespace System.ServiceModel.Discovery
 			cb.ReplyFind (CreateFindResponseCD1 ());
 		}
 
-		IAsyncResult IDiscoveryTargetContractCD1.BeginReplyFind (MessageContractsCD1.FindResponse message, AsyncCallback callback, object state)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
-		void IDiscoveryTargetContractCD1.EndReplyFind (IAsyncResult result)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
 		IAsyncResult IDiscoveryTargetContractCD1.BeginResolve (MessageContractsCD1.ResolveRequest message, AsyncCallback callback, object state)
 		{
 			return OnBeginResolve (message.Body.ToResolveCriteria (), callback, state);
@@ -331,18 +271,6 @@ namespace System.ServiceModel.Discovery
 			OnEndResolve (result);
 		}
 
-		IAsyncResult IDiscoveryTargetContractCD1.BeginReplyResolve (MessageContractsCD1.ResolveResponse message, AsyncCallback callback, object state)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
-		void IDiscoveryTargetContractCD1.EndReplyResolve (IAsyncResult result)
-		{
-			// is it expected to be invoked??
-			throw new NotImplementedException ();
-		}
-
 		IAsyncResult IDiscoveryTargetContractCD1.BeginOnlineAnnouncement (MessageContractsCD1.OnlineAnnouncement message, AsyncCallback callback, object state)
 		{
 			// is it expected to be invoked??
diff --git a/mcs/class/System.ServiceModel.Discovery/Test/System.ServiceModel.Discovery/DiscoveryClientBindingElementTest.cs b/mcs/class/System.ServiceModel.Discovery/Test/System.ServiceModel.Discovery/DiscoveryClientBindingElementTest.cs
index 3f7c0a93d6d..8b76e0bc2b6 100644
--- a/mcs/class/System.ServiceModel.Discovery/Test/System.ServiceModel.Discovery/DiscoveryClientBindingElementTest.cs
+++ b/mcs/class/System.ServiceModel.Discovery/Test/System.ServiceModel.Discovery/DiscoveryClientBindingElementTest.cs
@@ -144,7 +144,7 @@ namespace MonoTests.System.ServiceModel.Discovery
 			Assert.AreEqual (DiscoveryClientBindingElement.DiscoveryEndpointAddress, ch.RemoteAddress, "#1");
 		}
 
-		// This test takes a while, so I in face don't want to enable it ...
+		// This test takes a while, so I in fact don't want to enable it ...
 		[Test]
 		[ExpectedException (typeof (EndpointNotFoundException))]
 		public void RequestChannelOpenFails ()
@@ -156,9 +156,10 @@ namespace MonoTests.System.ServiceModel.Discovery
 			Assert.IsNull (cf.GetProperty<DiscoveryEndpoint> (), "#1");
 			var ch = cf.CreateChannel (DiscoveryClientBindingElement.DiscoveryEndpointAddress);
 			Assert.IsNull (ch.GetProperty<DiscoveryEndpoint> (), "#2");
-			ch.Open ();
+			ch.Open (TimeSpan.FromSeconds (80));
 		}
 
+		// This test takes a while, so I in fact don't want to enable it ...
 		[Test]
 		[ExpectedException (typeof (EndpointNotFoundException))]
 		public void RequestChannelOpenFails2 ()
@@ -168,7 +169,7 @@ namespace MonoTests.System.ServiceModel.Discovery
 			var cf = be.BuildChannelFactory<IDuplexSessionChannel> (bc);
 			cf.Open ();
 			var ch = cf.CreateChannel (DiscoveryClientBindingElement.DiscoveryEndpointAddress);
-			ch.Open ();
+			ch.Open (TimeSpan.FromSeconds (80));
 		}
 
 		[Test]