CppEditor: Tweak test infrastructure

... so we can re-use the "follow symbol" test cases with clangd.

Call Creator like this (clangd needs to be version 12 or later):
$ QTC_CLANGD=<path to clangd> qtcreator -test
'CppEditor,*Follow*,*Switch*' -test 'ClangCodeModel,*dummy*'

During testing, some invalid code in the test cases was uncovered and
fixed.

Change-Id: I9dc650fdba2a27600e6a550420ee873f6fb31d23
Reviewed-by: David Schulz <david.schulz@qt.io>

2 files changed, 30 insertions, 0 deletions

diff --git a/src/plugins/cpptools/cpptoolstestcase.cpp b/src/plugins/cpptools/cpptoolstestcase.cpp
index 8a714b7df7..c80a4a7cff 100644
--- a/src/plugins/cpptools/cpptoolstestcase.cpp
+++ b/src/plugins/cpptools/cpptoolstestcase.cpp
@@ -44,6 +44,7 @@
 #include <cplusplus/CppDocument.h>
 #include <utils/executeondestruction.h>
 #include <utils/fileutils.h>
+#include <utils/hostosinfo.h>
 #include <utils/temporarydirectory.h>
 
 #include <QtTest>
@@ -421,5 +422,15 @@ bool VerifyCleanCppModelManager::isClean(bool testOnlyForCleanedProjects)
 
 #undef RETURN_FALSE_IF_NOT
 
+int clangdIndexingTimeout()
+{
+    const QByteArray timeoutAsByteArray = qgetenv("QTC_CLANGD_INDEXING_TIMEOUT");
+    bool isConversionOk = false;
+    const int intervalAsInt = timeoutAsByteArray.toInt(&isConversionOk);
+    if (!isConversionOk)
+        return Utils::HostOsInfo::isWindowsHost() ? 20000 : 10000;
+    return intervalAsInt;
+}
+
 } // namespace Tests
 } // namespace CppTools
diff --git a/src/plugins/cpptools/cpptoolstestcase.h b/src/plugins/cpptools/cpptoolstestcase.h
index aaa94f1e07..08ae5b7c70 100644
--- a/src/plugins/cpptools/cpptoolstestcase.h
+++ b/src/plugins/cpptools/cpptoolstestcase.h
@@ -30,7 +30,9 @@
 #include <cplusplus/CppDocument.h>
 #include <utils/temporarydirectory.h>
 
+#include <QEventLoop>
 #include <QStringList>
+#include <QTimer>
 
 namespace CPlusPlus {
 class Document;
@@ -54,6 +56,23 @@ class ProjectInfo;
 
 namespace Tests {
 
+int CPPTOOLS_EXPORT clangdIndexingTimeout();
+
+template <typename Signal> inline bool waitForSignalOrTimeout(
+        const typename QtPrivate::FunctionPointer<Signal>::Object *sender, Signal signal,
+        int timeoutInMs)
+{
+    QTimer timer;
+    timer.setSingleShot(true);
+    timer.setInterval(timeoutInMs);
+    QEventLoop loop;
+    QObject::connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
+    QObject::connect(sender, signal, &loop, &QEventLoop::quit);
+    timer.start();
+    loop.exec();
+    return timer.isActive();
+}
+
 class CPPTOOLS_EXPORT TestDocument
 {
 public: