From 3ef803d40ba574288865e9bdd5239822632a487f Mon Sep 17 00:00:00 2001
From: FrancisANDRE <zosrothko@orange.fr>
Date: Tue, 29 Dec 2015 19:46:18 +0100
Subject: [PATCH] Add WebSocketTestSuite

Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
---
 NetSSL_Win/testsuite/TestSuite_vs120.vcxproj  | 88 ++++++++++---------
 .../testsuite/TestSuite_vs120.vcxproj.filters | 15 ++++
 NetSSL_Win/testsuite/src/NetSSLTestSuite.cpp  |  2 +
 .../HTTPTimeServer/src/TimeHandler.cpp        | 11 +--
 .../samples/HTTPTimeServer/src/TimeHandler.h  |  7 --
 5 files changed, 65 insertions(+), 58 deletions(-)

diff --git a/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj b/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj
index c64c28740..55cb0766c 100644
--- a/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj
+++ b/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="debug_shared|Win32">
@@ -32,7 +32,7 @@
     <RootNamespace>TestSuite</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -63,27 +63,27 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
-  <ImportGroup Label="ExtensionSettings"/>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros"/>
+  <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
@@ -136,7 +136,7 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
@@ -167,9 +167,9 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
@@ -196,7 +196,7 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
@@ -227,9 +227,9 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
@@ -256,7 +256,7 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
@@ -287,9 +287,9 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
@@ -304,28 +304,32 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="src\HTTPSClientSessionTest.h"/>
-    <ClInclude Include="src\HTTPSClientTestSuite.h"/>
-    <ClInclude Include="src\HTTPSServerTest.h"/>
-    <ClInclude Include="src\HTTPSServerTestSuite.h"/>
-    <ClInclude Include="src\HTTPSStreamFactoryTest.h"/>
-    <ClInclude Include="src\HTTPSTestServer.h"/>
-    <ClInclude Include="src\NetSSLTestSuite.h"/>
-    <ClInclude Include="src\TCPServerTest.h"/>
-    <ClInclude Include="src\TCPServerTestSuite.h"/>
+    <ClInclude Include="src\HTTPSClientSessionTest.h" />
+    <ClInclude Include="src\HTTPSClientTestSuite.h" />
+    <ClInclude Include="src\HTTPSServerTest.h" />
+    <ClInclude Include="src\HTTPSServerTestSuite.h" />
+    <ClInclude Include="src\HTTPSStreamFactoryTest.h" />
+    <ClInclude Include="src\HTTPSTestServer.h" />
+    <ClInclude Include="src\NetSSLTestSuite.h" />
+    <ClInclude Include="src\TCPServerTest.h" />
+    <ClInclude Include="src\TCPServerTestSuite.h" />
+    <ClInclude Include="src\WebSocketTest.h" />
+    <ClInclude Include="src\WebSocketTestSuite.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\Driver.cpp"/>
-    <ClCompile Include="src\HTTPSClientSessionTest.cpp"/>
-    <ClCompile Include="src\HTTPSClientTestSuite.cpp"/>
-    <ClCompile Include="src\HTTPSServerTest.cpp"/>
-    <ClCompile Include="src\HTTPSServerTestSuite.cpp"/>
-    <ClCompile Include="src\HTTPSStreamFactoryTest.cpp"/>
-    <ClCompile Include="src\HTTPSTestServer.cpp"/>
-    <ClCompile Include="src\NetSSLTestSuite.cpp"/>
-    <ClCompile Include="src\TCPServerTest.cpp"/>
-    <ClCompile Include="src\TCPServerTestSuite.cpp"/>
+    <ClCompile Include="src\Driver.cpp" />
+    <ClCompile Include="src\HTTPSClientSessionTest.cpp" />
+    <ClCompile Include="src\HTTPSClientTestSuite.cpp" />
+    <ClCompile Include="src\HTTPSServerTest.cpp" />
+    <ClCompile Include="src\HTTPSServerTestSuite.cpp" />
+    <ClCompile Include="src\HTTPSStreamFactoryTest.cpp" />
+    <ClCompile Include="src\HTTPSTestServer.cpp" />
+    <ClCompile Include="src\NetSSLTestSuite.cpp" />
+    <ClCompile Include="src\TCPServerTest.cpp" />
+    <ClCompile Include="src\TCPServerTestSuite.cpp" />
+    <ClCompile Include="src\WebSocketTest.cpp" />
+    <ClCompile Include="src\WebSocketTestSuite.cpp" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
-  <ImportGroup Label="ExtensionTargets"/>
-</Project>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets" />
+</Project>
\ No newline at end of file
diff --git a/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj.filters
index bd3bc66f1..7e0c821b6 100644
--- a/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj.filters
+++ b/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj.filters
@@ -52,6 +52,9 @@
     <Filter Include="HTTPSClient\Source Files">
       <UniqueIdentifier>{40e36c0c-5808-4c87-aa2e-04c0ffa6f35e}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Websocket">
