From 47c01daeb27436e90121b7438c1b28e09fc2ebbc Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Thu, 15 Sep 2016 17:41:41 +0200
Subject: [PATCH] UnitTest: Cleanup

Improve naming and introduce googletest.h.

Change-Id: I445c13db4c23d6dd5682ce0db3b83055cc6b8a89
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 ...tivationsequencecontextprocessor-test.cpp} |   7 +-
 ...p => activationsequenceprocessor-test.cpp} |   7 +-
 tests/unit/unittest/chunksreportedmonitor.cpp |   6 +-
 ...syncjobtest.cpp => clangasyncjob-base.cpp} |   6 +-
 ...angasyncjobtest.h => clangasyncjob-base.h} |   9 +-
 ....cpp => clangcodecompleteresults-test.cpp} |   7 +-
 ...test.cpp => clangcompletecodejob-test.cpp} |   2 +-
 ...> clangcompletioncontextanalyzer-test.cpp} |   7 +-
 ...createinitialdocumentpreamblejob-test.cpp} |   2 +-
 ...est.cpp => clangdiagnosticfilter-test.cpp} |   7 +-
 ...ocumenttest.cpp => clangdocument-test.cpp} |   7 +-
 ...umentstest.cpp => clangdocuments-test.cpp} |   7 +-
 ...ntest.cpp => clangfixitoperation-test.cpp} |   5 +-
 ...servertest.cpp => clangipcserver-test.cpp} |  11 +-
 ...angisdiagnosticrelatedtolocation-test.cpp} |   7 +-
 ...obqueuetest.cpp => clangjobqueue-test.cpp} |   8 +-
 .../{clangjobstest.cpp => clangjobs-test.cpp} |  12 +-
 ...angrequestdocumentannotationsjob-test.cpp} |   2 +-
 ...angstringtest.cpp => clangstring-test.cpp} |   7 +-
 ...langupdatedocumentannotationsjob-test.cpp} |   2 +-
 ...est.cpp => clientserverinprocess-test.cpp} |   7 +-
 .../unittest/clientserveroutsideprocess.cpp   |   7 +-
 ...letiontest.cpp => codecompletion-test.cpp} |   7 +-
 ....cpp => codecompletionsextractor-test.cpp} |   7 +-
 ... completionchunkstotextconverter-test.cpp} |   7 +-
 ...> createtablesqlstatementbuilder-test.cpp} |   4 +-
 .../{cursortest.cpp => cursor-test.cpp}       |   7 +-
 ...diagnostictest.cpp => diagnostic-test.cpp} |   9 +-
 ...tainer.h => diagnosticcontainer-matcher.h} |   0
 ...sticsettest.cpp => diagnosticset-test.cpp} |   9 +-
 ...stemutilities.h => filesystem-utilities.h} |   0
 .../{fixittest.cpp => fixit-test.cpp}         |   7 +-
 tests/unit/unittest/googletest.h              |  31 ++++
 ...rkstest.cpp => highlightingmarks-test.cpp} |   7 +-
 ...cpp => highlightingmarksreporter-test.cpp} |   7 +-
 ...prefixertest.cpp => lineprefixer-test.cpp} |   6 +-
 ...mock.h => mockrefactoringclientcallback.h} |   2 +-
 ...tutils.cpp => processevents-utilities.cpp} |   7 +-
 ...{testutils.h => processevents-utilities.h} |   7 +-
 .../{projecttest.cpp => projectpart-test.cpp} |   7 +-
 ....cpp => readandwritemessageblock-test.cpp} |   7 +-
 ...enttest.cpp => refactoringclient-test.cpp} |  10 +-
 ...refactoringclientserverinprocess-test.cpp} |   7 +-
 ...> refactoringcompilationdatabase-test.cpp} |   7 +-
 ...inetest.cpp => refactoringengine-test.cpp} |   7 +-
 ...vertest.cpp => refactoringserver-test.cpp} |   7 +-
 ...rtest.cpp => senddocumenttracker-test.cpp} |   7 +-
 ...sizedarraytest.cpp => sizedarray-test.cpp} |   4 +-
 ...stest.cpp => skippedsourceranges-test.cpp} |   7 +-
 ...enchmark.cpp => smallstring-benchmark.cpp} |   0
 ...allstringtest.cpp => smallstring-test.cpp} |   4 +-
 ...cationtest.cpp => sourcelocation-test.cpp} |   7 +-
 ...urcerangetest.cpp => sourcerange-test.cpp} |   7 +-
 ...tecolumntest.cpp => sqlitecolumn-test.cpp} |   7 +-
 ...tabasetest.cpp => sqlitedatabase-test.cpp} |   7 +-
 ...est.cpp => sqlitedatabasebackend-test.cpp} |  13 +-
 ...ementtest.cpp => sqlitestatement-test.cpp} |   7 +-
 ...litetabletest.cpp => sqlitetable-test.cpp} |   6 +-
 ...rtest.cpp => sqlstatementbuilder-test.cpp} |   7 +-
 ...olfindertest.cpp => symbolfinder-test.cpp} |   9 +-
 ...st.cpp => translationunitupdater-test.cpp} |   7 +-
 tests/unit/unittest/unittest.pro              | 139 +++++++++---------
 .../unittest/{main.cpp => unittests-main.cpp} |   0
 ...savedfiletest.cpp => unsavedfile-test.cpp} |   5 +-
 ...vedfilestest.cpp => unsavedfiles-test.cpp} |   5 +-
 .../unittest/{utf8test.cpp => utf8-test.cpp}  |   4 +-
 ...pp => utf8positionfromlinecolumn-test.cpp} |   5 +-
 67 files changed, 227 insertions(+), 348 deletions(-)
 rename tests/unit/unittest/{activationsequencecontextprocessortest.cpp => activationsequencecontextprocessor-test.cpp} (98%)
 rename tests/unit/unittest/{activationsequenceprocessortest.cpp => activationsequenceprocessor-test.cpp} (98%)
 rename tests/unit/unittest/{clangasyncjobtest.cpp => clangasyncjob-base.cpp} (94%)
 rename tests/unit/unittest/{clangasyncjobtest.h => clangasyncjob-base.h} (94%)
 rename tests/unit/unittest/{clangcodecompleteresultstest.cpp => clangcodecompleteresults-test.cpp} (97%)
 rename tests/unit/unittest/{clangcompletecodejobtest.cpp => clangcompletecodejob-test.cpp} (98%)
 rename tests/unit/unittest/{clangcompletioncontextanalyzertest.cpp => clangcompletioncontextanalyzer-test.cpp} (99%)
 rename tests/unit/unittest/{clangcreateinitialdocumentpreamblejobtest.cpp => clangcreateinitialdocumentpreamblejob-test.cpp} (98%)
 rename tests/unit/unittest/{clangdiagnosticfiltertest.cpp => clangdiagnosticfilter-test.cpp} (98%)
 rename tests/unit/unittest/{clangdocumenttest.cpp => clangdocument-test.cpp} (98%)
 rename tests/unit/unittest/{clangdocumentstest.cpp => clangdocuments-test.cpp} (99%)
 rename tests/unit/unittest/{clangfixitoperationtest.cpp => clangfixitoperation-test.cpp} (97%)
 rename tests/unit/unittest/{clangipcservertest.cpp => clangipcserver-test.cpp} (99%)
 rename tests/unit/unittest/{clangisdiagnosticrelatedtolocationtest.cpp => clangisdiagnosticrelatedtolocation-test.cpp} (97%)
 rename tests/unit/unittest/{clangjobqueuetest.cpp => clangjobqueue-test.cpp} (99%)
 rename tests/unit/unittest/{clangjobstest.cpp => clangjobs-test.cpp} (94%)
 rename tests/unit/unittest/{clangrequestdocumentannotationsjobtest.cpp => clangrequestdocumentannotationsjob-test.cpp} (98%)
 rename tests/unit/unittest/{clangstringtest.cpp => clangstring-test.cpp} (95%)
 rename tests/unit/unittest/{clangupdatedocumentannotationsjobtest.cpp => clangupdatedocumentannotationsjob-test.cpp} (99%)
 rename tests/unit/unittest/{clientserverinprocesstest.cpp => clientserverinprocess-test.cpp} (98%)
 rename tests/unit/unittest/{codecompletiontest.cpp => codecompletion-test.cpp} (99%)
 rename tests/unit/unittest/{codecompletionsextractortest.cpp => codecompletionsextractor-test.cpp} (99%)
 rename tests/unit/unittest/{completionchunkstotextconvertertest.cpp => completionchunkstotextconverter-test.cpp} (99%)
 rename tests/unit/unittest/{createtablesqlstatementbuildertest.cpp => createtablesqlstatementbuilder-test.cpp} (98%)
 rename tests/unit/unittest/{cursortest.cpp => cursor-test.cpp} (99%)
 rename tests/unit/unittest/{diagnostictest.cpp => diagnostic-test.cpp} (97%)
 rename tests/unit/unittest/{matcher-diagnosticcontainer.h => diagnosticcontainer-matcher.h} (100%)
 rename tests/unit/unittest/{diagnosticsettest.cpp => diagnosticset-test.cpp} (97%)
 rename tests/unit/unittest/{filesystemutilities.h => filesystem-utilities.h} (100%)
 rename tests/unit/unittest/{fixittest.cpp => fixit-test.cpp} (97%)
 create mode 100644 tests/unit/unittest/googletest.h
 rename tests/unit/unittest/{highlightingmarkstest.cpp => highlightingmarks-test.cpp} (99%)
 rename tests/unit/unittest/{highlightingmarksreportertest.cpp => highlightingmarksreporter-test.cpp} (97%)
 rename tests/unit/unittest/{lineprefixertest.cpp => lineprefixer-test.cpp} (97%)
 rename tests/unit/unittest/{refactoringclientcallbackmock.h => mockrefactoringclientcallback.h} (97%)
 rename tests/unit/unittest/{testutils.cpp => processevents-utilities.cpp} (91%)
 rename tests/unit/unittest/{testutils.h => processevents-utilities.h} (91%)
 rename tests/unit/unittest/{projecttest.cpp => projectpart-test.cpp} (98%)
 rename tests/unit/unittest/{readandwritemessageblocktest.cpp => readandwritemessageblock-test.cpp} (98%)
 rename tests/unit/unittest/{refactoringclienttest.cpp => refactoringclient-test.cpp} (95%)
 rename tests/unit/unittest/{refactoringclientserverinprocesstest.cpp => refactoringclientserverinprocess-test.cpp} (97%)
 rename tests/unit/unittest/{refactoringcompilationdatabasetest.cpp => refactoringcompilationdatabase-test.cpp} (96%)
 rename tests/unit/unittest/{refactoringenginetest.cpp => refactoringengine-test.cpp} (97%)
 rename tests/unit/unittest/{refactoringservertest.cpp => refactoringserver-test.cpp} (97%)
 rename tests/unit/unittest/{senddocumenttrackertest.cpp => senddocumenttracker-test.cpp} (98%)
 rename tests/unit/unittest/{sizedarraytest.cpp => sizedarray-test.cpp} (97%)
 rename tests/unit/unittest/{skippedsourcerangestest.cpp => skippedsourceranges-test.cpp} (97%)
 rename tests/unit/unittest/{smallstringbenchmark.cpp => smallstring-benchmark.cpp} (100%)
 rename tests/unit/unittest/{smallstringtest.cpp => smallstring-test.cpp} (99%)
 rename tests/unit/unittest/{sourcelocationtest.cpp => sourcelocation-test.cpp} (96%)
 rename tests/unit/unittest/{sourcerangetest.cpp => sourcerange-test.cpp} (97%)
 rename tests/unit/unittest/{sqlitecolumntest.cpp => sqlitecolumn-test.cpp} (95%)
 rename tests/unit/unittest/{sqlitedatabasetest.cpp => sqlitedatabase-test.cpp} (96%)
 rename tests/unit/unittest/{sqlitedatabasebackendtest.cpp => sqlitedatabasebackend-test.cpp} (95%)
 rename tests/unit/unittest/{sqlitestatementtest.cpp => sqlitestatement-test.cpp} (99%)
 rename tests/unit/unittest/{sqlitetabletest.cpp => sqlitetable-test.cpp} (96%)
 rename tests/unit/unittest/{sqlstatementbuildertest.cpp => sqlstatementbuilder-test.cpp} (98%)
 rename tests/unit/unittest/{symbolfindertest.cpp => symbolfinder-test.cpp} (98%)
 rename tests/unit/unittest/{translationunitupdatertest.cpp => translationunitupdater-test.cpp} (97%)
 rename tests/unit/unittest/{main.cpp => unittests-main.cpp} (100%)
 rename tests/unit/unittest/{unsavedfiletest.cpp => unsavedfile-test.cpp} (98%)
 rename tests/unit/unittest/{unsavedfilestest.cpp => unsavedfiles-test.cpp} (98%)
 rename tests/unit/unittest/{utf8test.cpp => utf8-test.cpp} (98%)
 rename tests/unit/unittest/{utf8positionfromlinecolumntest.cpp => utf8positionfromlinecolumn-test.cpp} (97%)

