<table><tr><td style="">jgrulich added inline comments.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D17317">View Revision</a></tr></table><br /><div><strong>INLINE COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D17317#inline-94829">View Inline</a><span style="color: #4b4d51; font-weight: bold;">matchsettingtest.cpp:29</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #304a96">#if !NM_CHECK_VERSION(1, 12, 0)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #304a96">#define NM_SETTING_MATCH_INTERFACE_NAME "interface-name"</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">NM 1.14.0, which is not released yet.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D17317#inline-94780">View Inline</a><span style="color: #4b4d51; font-weight: bold;">jgrulich</span> wrote in <span style="color: #4b4d51; font-weight: bold;">tcsettingtest.cpp:74</span></div>
<div style="margin: 8px 0; padding: 0 12px; color: #74777D;"><p style="padding: 0; margin: 8px;">Something like:</p>
<div class="remarkup-code-block" style="margin: 12px 0;" data-code-lang="text" data-sigil="remarkup-code-block"><pre class="remarkup-code" style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; padding: 12px; margin: 0; background: rgba(71, 87, 120, 0.08);">NMVariantMapList list = it.value();
NMVariantMapList list1 = map1.value(it.key());
QCOMPARE(list.count(), list1.count());
int comparedMaps = 0;
NMVariantMapList::const_iterator listIt = list.constBegin();
while (listIt != list.constEnd() {
NMVariantMapList::const_iterator list1It = list1.constBegin();
while (list1it != list1.constEnd()) {
QVariantMap listMap = listIt.value();
QVariantMap1 listMap1 = list1It.value();
// Test if keys do match, because the list can be in different order
QStringList listMapKeys = listMap.keys();
QStringList listMapKeys1 = listMap1.keys();
listMapKeys.sort();
listMapKeys1.sort();
if (listMapKeys.join(QChar(' ')) == listMapKeys1.join(QChar(' '))) {
// Here the maps should have same keys so compare QVariantMaps as we do now
.........
++comparedMaps;
}
++list1it;
}
++listIt;
}
// Test if we compared all maps, if not, then probably they didn't match
QCOMPARE(comparedMaps, list.count();</pre></div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">It should be:</p>
<div class="remarkup-code-block" style="margin: 12px 0;" data-code-lang="text" data-sigil="remarkup-code-block"><pre class="remarkup-code" style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; padding: 12px; margin: 0; background: rgba(71, 87, 120, 0.08);">// Will fail if set some default values, because they are skipped in toMap() method
QVariantMap::const_iterator it = map.constBegin();
while (it != map.constEnd()) {
NMVariantMapList list = it.value().value<NMVariantMapList>();
NMVariantMapList list1 = map1.value(it.key()).value<NMVariantMapList>();
QCOMPARE(list.count(), list1.count());
int comparedMaps = 0;
NMVariantMapList::const_iterator listIt = list.constBegin();
while (listIt != list.constEnd()) {
NMVariantMapList::const_iterator list1It = list1.constBegin();
while (list1It != list1.constEnd()) {
QVariantMap listMap = *listIt;
QVariantMap listMap1 = *list1It;
// Test if keys do match, because the list can be in different order
QStringList listMapKeys = listMap.keys();
QStringList listMapKeys1 = listMap1.keys();
listMapKeys.sort();
listMapKeys1.sort();
if (listMapKeys.join(QChar(' ')) == listMapKeys1.join(QChar(' '))) {
// Here the maps should have same keys so compare QVariantMaps as we do now
.........
++comparedMaps;
}
++list1It;
}
++listIt;
}
++it;
}</pre></div>
<p style="padding: 0; margin: 8px;">You just need to add missing comparison of variant maps, which should be trivial.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D17317#inline-94827">View Inline</a><span style="color: #4b4d51; font-weight: bold;">matchsetting.cpp:26</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #304a96">#if !NM_CHECK_VERSION(1, 12, 0)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #304a96">#define NM_SETTING_MATCH_SETTING_NAME "match"</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">This is actually in master only, which means upcoming NM 1.14.0.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D17317#inline-94828">View Inline</a><span style="color: #4b4d51; font-weight: bold;">setting.cpp:33</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #304a96">#endif</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #304a96">#if !NM_CHECK_VERSION(1, 12, 0)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #304a96">#define NM_SETTING_MATCH_SETTING_NAME "match"</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Same here, should be NM 1.14.0.</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R282 NetworkManagerQt</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D17317">https://phabricator.kde.org/D17317</a></div></div><br /><div><strong>To: </strong>pranavgade, jgrulich<br /><strong>Cc: </strong>kde-frameworks-devel, michaelh, ngraham, bruns<br /></div>