wsd: test: move WebSocketSession under test

WebSocketSession is used exclusively for tests,
so it's best that it is located in the test
directory.

Change-Id: I88333d619902df7991c3f26b94ed309246446ae0
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>

Makefile.am

@@ -373,7 +373,6 @@ shared_headers = common/Common.hpp \
                  net/ServerSocket.hpp \
                  net/Socket.hpp \
                  net/WebSocketHandler.hpp \
-                 net/WebSocketSession.hpp \
                  tools/Replay.hpp
 if ENABLE_SSL
 shared_headers += net/Ssl.hpp \

test/UnitBadDocLoad.cpp

@@ -11,19 +11,19 @@
 
 #include <config.h>
 
-#include <memory>
-#include <ostream>
-#include <string>
+#include <Png.hpp>
+#include <Unit.hpp>
+#include <WebSocketSession.hpp>
+#include <helpers.hpp>
 
 #include <Poco/Exception.h>
 #include <Poco/RegularExpression.h>
 #include <Poco/URI.h>
 #include <test/lokassert.hpp>
 
-#include <Png.hpp>
-#include <Unit.hpp>
-#include <helpers.hpp>
-#include <net/WebSocketSession.hpp>
+#include <memory>
+#include <ostream>
+#include <string>
 
 // Include config.h last, so the test server URI is still HTTP, even in SSL builds.
 #include <config.h>

test/UnitCalc.cpp

@@ -11,19 +11,19 @@
 
 #include <config.h>
 
-#include <memory>
-#include <ostream>
-#include <string>
+#include <Png.hpp>
+#include <Unit.hpp>
+#include <WebSocketSession.hpp>
+#include <helpers.hpp>
+#include <kit/Delta.hpp>
 
 #include <Poco/Exception.h>
 #include <Poco/URI.h>
 #include <test/lokassert.hpp>
 
-#include <Png.hpp>
-#include <Unit.hpp>
-#include <helpers.hpp>
-#include <kit/Delta.hpp>
-#include <net/WebSocketSession.hpp>
+#include <memory>
+#include <ostream>
+#include <string>
 
 namespace
 {

test/UnitCopyPaste.cpp

@@ -13,25 +13,24 @@
 
 #include <config.h>
 
-#include "HttpRequest.hpp"
-#include "lokassert.hpp"
-
+#include <HttpRequest.hpp>
 #include <Unit.hpp>
 #include <UnitHTTP.hpp>
-#include <helpers.hpp>
-#include <sstream>
-#include <wsd/COOLWSD.hpp>
+#include <WebSocketSession.hpp>
 #include <common/Clipboard.hpp>
+#include <helpers.hpp>
+#include <lokassert.hpp>
+#include <test.hpp>
+#include <wsd/COOLWSD.hpp>
 #include <wsd/ClientSession.hpp>
-#include <net/WebSocketSession.hpp>
 
+#include <Poco/Net/HTMLForm.h>
 #include <Poco/Net/HTTPResponse.h>
 #include <Poco/Net/HTTPServerRequest.h>
-#include <Poco/Net/HTMLForm.h>
 #include <Poco/Net/StringPartSource.h>
 #include <Poco/Util/LayeredConfiguration.h>
 
-#include <test.hpp>
+#include <sstream>
 
 using namespace Poco::Net;
 

test/UnitCopyPasteWriter.cpp

@@ -13,18 +13,14 @@
 
 #include <config.h>
 
-#include <Unit.hpp>
-
-#include <sstream>
-
-#include <common/JsonUtil.hpp>
-#include <net/WebSocketSession.hpp>
-#include <wsd/COOLWSD.hpp>
-#include <wsd/ClientSession.hpp>
-
 #include <HttpRequest.hpp>
+#include <Unit.hpp>
+#include <WebSocketSession.hpp>
+#include <common/JsonUtil.hpp>
 #include <helpers.hpp>
 #include <lokassert.hpp>
+#include <wsd/COOLWSD.hpp>
+#include <wsd/ClientSession.hpp>
 
 using namespace Poco::Net;
 

test/UnitLoad.cpp

@@ -11,21 +11,21 @@
 
 #include <config.h>
 
-#include <test/lokassert.hpp>
-#include <Unit.hpp>
-#include <helpers.hpp>
-#include <net/WebSocketSession.hpp>
 #include "Util.hpp"
+#include <Unit.hpp>
+#include <WebSocketSession.hpp>
+#include <helpers.hpp>
+#include <test/lokassert.hpp>
+
+#include <Poco/Exception.h>
+#include <Poco/URI.h>
+#include <Poco/Util/LayeredConfiguration.h>
 
 #include <chrono>
 #include <memory>
 #include <ostream>
 #include <string>
 
-#include <Poco/Exception.h>
-#include <Poco/URI.h>
-#include <Poco/Util/LayeredConfiguration.h>
-
 namespace
 {
 void loadDoc(const std::string& documentURL, const std::string& testname)

test/UnitLoadTorture.cpp

@@ -11,14 +11,13 @@
 
 #include <config.h>
 
-#include <string>
-
-#include <test/lokassert.hpp>
-
 #include <Unit.hpp>
 #include <Util.hpp>
 #include <helpers.hpp>
-#include <net/WebSocketSession.hpp>
+#include <WebSocketSession.hpp>
+#include <test/lokassert.hpp>
+
+#include <string>
 
 /// Load torture testcase.
 class UnitLoadTorture : public UnitWSD

test/UnitTyping.cpp

@@ -13,18 +13,17 @@
 
 #include <config.h>
 
-#include <random>
-#include <iostream>
-
+#include <COOLWSD.hpp>
 #include <Exceptions.hpp>
 #include <Log.hpp>
 #include <Unit.hpp>
 #include <UnitHTTP.hpp>
+#include <WebSocketSession.hpp>
 #include <helpers.hpp>
-#include <COOLWSD.hpp>
-
 #include <wsd/TileDesc.hpp>
-#include <net/WebSocketSession.hpp>
+
+#include <random>
+#include <iostream>
 
 using namespace ::helpers;
 

test/helpers.hpp

@@ -11,8 +11,16 @@
 
 #pragma once
 
-#include <test/testlog.hpp>
 #include <test/lokassert.hpp>
+#include <test/testlog.hpp>
+
+#include <Socket.hpp>
+#include <Common.hpp>
+#include <WebSocketSession.hpp>
+#include <common/ConfigUtil.hpp>
+#include <common/Util.hpp>
+#include <tools/COOLWebSocket.hpp>
+#include <wsd/TileDesc.hpp>
 
 #include <Poco/BinaryReader.h>
 #include <Poco/Dynamic/Var.h>
@@ -26,15 +34,6 @@
 #include <Poco/Path.h>
 #include <Poco/URI.h>
 
-#include <Common.hpp>
-#include "Socket.hpp"
-#include "common/FileUtil.hpp"
-#include <tools/COOLWebSocket.hpp>
-#include <common/ConfigUtil.hpp>
-#include <common/Util.hpp>
-#include <net/WebSocketSession.hpp>
-#include <wsd/TileDesc.hpp>
-
 #include <chrono>
 #include <filesystem>
 #include <fstream>