Add ClientAndServerHandlerFactory to construct from server+client pair.

MartinsPlayground/Instrumentation/Console/Program.cs

@@ -269,8 +269,8 @@ namespace Mono.Security.Instrumentation.Console
 		async Task RunWithLocalServer (ClientAndServerFactory factory, ClientAndServerParameters parameters)
 		{
 			try {
-				var connection = await factory.Start (parameters);
-				var handler = ConnectionHandlerFactory.WaitForOkAndDone.Create (connection);
+				var connection = (IClientAndServer)await factory.Start (parameters);
+				var handler = ClientAndServerHandlerFactory.WaitForOkAndDone.Create (connection.Server, connection.Client);
 				await handler.Run ();
 				connection.Dispose ();
 			} catch (Exception ex) {

Mono.Security.NewTls.TestFramework/ClientAndServerHandlerFactory.cs

@@ -0,0 +1,98 @@
+//
+// ClientAndServerHandlerFactory.cs
+//
+// Author:
+//       Martin Baulig <martin.baulig@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin, Inc.
+//
+// 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.Threading;
+using System.Threading.Tasks;
+
+namespace Mono.Security.NewTls.TestFramework
+{
+	public abstract class ClientAndServerHandlerFactory
+	{
+		public abstract IConnectionHandler Create (IServer server, IClient client);
+
+		public static readonly ClientAndServerHandlerFactory WaitForOkAndDone = new SimpleFactory ((s,c) => new WaitForOkAndDoneHandler (s,c));
+
+		public static readonly ClientAndServerHandlerFactory HandshakeAndDone = new SimpleFactory ((s,c) => new HandshakeAndDoneHandler (s,c));
+
+		delegate IConnectionHandler FactoryDelegate (IServer server, IClient client);
+
+		class SimpleFactory : ClientAndServerHandlerFactory
+		{
+			FactoryDelegate func;
+
+			public SimpleFactory (FactoryDelegate func)
+			{
+				this.func = func;
+			}
+
+			public override IConnectionHandler Create (IServer server, IClient client)
+			{
+				return func (server, client);
+			}
+		}
+
+		class WaitForOkAndDoneHandler : ClientAndServerHandler
+		{
+			public WaitForOkAndDoneHandler (IServer server, IClient client)
+				: base (server, client)
+			{
+			}
+
+			protected override async Task MainLoop (ILineBasedStream serverStream, ILineBasedStream clientStream)
+			{
+				await serverStream.WriteLineAsync ("OK");
+				var line = await clientStream.ReadLineAsync ();
+				if (!line.Equals ("OK"))
+					throw new ConnectionException ("Got unexpected output '{0}'", line);
+				await Shutdown (SupportsCleanShutdown, true);
+				Close ();
+			}
+		}
+
+		class HandshakeAndDoneHandler : ClientAndServerHandler
+		{
+			public HandshakeAndDoneHandler (IServer server, IClient client)
+				: base (server, client)
+			{
+			}
+
+			protected override async Task MainLoop (ILineBasedStream serverStream, ILineBasedStream clientStream)
+			{
+				await serverStream.WriteLineAsync ("SERVER OK");
+				var line = await clientStream.ReadLineAsync ();
+				if (!line.Equals ("SERVER OK"))
+					throw new ConnectionException ("Got unexpected output from server: '{0}'", line);
+				await clientStream.WriteLineAsync ("CLIENT OK");
+				line = await serverStream.ReadLineAsync ();
+				if (!line.Equals ("CLIENT OK"))
+					throw new ConnectionException ("Got unexpected output from client: '{0}'", line);
+				await Shutdown (SupportsCleanShutdown, true);
+				Close ();
+			}
+		}
+	}
+}
+

Mono.Security.NewTls.TestFramework/ConnectionHandlerFactory.cs

@@ -12,10 +12,6 @@ namespace Mono.Security.NewTls.TestFramework
 
 		public static readonly ConnectionHandlerFactory Echo = new SimpleFactory (c => new EchoHandler (c));
 
-		public static readonly ConnectionHandlerFactory WaitForOkAndDone = new SimpleFactory (c => new WaitForOkAndDoneHandler ((IClientAndServer)c));
-
-		public static readonly ConnectionHandlerFactory HandshakeAndDone = new SimpleFactory (c => new HandshakeAndDoneHandler ((IClientAndServer)c));
-
 		delegate IConnectionHandler FactoryDelegate (IConnection connection);
 
 		class SimpleFactory : ConnectionHandlerFactory
@@ -62,47 +58,6 @@ namespace Mono.Security.NewTls.TestFramework
 					await stream.WriteLineAsync (line);
 			}
 		}
-
-		class WaitForOkAndDoneHandler : ClientAndServerHandler
-		{
-			public WaitForOkAndDoneHandler (IClientAndServer connection)
-				: base (connection.Server, connection.Client)
-			{
-			}
-
-			protected override async Task MainLoop (ILineBasedStream serverStream, ILineBasedStream clientStream)
-			{
-				await serverStream.WriteLineAsync ("OK");
-				var line = await clientStream.ReadLineAsync ();
-				if (!line.Equals ("OK"))
-					throw new ConnectionException ("Got unexpected output '{0}'", line);
-				await Shutdown (SupportsCleanShutdown, true);
-				Close ();
-			}
-		}
-
-		class HandshakeAndDoneHandler : ClientAndServerHandler
-		{
-			public HandshakeAndDoneHandler (IClientAndServer connection)
-				: base (connection.Server, connection.Client)
-			{
-			}
-
-			protected override async Task MainLoop (ILineBasedStream serverStream, ILineBasedStream clientStream)
-			{
-				await serverStream.WriteLineAsync ("SERVER OK");
-				var line = await clientStream.ReadLineAsync ();
-				if (!line.Equals ("SERVER OK"))
-					throw new ConnectionException ("Got unexpected output from server: '{0}'", line);
-				await clientStream.WriteLineAsync ("CLIENT OK");
-				line = await serverStream.ReadLineAsync ();
-				if (!line.Equals ("CLIENT OK"))
-					throw new ConnectionException ("Got unexpected output from client: '{0}'", line);
-				await Shutdown (SupportsCleanShutdown, true);
-				Close ();
-			}
-		}
-
 	}
 }
 

Mono.Security.NewTls.TestFramework/Mono.Security.NewTls.TestFramework.csproj

@@ -69,6 +69,7 @@
     <Compile Include="ClientParameters.cs" />
     <Compile Include="ClientAndServerParameters.cs" />
     <Compile Include="IConnectionHandler.cs" />
+    <Compile Include="ClientAndServerHandlerFactory.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <ProjectExtensions>

Mono.Security.NewTls.Tests/SimpleConnectionTest.cs

@@ -107,10 +107,8 @@ namespace Mono.Security.NewTls.Tests
 		{
 			ctx.LogMessage ("TEST CONNECTION: {0} {1} {2}", parameters, server, client);
 
-			await client.WaitForConnection ();
-			ctx.LogMessage ("GOT CLIENT CONNECTION!");
-
-			await Task.Delay (10000);
+			var handler = ClientAndServerHandlerFactory.WaitForOkAndDone.Create (server, client);
+			await handler.Run ();
 		}
 
 	}

external/web-tests

@@ -1 +1 @@
-Subproject commit a3262e06c672498516d2929fdcaaa62b8a82d644
+Subproject commit 57fd69ac2ff0275ce2cebcad9281f46f73a3c4e3