Add printer to every file

Otherwise the template definition is picked by the linker.

Change-Id: I168afb8c78ba59f546d1ecda67345237632cb4c7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>

18 files changed, 70 insertions, 5 deletions

diff --git a/tests/unit/codemodelbackend/unittest/clangcodecompleteresultstest.cpp b/tests/unit/codemodelbackend/unittest/clangcodecompleteresultstest.cpp
index ee8b5b1f6f..6f62164dc1 100644
--- a/tests/unit/codemodelbackend/unittest/clangcodecompleteresultstest.cpp
+++ b/tests/unit/codemodelbackend/unittest/clangcodecompleteresultstest.cpp
@@ -31,6 +31,7 @@
 #include "gtest/gtest.h"
 #include "gmock/gmock-matchers.h"
 #include "gmock/gmock.h"
+#include "gtest-qt-printing.h"
 
 #include <clang-c/Index.h>
 
diff --git a/tests/unit/codemodelbackend/unittest/clangstringtest.cpp b/tests/unit/codemodelbackend/unittest/clangstringtest.cpp
index dd7199d43f..1283f2b476 100644
--- a/tests/unit/codemodelbackend/unittest/clangstringtest.cpp
+++ b/tests/unit/codemodelbackend/unittest/clangstringtest.cpp
@@ -31,6 +31,7 @@
 #include "gtest/gtest.h"
 #include "gmock/gmock-matchers.h"
 #include "gmock/gmock.h"
+#include "gtest-qt-printing.h"
 
 #include <clang-c/CXString.h>
 #include <clang-c/Index.h>
diff --git a/tests/unit/codemodelbackend/unittest/codecompletionsextractortest.cpp b/tests/unit/codemodelbackend/unittest/codecompletionsextractortest.cpp
index 8108c39900..fac0ca25af 100644
--- a/tests/unit/codemodelbackend/unittest/codecompletionsextractortest.cpp
+++ b/tests/unit/codemodelbackend/unittest/codecompletionsextractortest.cpp
@@ -32,6 +32,7 @@
 
 #include "gmock/gmock-matchers.h"
 #include "gmock/gmock-generated-matchers.h"
+#include "gtest-qt-printing.h"
 
 #include <clang-c/Index.h>
 
@@ -584,7 +585,7 @@ TEST_F(CodeCompletionsExtractor, NoArgumentDefinition)
                                             CodeCompletion::Available)));
 }
 
-TEST_F(CodeCompletionsExtractor, CompletionChunks)
+TEST_F(CodeCompletionsExtractor, CompletionChunksFunction)
 {
     ClangCodeCompleteResults completeResults(getResults(functionTranslationUnit, 20));
 
@@ -597,7 +598,7 @@ TEST_F(CodeCompletionsExtractor, CompletionChunks)
                                                                              {CodeCompletionChunk::RightParen, Utf8StringLiteral(")")}})));
 }
 
-TEST_F(CodeCompletionsExtractor, CompletionChunksWithOptionalChunks)
+TEST_F(CodeCompletionsExtractor, CompletionChunksFunctionWithOptionalChunks)
 {
     ClangCodeCompleteResults completeResults(getResults(functionTranslationUnit, 20));
 
@@ -607,7 +608,55 @@ TEST_F(CodeCompletionsExtractor, CompletionChunksWithOptionalChunks)
                                                QVector<CodeCompletionChunk>({{CodeCompletionChunk::ResultType, Utf8StringLiteral("void")},
                                                                              {CodeCompletionChunk::TypedText, Utf8StringLiteral("FunctionWithOptional")},
                                                                              {CodeCompletionChunk::LeftParen, Utf8StringLiteral("(")},
-                                                                             {CodeCompletionChunk::Optional, Utf8String(), QVector<CodeCompletionChunk>({{CodeCompletionChunk::Placeholder, Utf8StringLiteral("int x")}})},
+                                                                             {CodeCompletionChunk::Placeholder, Utf8StringLiteral("int x")},
+                                                                             {CodeCompletionChunk::Comma, Utf8StringLiteral(", ")},
+                                                                             {CodeCompletionChunk::Placeholder, Utf8StringLiteral("char y")},
+                                                                             {CodeCompletionChunk::Optional, Utf8String(), QVector<CodeCompletionChunk>({{CodeCompletionChunk::Comma, Utf8StringLiteral(", ")},
+                                                                                                                                                         {CodeCompletionChunk::Placeholder, Utf8StringLiteral("int z")}})},
                                                                              {CodeCompletionChunk::RightParen, Utf8StringLiteral(")")}})));
 }
