ClangCodeModel: Use a configurable timeout in the tests

Change-Id: Ie3923217f79a72d2774aaa2a499144c3191cb478
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

3 files changed, 17 insertions, 13 deletions

diff --git a/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp
index b1ce0cd6eb..bb45147eb8 100644
--- a/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp
+++ b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp
@@ -58,10 +58,11 @@
 #include <QThread>
 
 using namespace ClangBackEnd;
-using namespace ClangCodeModel;
-using namespace ClangCodeModel::Internal;
 using namespace ProjectExplorer;
 
+namespace ClangCodeModel {
+namespace Internal {
+
 static Q_LOGGING_CATEGORY(debug, "qtc.clangcodemodel.batch", QtWarningMsg);
 
 static int timeOutFromEnvironmentVariable()
@@ -78,7 +79,7 @@ static int timeOutFromEnvironmentVariable()
     return intervalAsInt;
 }
 
-static int timeOutInMs()
+int timeOutInMs()
 {
     static int timeOut = timeOutFromEnvironmentVariable();
     return timeOut;
@@ -747,9 +748,6 @@ bool BatchFileParser::parseLine(const QString &line)
 
 } // anonymous namespace
 
-namespace ClangCodeModel {
-namespace Internal {
-
 static QString applySubstitutions(const QString &filePath, const QString &text)
 {
     const QString dirPath = QFileInfo(filePath).absolutePath();
diff --git a/src/plugins/clangcodemodel/test/clangbatchfileprocessor.h b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.h
index 40f0bceee3..8608229f98 100644
--- a/src/plugins/clangcodemodel/test/clangbatchfileprocessor.h
+++ b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.h
@@ -30,6 +30,8 @@
 namespace ClangCodeModel {
 namespace Internal {
 
+int timeOutInMs();
+
 bool runClangBatchFile(const QString &filePath);
 
 } // namespace Internal
diff --git a/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp b/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
index 0a38744a38..e32e22d8e1 100644
--- a/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
+++ b/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
@@ -26,6 +26,7 @@
 #include "clangcodecompletion_test.h"
 
 #include "clangautomationutils.h"
+#include "clangbatchfileprocessor.h"
 #include "../clangcompletionassistinterface.h"
 #include "../clangmodelmanagersupport.h"
 
@@ -344,7 +345,7 @@ public:
         if (!textToInsert.isEmpty())
             openEditor.editor()->insert(textToInsert);
 
-        proposal = completionResults(openEditor.editor(), includePaths, 15000);
+        proposal = completionResults(openEditor.editor(), includePaths, timeOutInMs());
     }
 
     TextEditor::ProposalModelPtr proposal;
@@ -657,7 +658,8 @@ void ClangCodeCompletionTest::testCompleteProjectDependingCode()
     OpenEditorAtCursorPosition openEditor(testDocument);
     QVERIFY(openEditor.succeeded());
 
-    TextEditor::ProposalModelPtr proposal = completionResults(openEditor.editor());
+    TextEditor::ProposalModelPtr proposal = completionResults(openEditor.editor(), {},
+                                                              timeOutInMs());
     QVERIFY(hasItem(proposal, "projectConfiguration1"));
 }
 
@@ -670,7 +672,8 @@ void ClangCodeCompletionTest::testCompleteProjectDependingCodeAfterChangingProje
     QVERIFY(openEditor.succeeded());
 
     // Check completion without project
-    TextEditor::ProposalModelPtr proposal = completionResults(openEditor.editor());
+    TextEditor::ProposalModelPtr proposal = completionResults(openEditor.editor(), {},
+                                                              timeOutInMs());
     QVERIFY(hasItem(proposal, "noProjectConfigurationDetected"));
 
     {
@@ -681,7 +684,7 @@ void ClangCodeCompletionTest::testCompleteProjectDependingCodeAfterChangingProje
         QVERIFY(projectLoader.load());
         openEditor.waitUntilProjectPartChanged(QLatin1String("myproject.project"));
 
-        proposal = completionResults(openEditor.editor());
+        proposal = completionResults(openEditor.editor(), {}, timeOutInMs());
 
         QVERIFY(hasItem(proposal, "projectConfiguration1"));
         QVERIFY(!hasItem(proposal, "projectConfiguration2"));
@@ -689,7 +692,7 @@ void ClangCodeCompletionTest::testCompleteProjectDependingCodeAfterChangingProje
         // Check completion with project configuration 2
         QVERIFY(projectLoader.updateProject({{"PROJECT_CONFIGURATION_2"}}));
         openEditor.waitUntilBackendIsNotified();
-        proposal = completionResults(openEditor.editor());
+        proposal = completionResults(openEditor.editor(), {}, timeOutInMs());
 
         QVERIFY(!hasItem(proposal, "projectConfiguration1"));
         QVERIFY(hasItem(proposal, "projectConfiguration2"));
@@ -697,7 +700,7 @@ void ClangCodeCompletionTest::testCompleteProjectDependingCodeAfterChangingProje
 
     // Check again completion without project
     openEditor.waitUntilProjectPartChanged(QLatin1String(""));
-    proposal = completionResults(openEditor.editor());
+    proposal = completionResults(openEditor.editor(), {}, timeOutInMs());
     QVERIFY(hasItem(proposal, "noProjectConfigurationDetected"));
 }
 
@@ -723,7 +726,8 @@ void ClangCodeCompletionTest::testCompleteProjectDependingCodeInGeneratedUiFile(
     QVERIFY(openSource.succeeded());
 
     // ...and check comletions
-    TextEditor::ProposalModelPtr proposal = completionResults(openSource.editor());
+    TextEditor::ProposalModelPtr proposal = completionResults(openSource.editor(), {},
+                                                              timeOutInMs());
     QVERIFY(hasItem(proposal, "menuBar"));
     QVERIFY(hasItem(proposal, "statusBar"));
     QVERIFY(hasItem(proposal, "centralWidget"));