diff --git a/tests/unit/unittest/activationsequencecontextprocessortest.cpp b/tests/unit/unittest/activationsequencecontextprocessor-test.cpp
similarity index 98%
rename from tests/unit/unittest/activationsequencecontextprocessortest.cpp
rename to tests/unit/unittest/activationsequencecontextprocessor-test.cpp
index feaac411927..0f565aecd7d 100644
--- a/tests/unit/unittest/activationsequencecontextprocessortest.cpp
+++ b/tests/unit/unittest/activationsequencecontextprocessor-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <clangactivationsequencecontextprocessor.h>
 
 #include <clangcodemodel/clangcompletionassistinterface.h>
@@ -32,11 +34,6 @@
 #include <QTextCursor>
 #include <QTextDocument>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 namespace {
 
 using ContextProcessor  = ClangCodeModel::Internal::ActivationSequenceContextProcessor;
diff --git a/tests/unit/unittest/activationsequenceprocessortest.cpp b/tests/unit/unittest/activationsequenceprocessor-test.cpp
similarity index 98%
rename from tests/unit/unittest/activationsequenceprocessortest.cpp
rename to tests/unit/unittest/activationsequenceprocessor-test.cpp
index 130ec90dc04..b51f2c75986 100644
--- a/tests/unit/unittest/activationsequenceprocessortest.cpp
+++ b/tests/unit/unittest/activationsequenceprocessor-test.cpp
@@ -23,15 +23,12 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <clangactivationsequenceprocessor.h>
 
 #include <cplusplus/Token.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 namespace {
 
 using testing::PrintToString;
diff --git a/tests/unit/unittest/chunksreportedmonitor.cpp b/tests/unit/unittest/chunksreportedmonitor.cpp
index 7bec742a7c2..479088c6efb 100644
--- a/tests/unit/unittest/chunksreportedmonitor.cpp
+++ b/tests/unit/unittest/chunksreportedmonitor.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include "chunksreportedmonitor.h"
 
 #include <QSignalSpy>
@@ -43,10 +45,8 @@ bool ChunksReportedMonitor::waitUntilFinished(int timeoutInMs)
     return spy.wait(timeoutInMs);
 }
 
-void ChunksReportedMonitor::onResultsReadyAt(int beginIndex, int endIndex)
+void ChunksReportedMonitor::onResultsReadyAt(int, int)
 {
-    Q_UNUSED(beginIndex)
-    Q_UNUSED(endIndex)
     ++m_resultsReadyCounter;
 }
 
diff --git a/tests/unit/unittest/clangasyncjobtest.cpp b/tests/unit/unittest/clangasyncjob-base.cpp
similarity index 94%
rename from tests/unit/unittest/clangasyncjobtest.cpp
rename to tests/unit/unittest/clangasyncjob-base.cpp
index 8033d6eca15..ebb28eae40b 100644
--- a/tests/unit/unittest/clangasyncjobtest.cpp
+++ b/tests/unit/unittest/clangasyncjob-base.cpp
@@ -23,8 +23,8 @@
 **
 ****************************************************************************/
 
-#include "clangasyncjobtest.h"
-#include "testutils.h"
+#include "clangasyncjob-base.h"
+#include "processevents-utilities.h"
 
 #include <clangbackendipc/filecontainer.h>
 
