git.iko.soy/unity8
on xenial help sign in
test the visible+network code for card images
commit1d829a483ab5c66be6639d5b313b5d3cd18b716c authorAlbert Astals <albert.astals@canonical.com> dateMon 1 Sep 2014, 12:25 (12 years ago) parent6a99ed9
3 files changed+38−2
compare with xenial
unifiedsplit
tests/mocks/Ubuntu/Connectivity/networking-status.cpp+10−1 tests/mocks/Ubuntu/Connectivity/networking-status.h+7−1 tests/qmltests/Dash/tst_Card.qml+21
tests/mocks/Ubuntu/Connectivity/networking-status.cpp+10−1
@@ -34,7 +34,7 @@ NetworkingStatus::~NetworkingStatus()
3434QVector<NetworkingStatus::Limitations>
3535NetworkingStatus::limitations() const
3636{
37− return QVector<NetworkingStatus::Limitations>();
37+ return m_limitations;
3838}
3939
4040NetworkingStatus::Status
@@ -54,3 +54,12 @@ NetworkingStatus::limitedBandwith() const
5454{
5555 return limitations().contains(Limitations::Bandwith);
5656}
57+
58+void NetworkingStatus::setLimitedBandwidth(bool limited)
59+{
60+ if (limited) {
61+ m_limitations << Limitations::Bandwith;
62+ } else if (limitedBandwith()) {
63+ m_limitations.remove(m_limitations.indexOf(Limitations::Bandwith));
64+ }
65+}
tests/mocks/Ubuntu/Connectivity/networking-status.h+7−1
@@ -32,7 +32,7 @@ class Q_DECL_EXPORT NetworkingStatus : public QObject
3232 Q_PROPERTY(QVector<Limitations> limitations READ limitations NOTIFY limitationsChanged)
3333 Q_PROPERTY(Status status READ status NOTIFY statusChanged)
3434 Q_PROPERTY(bool online READ online NOTIFY onlineChanged)
35− Q_PROPERTY(bool limitedBandwith READ limitedBandwith NOTIFY limitedBandwithChanged)
35+ Q_PROPERTY(bool limitedBandwith READ limitedBandwith WRITE setLimitedBandwidth NOTIFY limitedBandwithChanged)
3636
3737public:
3838 explicit NetworkingStatus(QObject *parent = 0);
@@ -53,11 +53,17 @@ public:
5353 bool online() const;
5454 bool limitedBandwith() const;
5555
56+ // Only in the fake one
57+ void setLimitedBandwidth(bool limited);
58+
5659Q_SIGNALS:
5760 void limitationsChanged();
5861 void statusChanged(Status value);
5962 void onlineChanged(bool value);
6063 void limitedBandwithChanged(bool value);
64+
65+private:
66+ QVector<NetworkingStatus::Limitations> m_limitations;
6167};
6268
6369Q_DECLARE_METATYPE(NetworkingStatus::Limitations)
tests/qmltests/Dash/tst_Card.qml+21
@@ -17,6 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import Ubuntu.Components 0.1
20+import Ubuntu.Connectivity 1.0
2021import Unity.Test 0.1 as UT
2122import "../../../qml/Dash"
2223import "CardHelpers.js" as Helpers
@@ -566,5 +567,25 @@ Rectangle {
566567 verify((card.width - titleToCard.x - titleToCard.width) === units.gu(1));
567568 }
568569 }
570+
571+ function test_load_images_visibility_network_data() {
572+ return [
573+ { tag: "Visible, network", visible: true, limitedBandwith: false },
574+ { tag: "Visible, no network", visible: true, limitedBandwith: true },
575+ { tag: "Not Visible, network", visible: false, limitedBandwith: false },
576+ { tag: "Not Visible, no network", visible: false, limitedBandwith: true }
577+ ];
578+ }
579+
580+ function test_load_images_visibility_network(data) {
581+ loader.visible = data.visible;
582+ NetworkingStatus.limitedBandwith = data.limitedBandwith;
583+
584+ selector.selectedIndex = 0;
585+ waitForRendering(selector);
586+ waitForRendering(card);
587+
588+ verify(data.visible || !data.limitedBandwith || artImage.source == "");
589+ }
569590 }
570591}