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/cppheadersource_test.cpp | |
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/cppheadersource_test.cpp')
-rw-r--r-- | src/plugins/cpptools/cppheadersource_test.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/cpptools/cppheadersource_test.cpp b/src/plugins/cpptools/cppheadersource_test.cpp index ed67fa9217..e739320de6 100644 --- a/src/plugins/cpptools/cppheadersource_test.cpp +++ b/src/plugins/cpptools/cppheadersource_test.cpp @@ -30,6 +30,7 @@ #include "cpptoolsplugin.h" #include "cpptoolsreuse.h" +#include "cpptoolstestcase.h" #include "cppfilesettingspage.h" #include <utils/fileutils.h> @@ -60,15 +61,16 @@ void CppToolsPlugin::test_headersource() QFETCH(QString, sourceFileName); QFETCH(QString, headerFileName); - bool wasHeader; - const QString baseDir = baseTestDir(); - QDir path = QDir(baseDir + _(QTest::currentDataTag())); + Tests::TemporaryDir temporaryDir; + QVERIFY(temporaryDir.isValid()); + const QDir path = QDir(temporaryDir.path() + QLatin1Char('/') + _(QTest::currentDataTag())); const QString sourcePath = path.absoluteFilePath(sourceFileName); const QString headerPath = path.absoluteFilePath(headerFileName); createTempFile(sourcePath); createTempFile(headerPath); + bool wasHeader; clearHeaderSourceCache(); QCOMPARE(correspondingHeaderOrSource(sourcePath, &wasHeader), headerPath); QVERIFY(!wasHeader); |