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

SDKtool: Fix tests

Browse Source 
Change-Id: I64e7d415bed1e6cea055d4d80102c8fa98434361
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2018-06-22 10:58:45 +02:00
parent 10d4792c85
commit 172d6184a5
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,7 +143,7 @@ bool AddCMakeOperation::test() const
|| !map.contains(QString::fromLatin1(PREFIX) + '0')) || !map.contains(QString::fromLatin1(PREFIX) + '0'))
return false; return false;
QVariantMap cmData = map.value(QString::fromLatin1(PREFIX) + '0').toMap(); QVariantMap cmData = map.value(QString::fromLatin1(PREFIX) + '0').toMap();
if (cmData.count() != 8 if (cmData.count() != 5
|| cmData.value(ID_KEY).toString() != "testId" || cmData.value(ID_KEY).toString() != "testId"
|| cmData.value(DISPLAYNAME_KEY).toString() != "name" || cmData.value(DISPLAYNAME_KEY).toString() != "name"
|| cmData.value(AUTODETECTED_KEY).toBool() != true || cmData.value(AUTODETECTED_KEY).toBool() != true
@@ -165,7 +165,7 @@ bool AddCMakeOperation::test() const
|| !map.contains(QString::fromLatin1(PREFIX) + '1')) || !map.contains(QString::fromLatin1(PREFIX) + '1'))
return false; return false;
cmData = map.value(QString::fromLatin1(PREFIX) + '0').toMap(); cmData = map.value(QString::fromLatin1(PREFIX) + '0').toMap();
if (cmData.count() != 8 if (cmData.count() != 5
|| cmData.value(ID_KEY).toString() != "testId" || cmData.value(ID_KEY).toString() != "testId"
|| cmData.value(DISPLAYNAME_KEY).toString() != "name" || cmData.value(DISPLAYNAME_KEY).toString() != "name"
|| cmData.value(AUTODETECTED_KEY).toBool() != true || cmData.value(AUTODETECTED_KEY).toBool() != true
@@ -173,7 +173,7 @@ bool AddCMakeOperation::test() const
|| cmData.value("ExtraKey").toString() != "ExtraValue") || cmData.value("ExtraKey").toString() != "ExtraValue")
return false; return false;
cmData = map.value(QString::fromLatin1(PREFIX) + '1').toMap(); cmData = map.value(QString::fromLatin1(PREFIX) + '1').toMap();
if (cmData.count() != 8 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() != "name2"
|| cmData.value(AUTODETECTED_KEY).toBool() != true || cmData.value(AUTODETECTED_KEY).toBool() != true

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

@@ -183,7 +183,7 @@ bool AddToolChainOperation::test() const
QVariantMap tcData = map.value(QString::fromLatin1(PREFIX) + '0').toMap(); QVariantMap tcData = map.value(QString::fromLatin1(PREFIX) + '0').toMap();
if (tcData.count() != 8 if (tcData.count() != 8
|| tcData.value(ID).toString() != "testId" || tcData.value(ID).toString() != "testId"
|| tcData.value(LANGUAGE_KEY).toString() != "langId" || tcData.value(LANGUAGE_KEY_V2).toString() != "langId"
|| tcData.value(DISPLAYNAME).toString() != "name" || 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"
@@ -209,7 +209,7 @@ bool AddToolChainOperation::test() const
tcData = map.value(QString::fromLatin1(PREFIX) + '0').toMap(); tcData = map.value(QString::fromLatin1(PREFIX) + '0').toMap();
if (tcData.count() != 8 if (tcData.count() != 8
|| tcData.value(ID).toString() != "testId" || tcData.value(ID).toString() != "testId"
|| tcData.value(LANGUAGE_KEY).toString() != "langId" || tcData.value(LANGUAGE_KEY_V2).toString() != "langId"
|| tcData.value(DISPLAYNAME).toString() != "name" || 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"
@@ -220,7 +220,7 @@ bool AddToolChainOperation::test() const
tcData = map.value(QString::fromLatin1(PREFIX) + '1').toMap(); tcData = map.value(QString::fromLatin1(PREFIX) + '1').toMap();
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).toString() != "langId2" || tcData.value(LANGUAGE_KEY_V2).toString() != "langId2"
|| tcData.value(DISPLAYNAME).toString() != "name2" || tcData.value(DISPLAYNAME).toString() != "name2"
|| tcData.value(AUTODETECTED).toBool() != true || tcData.value(AUTODETECTED).toBool() != true
|| tcData.value(PATH).toString() != "/tmp/test" || tcData.value(PATH).toString() != "/tmp/test"

13
src/tools/sdktool/rmcmakeoperation.cpp
View File

@@ -97,6 +97,7 @@ bool RmCMakeOperation::test() const
{ {
// Add cmakes: // Add cmakes:
QVariantMap map = AddCMakeOperation::initializeCMake(); QVariantMap map = AddCMakeOperation::initializeCMake();
const QVariantMap emptyMap = map;
map = AddCMakeOperation::addCMake(map, "testId", "name", "/tmp/test", map = AddCMakeOperation::addCMake(map, "testId", "name", "/tmp/test",
KeyValuePairList({KeyValuePair("ExtraKey", QVariant("ExtraValue"))})); KeyValuePairList({KeyValuePair("ExtraKey", QVariant("ExtraValue"))}));
map = AddCMakeOperation::addCMake(map, "testId2", "other name", "/tmp/test2", KeyValuePairList()); map = AddCMakeOperation::addCMake(map, "testId2", "other name", "/tmp/test2", KeyValuePairList());
@@ -109,21 +110,25 @@ bool RmCMakeOperation::test() const
if (result != map) if (result != map)
return false; return false;
// Remove from map with both testId and testId2:
result = rmCMake(map, "testId2"); result = rmCMake(map, "testId2");
if (result == map if (result == map
|| result.value(COUNT, 0).toInt() != 1 || result.value(COUNT, 0).toInt() != 1
|| !result.contains("CMake.0") || result.value("CMake.0") != map.value("CMake.0")) || !result.contains(QString::fromLatin1(PREFIX) + "0")
|| result.value(QString::fromLatin1(PREFIX) + "0") != map.value(QString::fromLatin1(PREFIX) + "0"))
return false; return false;
// Remove from map with both testId and testId2:
result = rmCMake(map, "testId"); result = rmCMake(map, "testId");
if (result == map if (result == map
|| result.value(COUNT, 0).toInt() != 1 || result.value(COUNT, 0).toInt() != 1
|| !result.contains("CMake.0") || result.value("CMake.0") != map.value("CMake.1")) || !result.contains(QString::fromLatin1(PREFIX) + "0")
|| result.value(QString::fromLatin1(PREFIX) + "0") != map.value(QString::fromLatin1(PREFIX) + "1"))
return false; return false;
// Remove from map without testId!
result = rmCMake(result, "testId2"); result = rmCMake(result, "testId2");
if (result == map if (result != emptyMap)
|| result.value(COUNT, 0).toInt() != 0)
return false; return false;
return true; return true;