Refactor TestCodeParser

Change-Id: I5fdb6429e8509468b7a710414af250ea6464d92d
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>

plugins/autotest/testcodeparser.h

@@ -33,8 +33,10 @@ class Id;
 namespace Autotest {
 namespace Internal {
 
+struct TestCodeLocationAndType;
 class TestInfo;
 class TestTreeModel;
+class TestTreeItem;
 
 class TestCodeParser : public QObject
 {
@@ -48,11 +50,11 @@ signals:
 public slots:
     void emitUpdateTestTree();
     void updateTestTree();
-    void checkDocumentForTestCode(CPlusPlus::Document::Ptr doc);
-    void handleQtQuickTest(CPlusPlus::Document::Ptr doc);
+    void checkDocumentForTestCode(CPlusPlus::Document::Ptr document);
+    void handleQtQuickTest(CPlusPlus::Document::Ptr document);
 
-    void onCppDocumentUpdated(const CPlusPlus::Document::Ptr &doc);
-    void onQmlDocumentUpdated(const QmlJS::Document::Ptr &doc);
+    void onCppDocumentUpdated(const CPlusPlus::Document::Ptr &document);
+    void onQmlDocumentUpdated(const QmlJS::Document::Ptr &document);
     void removeFiles(const QStringList &files);
     void onProFileEvaluated();
 
@@ -61,8 +63,16 @@ private:
     void clearMaps();
     void removeTestsIfNecessary(const QString &fileName);
     void removeTestsIfNecessaryByProFile(const QString &proFile);
+    void removeUnnamedQuickTests(const QString &fileName, const QStringList &testFunctions);
+    void recreateUnnamedQuickTest(const QMap<QString, TestCodeLocationAndType> &testFunctions,
+                                  const QString &mainFile, TestTreeItem *rootItem);
     void onTaskStarted(Core::Id type);
     void onAllTasksFinished(Core::Id type);
+    void updateModelAndCppDocMap(CPlusPlus::Document::Ptr document, const QString &declFileName,
+                                 TestTreeItem *testItem, TestTreeItem *rootItem);
+    void updateModelAndQuickDocMap(QmlJS::Document::Ptr qmlDoc, const QString &currentQmlJSFile,
+                                   const QString &referencingFileName,
+                                   TestTreeItem *testItem, TestTreeItem *rootItem);
 
     TestTreeModel *m_model;
     QMap<QString, TestInfo> m_cppDocMap;

plugins/autotest/testtreeitem.cpp

@@ -172,6 +172,14 @@ Qt::CheckState TestTreeItem::checked() const
     return Qt::Unchecked;
 }
 
+QList<QString> TestTreeItem::getChildNames() const
+{
+    QList<QString> names;
+    foreach (TestTreeItem *item, m_children)
+        names << item->name();
+    return names;
+}
+
 void TestTreeItem::revalidateCheckState()
 {
     if (m_children.size() == 0)

plugins/autotest/testtreeitem.h

@@ -64,6 +64,7 @@ public:
     Qt::CheckState checked() const;
     Type type() const { return m_type; }
     void setParent(TestTreeItem *parent) { m_parent = parent; }
+    QList<QString> getChildNames() const;
 
 private:
     void revalidateCheckState();