1 files changed, 23 insertions, 9 deletions
diff --git a/src/plugins/cpptools/cpptoolstestcase.cpp b/src/plugins/cpptools/cpptoolstestcase.cpp
index 4c3fbb9679..f8b5f0475f 100644
--- a/src/plugins/cpptools/cpptoolstestcase.cpp
+++ b/src/plugins/cpptools/cpptoolstestcase.cpp
@@ -344,18 +344,32 @@ IAssistProposalScopedPointer::~IAssistProposalScopedPointer()
         delete d->model();
 }
 
-void VerifyCleanCppModelManager::verify()
+VerifyCleanCppModelManager::VerifyCleanCppModelManager()
+{
+    QVERIFY(isClean());
+}
+
+VerifyCleanCppModelManager::~VerifyCleanCppModelManager() {
+    QVERIFY(isClean());
+}
+
+#define RETURN_FALSE_IF_NOT(check) if (!(check)) return false;
+
+bool VerifyCleanCppModelManager::isClean()
 {
     CppModelManager *mm = CppModelManager::instance();
-    QVERIFY(mm);
-    QVERIFY(mm->projectInfos().isEmpty());
-    QVERIFY(mm->headerPaths().isEmpty());
-    QVERIFY(mm->definedMacros().isEmpty());
-    QVERIFY(mm->projectFiles().isEmpty());
-    QVERIFY(mm->snapshot().isEmpty());
-    QCOMPARE(mm->workingCopy().size(), 1);
-    QVERIFY(mm->workingCopy().contains(mm->configurationFileName()));
+    RETURN_FALSE_IF_NOT(mm);
+    RETURN_FALSE_IF_NOT(mm->projectInfos().isEmpty());
+    RETURN_FALSE_IF_NOT(mm->headerPaths().isEmpty());
+    RETURN_FALSE_IF_NOT(mm->definedMacros().isEmpty());
+    RETURN_FALSE_IF_NOT(mm->projectFiles().isEmpty());
+    RETURN_FALSE_IF_NOT(mm->snapshot().isEmpty());
+    RETURN_FALSE_IF_NOT(mm->workingCopy().size() == 1);
+    RETURN_FALSE_IF_NOT(mm->workingCopy().contains(mm->configurationFileName()));
+    return true;
 }
 
+#undef RETURN_FALSE_IF_NOT
+
 } // namespace Tests
 } // namespace CppTools