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

ClearCase: Use a FilePath for the test file

Browse Source 
Change-Id: I79b149df87d28e91f7692616dd9fdb1b925f7ab5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2022-11-21 12:55:36 +01:00
parent a2baeea394
commit bf325fd6af
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/clearcase/clearcaseplugin.cpp
View File

@@ -344,7 +344,7 @@ private:
friend class ClearCasePlugin; friend class ClearCasePlugin;
#ifdef WITH_TESTS #ifdef WITH_TESTS
bool m_fakeClearTool = false; bool m_fakeClearTool = false;
QString m_tempFile; FilePath m_tempFile;
#endif #endif
}; };
@@ -2501,15 +2501,15 @@ void ClearCasePlugin::testLogResolving()
void ClearCasePlugin::initTestCase() void ClearCasePlugin::initTestCase()
{ {
dd->m_tempFile = QDir::currentPath() + QLatin1String("/cc_file.cpp"); dd->m_tempFile = FilePath::currentWorkingPath() / "cc_file.cpp";
FileSaver srcSaver(FilePath::fromString(dd->m_tempFile)); FileSaver srcSaver(dd->m_tempFile);
srcSaver.write(QByteArray()); srcSaver.write(QByteArray());
srcSaver.finalize(); srcSaver.finalize();
} }
void ClearCasePlugin::cleanupTestCase() void ClearCasePlugin::cleanupTestCase()
{ {
QVERIFY(QFile::remove(dd->m_tempFile)); QVERIFY(dd->m_tempFile.removeFile());
} }
void ClearCasePlugin::testFileStatusParsing_data() void ClearCasePlugin::testFileStatusParsing_data()
@@ -2518,25 +2518,27 @@ void ClearCasePlugin::testFileStatusParsing_data()
QTest::addColumn<QString>("cleartoolLsLine"); QTest::addColumn<QString>("cleartoolLsLine");
QTest::addColumn<int>("status"); QTest::addColumn<int>("status");
const QString filename = dd->m_tempFile.path();
QTest::newRow("CheckedOut") QTest::newRow("CheckedOut")
<< dd->m_tempFile << filename
<< QString(dd->m_tempFile + QLatin1String("@@/main/branch1/CHECKEDOUT from /main/branch1/0 Rule: CHECKEDOUT")) << QString(filename + QLatin1String("@@/main/branch1/CHECKEDOUT from /main/branch1/0 Rule: CHECKEDOUT"))
<< static_cast<int>(FileStatus::CheckedOut); << static_cast<int>(FileStatus::CheckedOut);
QTest::newRow("CheckedIn") QTest::newRow("CheckedIn")
<< dd->m_tempFile << filename
<< QString(dd->m_tempFile + QLatin1String("@@/main/9 Rule: MY_LABEL_1.6.4 [-mkbranch branch1]")) << QString(filename + QLatin1String("@@/main/9 Rule: MY_LABEL_1.6.4 [-mkbranch branch1]"))
<< static_cast<int>(FileStatus::CheckedIn); << static_cast<int>(FileStatus::CheckedIn);
QTest::newRow("Hijacked") QTest::newRow("Hijacked")
<< dd->m_tempFile << filename
<< QString(dd->m_tempFile + QLatin1String("@@/main/9 [hijacked] Rule: MY_LABEL_1.5.33 [-mkbranch myview1]")) << QString(filename + QLatin1String("@@/main/9 [hijacked] Rule: MY_LABEL_1.5.33 [-mkbranch myview1]"))
<< static_cast<int>(FileStatus::Hijacked); << static_cast<int>(FileStatus::Hijacked);
QTest::newRow("Missing") QTest::newRow("Missing")
<< dd->m_tempFile << filename
<< QString(dd->m_tempFile + QLatin1String("@@/main/9 [loaded but missing] Rule: MY_LABEL_1.5.33 [-mkbranch myview1]")) << QString(filename + QLatin1String("@@/main/9 [loaded but missing] Rule: MY_LABEL_1.5.33 [-mkbranch myview1]"))
<< static_cast<int>(FileStatus::Missing); << static_cast<int>(FileStatus::Missing);
} }