[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - test/helpers.hpp test/httpwserror.cpp test/TileCacheTests.cpp

[Ashod Nakashian]

 test/TileCacheTests.cpp |    4 ++++
 test/helpers.hpp        |   21 ++-------------------
 test/httpwserror.cpp    |    3 +++
 3 files changed, 9 insertions(+), 19 deletions(-)

New commits:
commit e6b2e8caadcd7dc9c33fe5e9fff6fb72cf39fe63
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun Apr 16 23:31:03 2017 -0400

    wsd: include cleanup in test
    
    Change-Id: Ie54aabc74e8980f3131a66f3610c1dcdd9f668ff
    Reviewed-on: https://gerrit.libreoffice.org/36600
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>
    (cherry picked from commit 0feea0e80e5da95baa6554ad660df676613443fd)
    Reviewed-on: https://gerrit.libreoffice.org/36610
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
index 128f559d..227f7adb 100644
--- a/test/TileCacheTests.cpp
+++ b/test/TileCacheTests.cpp
@@ -9,6 +9,10 @@
 
 #include "config.h"
 
+#include <Poco/Net/AcceptCertificateHandler.h>
+#include <Poco/Net/InvalidCertificateHandler.h>
+#include <Poco/Net/SSLManager.h>
+
 #include <cppunit/extensions/HelperMacros.h>
 
 #include "Common.hpp"
diff --git a/test/helpers.hpp b/test/helpers.hpp
index ce6aef98..70bf6e4c 100644
--- a/test/helpers.hpp
+++ b/test/helpers.hpp
@@ -10,41 +10,24 @@
 #ifndef INCLUDED_TEST_HELPERS_HPP
 #define INCLUDED_TEST_HELPERS_HPP
 
-#include <algorithm>
-#include <condition_variable>
-#include <cstdlib>
-#include <mutex>
-#include <regex>
-#include <thread>
+#include <iterator>
 
 #include <Poco/BinaryReader.h>
-#include <Poco/DirectoryIterator.h>
-#include <Poco/Dynamic/Var.h>
-#include <Poco/FileStream.h>
-#include <Poco/JSON/JSON.h>
-#include <Poco/JSON/Parser.h>
-#include <Poco/Net/AcceptCertificateHandler.h>
 #include <Poco/Net/HTTPClientSession.h>
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/Net/HTTPResponse.h>
 #include <Poco/Net/HTTPSClientSession.h>
-#include <Poco/Net/InvalidCertificateHandler.h>
 #include <Poco/Net/NetException.h>
-#include <Poco/Net/PrivateKeyPassphraseHandler.h>
-#include <Poco/Net/SSLManager.h>
 #include <Poco/Net/Socket.h>
 #include <Poco/Path.h>
-#include <Poco/StreamCopier.h>
 #include <Poco/StringTokenizer.h>
-#include <Poco/Thread.h>
 #include <Poco/URI.h>
+
 #include <cppunit/extensions/HelperMacros.h>
 
 #include <Common.hpp>
 #include "common/FileUtil.hpp"
-#include <Protocol.hpp>
 #include <LOOLWebSocket.hpp>
-#include <UserMessages.hpp>
 #include <Util.hpp>
 
 #ifndef TDOC
diff --git a/test/httpwserror.cpp b/test/httpwserror.cpp
index ff417f25..a0663f63 100644
--- a/test/httpwserror.cpp
+++ b/test/httpwserror.cpp
@@ -12,11 +12,14 @@
 #include <vector>
 #include <string>
 
+#include <Poco/Net/AcceptCertificateHandler.h>
 #include <Poco/Net/HTTPClientSession.h>
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/Net/HTTPResponse.h>
 #include <Poco/Net/HTTPSClientSession.h>
+#include <Poco/Net/InvalidCertificateHandler.h>
 #include <Poco/Net/NetException.h>
+#include <Poco/Net/SSLManager.h>
 #include <Poco/URI.h>
 
 #include <cppunit/extensions/HelperMacros.h>