+
+TEST_F(CodeCompletionsExtractor, CompletionChunksField)
+{
+    ClangCodeCompleteResults completeResults(getResults(variableTranslationUnit, 20));
+
+    ::CodeCompletionsExtractor extractor(completeResults.data());
+
+    ASSERT_THAT(extractor, HasCompletionChunks(Utf8StringLiteral("Field"),
+                                               QVector<CodeCompletionChunk>({{CodeCompletionChunk::ResultType, Utf8StringLiteral("int")},
+                                                                             {CodeCompletionChunk::TypedText, Utf8StringLiteral("Field")}})));
+}
+
+TEST_F(CodeCompletionsExtractor, CompletionChunksEnumerator)
+{
+    ClangCodeCompleteResults completeResults(getResults(enumerationTranslationUnit, 20));
+
+    ::CodeCompletionsExtractor extractor(completeResults.data());
+
+    ASSERT_THAT(extractor, HasCompletionChunks(Utf8StringLiteral("Enumerator"),
+                                               QVector<CodeCompletionChunk>({{CodeCompletionChunk::ResultType, Utf8StringLiteral("Enumeration")},
+                                                                             {CodeCompletionChunk::TypedText, Utf8StringLiteral("Enumerator")}})));
+}
+
+TEST_F(CodeCompletionsExtractor, CompletionChunksEnumeration)
+{
+    ClangCodeCompleteResults completeResults(getResults(enumerationTranslationUnit, 20));
+
+    ::CodeCompletionsExtractor extractor(completeResults.data());
+
+    ASSERT_THAT(extractor, HasCompletionChunks(Utf8StringLiteral("Enumeration"),
+                                               QVector<CodeCompletionChunk>({{CodeCompletionChunk::TypedText, Utf8StringLiteral("Enumeration")}})));
+}
+
+TEST_F(CodeCompletionsExtractor, CompletionChunksClass)
+{
+    ClangCodeCompleteResults completeResults(getResults(classTranslationUnit, 20));
+
+    ::CodeCompletionsExtractor extractor(completeResults.data());
+
+    ASSERT_THAT(extractor, HasCompletionChunks(Utf8StringLiteral("Class"),
+                                               QVector<CodeCompletionChunk>({{CodeCompletionChunk::TypedText, Utf8StringLiteral("Class")}})));
+}
+
+
 }
diff --git a/tests/unit/codemodelbackend/unittest/codecompletiontest.cpp b/tests/unit/codemodelbackend/unittest/codecompletiontest.cpp
index 5522277aa7..4ce56f30ef 100644
--- a/tests/unit/codemodelbackend/unittest/codecompletiontest.cpp
+++ b/tests/unit/codemodelbackend/unittest/codecompletiontest.cpp
@@ -30,6 +30,7 @@
 
 #include "gtest/gtest.h"
 #include "gmock/gmock-matchers.h"
+#include "gtest-qt-printing.h"
 
 #include <codecompleter.h>
 #include <filecontainer.h>
diff --git a/tests/unit/codemodelbackend/unittest/createtablesqlstatementbuildertest.cpp b/tests/unit/codemodelbackend/unittest/createtablesqlstatementbuildertest.cpp
index 667bc7ae30..7c4fd7cde3 100644
--- a/tests/unit/codemodelbackend/unittest/createtablesqlstatementbuildertest.cpp
+++ b/tests/unit/codemodelbackend/unittest/createtablesqlstatementbuildertest.cpp
@@ -30,6 +30,7 @@
 
 #include "gtest/gtest.h"
 #include "gmock/gmock-matchers.h"
+#include "gtest-qt-printing.h"
 
 #include <QString>
 
