diff options
author | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2014-12-09 18:42:15 +0100 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2014-12-19 10:29:16 +0100 |
commit | 6cafc424e837aa64ecfad3828fb840d08b747452 (patch) | |
tree | 4b48d06bb2ba0117481944393f82b0f99b67d806 /src/plugins/cpptools/cpptoolstestcase.h | |
parent | cb3c7538be3f5ddb26f48b5dfce23bd3ea6daacc (diff) | |
download | qt-creator-6cafc424e837aa64ecfad3828fb840d08b747452.tar.gz |
CppTools: Tests: Stop writing into source dir
Instead, always write into a unique temporary directory in
QDir::tempPath().
Where applicable, read the test source from files instead of first
writing the file.
Some clean ups in test_codegen*.
Change-Id: Id48dc50c6ca16252edfd9fc8a86ba0de9f9be486
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to 'src/plugins/cpptools/cpptoolstestcase.h')
-rw-r--r-- | src/plugins/cpptools/cpptoolstestcase.h | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/src/plugins/cpptools/cpptoolstestcase.h b/src/plugins/cpptools/cpptoolstestcase.h index bbe4629858..5cfa8eba40 100644 --- a/src/plugins/cpptools/cpptoolstestcase.h +++ b/src/plugins/cpptools/cpptoolstestcase.h @@ -60,10 +60,13 @@ class CPPTOOLS_EXPORT TestDocument public: TestDocument(const QByteArray &fileName, const QByteArray &source, char cursorMarker = '@'); + void setBaseDirectory(const QString &baseDirectory) { m_baseDirectory = baseDirectory; } + QString filePath() const; bool writeToDisk() const; public: + QString m_baseDirectory; QString m_fileName; QString m_source; char m_cursorMarker; @@ -124,20 +127,33 @@ private: QList<ProjectExplorer::Project *> m_openProjects; }; -class CPPTOOLS_EXPORT TemporaryCopiedDir +class TemporaryDir { + Q_DISABLE_COPY(TemporaryDir) + public: - TemporaryCopiedDir(const QString &sourceDirPath); + TemporaryDir(); bool isValid() const { return m_isValid; } QString path() const { return m_temporaryDir.path(); } - QString absolutePath(const QByteArray &relativePath) const; -private: + QString createFile(const QByteArray &relativePath, const QByteArray &contents); + +protected: QTemporaryDir m_temporaryDir; bool m_isValid; }; +class CPPTOOLS_EXPORT TemporaryCopiedDir : public TemporaryDir +{ +public: + TemporaryCopiedDir(const QString &sourceDirPath); + QString absolutePath(const QByteArray &relativePath) const; + +private: + TemporaryCopiedDir(); +}; + class CPPTOOLS_EXPORT VerifyCleanCppModelManager { public: |