UnitTest: Cleanup

Improve naming and introduce googletest.h.

Change-Id: I445c13db4c23d6dd5682ce0db3b83055cc6b8a89
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

tests/unit/unittest/activationsequencecontextprocessortest.cpp → 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;

tests/unit/unittest/activationsequenceprocessortest.cpp → 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;

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;
 }
 

tests/unit/unittest/clangasyncjobtest.cpp → 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);
 }

tests/unit/unittest/clangasyncjobtest.h → 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:

tests/unit/unittest/clangcodecompleteresultstest.cpp → 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;

tests/unit/unittest/clangcompletecodejobtest.cpp → tests/unit/unittest/clangcompletecodejob-test.cpp

@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include "clangasyncjobtest.h"
+#include "clangasyncjob-base.h"
 
 #include <clangcompletecodejob.h>
 

tests/unit/unittest/clangcompletioncontextanalyzertest.cpp → 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 {
 

tests/unit/unittest/clangcreateinitialdocumentpreamblejobtest.cpp → tests/unit/unittest/clangcreateinitialdocumentpreamblejob-test.cpp

@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include "clangasyncjobtest.h"
+#include "clangasyncjob-base.h"
 
 #include <clangcreateinitialdocumentpreamblejob.h>
 

tests/unit/unittest/clangdiagnosticfiltertest.cpp → 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;

tests/unit/unittest/clangdocumenttest.cpp → 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>

tests/unit/unittest/clangdocumentstest.cpp → 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;

tests/unit/unittest/clangfixitoperationtest.cpp → 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>

tests/unit/unittest/clangipcservertest.cpp → 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(

tests/unit/unittest/clangisdiagnosticrelatedtolocationtest.cpp → 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;

tests/unit/unittest/clangjobqueuetest.cpp → 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;

tests/unit/unittest/clangjobstest.cpp → 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,

tests/unit/unittest/clangrequestdocumentannotationsjobtest.cpp → tests/unit/unittest/clangrequestdocumentannotationsjob-test.cpp

@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include "clangasyncjobtest.h"
+#include "clangasyncjob-base.h"
 
 #include <clangrequestdocumentannotationsjob.h>
 

tests/unit/unittest/clangstringtest.cpp → 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;

tests/unit/unittest/clangupdatedocumentannotationsjobtest.cpp → tests/unit/unittest/clangupdatedocumentannotationsjob-test.cpp

@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include "clangasyncjobtest.h"
+#include "clangasyncjob-base.h"
 
 #include <clangupdatedocumentannotationsjob.h>
 

tests/unit/unittest/clientserverinprocesstest.cpp → 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 {

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>

tests/unit/unittest/codecompletiontest.cpp → 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;

tests/unit/unittest/codecompletionsextractortest.cpp → 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;

tests/unit/unittest/completionchunkstotextconvertertest.cpp → 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;

tests/unit/unittest/createtablesqlstatementbuildertest.cpp → 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>
 

tests/unit/unittest/cursortest.cpp → 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;

tests/unit/unittest/diagnostictest.cpp → 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;

tests/unit/unittest/diagnosticsettest.cpp → 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;

tests/unit/unittest/fixittest.cpp → 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;

tests/unit/unittest/googletest.h

+/****************************************************************************
+**
+** 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"

tests/unit/unittest/highlightingmarkstest.cpp → tests/unit/unittest/highlightingmarks-test.cpp

@@ -23,6 +23,8 @@
 **
 ****************************************************************************/