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

sdktool: Fix type of device type and the unit tests

Browse Source 
Change-Id: I64b817c0bd6c454d4f9cb423720c8baed8490fea
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2012-10-09 16:01:56 +02:00
parent f3d30dfba1
commit ae2a600af8
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/sdktool/addkeysoperation.cpp
View File

@@ -112,7 +112,7 @@ bool AddKeysOperation::test() const
data.append(KeyValuePair(QLatin1String("newsub/1/2.1/3/qbytearray"), QString::fromLatin1("QByteArray:test array."))); data.append(KeyValuePair(QLatin1String("newsub/1/2.1/3/qbytearray"), QString::fromLatin1("QByteArray:test array.")));
QVariantMap result = addKeys(testMap, data); QVariantMap result = addKeys(testMap, data);
if (result.count() != 8) if (result.count() != 9)
return false; return false;
// subkeys: // subkeys:

22
src/tools/sdktool/addkitoperation.cpp
View File

@@ -208,7 +208,7 @@ int AddKitOperation::execute() const
map = initializeKits(); map = initializeKits();
map = addKit(map, m_id, m_displayName, m_icon, m_debuggerEngine, m_debugger, map = addKit(map, m_id, m_displayName, m_icon, m_debuggerEngine, m_debugger,
m_deviceType, m_sysRoot, m_tc, m_qt, m_mkspec, m_extra); m_deviceType.toUtf8(), m_sysRoot, m_tc, m_qt, m_mkspec, m_extra);
if (map.isEmpty()) if (map.isEmpty())
return -2; return -2;
@@ -230,9 +230,9 @@ bool AddKitOperation::test() const
|| map.value(QLatin1String(DEFAULT)).toInt() != -1) || map.value(QLatin1String(DEFAULT)).toInt() != -1)
return false; return false;
map = addKit(map, QLatin1String("testId"), QLatin1String("Test Qt Version"), QLatin1String("/tmp/icon.png"), map = addKit(map, QLatin1String("testId"), QLatin1String("Test Kit"), QLatin1String("/tmp/icon.png"),
1, QLatin1String("/usr/bin/gdb-test"), 1, QLatin1String("/usr/bin/gdb-test"),
QLatin1String("Desktop"), QString(), QByteArray("Desktop"), QString(),
QLatin1String("{some-tc-id}"), QLatin1String("{some-qt-id}"), QLatin1String("unsupported/mkspec"), QLatin1String("{some-tc-id}"), QLatin1String("{some-qt-id}"), QLatin1String("unsupported/mkspec"),
KeyValuePairList() << KeyValuePair(QLatin1String("PE.Profile.Data/extraData"), QVariant(QLatin1String("extraValue")))); KeyValuePairList() << KeyValuePair(QLatin1String("PE.Profile.Data/extraData"), QVariant(QLatin1String("extraValue"))));
@@ -247,11 +247,11 @@ bool AddKitOperation::test() const
return false; return false;
QVariantMap profile0 = map.value(QLatin1String("Profile.0")).toMap(); QVariantMap profile0 = map.value(QLatin1String("Profile.0")).toMap();
if (profile0.count() != 6 if (profile0.count() != 5
|| !profile0.contains(QLatin1String(ID)) || !profile0.contains(QLatin1String(ID))
|| profile0.value(QLatin1String(ID)).toString() != QLatin1String("testId") || profile0.value(QLatin1String(ID)).toString() != QLatin1String("testId")
|| !profile0.contains(QLatin1String(DISPLAYNAME)) || !profile0.contains(QLatin1String(DISPLAYNAME))
|| profile0.value(QLatin1String(DISPLAYNAME)).toString() != QLatin1String("Test Qt Version") || profile0.value(QLatin1String(DISPLAYNAME)).toString() != QLatin1String("Test Kit")
|| !profile0.contains(QLatin1String(AUTODETECTED)) || !profile0.contains(QLatin1String(AUTODETECTED))
|| profile0.value(QLatin1String(AUTODETECTED)).toBool() != true) || profile0.value(QLatin1String(AUTODETECTED)).toBool() != true)
return false; return false;
@@ -259,16 +259,16 @@ bool AddKitOperation::test() const
// Ignore existing ids: // Ignore existing ids:
QVariantMap result = addKit(map, QLatin1String("testId"), QLatin1String("Test Qt Version X"), QLatin1String("/tmp/icon3.png"), QVariantMap result = addKit(map, QLatin1String("testId"), QLatin1String("Test Qt Version X"), QLatin1String("/tmp/icon3.png"),
1, QLatin1String("/usr/bin/gdb-test3"), 1, QLatin1String("/usr/bin/gdb-test3"),
QLatin1String("Desktop"), QString(), QByteArray("Desktop"), QString(),
QLatin1String("{some-tc-id3}"), QLatin1String("{some-qt-id3}"), QLatin1String("unsupported/mkspec3"), QLatin1String("{some-tc-id3}"), QLatin1String("{some-qt-id3}"), QLatin1String("unsupported/mkspec3"),
KeyValuePairList() << KeyValuePair(QLatin1String("PE.Profile.Data/extraData"), QVariant(QLatin1String("extraValue3")))); KeyValuePairList() << KeyValuePair(QLatin1String("PE.Profile.Data/extraData"), QVariant(QLatin1String("extraValue3"))));
if (!result.isEmpty()) if (!result.isEmpty())
return false; return false;
// Make sure name is unique: // Make sure name is unique:
map = addKit(map, QLatin1String("testId2"), QLatin1String("Test Qt Version"), QLatin1String("/tmp/icon2.png"), map = addKit(map, QLatin1String("testId2"), QLatin1String("Test Kit2"), QLatin1String("/tmp/icon2.png"),
1, QLatin1String("/usr/bin/gdb-test2"), 1, QLatin1String("/usr/bin/gdb-test2"),
QLatin1String("Desktop"), QString(), QByteArray("Desktop"), QString(),
QLatin1String("{some-tc-id2}"), QLatin1String("{some-qt-id2}"), QLatin1String("unsupported/mkspec2"), QLatin1String("{some-tc-id2}"), QLatin1String("{some-qt-id2}"), QLatin1String("unsupported/mkspec2"),
KeyValuePairList() << KeyValuePair(QLatin1String("PE.Profile.Data/extraData"), QVariant(QLatin1String("extraValue2")))); KeyValuePairList() << KeyValuePair(QLatin1String("PE.Profile.Data/extraData"), QVariant(QLatin1String("extraValue2"))));
if (map.count() != 5 if (map.count() != 5
@@ -285,11 +285,11 @@ bool AddKitOperation::test() const
return false; return false;
QVariantMap profile1 = map.value(QLatin1String("Profile.1")).toMap(); QVariantMap profile1 = map.value(QLatin1String("Profile.1")).toMap();
if (profile1.count() != 6 if (profile1.count() != 5
|| !profile1.contains(QLatin1String(ID)) || !profile1.contains(QLatin1String(ID))
|| profile1.value(QLatin1String(ID)).toString() != QLatin1String("testId2") || profile1.value(QLatin1String(ID)).toString() != QLatin1String("testId2")
|| !profile1.contains(QLatin1String(DISPLAYNAME)) || !profile1.contains(QLatin1String(DISPLAYNAME))
|| profile1.value(QLatin1String(DISPLAYNAME)).toString() != QLatin1String("Test Qt Version2") || profile1.value(QLatin1String(DISPLAYNAME)).toString() != QLatin1String("Test Kit2")
|| !profile1.contains(QLatin1String(AUTODETECTED)) || !profile1.contains(QLatin1String(AUTODETECTED))
|| profile1.value(QLatin1String(AUTODETECTED)).toBool() != true) || profile1.value(QLatin1String(AUTODETECTED)).toBool() != true)
return false; return false;
@@ -301,7 +301,7 @@ bool AddKitOperation::test() const
QVariantMap AddKitOperation::addKit(const QVariantMap &map, QVariantMap AddKitOperation::addKit(const QVariantMap &map,
const QString &id, const QString &displayName, const QString &icon, const QString &id, const QString &displayName, const QString &icon,
const quint32 &debuggerType, const QString &debugger, const quint32 &debuggerType, const QString &debugger,
const QString &deviceType, const QString &sysRoot, const QByteArray &deviceType, const QString &sysRoot,
const QString &tc, const QString &qt, const QString &mkspec, const QString &tc, const QString &qt, const QString &mkspec,
const KeyValuePairList &extra) const KeyValuePairList &extra)
{ {

2
src/tools/sdktool/addkitoperation.h
View File

@@ -54,7 +54,7 @@ public:
static QVariantMap addKit(const QVariantMap &map, static QVariantMap addKit(const QVariantMap &map,
const QString &id, const QString &displayName, const QString &icon, const QString &id, const QString &displayName, const QString &icon,
const quint32 &debuggerType, const QString &debugger, const quint32 &debuggerType, const QString &debugger,
const QString &deviceType, const QString &sysRoot, const QByteArray &deviceType, const QString &sysRoot,
const QString &tc, const QString &qt, const QString &mkspec, const QString &tc, const QString &qt, const QString &mkspec,
const KeyValuePairList &extra); const KeyValuePairList &extra);

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

@@ -155,7 +155,7 @@ bool AddQtOperation::test() const
return false; return false;
QVariantMap version0 = map.value(QLatin1String("QtVersion.0")).toMap(); QVariantMap version0 = map.value(QLatin1String("QtVersion.0")).toMap();
if (version0.count() != 6 if (version0.count() != 7
|| !version0.contains(QLatin1String(ID)) || !version0.contains(QLatin1String(ID))
|| version0.value(QLatin1String(ID)).toInt() != -1 || version0.value(QLatin1String(ID)).toInt() != -1
|| !version0.contains(QLatin1String(DISPLAYNAME)) || !version0.contains(QLatin1String(DISPLAYNAME))
@@ -194,7 +194,7 @@ bool AddQtOperation::test() const
return false; return false;
QVariantMap version1 = map.value(QLatin1String("QtVersion.1")).toMap(); QVariantMap version1 = map.value(QLatin1String("QtVersion.1")).toMap();
if (version1.count() != 6 if (version1.count() != 7
|| !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))

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

@@ -100,7 +100,7 @@ bool RmKitOperation::test() const
QLatin1String("testId"), QLatin1String("Test Qt Version"), QLatin1String("testId"), QLatin1String("Test Qt Version"),
QLatin1String("/tmp/icon.png"), QLatin1String("/tmp/icon.png"),
1, QLatin1String("/usr/bin/gdb-test"), 1, QLatin1String("/usr/bin/gdb-test"),
QLatin1String("Desktop"), QString(), QByteArray("Desktop"), QString(),
QLatin1String("{some-tc-id}"), QLatin1String("{some-qt-id}"), QLatin1String("{some-tc-id}"), QLatin1String("{some-qt-id}"),
QLatin1String("unsupported/mkspec"), QLatin1String("unsupported/mkspec"),
KeyValuePairList() << KeyValuePair(QLatin1String("PE.Profile.Data/extraData"), QVariant(QLatin1String("extraValue")))); KeyValuePairList() << KeyValuePair(QLatin1String("PE.Profile.Data/extraData"), QVariant(QLatin1String("extraValue"))));
@@ -108,7 +108,7 @@ bool RmKitOperation::test() const
AddKitOperation::addKit(map, QLatin1String("testId2"), QLatin1String("Test Qt Version"), AddKitOperation::addKit(map, QLatin1String("testId2"), QLatin1String("Test Qt Version"),
QLatin1String("/tmp/icon2.png"), QLatin1String("/tmp/icon2.png"),
1, QLatin1String("/usr/bin/gdb-test2"), 1, QLatin1String("/usr/bin/gdb-test2"),
QLatin1String("Desktop"), QString(), QByteArray("Desktop"), QString(),
QLatin1String("{some-tc-id2}"), QLatin1String("{some-qt-id2}"), QLatin1String("{some-tc-id2}"), QLatin1String("{some-qt-id2}"),
QLatin1String("unsupported/mkspec2"), QLatin1String("unsupported/mkspec2"),
KeyValuePairList() << KeyValuePair(QLatin1String("PE.Profile.Data/extraData"), QVariant(QLatin1String("extraValue2")))); KeyValuePairList() << KeyValuePair(QLatin1String("PE.Profile.Data/extraData"), QVariant(QLatin1String("extraValue2"))));