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

sdktool: Adapt tests

Browse Source 
The names for registered Qt, cmake and toolchain must
no more be unique.
Amends e9e4c27e3a.

Change-Id: Icea00636f3632148f209616de3473816e12e4655
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2019-05-29 13:35:37 +02:00
parent 1ef76e3dd7
commit d73c271259
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/sdktool/addcmakeoperation.cpp
View File

@@ -157,7 +157,7 @@ bool AddCMakeOperation::test() const
if (!unchanged.isEmpty()) if (!unchanged.isEmpty())
return false; return false;
// Make sure name stays unique: // add 2nd cmake
map = addCMake(map, "{some-cm-id}", "name", "/tmp/test", map = addCMake(map, "{some-cm-id}", "name", "/tmp/test",
KeyValuePairList() << KeyValuePair("ExtraKey", QVariant("ExtraValue"))); KeyValuePairList() << KeyValuePair("ExtraKey", QVariant("ExtraValue")));
if (map.value(COUNT).toInt() != 2 if (map.value(COUNT).toInt() != 2
@@ -175,7 +175,7 @@ bool AddCMakeOperation::test() const
cmData = map.value(QString::fromLatin1(PREFIX) + '1').toMap(); cmData = map.value(QString::fromLatin1(PREFIX) + '1').toMap();
if (cmData.count() != 5 if (cmData.count() != 5
|| cmData.value(ID_KEY).toString() != "{some-cm-id}" || cmData.value(ID_KEY).toString() != "{some-cm-id}"
|| cmData.value(DISPLAYNAME_KEY).toString() != "name2" || cmData.value(DISPLAYNAME_KEY).toString() != "name"
|| cmData.value(AUTODETECTED_KEY).toBool() != true || cmData.value(AUTODETECTED_KEY).toBool() != true
|| cmData.value(PATH_KEY).toString() != "/tmp/test" || cmData.value(PATH_KEY).toString() != "/tmp/test"
|| cmData.value("ExtraKey").toString() != "ExtraValue") || cmData.value("ExtraKey").toString() != "ExtraValue")

4
src/tools/sdktool/addqtoperation.cpp
View File

@@ -231,7 +231,7 @@ bool AddQtOperation::test() const
if (!result.isEmpty()) if (!result.isEmpty())
return false; return false;
// Make sure name is unique: // add 2nd Qt version:
map = addQt(map, QLatin1String("testId2"), QLatin1String("Test Qt Version"), QLatin1String("testType3"), map = addQt(map, QLatin1String("testId2"), QLatin1String("Test Qt Version"), QLatin1String("testType3"),
QLatin1String("/tmp/test/qmake2"), QLatin1String("/tmp/test/qmake2"),
KeyValuePairList() << KeyValuePair(QLatin1String("extraData"), QVariant(QLatin1String("extraValue"))), KeyValuePairList() << KeyValuePair(QLatin1String("extraData"), QVariant(QLatin1String("extraValue"))),
@@ -251,7 +251,7 @@ bool AddQtOperation::test() const
|| !version1.contains(QLatin1String(ID)) || !version1.contains(QLatin1String(ID))
|| version1.value(QLatin1String(ID)).toInt() != -1 || version1.value(QLatin1String(ID)).toInt() != -1
|| !version1.contains(QLatin1String(DISPLAYNAME)) || !version1.contains(QLatin1String(DISPLAYNAME))
|| version1.value(QLatin1String(DISPLAYNAME)).toString() != QLatin1String("Test Qt Version2") || version1.value(QLatin1String(DISPLAYNAME)).toString() != QLatin1String("Test Qt Version")
|| !version1.contains(QLatin1String(AUTODETECTED)) || !version1.contains(QLatin1String(AUTODETECTED))
|| version1.value(QLatin1String(AUTODETECTED)).toBool() != true || version1.value(QLatin1String(AUTODETECTED)).toBool() != true
|| !version1.contains(QLatin1String(AUTODETECTION_SOURCE)) || !version1.contains(QLatin1String(AUTODETECTION_SOURCE))

4
src/tools/sdktool/addtoolchainoperation.cpp
View File

@@ -199,7 +199,7 @@ bool AddToolChainOperation::test() const
if (!unchanged.isEmpty()) if (!unchanged.isEmpty())
return false; return false;
// Make sure name stays unique: // add 2nd tool chain:
map = addToolChain(map, "{some-tc-id}", "langId2", "name", "/tmp/test", "test-abi", "test-abi,test-abi2", map = addToolChain(map, "{some-tc-id}", "langId2", "name", "/tmp/test", "test-abi", "test-abi,test-abi2",
KeyValuePairList() << KeyValuePair("ExtraKey", QVariant("ExtraValue"))); KeyValuePairList() << KeyValuePair("ExtraKey", QVariant("ExtraValue")));
if (map.value(COUNT).toInt() != 2 if (map.value(COUNT).toInt() != 2
@@ -221,7 +221,7 @@ bool AddToolChainOperation::test() const
if (tcData.count() != 8 if (tcData.count() != 8
|| tcData.value(ID).toString() != "{some-tc-id}" || tcData.value(ID).toString() != "{some-tc-id}"
|| tcData.value(LANGUAGE_KEY_V2).toString() != "langId2" || tcData.value(LANGUAGE_KEY_V2).toString() != "langId2"
|| tcData.value(DISPLAYNAME).toString() != "name2" || tcData.value(DISPLAYNAME).toString() != "name"
|| tcData.value(AUTODETECTED).toBool() != true || tcData.value(AUTODETECTED).toBool() != true
|| tcData.value(PATH).toString() != "/tmp/test" || tcData.value(PATH).toString() != "/tmp/test"
|| tcData.value(TARGET_ABI).toString() != "test-abi" || tcData.value(TARGET_ABI).toString() != "test-abi"

4
tests/auto/sdktool/tst_sdktool.cpp
View File

@@ -43,7 +43,9 @@ void SdktoolTest::testSdktool()
process.start(rootDir.absoluteFilePath(QLatin1String("sdktool")), process.start(rootDir.absoluteFilePath(QLatin1String("sdktool")),
QStringList() << QLatin1String("-test")); QStringList() << QLatin1String("-test"));
process.waitForFinished(); process.waitForFinished();
qDebug() << process.readAllStandardError(); QByteArray output = process.readAllStandardError();
for (auto line : output.split('\n'))
qDebug() << line;
QCOMPARE(process.exitCode(), 0); QCOMPARE(process.exitCode(), 0);
} }