@@ -66,5 +66,5 @@ bool ClangAsyncJobTest::waitUntilJobFinished(const ClangBackEnd::IAsyncJob &asyn
 {
     const auto isOnFinishedSlotExecuted = [&asyncJob](){ return asyncJob.isFinished(); };
 
-    return TestUtils::processEventsUntilTrue(isOnFinishedSlotExecuted, timeOutInMs);
+    return ProcessEventUtilities::processEventsUntilTrue(isOnFinishedSlotExecuted, timeOutInMs);
 }
diff --git a/tests/unit/unittest/clangasyncjobtest.h b/tests/unit/unittest/clangasyncjob-base.h
similarity index 94%
rename from tests/unit/unittest/clangasyncjobtest.h
rename to tests/unit/unittest/clangasyncjob-base.h
index 249278ec343..74e4e587f05 100644
--- a/tests/unit/unittest/clangasyncjobtest.h
+++ b/tests/unit/unittest/clangasyncjob-base.h
@@ -25,21 +25,18 @@
 
 #pragma once
 
+#include "googletest.h"
+
 #include "dummyclangipcclient.h"
 #include "mockclangcodemodelclient.h"
-#include "clangiasyncjob.h"
 
 #include <clangdocument.h>
+#include <clangiasyncjob.h>
 #include <clangjobrequest.h>
 #include <projects.h>
 #include <clangdocuments.h>
 #include <unsavedfiles.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 class ClangAsyncJobTest : public ::testing::Test
 {
 protected:
diff --git a/tests/unit/unittest/clangcodecompleteresultstest.cpp b/tests/unit/unittest/clangcodecompleteresults-test.cpp
similarity index 97%
rename from tests/unit/unittest/clangcodecompleteresultstest.cpp
rename to tests/unit/unittest/clangcodecompleteresults-test.cpp
index e7654a4b280..85e3eac1c7c 100644
--- a/tests/unit/unittest/clangcodecompleteresultstest.cpp
+++ b/tests/unit/unittest/clangcodecompleteresults-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <clangcodecompleteresults.h>
 #include <clangdocument.h>
 #include <clangfilepath.h>
@@ -36,11 +38,6 @@
 
 #include <clang-c/Index.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 namespace {
 
 using ClangBackEnd::ClangCodeCompleteResults;
diff --git a/tests/unit/unittest/clangcompletecodejobtest.cpp b/tests/unit/unittest/clangcompletecodejob-test.cpp
similarity index 98%
rename from tests/unit/unittest/clangcompletecodejobtest.cpp
rename to tests/unit/unittest/clangcompletecodejob-test.cpp
index 5f4b6f9be35..8a38f490429 100644
--- a/tests/unit/unittest/clangcompletecodejobtest.cpp
+++ b/tests/unit/unittest/clangcompletecodejob-test.cpp
@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include "clangasyncjobtest.h"
+#include "clangasyncjob-base.h"
 
 #include <clangcompletecodejob.h>
 
diff --git a/tests/unit/unittest/clangcompletioncontextanalyzertest.cpp b/tests/unit/unittest/clangcompletioncontextanalyzer-test.cpp
similarity index 99%
rename from tests/unit/unittest/clangcompletioncontextanalyzertest.cpp
rename to tests/unit/unittest/clangcompletioncontextanalyzer-test.cpp
index ceff9440c22..fdc7344a942 100644
--- a/tests/unit/unittest/clangcompletioncontextanalyzertest.cpp
+++ b/tests/unit/unittest/clangcompletioncontextanalyzer-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <clangcodemodel/clangcompletioncontextanalyzer.h>
 #include <clangcodemodel/clangcompletionassistinterface.h>
 
@@ -30,11 +32,6 @@
 
 #include <QTextDocument>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 namespace ClangCodeModel {
 namespace Internal {
 
diff --git a/tests/unit/unittest/clangcreateinitialdocumentpreamblejobtest.cpp b/tests/unit/unittest/clangcreateinitialdocumentpreamblejob-test.cpp
similarity index 98%
rename from tests/unit/unittest/clangcreateinitialdocumentpreamblejobtest.cpp
rename to tests/unit/unittest/clangcreateinitialdocumentpreamblejob-test.cpp
index 8a2a260c29c..7a793a903e0 100644
--- a/tests/unit/unittest/clangcreateinitialdocumentpreamblejobtest.cpp
+++ b/tests/unit/unittest/clangcreateinitialdocumentpreamblejob-test.cpp
@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include "clangasyncjobtest.h"
+#include "clangasyncjob-base.h"
 
 #include <clangcreateinitialdocumentpreamblejob.h>
 
diff --git a/tests/unit/unittest/clangdiagnosticfiltertest.cpp b/tests/unit/unittest/clangdiagnosticfilter-test.cpp
similarity index 98%
rename from tests/unit/unittest/clangdiagnosticfiltertest.cpp
rename to tests/unit/unittest/clangdiagnosticfilter-test.cpp
index 31b7588aa1b..a8d3c2f1754 100644
--- a/tests/unit/unittest/clangdiagnosticfiltertest.cpp
+++ b/tests/unit/unittest/clangdiagnosticfilter-test.cpp
@@ -23,15 +23,12 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <clangdiagnosticfilter.h>
 #include <diagnosticcontainer.h>
 #include <fixitcontainer.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 namespace {
 
 using ::testing::Contains;
diff --git a/tests/unit/unittest/clangdocumenttest.cpp b/tests/unit/unittest/clangdocument-test.cpp
similarity index 98%
rename from tests/unit/unittest/clangdocumenttest.cpp
rename to tests/unit/unittest/clangdocument-test.cpp
index 5817541a664..86cf8a43635 100644
--- a/tests/unit/unittest/clangdocumenttest.cpp
+++ b/tests/unit/unittest/clangdocument-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <clangfilepath.h>
 #include <clangtranslationunitupdater.h>
 #include <commandlinearguments.h>
@@ -41,11 +43,6 @@
 
 #include <clang-c/Index.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 #include <QTemporaryFile>
 
 #include <chrono>
diff --git a/tests/unit/unittest/clangdocumentstest.cpp b/tests/unit/unittest/clangdocuments-test.cpp
similarity index 99%
rename from tests/unit/unittest/clangdocumentstest.cpp
rename to tests/unit/unittest/clangdocuments-test.cpp
index 6889c7dea03..0be8c6281a2 100644
--- a/tests/unit/unittest/clangdocumentstest.cpp
+++ b/tests/unit/unittest/clangdocuments-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <projectpart.h>
 #include <clangexceptions.h>
 #include <projects.h>
@@ -33,11 +35,6 @@
 
 #include <clang-c/Index.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 using ClangBackEnd::Document;
 using ClangBackEnd::UnsavedFiles;
 using ClangBackEnd::ProjectPart;
diff --git a/tests/unit/unittest/clangfixitoperationtest.cpp b/tests/unit/unittest/clangfixitoperation-test.cpp
similarity index 97%
rename from tests/unit/unittest/clangfixitoperationtest.cpp
rename to tests/unit/unittest/clangfixitoperation-test.cpp
index ab01f1b103d..21b250fdebb 100644
--- a/tests/unit/unittest/clangfixitoperationtest.cpp
+++ b/tests/unit/unittest/clangfixitoperation-test.cpp
@@ -23,10 +23,7 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock.h"
-#include "gtest-qt-printing.h"
+#include "googletest.h"
 
 #include <clangfixitoperation.h>
 #include <fixitcontainer.h>
diff --git a/tests/unit/unittest/clangipcservertest.cpp b/tests/unit/unittest/clangipcserver-test.cpp
similarity index 99%
rename from tests/unit/unittest/clangipcservertest.cpp
rename to tests/unit/unittest/clangipcserver-test.cpp
index 39eb42e7df9..44e631323af 100644
--- a/tests/unit/unittest/clangipcservertest.cpp
+++ b/tests/unit/unittest/clangipcserver-test.cpp
@@ -23,8 +23,10 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include "mockclangcodemodelclient.h"
-#include "testutils.h"
+#include "processevents-utilities.h"
 
 #include <clangcodemodelserver.h>
 #include <highlightingmarkcontainer.h>
@@ -41,11 +43,6 @@
 
 #include <QFile>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 using testing::Property;
 using testing::Contains;
 using testing::Not;
@@ -331,7 +328,7 @@ bool ClangClangCodeModelServer::waitUntilAllJobsFinished(int timeOutInMs)
             && !clangServer.isTimerRunningForTestOnly();
     };
 
-    return TestUtils::processEventsUntilTrue(noJobsRunningAnymore, timeOutInMs);
+    return ProcessEventUtilities::processEventsUntilTrue(noJobsRunningAnymore, timeOutInMs);
 }
 
 void ClangClangCodeModelServer::registerProjectAndFilesAndWaitForFinished(
diff --git a/tests/unit/unittest/clangisdiagnosticrelatedtolocationtest.cpp b/tests/unit/unittest/clangisdiagnosticrelatedtolocation-test.cpp
similarity index 97%
rename from tests/unit/unittest/clangisdiagnosticrelatedtolocationtest.cpp
rename to tests/unit/unittest/clangisdiagnosticrelatedtolocation-test.cpp
index eb3cdd4732c..490b97c4557 100644
--- a/tests/unit/unittest/clangisdiagnosticrelatedtolocationtest.cpp
+++ b/tests/unit/unittest/clangisdiagnosticrelatedtolocation-test.cpp
@@ -23,14 +23,11 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <clangisdiagnosticrelatedtolocation.h>
 #include <diagnosticcontainer.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 using ClangBackEnd::DiagnosticContainer;
 using ClangBackEnd::SourceLocationContainer;
 using ClangBackEnd::SourceRangeContainer;
diff --git a/tests/unit/unittest/clangjobqueuetest.cpp b/tests/unit/unittest/clangjobqueue-test.cpp
similarity index 99%
rename from tests/unit/unittest/clangjobqueuetest.cpp
rename to tests/unit/unittest/clangjobqueue-test.cpp
index 255f6a1a812..b3fbafb7534 100644
--- a/tests/unit/unittest/clangjobqueuetest.cpp
+++ b/tests/unit/unittest/clangjobqueue-test.cpp
@@ -23,7 +23,8 @@
 **
 ****************************************************************************/
 
-#include "testutils.h"
+#include "googletest.h"
+#include "processevents-utilities.h"
 
 #include <clangdocument.h>
 #include <clangdocuments.h>
@@ -35,11 +36,6 @@
 
 #include <clang-c/Index.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 #include <QTemporaryFile>
 
 using namespace ClangBackEnd;
diff --git a/tests/unit/unittest/clangjobstest.cpp b/tests/unit/unittest/clangjobs-test.cpp
similarity index 94%
rename from tests/unit/unittest/clangjobstest.cpp
rename to tests/unit/unittest/clangjobs-test.cpp
index 461700972d5..3c642343351 100644
--- a/tests/unit/unittest/clangjobstest.cpp
+++ b/tests/unit/unittest/clangjobs-test.cpp
@@ -23,7 +23,8 @@
 **
 ****************************************************************************/
 
-#include "testutils.h"
+#include "googletest.h"
+#include "processevents-utilities.h"
 #include "dummyclangipcclient.h"
 
 #include <clangdocument.h>
@@ -36,11 +37,6 @@
 
 #include <clang-c/Index.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 using namespace ClangBackEnd;
 
 using testing::IsNull;
@@ -136,7 +132,7 @@ bool Jobs::waitUntilAllJobsFinished(int timeOutInMs) const
 {
     const auto noJobsRunningAnymore = [this](){ return jobs.runningJobs() == 0; };
 
-    return TestUtils::processEventsUntilTrue(noJobsRunningAnymore, timeOutInMs);
+    return ProcessEventUtilities::processEventsUntilTrue(noJobsRunningAnymore, timeOutInMs);
 }
 
 bool Jobs::waitUntilJobChainFinished(int timeOutInMs) const
@@ -145,7 +141,7 @@ bool Jobs::waitUntilJobChainFinished(int timeOutInMs) const
         return jobs.runningJobs() == 0 && jobs.queue().isEmpty();
     };
 
-    return TestUtils::processEventsUntilTrue(noJobsRunningAnymore, timeOutInMs);
+    return ProcessEventUtilities::processEventsUntilTrue(noJobsRunningAnymore, timeOutInMs);
 }
 
 JobRequest Jobs::createJobRequest(const Utf8String &filePath,
diff --git a/tests/unit/unittest/clangrequestdocumentannotationsjobtest.cpp b/tests/unit/unittest/clangrequestdocumentannotationsjob-test.cpp
similarity index 98%
rename from tests/unit/unittest/clangrequestdocumentannotationsjobtest.cpp
rename to tests/unit/unittest/clangrequestdocumentannotationsjob-test.cpp
index e2f4b3c3f39..5e2d77fee41 100644
--- a/tests/unit/unittest/clangrequestdocumentannotationsjobtest.cpp
+++ b/tests/unit/unittest/clangrequestdocumentannotationsjob-test.cpp
@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include "clangasyncjobtest.h"
+#include "clangasyncjob-base.h"
 
 #include <clangrequestdocumentannotationsjob.h>
 
diff --git a/tests/unit/unittest/clangstringtest.cpp b/tests/unit/unittest/clangstring-test.cpp
similarity index 95%
rename from tests/unit/unittest/clangstringtest.cpp
rename to tests/unit/unittest/clangstring-test.cpp
index 632072d160c..6fb59daef22 100644
--- a/tests/unit/unittest/clangstringtest.cpp
+++ b/tests/unit/unittest/clangstring-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <clangstring.h>
 
 #include <utf8string.h>
@@ -30,11 +32,6 @@
 #include <clang-c/CXString.h>
 #include <clang-c/Index.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 namespace {
 
 using ::testing::StrEq;
diff --git a/tests/unit/unittest/clangupdatedocumentannotationsjobtest.cpp b/tests/unit/unittest/clangupdatedocumentannotationsjob-test.cpp
similarity index 99%
rename from tests/unit/unittest/clangupdatedocumentannotationsjobtest.cpp
rename to tests/unit/unittest/clangupdatedocumentannotationsjob-test.cpp
index ec37d336730..a76e0f8703c 100644
--- a/tests/unit/unittest/clangupdatedocumentannotationsjobtest.cpp
+++ b/tests/unit/unittest/clangupdatedocumentannotationsjob-test.cpp
@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include "clangasyncjobtest.h"
+#include "clangasyncjob-base.h"
 
 #include <clangupdatedocumentannotationsjob.h>
 
diff --git a/tests/unit/unittest/clientserverinprocesstest.cpp b/tests/unit/unittest/clientserverinprocess-test.cpp
similarity index 98%
rename from tests/unit/unittest/clientserverinprocesstest.cpp
rename to tests/unit/unittest/clientserverinprocess-test.cpp
index 93bf6cd1a12..37d1e46570c 100644
--- a/tests/unit/unittest/clientserverinprocesstest.cpp
+++ b/tests/unit/unittest/clientserverinprocess-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include "mockclangcodemodelclient.h"
 #include "mockclangcodemodelserver.h"
 
@@ -55,11 +57,6 @@
 
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 using namespace ClangBackEnd;
 
 namespace {
diff --git a/tests/unit/unittest/clientserveroutsideprocess.cpp b/tests/unit/unittest/clientserveroutsideprocess.cpp
index fb1940e2752..94922802814 100644
--- a/tests/unit/unittest/clientserveroutsideprocess.cpp
+++ b/tests/unit/unittest/clientserveroutsideprocess.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include "mockclangcodemodelclient.h"
 
 #include <cmbalivemessage.h>
@@ -41,11 +43,6 @@
 #include <translationunitdoesnotexistmessage.h>
 #include <writemessageblock.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 #include <utils/hostosinfo.h>
 
 #include <QBuffer>
diff --git a/tests/unit/unittest/codecompletiontest.cpp b/tests/unit/unittest/codecompletion-test.cpp
similarity index 99%
rename from tests/unit/unittest/codecompletiontest.cpp
rename to tests/unit/unittest/codecompletion-test.cpp
index 71379cc5dfe..e29c2682ab7 100644
--- a/tests/unit/unittest/codecompletiontest.cpp
+++ b/tests/unit/unittest/codecompletion-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <codecompleter.h>
 #include <clangdocument.h>
 #include <filecontainer.h>
@@ -36,11 +38,6 @@
 #include <QFile>
 #include <QTemporaryDir>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 using ::testing::ElementsAreArray;
 using ::testing::Contains;
 using ::testing::AllOf;
diff --git a/tests/unit/unittest/codecompletionsextractortest.cpp b/tests/unit/unittest/codecompletionsextractor-test.cpp
similarity index 99%
rename from tests/unit/unittest/codecompletionsextractortest.cpp
rename to tests/unit/unittest/codecompletionsextractor-test.cpp
index d7c82415a9c..52ec3777dcd 100644
--- a/tests/unit/unittest/codecompletionsextractortest.cpp
+++ b/tests/unit/unittest/codecompletionsextractor-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <clangcodecompleteresults.h>
 #include <clangdocument.h>
 #include <clangfilepath.h>
@@ -40,11 +42,6 @@
 
 #include <QFile>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 using ClangBackEnd::CodeCompletionsExtractor;
 using ClangBackEnd::ClangCodeCompleteResults;
 using ClangBackEnd::FilePath;
diff --git a/tests/unit/unittest/completionchunkstotextconvertertest.cpp b/tests/unit/unittest/completionchunkstotextconverter-test.cpp
similarity index 99%
rename from tests/unit/unittest/completionchunkstotextconvertertest.cpp
rename to tests/unit/unittest/completionchunkstotextconverter-test.cpp
index baf3b213129..98fe113bf86 100644
--- a/tests/unit/unittest/completionchunkstotextconvertertest.cpp
+++ b/tests/unit/unittest/completionchunkstotextconverter-test.cpp
@@ -23,14 +23,11 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <codecompletionchunk.h>
 #include <clangcompletionchunkstotextconverter.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 namespace {
 
 using ClangBackEnd::CodeCompletionChunk;
diff --git a/tests/unit/unittest/createtablesqlstatementbuildertest.cpp b/tests/unit/unittest/createtablesqlstatementbuilder-test.cpp
similarity index 98%
rename from tests/unit/unittest/createtablesqlstatementbuildertest.cpp
rename to tests/unit/unittest/createtablesqlstatementbuilder-test.cpp
index 184aae093fa..7b1dc4d42af 100644
--- a/tests/unit/unittest/createtablesqlstatementbuildertest.cpp
+++ b/tests/unit/unittest/createtablesqlstatementbuilder-test.cpp
@@ -23,9 +23,7 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gtest-qt-printing.h"
+#include "googletest.h"
 
 #include <QString>
 
diff --git a/tests/unit/unittest/cursortest.cpp b/tests/unit/unittest/cursor-test.cpp
similarity index 99%
rename from tests/unit/unittest/cursortest.cpp
rename to tests/unit/unittest/cursor-test.cpp
index f9bb92e17e6..6fa4249c725 100644
--- a/tests/unit/unittest/cursortest.cpp
+++ b/tests/unit/unittest/cursor-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <clangdocument.h>
 #include <clangdocuments.h>
 #include <clangstring.h>
@@ -34,11 +36,6 @@
 #include <clangtranslationunit.h>
 #include <unsavedfiles.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 using ClangBackEnd::Cursor;
 using ClangBackEnd::Document;
 using ClangBackEnd::TranslationUnit;
diff --git a/tests/unit/unittest/diagnostictest.cpp b/tests/unit/unittest/diagnostic-test.cpp
similarity index 97%
rename from tests/unit/unittest/diagnostictest.cpp
rename to tests/unit/unittest/diagnostic-test.cpp
index 8158711274b..e5e3880965e 100644
--- a/tests/unit/unittest/diagnostictest.cpp
+++ b/tests/unit/unittest/diagnostic-test.cpp
@@ -23,6 +23,9 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+#include "diagnosticcontainer-matcher.h"
+
 #include <diagnostic.h>
 #include <diagnosticcontainer.h>
 #include <diagnosticset.h>
@@ -38,12 +41,6 @@
 
 #include <clang-c/Index.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-
-#include "gtest-qt-printing.h"
-#include "matcher-diagnosticcontainer.h"
 
 using ::testing::Contains;
 using ::testing::Not;
diff --git a/tests/unit/unittest/matcher-diagnosticcontainer.h b/tests/unit/unittest/diagnosticcontainer-matcher.h
similarity index 100%
rename from tests/unit/unittest/matcher-diagnosticcontainer.h
rename to tests/unit/unittest/diagnosticcontainer-matcher.h
diff --git a/tests/unit/unittest/diagnosticsettest.cpp b/tests/unit/unittest/diagnosticset-test.cpp
similarity index 97%
rename from tests/unit/unittest/diagnosticsettest.cpp
rename to tests/unit/unittest/diagnosticset-test.cpp
index 476f87523c3..a35c9de3b82 100644
--- a/tests/unit/unittest/diagnosticsettest.cpp
+++ b/tests/unit/unittest/diagnosticset-test.cpp
@@ -23,6 +23,9 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+#include "diagnosticcontainer-matcher.h"
+
 #include <clangbackendipc_global.h>
 #include <clangdocument.h>
 #include <diagnosticcontainer.h>
@@ -39,12 +42,6 @@
 
 #include <clang-c/Index.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "matcher-diagnosticcontainer.h"
-#include "gtest-qt-printing.h"
-
 using ::testing::Contains;
 using ::testing::Not;
 using ::testing::PrintToString;
diff --git a/tests/unit/unittest/filesystemutilities.h b/tests/unit/unittest/filesystem-utilities.h
similarity index 100%
rename from tests/unit/unittest/filesystemutilities.h
rename to tests/unit/unittest/filesystem-utilities.h
diff --git a/tests/unit/unittest/fixittest.cpp b/tests/unit/unittest/fixit-test.cpp
similarity index 97%
rename from tests/unit/unittest/fixittest.cpp
rename to tests/unit/unittest/fixit-test.cpp
index 515c819307a..bedf945891b 100644
--- a/tests/unit/unittest/fixittest.cpp
+++ b/tests/unit/unittest/fixit-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <diagnostic.h>
 #include <diagnosticset.h>
 #include <projectpart.h>
@@ -37,11 +39,6 @@
 
 #include <clang-c/Index.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 using ClangBackEnd::DiagnosticSet;
 using ClangBackEnd::Document;
 using ClangBackEnd::TranslationUnit;
diff --git a/tests/unit/unittest/googletest.h b/tests/unit/unittest/googletest.h
new file mode 100644
index 00000000000..da028e9f64e
--- /dev/null
+++ b/tests/unit/unittest/googletest.h
@@ -0,0 +1,31 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+#pragma once
+
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include "gtest-qt-printing.h"
diff --git a/tests/unit/unittest/highlightingmarkstest.cpp b/tests/unit/unittest/highlightingmarks-test.cpp
similarity index 99%
rename from tests/unit/unittest/highlightingmarkstest.cpp
rename to tests/unit/unittest/highlightingmarks-test.cpp
index 4b18d74f5cd..de79d379fd9 100644
--- a/tests/unit/unittest/highlightingmarkstest.cpp
+++ b/tests/unit/unittest/highlightingmarks-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <clangdocument.h>
 #include <clangdocuments.h>
 #include <clangtranslationunit.h>
@@ -39,11 +41,6 @@
 
 #include <clang-c/Index.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 using ClangBackEnd::Cursor;
 using ClangBackEnd::HighlightingTypes;
 using ClangBackEnd::HighlightingMark;
diff --git a/tests/unit/unittest/highlightingmarksreportertest.cpp b/tests/unit/unittest/highlightingmarksreporter-test.cpp
similarity index 97%
rename from tests/unit/unittest/highlightingmarksreportertest.cpp
rename to tests/unit/unittest/highlightingmarksreporter-test.cpp
index 5fa3963e22b..ec9760a10f1 100644
--- a/tests/unit/unittest/highlightingmarksreportertest.cpp
+++ b/tests/unit/unittest/highlightingmarksreporter-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <chunksreportedmonitor.h>
 #include <clangdocument.h>
 #include <clangdocuments.h>
@@ -34,11 +36,6 @@
 #include <projects.h>
 #include <unsavedfiles.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 using ClangBackEnd::Cursor;
 using ClangBackEnd::HighlightingMarks;
 using ClangBackEnd::HighlightingMarkContainer;
diff --git a/tests/unit/unittest/lineprefixertest.cpp b/tests/unit/unittest/lineprefixer-test.cpp
similarity index 97%
rename from tests/unit/unittest/lineprefixertest.cpp
rename to tests/unit/unittest/lineprefixer-test.cpp
index 473f8fc2102..222a0f282bb 100644
--- a/tests/unit/unittest/lineprefixertest.cpp
+++ b/tests/unit/unittest/lineprefixer-test.cpp
@@ -23,13 +23,11 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <lineprefixer.h>
 #include <utf8string.h>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 namespace {
 
 QByteArray runPrefixer(QList<QByteArray> inputChunks);
diff --git a/tests/unit/unittest/refactoringclientcallbackmock.h b/tests/unit/unittest/mockrefactoringclientcallback.h
similarity index 97%
rename from tests/unit/unittest/refactoringclientcallbackmock.h
rename to tests/unit/unittest/mockrefactoringclientcallback.h
index 703f9ff9c42..3f9a473b60c 100644
--- a/tests/unit/unittest/refactoringclientcallbackmock.h
+++ b/tests/unit/unittest/mockrefactoringclientcallback.h
@@ -32,7 +32,7 @@
 #include <gtest/gtest.h>
 #include "gtest-qt-printing.h"
 
-class RefactoringClientCallBackMock
+class MockRefactoringClientCallBack
 {
 public:
     MOCK_METHOD3(localRenaming,
diff --git a/tests/unit/unittest/testutils.cpp b/tests/unit/unittest/processevents-utilities.cpp
similarity index 91%
rename from tests/unit/unittest/testutils.cpp
rename to tests/unit/unittest/processevents-utilities.cpp
index 7368dce5825..32162edecd1 100644
--- a/tests/unit/unittest/testutils.cpp
+++ b/tests/unit/unittest/processevents-utilities.cpp
@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include "testutils.h"
+#include "processevents-utilities.h"
 
 #include <QCoreApplication>
 #include <QThread>
@@ -31,7 +31,9 @@
 
 #include <QDebug>
 
-bool TestUtils::processEventsUntilTrue(std::function<bool ()> condition, int timeOutInMs)
+namespace ProcessEventUtilities
+{
+bool processEventsUntilTrue(std::function<bool ()> condition, int timeOutInMs)
 {
     if (condition())
         return true;
@@ -52,3 +54,4 @@ bool TestUtils::processEventsUntilTrue(std::function<bool ()> condition, int tim
         QCoreApplication::processEvents();
     }
 }
+}
diff --git a/tests/unit/unittest/testutils.h b/tests/unit/unittest/processevents-utilities.h
similarity index 91%
rename from tests/unit/unittest/testutils.h
rename to tests/unit/unittest/processevents-utilities.h
index fd856cc28aa..4b8fe9066e2 100644
--- a/tests/unit/unittest/testutils.h
+++ b/tests/unit/unittest/processevents-utilities.h
@@ -27,8 +27,7 @@
 
 #include <functional>
 
-class TestUtils
+namespace ProcessEventUtilities
 {
-public:
-    static bool processEventsUntilTrue(std::function<bool ()> condition, int timeOutInMs);
-};
+bool processEventsUntilTrue(std::function<bool ()> condition, int timeOutInMs);
+}
diff --git a/tests/unit/unittest/projecttest.cpp b/tests/unit/unittest/projectpart-test.cpp
similarity index 98%
rename from tests/unit/unittest/projecttest.cpp
rename to tests/unit/unittest/projectpart-test.cpp
index bf7e33c9d81..7595cedbfc2 100644
--- a/tests/unit/unittest/projecttest.cpp
+++ b/tests/unit/unittest/projectpart-test.cpp
@@ -23,16 +23,13 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <projectpart.h>
 #include <clangexceptions.h>
 #include <projects.h>
 #include <utf8stringvector.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 #include <chrono>
 #include <thread>
 
diff --git a/tests/unit/unittest/readandwritemessageblocktest.cpp b/tests/unit/unittest/readandwritemessageblock-test.cpp
similarity index 98%
rename from tests/unit/unittest/readandwritemessageblocktest.cpp
rename to tests/unit/unittest/readandwritemessageblock-test.cpp
index 90fcc56926d..d45a3a347ae 100644
--- a/tests/unit/unittest/readandwritemessageblocktest.cpp
+++ b/tests/unit/unittest/readandwritemessageblock-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <cmbalivemessage.h>
 #include <cmbcodecompletedmessage.h>
 #include <cmbcompletecodemessage.h>
@@ -46,11 +48,6 @@
 
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 using namespace testing;
 namespace CodeModelBackeEndTest {
 
diff --git a/tests/unit/unittest/refactoringclienttest.cpp b/tests/unit/unittest/refactoringclient-test.cpp
similarity index 95%
rename from tests/unit/unittest/refactoringclienttest.cpp
rename to tests/unit/unittest/refactoringclient-test.cpp
index ac6f0cdc3cb..6badbee3c60 100644
--- a/tests/unit/unittest/refactoringclienttest.cpp
+++ b/tests/unit/unittest/refactoringclient-test.cpp
@@ -23,7 +23,8 @@
 **
 ****************************************************************************/
 
-#include "refactoringclientcallbackmock.h"
+#include "googletest.h"
+#include "mockrefactoringclientcallback.h"
 
 #include <refactoringclient.h>
 #include <refactoringcompileroptionsbuilder.h>
@@ -39,11 +40,6 @@
 #include <QTextCursor>
 #include <QTextDocument>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 namespace {
 
 using ClangRefactoring::RefactoringCompilerOptionsBuilder;
@@ -59,7 +55,7 @@ class RefactoringClient : public ::testing::Test
     void SetUp();
 
 protected:
-    RefactoringClientCallBackMock callbackMock;
+    MockRefactoringClientCallBack callbackMock;
     ClangRefactoring::RefactoringClient client;
     ClangBackEnd::RefactoringConnectionClient connectionClient{&client};
     RefactoringEngine engine{connectionClient.serverProxy(), client};
diff --git a/tests/unit/unittest/refactoringclientserverinprocesstest.cpp b/tests/unit/unittest/refactoringclientserverinprocess-test.cpp
similarity index 97%
rename from tests/unit/unittest/refactoringclientserverinprocesstest.cpp
rename to tests/unit/unittest/refactoringclientserverinprocess-test.cpp
index f67c0ee4bd3..1080df77ab2 100644
--- a/tests/unit/unittest/refactoringclientserverinprocesstest.cpp
+++ b/tests/unit/unittest/refactoringclientserverinprocess-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include "mockrefactoringclient.h"
 #include "mockrefactoringserver.h"
 
@@ -38,11 +40,6 @@
 
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 using namespace ClangBackEnd;
 
 namespace {
diff --git a/tests/unit/unittest/refactoringcompilationdatabasetest.cpp b/tests/unit/unittest/refactoringcompilationdatabase-test.cpp
similarity index 96%
rename from tests/unit/unittest/refactoringcompilationdatabasetest.cpp
rename to tests/unit/unittest/refactoringcompilationdatabase-test.cpp
index 6bd2e87b1e8..83ea1516188 100644
--- a/tests/unit/unittest/refactoringcompilationdatabasetest.cpp
+++ b/tests/unit/unittest/refactoringcompilationdatabase-test.cpp
@@ -23,12 +23,9 @@
 **
 ****************************************************************************/
 
-#include <refactoringcompilationdatabase.h>
+#include "googletest.h"
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
+#include <refactoringcompilationdatabase.h>
 
 using testing::Contains;
 using testing::IsEmpty;
diff --git a/tests/unit/unittest/refactoringenginetest.cpp b/tests/unit/unittest/refactoringengine-test.cpp
similarity index 97%
rename from tests/unit/unittest/refactoringenginetest.cpp
rename to tests/unit/unittest/refactoringengine-test.cpp
index 769594d73a3..e295ac34f1a 100644
--- a/tests/unit/unittest/refactoringenginetest.cpp
+++ b/tests/unit/unittest/refactoringengine-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include "mockrefactoringserver.h"
 #include "mockrefactoringclient.h"
 
@@ -37,11 +39,6 @@
 #include <QTextCursor>
 #include <QTextDocument>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 namespace {
 
 using testing::_;
diff --git a/tests/unit/unittest/refactoringservertest.cpp b/tests/unit/unittest/refactoringserver-test.cpp
similarity index 97%
rename from tests/unit/unittest/refactoringservertest.cpp
rename to tests/unit/unittest/refactoringserver-test.cpp
index 257b37104ec..897a47d162b 100644
--- a/tests/unit/unittest/refactoringservertest.cpp
+++ b/tests/unit/unittest/refactoringserver-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include "mockrefactoringclient.h"
 
 #include <refactoringserver.h>
@@ -30,11 +32,6 @@
 #include <sourcelocationsforrenamingmessage.h>
 #include <sourcelocationscontainer.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 namespace {
 
 using testing::AllOf;
diff --git a/tests/unit/unittest/senddocumenttrackertest.cpp b/tests/unit/unittest/senddocumenttracker-test.cpp
similarity index 98%
rename from tests/unit/unittest/senddocumenttrackertest.cpp
rename to tests/unit/unittest/senddocumenttracker-test.cpp
index ac165234d11..dbea1415531 100644
--- a/tests/unit/unittest/senddocumenttrackertest.cpp
+++ b/tests/unit/unittest/senddocumenttracker-test.cpp
@@ -23,12 +23,9 @@
 **
 ****************************************************************************/
 
-#include <cpptools/senddocumenttracker.h>
+#include "googletest.h"
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
+#include <cpptools/senddocumenttracker.h>
 
 using CppTools::SendDocumentTracker;
 using testing::PrintToString;
diff --git a/tests/unit/unittest/sizedarraytest.cpp b/tests/unit/unittest/sizedarray-test.cpp
similarity index 97%
rename from tests/unit/unittest/sizedarraytest.cpp
rename to tests/unit/unittest/sizedarray-test.cpp
index 1af4f45f540..b3637a23a19 100644
--- a/tests/unit/unittest/sizedarraytest.cpp
+++ b/tests/unit/unittest/sizedarray-test.cpp
@@ -23,9 +23,7 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gtest-qt-printing.h"
+#include "googletest.h"
 
 #include <utils/sizedarray.h>
 
diff --git a/tests/unit/unittest/skippedsourcerangestest.cpp b/tests/unit/unittest/skippedsourceranges-test.cpp
similarity index 97%
rename from tests/unit/unittest/skippedsourcerangestest.cpp
rename to tests/unit/unittest/skippedsourceranges-test.cpp
index 02c1ad9f0f5..e775961a84b 100644
--- a/tests/unit/unittest/skippedsourcerangestest.cpp
+++ b/tests/unit/unittest/skippedsourceranges-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <cursor.h>
 #include <clangdocument.h>
 #include <clangdocuments.h>
@@ -39,11 +41,6 @@
 
 #include <QVector>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 using ClangBackEnd::Cursor;
 using ClangBackEnd::Document;
 using ClangBackEnd::Documents;
diff --git a/tests/unit/unittest/smallstringbenchmark.cpp b/tests/unit/unittest/smallstring-benchmark.cpp
similarity index 100%
rename from tests/unit/unittest/smallstringbenchmark.cpp
rename to tests/unit/unittest/smallstring-benchmark.cpp
diff --git a/tests/unit/unittest/smallstringtest.cpp b/tests/unit/unittest/smallstring-test.cpp
similarity index 99%
rename from tests/unit/unittest/smallstringtest.cpp
rename to tests/unit/unittest/smallstring-test.cpp
index cca754b8794..4770ed2f990 100644
--- a/tests/unit/unittest/smallstringtest.cpp
+++ b/tests/unit/unittest/smallstring-test.cpp
@@ -23,9 +23,7 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gtest-qt-printing.h"
+#include "googletest.h"
 
 #include <QString>
 
diff --git a/tests/unit/unittest/sourcelocationtest.cpp b/tests/unit/unittest/sourcelocation-test.cpp
similarity index 96%
rename from tests/unit/unittest/sourcelocationtest.cpp
rename to tests/unit/unittest/sourcelocation-test.cpp
index 7c2361f0238..3c9cb640a3c 100644
--- a/tests/unit/unittest/sourcelocationtest.cpp
+++ b/tests/unit/unittest/sourcelocation-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <diagnostic.h>
 #include <diagnosticset.h>
 #include <projectpart.h>
@@ -35,11 +37,6 @@
 
 #include <clang-c/Index.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 using ClangBackEnd::Diagnostic;
 using ClangBackEnd::DiagnosticSet;
 using ClangBackEnd::ProjectPart;
diff --git a/tests/unit/unittest/sourcerangetest.cpp b/tests/unit/unittest/sourcerange-test.cpp
similarity index 97%
rename from tests/unit/unittest/sourcerangetest.cpp
rename to tests/unit/unittest/sourcerange-test.cpp
index 0a13f8e773b..a9adee64138 100644
--- a/tests/unit/unittest/sourcerangetest.cpp
+++ b/tests/unit/unittest/sourcerange-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <clangtranslationunit.h>
 #include <diagnostic.h>
 #include <diagnosticset.h>
@@ -37,11 +39,6 @@
 
 #include <memory>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 using ClangBackEnd::DiagnosticSet;
 using ClangBackEnd::Document;
 using ClangBackEnd::Documents;
diff --git a/tests/unit/unittest/sqlitecolumntest.cpp b/tests/unit/unittest/sqlitecolumn-test.cpp
similarity index 95%
rename from tests/unit/unittest/sqlitecolumntest.cpp
rename to tests/unit/unittest/sqlitecolumn-test.cpp
index b714249a1dd..b520fc40eb8 100644
--- a/tests/unit/unittest/sqlitecolumntest.cpp
+++ b/tests/unit/unittest/sqlitecolumn-test.cpp
@@ -23,12 +23,9 @@
 **
 ****************************************************************************/
 
-#include <sqlitecolumn.h>
+#include "googletest.h"
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
+#include <sqlitecolumn.h>
 
 namespace {
 
diff --git a/tests/unit/unittest/sqlitedatabasetest.cpp b/tests/unit/unittest/sqlitedatabase-test.cpp
similarity index 96%
rename from tests/unit/unittest/sqlitedatabasetest.cpp
rename to tests/unit/unittest/sqlitedatabase-test.cpp
index b94c57da4b8..1e417aefb6c 100644
--- a/tests/unit/unittest/sqlitedatabasetest.cpp
+++ b/tests/unit/unittest/sqlitedatabase-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include "spydummy.h"
 
 #include <sqlitedatabase.h>
@@ -32,11 +34,6 @@
 #include <QSignalSpy>
 #include <QVariant>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 namespace {
 
 class SqliteDatabase : public ::testing::Test
diff --git a/tests/unit/unittest/sqlitedatabasebackendtest.cpp b/tests/unit/unittest/sqlitedatabasebackend-test.cpp
similarity index 95%
rename from tests/unit/unittest/sqlitedatabasebackendtest.cpp
rename to tests/unit/unittest/sqlitedatabasebackend-test.cpp
index 2018aacbad9..8cba32029ad 100644
--- a/tests/unit/unittest/sqlitedatabasebackendtest.cpp
+++ b/tests/unit/unittest/sqlitedatabasebackend-test.cpp
@@ -23,17 +23,14 @@
 **
 ****************************************************************************/
 
-#include "sqlitedatabasebackend.h"
-#include "sqliteexception.h"
-#include "sqlitewritestatement.h"
+#include "googletest.h"
+
+#include <sqlitedatabasebackend.h>
+#include <sqliteexception.h>
+#include <sqlitewritestatement.h>
 
 #include <QDir>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 namespace {
 
 class SqliteDatabaseBackend : public ::testing::Test
diff --git a/tests/unit/unittest/sqlitestatementtest.cpp b/tests/unit/unittest/sqlitestatement-test.cpp
similarity index 99%
rename from tests/unit/unittest/sqlitestatementtest.cpp
rename to tests/unit/unittest/sqlitestatement-test.cpp
index cea2971d393..8975eee591c 100644
--- a/tests/unit/unittest/sqlitestatementtest.cpp
+++ b/tests/unit/unittest/sqlitestatement-test.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <sqlitedatabasebackend.h>
 #include <sqlitereadstatement.h>
 #include <sqlitereadwritestatement.h>
@@ -36,11 +38,6 @@
 #include <QStringList>
 #include <QVariant>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 namespace {
 class SqliteStatement : public ::testing::Test
 {
diff --git a/tests/unit/unittest/sqlitetabletest.cpp b/tests/unit/unittest/sqlitetable-test.cpp
similarity index 96%
rename from tests/unit/unittest/sqlitetabletest.cpp
rename to tests/unit/unittest/sqlitetable-test.cpp
index 8d66b7b9344..9ca59576fc6 100644
--- a/tests/unit/unittest/sqlitetabletest.cpp
+++ b/tests/unit/unittest/sqlitetable-test.cpp
@@ -23,6 +23,7 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
 #include "spydummy.h"
 
 #include <sqlitecolumn.h>
@@ -33,11 +34,6 @@
 #include <QSignalSpy>
 #include <QVariant>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 namespace {
 
 class SqliteTable : public ::testing::Test
diff --git a/tests/unit/unittest/sqlstatementbuildertest.cpp b/tests/unit/unittest/sqlstatementbuilder-test.cpp
similarity index 98%
rename from tests/unit/unittest/sqlstatementbuildertest.cpp
rename to tests/unit/unittest/sqlstatementbuilder-test.cpp
index 0e469914596..7959dd5799a 100644
--- a/tests/unit/unittest/sqlstatementbuildertest.cpp
+++ b/tests/unit/unittest/sqlstatementbuilder-test.cpp
@@ -23,17 +23,14 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <sqlstatementbuilderexception.h>
 #include <sqlstatementbuilder.h>
 #include <utf8stringvector.h>
 
 #include <QString>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 using namespace ::testing;
 
 TEST(SqlStatementBuilder, Bind)
diff --git a/tests/unit/unittest/symbolfindertest.cpp b/tests/unit/unittest/symbolfinder-test.cpp
similarity index 98%
rename from tests/unit/unittest/symbolfindertest.cpp
rename to tests/unit/unittest/symbolfinder-test.cpp
index 9d8ac2ed945..dfbde15bff2 100644
--- a/tests/unit/unittest/symbolfindertest.cpp
+++ b/tests/unit/unittest/symbolfinder-test.cpp
@@ -23,15 +23,12 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <clangrefactoringbackend_global.h>
 #include <symbolfinder.h>
 
-#include "filesystemutilities.h"
-
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
+#include "filesystem-utilities.h"
 
 using ClangBackEnd::SymbolFinder;
 using ClangBackEnd::FileContent;
diff --git a/tests/unit/unittest/translationunitupdatertest.cpp b/tests/unit/unittest/translationunitupdater-test.cpp
similarity index 97%
rename from tests/unit/unittest/translationunitupdatertest.cpp
rename to tests/unit/unittest/translationunitupdater-test.cpp
index 0a78bdd3f38..c96b53d9eda 100644
--- a/tests/unit/unittest/translationunitupdatertest.cpp
+++ b/tests/unit/unittest/translationunitupdater-test.cpp
@@ -23,15 +23,12 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <clangtranslationunitupdater.h>
 
 #include <clang-c/Index.h>
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 using ClangBackEnd::TranslationUnitUpdater;
 using ClangBackEnd::TranslationUnitUpdateInput;
 using ClangBackEnd::TranslationUnitUpdateResult;
diff --git a/tests/unit/unittest/unittest.pro b/tests/unit/unittest/unittest.pro
index ea072b82815..6c40fbb8ece 100644
--- a/tests/unit/unittest/unittest.pro
+++ b/tests/unit/unittest/unittest.pro
@@ -25,101 +25,102 @@ win32:DEFINES += ECHOSERVER=\"R\\\"xxx($$OUT_PWD/../echo)xxx\\\"\"
 unix: DEFINES += ECHOSERVER=\"R\\\"xxx($$OUT_PWD/../echoserver/echo)xxx\\\"\"
 
 SOURCES += \
-    clientserverinprocesstest.cpp \
+    clientserverinprocess-test.cpp \
     clientserveroutsideprocess.cpp \
-    lineprefixertest.cpp \
-    main.cpp \
-    readandwritemessageblocktest.cpp \
-    sizedarraytest.cpp \
+    lineprefixer-test.cpp \
+    processevents-utilities.cpp \
+    readandwritemessageblock-test.cpp \
+    sizedarray-test.cpp \
+    smallstring-test.cpp \
     spydummy.cpp \
-    smallstringtest.cpp \
-    testutils.cpp \
-    utf8test.cpp
+    unittests-main.cpp \
+    utf8-test.cpp
 
 !isEmpty(LIBCLANG_LIBS) {
 SOURCES += \
-    activationsequencecontextprocessortest.cpp \
-    activationsequenceprocessortest.cpp \
-    clangcodecompleteresultstest.cpp \
-    clangcompletioncontextanalyzertest.cpp \
-    clangdiagnosticfiltertest.cpp \
-    clangfixitoperationtest.cpp \
-    clangipcservertest.cpp \
-    clangstringtest.cpp \
-    codecompletionsextractortest.cpp \
-    codecompletiontest.cpp \
-    completionchunkstotextconvertertest.cpp \
-    createtablesqlstatementbuildertest.cpp \
-    diagnosticsettest.cpp \
-    diagnostictest.cpp \
-    fixittest.cpp \
-    projecttest.cpp \
-    sourcelocationtest.cpp \
-    sourcerangetest.cpp \
-    sqlitecolumntest.cpp \
-    sqlitedatabasebackendtest.cpp \
-    sqlitedatabasetest.cpp \
-    sqlitestatementtest.cpp \
-    sqlitetabletest.cpp \
-    sqlstatementbuildertest.cpp \
-    clangdocumenttest.cpp \
-    clangdocumentstest.cpp \
-    unsavedfilestest.cpp \
-    senddocumenttrackertest.cpp \
-    cursortest.cpp \
-    skippedsourcerangestest.cpp \
-    highlightingmarksreportertest.cpp \
+    activationsequencecontextprocessor-test.cpp \
+    activationsequenceprocessor-test.cpp \
     chunksreportedmonitor.cpp \
-    unsavedfiletest.cpp \
-    clangisdiagnosticrelatedtolocationtest.cpp \
-    highlightingmarkstest.cpp \
-    utf8positionfromlinecolumntest.cpp \
-    translationunitupdatertest.cpp \
-    clangasyncjobtest.cpp \
-    clangcompletecodejobtest.cpp \
-    clangcreateinitialdocumentpreamblejobtest.cpp \
-    clangjobqueuetest.cpp \
-    clangjobstest.cpp \
-    clangrequestdocumentannotationsjobtest.cpp \
-    clangupdatedocumentannotationsjobtest.cpp
+    clangasyncjob-base.cpp \
+    clangcodecompleteresults-test.cpp \
+    clangcompletecodejob-test.cpp \
+    clangcompletioncontextanalyzer-test.cpp \
+    clangcreateinitialdocumentpreamblejob-test.cpp \
+    clangdiagnosticfilter-test.cpp \
+    clangdocuments-test.cpp \
+    clangdocument-test.cpp \
+    clangfixitoperation-test.cpp \
+    clangipcserver-test.cpp \
+    clangisdiagnosticrelatedtolocation-test.cpp \
+    clangjobqueue-test.cpp \
+    clangjobs-test.cpp \
+    clangrequestdocumentannotationsjob-test.cpp \
+    clangstring-test.cpp \
+    clangupdatedocumentannotationsjob-test.cpp \
+    codecompletionsextractor-test.cpp \
+    codecompletion-test.cpp \
+    completionchunkstotextconverter-test.cpp \
+    createtablesqlstatementbuilder-test.cpp \
+    cursor-test.cpp \
+    diagnosticset-test.cpp \
+    diagnostic-test.cpp \
+    fixit-test.cpp \
+    highlightingmarksreporter-test.cpp \
+    highlightingmarks-test.cpp \
+    projectpart-test.cpp \
+    senddocumenttracker-test.cpp \
+    skippedsourceranges-test.cpp \
+    sourcelocation-test.cpp \
+    sourcerange-test.cpp \
+    sqlitecolumn-test.cpp \
+    sqlitedatabasebackend-test.cpp \
+    sqlitedatabase-test.cpp \
+    sqlitestatement-test.cpp \
+    sqlitetable-test.cpp \
+    sqlstatementbuilder-test.cpp \
+    translationunitupdater-test.cpp \
+    unsavedfiles-test.cpp \
+    unsavedfile-test.cpp \
+    utf8positionfromlinecolumn-test.cpp
 }
 
 !isEmpty(LIBTOOLING_LIBS) {
 SOURCES += \
-    refactoringclientserverinprocesstest.cpp \
-    refactoringcompilationdatabasetest.cpp \
-    refactoringservertest.cpp \
-    refactoringenginetest.cpp \
-    refactoringclienttest.cpp \
-    symbolfindertest.cpp
+    refactoringclientserverinprocess-test.cpp \
+    refactoringclient-test.cpp \
+    refactoringcompilationdatabase-test.cpp \
+    refactoringengine-test.cpp \
+    refactoringserver-test.cpp \
+    symbolfinder-test.cpp
 }
 
 exists($$GOOGLEBENCHMARK_DIR) {
 SOURCES += \
-    smallstringbenchmark.cpp
+    smallstring-benchmark.cpp
 }
 
 HEADERS += \
+    filesystem-utilities.h \
+    googletest.h \
     gtest-qt-printing.h \
-    spydummy.h \
-    dummyclangipcclient.h \
-    testutils.h \
-    mockclangcodemodelclient.h \
-    mockclangcodemodelserver.h \
-    mockrefactoringclient.h \
-    mockrefactoringserver.h \
-    refactoringclientcallbackmock.h
+    processevents-utilities.h \
+    spydummy.h
 
 !isEmpty(LIBCLANG_LIBS) {
 HEADERS += \
-    clangasyncjobtest.h \
     chunksreportedmonitor.h \
-    matcher-diagnosticcontainer.h
+    clangasyncjob-base.h \
+    diagnosticcontainer-matcher.h \
+    dummyclangipcclient.h \
+    mockclangcodemodelclient.h \
+    mockclangcodemodelserver.h
 }
 
 !isEmpty(LIBTOOLING_LIBS) {
 HEADERS += \
-    filesystemutilities.h
+    mockrefactoringclientcallback.h \
+    mockrefactoringclient.h \
+    mockrefactoringserver.h
 }
 
 OTHER_FILES += $$files(data/*)
diff --git a/tests/unit/unittest/main.cpp b/tests/unit/unittest/unittests-main.cpp
similarity index 100%
rename from tests/unit/unittest/main.cpp
rename to tests/unit/unittest/unittests-main.cpp
diff --git a/tests/unit/unittest/unsavedfiletest.cpp b/tests/unit/unittest/unsavedfile-test.cpp
similarity index 98%
rename from tests/unit/unittest/unsavedfiletest.cpp
rename to tests/unit/unittest/unsavedfile-test.cpp
index 79f1040b129..05783a33c32 100644
--- a/tests/unit/unittest/unsavedfiletest.cpp
+++ b/tests/unit/unittest/unsavedfile-test.cpp
@@ -23,10 +23,7 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock.h"
-#include "gtest-qt-printing.h"
+#include "googletest.h"
 
 #include <clangfilepath.h>
 #include <unsavedfile.h>
diff --git a/tests/unit/unittest/unsavedfilestest.cpp b/tests/unit/unittest/unsavedfiles-test.cpp
similarity index 98%
rename from tests/unit/unittest/unsavedfilestest.cpp
rename to tests/unit/unittest/unsavedfiles-test.cpp
index fd3fbae9121..8bb474c55eb 100644
--- a/tests/unit/unittest/unsavedfilestest.cpp
+++ b/tests/unit/unittest/unsavedfiles-test.cpp
@@ -23,10 +23,7 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock.h"
-#include "gtest-qt-printing.h"
+#include "googletest.h"
 
 #include <filecontainer.h>
 #include <unsavedfiles.h>
diff --git a/tests/unit/unittest/utf8test.cpp b/tests/unit/unittest/utf8-test.cpp
similarity index 98%
rename from tests/unit/unittest/utf8test.cpp
rename to tests/unit/unittest/utf8-test.cpp
index c569390dd8a..663955dcbc0 100644
--- a/tests/unit/unittest/utf8test.cpp
+++ b/tests/unit/unittest/utf8-test.cpp
@@ -23,9 +23,7 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gtest-qt-printing.h"
+#include "googletest.h"
 
 #include <QString>
 
diff --git a/tests/unit/unittest/utf8positionfromlinecolumntest.cpp b/tests/unit/unittest/utf8positionfromlinecolumn-test.cpp
similarity index 97%
rename from tests/unit/unittest/utf8positionfromlinecolumntest.cpp
rename to tests/unit/unittest/utf8positionfromlinecolumn-test.cpp
index 683483ddab7..3cca681f7c0 100644
--- a/tests/unit/unittest/utf8positionfromlinecolumntest.cpp
+++ b/tests/unit/unittest/utf8positionfromlinecolumn-test.cpp
@@ -23,10 +23,7 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock.h"
-#include "gtest-qt-printing.h"
+#include "googletest.h"
 
 #include <utf8positionfromlinecolumn.h>
 #include <utf8string.h>