+      <UniqueIdentifier>{9243a946-e87f-42f5-adba-efbb4823f93c}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\HTTPSTestServer.h">
@@ -81,6 +84,12 @@
     <ClInclude Include="src\HTTPSStreamFactoryTest.h">
       <Filter>HTTPSClient\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\WebSocketTest.h">
+      <Filter>Websocket</Filter>
+    </ClInclude>
+    <ClInclude Include="src\WebSocketTestSuite.h">
+      <Filter>Websocket</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\HTTPSTestServer.cpp">
@@ -113,5 +122,11 @@
     <ClCompile Include="src\HTTPSStreamFactoryTest.cpp">
       <Filter>HTTPSClient\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\WebSocketTest.cpp">
+      <Filter>Websocket</Filter>
+    </ClCompile>
+    <ClCompile Include="src\WebSocketTestSuite.cpp">
+      <Filter>Websocket</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/NetSSL_Win/testsuite/src/NetSSLTestSuite.cpp b/NetSSL_Win/testsuite/src/NetSSLTestSuite.cpp
index 7fddff713..b2aa5303a 100644
--- a/NetSSL_Win/testsuite/src/NetSSLTestSuite.cpp
+++ b/NetSSL_Win/testsuite/src/NetSSLTestSuite.cpp
@@ -15,6 +15,7 @@
 #include "HTTPSClientTestSuite.h"
 #include "TCPServerTestSuite.h"
 #include "HTTPSServerTestSuite.h"
+#include "WebSocketTestSuite.h"
 
 
 CppUnit::Test* NetSSLTestSuite::suite()
@@ -24,6 +25,7 @@ CppUnit::Test* NetSSLTestSuite::suite()
 	pSuite->addTest(HTTPSClientTestSuite::suite());
 	pSuite->addTest(TCPServerTestSuite::suite());
 	pSuite->addTest(HTTPSServerTestSuite::suite());
+	pSuite->addTest(WebSocketTestSuite::suite());
 
 	return pSuite;
 }
diff --git a/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpp b/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpp
index 3ec7a9bb7..ddd7a079e 100644
--- a/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpp
+++ b/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpp
@@ -1,10 +1,3 @@
-//
-// TimeHandler.cpp
-//
-// This file has been generated from TimeHandler.cpsp on 2010-01-28 08:49:54.
-//
-
-
 #include "TimeHandler.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
@@ -28,7 +21,7 @@ void TimeHandler::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net
 	responseStream << "\n";
 	responseStream << "\n";
 	responseStream << "";
-#line 6 "/ws/poco-1.3/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpsp"
+#line 6 "/cygdrive/z/git/poco/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpsp"
 
     Poco::DateTime now;
     std::string dt(Poco::DateTimeFormatter::format(now, "%W, %e %b %y %H:%M:%S %Z"));
@@ -40,7 +33,7 @@ void TimeHandler::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net
 	responseStream << "</head>\n";
 	responseStream << "<body>\n";
 	responseStream << "<p style=\"text-align: center; font-size: 48px;\">";
-#line 16 "/ws/poco-1.3/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpsp"
+#line 16 "/cygdrive/z/git/poco/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpsp"
 	responseStream << ( dt );
 	responseStream << "</p>\n";
 	responseStream << "</body>\n";
diff --git a/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.h b/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.h
index e1ac5474d..c301516d0 100644
--- a/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.h
+++ b/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.h
@@ -1,10 +1,3 @@
-//
-// TimeHandler.h
-//
-// This file has been generated from TimeHandler.cpsp on 2010-01-28 08:49:54.
-//
-
-
 #ifndef TimeHandler_INCLUDED
 #define TimeHandler_INCLUDED