From b1bb6d9641f344ee053618e6c461d5897ce5fe6c Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Thu, 30 Nov 2017 11:27:06 +0100
Subject: [PATCH] UnitTests: Fix ODR problem for print functions

You have to include them for all translationunits because otherwise default
print function are generated. So you get to different implementations for
the same symbol.

Change-Id: I732d2e1f1774f72acdbb49cbe1848d31ca3f5c98
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
---
 tests/unit/unittest/diagnosticcontainer-matcher.h   | 5 +----
 tests/unit/unittest/mockclangcodemodelserver.h      | 7 ++-----
 tests/unit/unittest/mockrefactoringclientcallback.h | 7 ++-----
 tests/unit/unittest/unittests-main.cpp              | 5 ++---
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/tests/unit/unittest/diagnosticcontainer-matcher.h b/tests/unit/unittest/diagnosticcontainer-matcher.h
index 0574bd61699..f04e9e374bd 100644
--- a/tests/unit/unittest/diagnosticcontainer-matcher.h
+++ b/tests/unit/unittest/diagnosticcontainer-matcher.h
@@ -23,10 +23,7 @@
 **
 ****************************************************************************/
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
+#include "googletest.h"
 
 namespace {
 
diff --git a/tests/unit/unittest/mockclangcodemodelserver.h b/tests/unit/unittest/mockclangcodemodelserver.h
index d1f895d667c..8b6c66b2a33 100644
--- a/tests/unit/unittest/mockclangcodemodelserver.h
+++ b/tests/unit/unittest/mockclangcodemodelserver.h
@@ -25,12 +25,9 @@
 
 #pragma once
 
-#include <clangcodemodelserverinterface.h>
+#include "googletest.h"
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
+#include <clangcodemodelserverinterface.h>
 
 class MockClangCodeModelServer : public ClangBackEnd::ClangCodeModelServerInterface {
 public:
diff --git a/tests/unit/unittest/mockrefactoringclientcallback.h b/tests/unit/unittest/mockrefactoringclientcallback.h
index 3f9a473b60c..a3486c366c6 100644
--- a/tests/unit/unittest/mockrefactoringclientcallback.h
+++ b/tests/unit/unittest/mockrefactoringclientcallback.h
@@ -25,12 +25,9 @@
 
 #pragma once
 
-#include <sourcelocationscontainer.h>
+#include "googletest.h"
 
-#include <gmock/gmock.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
+#include <sourcelocationscontainer.h>
 
 class MockRefactoringClientCallBack
 {
diff --git a/tests/unit/unittest/unittests-main.cpp b/tests/unit/unittest/unittests-main.cpp
index 9f927805676..d8f0ce31005 100644
--- a/tests/unit/unittest/unittests-main.cpp
+++ b/tests/unit/unittest/unittests-main.cpp
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 
+#include "googletest.h"
+
 #include <sqliteglobal.h>
 
 #include <utils/temporarydirectory.h>
@@ -30,9 +32,6 @@
 #include <QCoreApplication>
 #include <QLoggingCategory>
 
-#include <gtest/gtest.h>
-#include "gtest-qt-printing.h"
-
 #ifdef WITH_BENCHMARKS
 #include <benchmark/benchmark.h>
 #endif