Differential D17342 Diff 46830 autotests/settings/teamportsettingtest.cpp

Changeset View

Standalone View

View Options

autotests/settings/teamportsettingtest.cpp

  • This file was added.
1​/*
2​ Copyright 2018 Pranav Gade <pranavgade20@gmail.com>
3​
4​ This library is free software; you can redistribute it and/or
5​ modify it under the terms of the GNU Lesser General Public
6​ License as published by the Free Software Foundation; either
7​ version 2.1 of the License, or (at your option) version 3, or any
8​ later version accepted by the membership of KDE e.V. (or its
9​ successor approved by the membership of KDE e.V.), which shall
10​ act as a proxy defined in Section 6 of version 3 of the license.
11​
12​ This library is distributed in the hope that it will be useful,
13​ but WITHOUT ANY WARRANTY; without even the implied warranty of
14​ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15​ Lesser General Public License for more details.
16​
17​ You should have received a copy of the GNU Lesser General Public
18​ License along with this library. If not, see <http://www.gnu.org/licenses/>.
19​*/
20​
21​#include "teamportsettingtest.h"
22​
23​#include "settings/teamportsetting.h"
24​
25​#include <libnm/NetworkManager.h>
26​
27​#include <QTest>
28​
29​#if !NM_CHECK_VERSION(1, 12, 0)
jgrulichUnsubmitted
Done

Those defines are already in NM 1.10

jgrulich: Those defines are already in NM 1.10
30​#define NM_SETTING_TEAM_PORT_CONFIG "config"
31​#define NM_SETTING_TEAM_PORT_QUEUE_ID "queue-id"
32​#define NM_SETTING_TEAM_PORT_PRIO "prio"
33​#define NM_SETTING_TEAM_PORT_STICKY "sticky"
34​#define NM_SETTING_TEAM_PORT_LACP_PRIO "lacp-prio"
35​#define NM_SETTING_TEAM_PORT_LACP_KEY "lacp-key"
36​#define NM_SETTING_TEAM_PORT_LINK_WATCHERS "link-watchers"
37​#endif
38​
39​void TeamPortSettingTest::testSetting_data()
40​{
41​ QTest::addColumn<QString>("config");
42​ QTest::addColumn<qint32>("lacpKey");
43​ QTest::addColumn<qint32>("lacpPrio");
44​ QTest::addColumn<qint32>("prio");
45​ QTest::addColumn<qint32>("queueId");
46​ QTest::addColumn<bool>("sticky");
47​ QTest::addColumn<NMVariantMapList>("linkWatchers");
48​
49​ NMVariantMapList linkWatchers;
50​ QVariantMap linkWatcher;
51​ linkWatcher["one"] = "1";
52​ linkWatcher["two"] = 2;
53​ linkWatchers.append(linkWatcher);
54​
55​
56​ QTest::newRow("setting1")
57​ << QString("abc") // config
58​ << (qint32)1 // lacpKey
59​ << (qint32)1 // lacpPrio
60​ << (qint32)1 // prio
61​ << (qint32)1 // queueId
62​ << false // sticky
jgrulichUnsubmitted
Done

set it to TRUE, otherwise it will fail once you fix the test

jgrulich: set it to TRUE, otherwise it will fail once you fix the test
63​ << linkWatchers; // linkWatchers
64​}
65​
66​void TeamPortSettingTest::testSetting()
67​{
68​ QFETCH(QString, config);
69​ QFETCH(qint32, lacpKey);
70​ QFETCH(qint32, lacpPrio);
71​ QFETCH(qint32, prio);
72​ QFETCH(qint32, queueId);
73​ QFETCH(bool, sticky);
74​ QFETCH(NMVariantMapList, linkWatchers);
75​
76​ QVariantMap map;
77​
78​ map.insert(QLatin1String(NM_SETTING_TEAM_PORT_CONFIG), config);
79​ map.insert(QLatin1String(NM_SETTING_TEAM_PORT_LACP_KEY), lacpKey);
80​ map.insert(QLatin1String(NM_SETTING_TEAM_PORT_LACP_PRIO), lacpPrio);
81​ map.insert(QLatin1String(NM_SETTING_TEAM_PORT_PRIO), prio);
82​ map.insert(QLatin1String(NM_SETTING_TEAM_PORT_QUEUE_ID), queueId);
83​ map.insert(QLatin1String(NM_SETTING_TEAM_PORT_STICKY), sticky);
84​ map.insert(QLatin1String(NM_SETTING_TEAM_PORT_LINK_WATCHERS), QVariant::fromValue(linkWatchers));
85​
86​
87​ NetworkManager::TeamPortSetting setting;
88​ setting.fromMap(map);
89​
90​ QVariantMap map1 = setting.toMap();
91​
92​ QVariantMap::const_iterator it = map.constBegin();
jgrulichUnsubmitted
Done

This is weird, this way only link-watchers should be compared, the rest should be identical to other unit tests.

jgrulich: This is weird, this way only link-watchers should be compared, the rest should be identical to…
93​ NMVariantMapList list = it.value().value<NMVariantMapList>();
94​ NMVariantMapList list1 = map1.value(it.key()).value<NMVariantMapList>();
95​
96​ QCOMPARE(list.count(), list1.count());
97​
98​ int comparedMaps = 0;
jgrulichUnsubmitted
Done

Still weird, why don't you put link-watchers to the same map as above. You can then skip comparison if the key is "link-watchers" as you saw in ipv6settingtest for example.

jgrulich: Still weird, why don't you put link-watchers to the same map as above. You can then skip…
99​ for (int i = 0; i < list.size(); ++i) {
100​ QVariantMap map = list.value(i);
101​ for (int j = 0; j < list1.size(); ++j) {
jgrulichUnsubmitted
Done

This is again wrong, you want to go through "link-watchers" map, not through the whole map.

jgrulich: This is again wrong, you want to go through "link-watchers" map, not through the whole map.
102​ QVariantMap map1 = list1.value(i);
103​
104​ QMap<QString, QVariant>::const_iterator ite = map.constBegin();
jgrulichUnsubmitted
Done

Why don't you skip this and just use NMVariantMapList list = map.value(QLatin1String(NM_SETTING_TEAM_PORT_LINK_WATCHERS).value<NMVariantMapList>()? same for the second one. You don't need to go through the map to get "link-watchers" property.

jgrulich: Why don't you skip this and just use NMVariantMapList list = map.value(QLatin1String…
105​ int comparedvals = 0;
106​ while (ite != map.constEnd()) {
107​ if (map1.contains(ite.key())) {
108​ comparedvals++;
109​ }
110​ ++ite;
111​ }
112​ if (comparedvals == map.size()) {
113​ comparedMaps++;
114​ }
115​ }
116​ }
117​
118​ QCOMPARE(comparedMaps, list.count());
jgrulichUnsubmitted
Done

I think you can use QCOMPARE() here, to make it fail in case they don't match.

jgrulich: I think you can use QCOMPARE() here, to make it fail in case they don't match.
119​}
120​
121​QTEST_MAIN(TeamPortSettingTest)
jgrulichUnsubmitted
Done

Here you compare whether the maps have identical keys, which is correct, but you also have to compare the values.

jgrulich: Here you compare whether the maps have identical keys, which is correct, but you also have to…
122​