diff --git a/tests/unit/codemodelbackend/unittest/data/complete_extractor_function.cpp b/tests/unit/codemodelbackend/unittest/data/complete_extractor_function.cpp
index 917c5c45d1..f3266b39a1 100644
--- a/tests/unit/codemodelbackend/unittest/data/complete_extractor_function.cpp
+++ b/tests/unit/codemodelbackend/unittest/data/complete_extractor_function.cpp
@@ -1,6 +1,6 @@
-void Function();
+void Function();
 template<class T> void TemplateFunction();
-void FunctionWithOptional(int x = 5);
+void FunctionWithOptional(int x, char y, int z = 5);
 #define FunctionMacro(X, Y) X + Y
 
 class base {
diff --git a/tests/unit/codemodelbackend/unittest/projecttest.cpp b/tests/unit/codemodelbackend/unittest/projecttest.cpp
index 31e761312f..467d031796 100644
--- a/tests/unit/codemodelbackend/unittest/projecttest.cpp
+++ b/tests/unit/codemodelbackend/unittest/projecttest.cpp
@@ -32,6 +32,7 @@
 
 #include "gmock/gmock-matchers.h"
 #include "gmock/gmock-generated-matchers.h"
+#include "gtest-qt-printing.h"
 
 #include <projectpart.h>
 #include <utf8stringvector.h>
diff --git a/tests/unit/codemodelbackend/unittest/readandwritecommandblocktest.cpp b/tests/unit/codemodelbackend/unittest/readandwritecommandblocktest.cpp
index 9abbdb096d..fa9f3d4832 100644
--- a/tests/unit/codemodelbackend/unittest/readandwritecommandblocktest.cpp
+++ b/tests/unit/codemodelbackend/unittest/readandwritecommandblocktest.cpp
@@ -30,6 +30,7 @@
 
 #include "gtest/gtest.h"
 #include "gmock/gmock-matchers.h"
+#include "gtest-qt-printing.h"
 
 #include <QString>
 #include <QBuffer>
diff --git a/tests/unit/codemodelbackend/unittest/sqlitecolumntest.cpp b/tests/unit/codemodelbackend/unittest/sqlitecolumntest.cpp
index 1fcdf16bb7..4f6d54ca3c 100644
--- a/tests/unit/codemodelbackend/unittest/sqlitecolumntest.cpp
+++ b/tests/unit/codemodelbackend/unittest/sqlitecolumntest.cpp
@@ -31,6 +31,7 @@
 
 #include <gtest/gtest.h>
 #include <gmock/gmock-matchers.h>
+#include "gtest-qt-printing.h"
 
 #include <sqlitecolumn.h>
 
diff --git a/tests/unit/codemodelbackend/unittest/sqlitedatabasebackendtest.cpp b/tests/unit/codemodelbackend/unittest/sqlitedatabasebackendtest.cpp
index 21910a756b..4f96914eda 100644
--- a/tests/unit/codemodelbackend/unittest/sqlitedatabasebackendtest.cpp
+++ b/tests/unit/codemodelbackend/unittest/sqlitedatabasebackendtest.cpp
@@ -30,6 +30,7 @@
 
 #include "gtest/gtest.h"
 #include "gmock/gmock-matchers.h"
+#include "gtest-qt-printing.h"
 
 #include <QDir>
 
diff --git a/tests/unit/codemodelbackend/unittest/sqlitedatabasetest.cpp b/tests/unit/codemodelbackend/unittest/sqlitedatabasetest.cpp
index 5c383f9d57..eb6f098008 100644
--- a/tests/unit/codemodelbackend/unittest/sqlitedatabasetest.cpp
+++ b/tests/unit/codemodelbackend/unittest/sqlitedatabasetest.cpp
@@ -31,6 +31,7 @@
 
 #include "gtest/gtest.h"
 #include "gmock/gmock-matchers.h"
+#include "gtest-qt-printing.h"
 
 #include <QVariant>
 #include <QSignalSpy>
diff --git a/tests/unit/codemodelbackend/unittest/sqlitestatementtest.cpp b/tests/unit/codemodelbackend/unittest/sqlitestatementtest.cpp
index 5ac05f017f..74069b1d3a 100644
--- a/tests/unit/codemodelbackend/unittest/sqlitestatementtest.cpp
+++ b/tests/unit/codemodelbackend/unittest/sqlitestatementtest.cpp
@@ -30,6 +30,7 @@
 
 #include "gtest/gtest.h"
 #include "gmock/gmock-matchers.h"
+#include "gtest-qt-printing.h"
 
 #include <QDir>
 #include <QVariant>
diff --git a/tests/unit/codemodelbackend/unittest/sqlitetabletest.cpp b/tests/unit/codemodelbackend/unittest/sqlitetabletest.cpp
index cc501c3075..f88e57e10a 100644
--- a/tests/unit/codemodelbackend/unittest/sqlitetabletest.cpp
+++ b/tests/unit/codemodelbackend/unittest/sqlitetabletest.cpp
@@ -30,6 +30,7 @@
 
 #include "gtest/gtest.h"
 #include "gmock/gmock-matchers.h"
+#include "gtest-qt-printing.h"
 
 #include <QVariant>
 #include <QSignalSpy>
diff --git a/tests/unit/codemodelbackend/unittest/sqlstatementbuildertest.cpp b/tests/unit/codemodelbackend/unittest/sqlstatementbuildertest.cpp
index 5bd550e3bc..861acabc22 100644
--- a/tests/unit/codemodelbackend/unittest/sqlstatementbuildertest.cpp
+++ b/tests/unit/codemodelbackend/unittest/sqlstatementbuildertest.cpp
@@ -30,6 +30,7 @@
 
 #include "gtest/gtest.h"
 #include "gmock/gmock-matchers.h"
+#include "gtest-qt-printing.h"
 
 #include <QString>
 
diff --git a/tests/unit/codemodelbackend/unittest/translationunitstest.cpp b/tests/unit/codemodelbackend/unittest/translationunitstest.cpp
index 7c5b5d3814..450ab75b75 100644
--- a/tests/unit/codemodelbackend/unittest/translationunitstest.cpp
+++ b/tests/unit/codemodelbackend/unittest/translationunitstest.cpp
@@ -31,6 +31,7 @@
 #include "gtest/gtest.h"
 #include "gmock/gmock-matchers.h"
 #include "gmock/gmock-generated-matchers.h"
+#include "gtest-qt-printing.h"
 
 #include <clang-c/Index.h>
 
diff --git a/tests/unit/codemodelbackend/unittest/translationunittest.cpp b/tests/unit/codemodelbackend/unittest/translationunittest.cpp
index 3961ddeec5..f0a64c76ef 100644
--- a/tests/unit/codemodelbackend/unittest/translationunittest.cpp
+++ b/tests/unit/codemodelbackend/unittest/translationunittest.cpp
@@ -31,6 +31,7 @@
 #include "gtest/gtest.h"
 #include "gmock/gmock-matchers.h"
 #include "gmock/gmock-generated-matchers.h"
+#include "gtest-qt-printing.h"
 
 #include <clang-c/Index.h>
 
diff --git a/tests/unit/codemodelbackend/unittest/unsavedfilestest.cpp b/tests/unit/codemodelbackend/unittest/unsavedfilestest.cpp
index d6c511e1f9..cc53e9cb12 100644
--- a/tests/unit/codemodelbackend/unittest/unsavedfilestest.cpp
+++ b/tests/unit/codemodelbackend/unittest/unsavedfilestest.cpp
@@ -31,6 +31,7 @@
 #include "gtest/gtest.h"
 #include "gmock/gmock-matchers.h"
 #include "gmock/gmock.h"
+#include "gtest-qt-printing.h"
 
 #include <unsavedfiles.h>
 #include <filecontainer.h>
diff --git a/tests/unit/codemodelbackend/unittest/utf8test.cpp b/tests/unit/codemodelbackend/unittest/utf8test.cpp
index 2a47e2d833..67c2813871 100644
--- a/tests/unit/codemodelbackend/unittest/utf8test.cpp
+++ b/tests/unit/codemodelbackend/unittest/utf8test.cpp
@@ -30,6 +30,7 @@
 
 #include "gtest/gtest.h"
 #include "gmock/gmock-matchers.h"
+#include "gtest-qt-printing.h"
 
 #include <QString>