feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AutoTest: Remove some unused member

Browse Source 
Change-Id: Iea332afc23c58aa0a3de1f3364eea519a422d524
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2020-04-23 12:38:27 +02:00
parent 925e6cb18e
commit 3eb4a69b6f
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/autotest/catch/catchcodeparser.cpp
View File

@@ -36,12 +36,9 @@ namespace Internal {
using namespace CPlusPlus; using namespace CPlusPlus;
CatchCodeParser::CatchCodeParser(const QByteArray &source, const LanguageFeatures &features, CatchCodeParser::CatchCodeParser(const QByteArray &source, const LanguageFeatures &features)
const Document::Ptr &doc, const Snapshot &snapshot)
: m_source(source) : m_source(source)
, m_features(features) , m_features(features)
, m_doc(doc)
, m_snapshot(snapshot)
{ {
} }

7
src/plugins/autotest/catch/catchcodeparser.h
View File

@@ -27,7 +27,6 @@
#include "catchtreeitem.h" #include "catchtreeitem.h"
#include <cplusplus/CppDocument.h>
#include <cplusplus/SimpleLexer.h> #include <cplusplus/SimpleLexer.h>
#include <QByteArray> #include <QByteArray>
@@ -38,8 +37,7 @@ namespace Internal {
class CatchCodeParser class CatchCodeParser
{ {
public: public:
CatchCodeParser(const QByteArray &source, const CPlusPlus::LanguageFeatures &features, CatchCodeParser(const QByteArray &source, const CPlusPlus::LanguageFeatures &features);
const CPlusPlus::Document::Ptr &doc, const CPlusPlus::Snapshot &snapshot);
virtual ~CatchCodeParser() = default; virtual ~CatchCodeParser() = default;
CatchTestCodeLocationList findTests(); CatchTestCodeLocationList findTests();
private: private:
@@ -56,12 +54,9 @@ private:
const QByteArray &m_source; const QByteArray &m_source;
const CPlusPlus::LanguageFeatures &m_features; const CPlusPlus::LanguageFeatures &m_features;
const CPlusPlus::Document::Ptr &m_doc;
const CPlusPlus::Snapshot &m_snapshot;
CPlusPlus::Tokens m_tokens; CPlusPlus::Tokens m_tokens;
int m_currentIndex = 0; int m_currentIndex = 0;
CatchTestCodeLocationList m_testCases; CatchTestCodeLocationList m_testCases;
int m_lineNo = 0;
}; };
} // namespace Internal } // namespace Internal

5
src/plugins/autotest/catch/catchtestparser.cpp
View File

@@ -97,7 +97,6 @@ static bool hasCatchNames(const CPlusPlus::Document::Ptr &document)
static bool handleCatchDocument(QFutureInterface<TestParseResultPtr> futureInterface, static bool handleCatchDocument(QFutureInterface<TestParseResultPtr> futureInterface,
const CPlusPlus::Document::Ptr &doc, const CPlusPlus::Document::Ptr &doc,
const CPlusPlus::Snapshot &snapshot,
ITestFramework *framework) ITestFramework *framework)
{ {
const CppTools::CppModelManager *modelManager = CppTools::CppModelManager::instance(); const CppTools::CppModelManager *modelManager = CppTools::CppModelManager::instance();
@@ -111,7 +110,7 @@ static bool handleCatchDocument(QFutureInterface<TestParseResultPtr> futureInter
const CppTools::ProjectPart::Ptr projectPart = projectParts.first(); const CppTools::ProjectPart::Ptr projectPart = projectParts.first();
proFile = projectPart->projectFile; proFile = projectPart->projectFile;
CatchCodeParser codeParser(fileContent, projectPart->languageFeatures, doc, snapshot); CatchCodeParser codeParser(fileContent, projectPart->languageFeatures);
const CatchTestCodeLocationList foundTests = codeParser.findTests(); const CatchTestCodeLocationList foundTests = codeParser.findTests();
CatchParseResult *parseResult = new CatchParseResult(framework); CatchParseResult *parseResult = new CatchParseResult(framework);
@@ -145,7 +144,7 @@ bool CatchTestParser::processDocument(QFutureInterface<TestParseResultPtr> futur
if (doc.isNull() || !includesCatchHeader(doc, m_cppSnapshot) || !hasCatchNames(doc)) if (doc.isNull() || !includesCatchHeader(doc, m_cppSnapshot) || !hasCatchNames(doc))
return false; return false;
return handleCatchDocument(futureInterface, doc, m_cppSnapshot, framework()); return handleCatchDocument(futureInterface, doc, framework());
} }
TestTreeItem *CatchParseResult::createTestTreeItem() const TestTreeItem *CatchParseResult::createTestTreeItem() const