1d829a4 · unity8 · git.iko.soy

tests/mocks/Ubuntu/Connectivity/networking-status.cpp+10−1

compare with xenial

unifiedsplit

@@ -34,7 +34,7 @@ NetworkingStatus::~NetworkingStatus()

34QVector<NetworkingStatus::Limitations>

35NetworkingStatus::limitations() const

36{

37− return QVector<NetworkingStatus::Limitations>();

37+ return m_limitations;

38}

39

40NetworkingStatus::Status

@@ -54,3 +54,12 @@ NetworkingStatus::limitedBandwith() const

54{

55 return limitations().contains(Limitations::Bandwith);

56}

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

32 Q_PROPERTY(QVector<Limitations> limitations READ limitations NOTIFY limitationsChanged)

33 Q_PROPERTY(Status status READ status NOTIFY statusChanged)

34 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)

36

37public:

38 explicit NetworkingStatus(QObject *parent = 0);

@@ -53,11 +53,17 @@ public:

53 bool online() const;

54 bool limitedBandwith() const;

55

56+ // Only in the fake one

57+ void setLimitedBandwidth(bool limited);

58+

56Q_SIGNALS:

59Q_SIGNALS:

57 void limitationsChanged();

60 void limitationsChanged();

58 void statusChanged(Status value);

61 void statusChanged(Status value);

59 void onlineChanged(bool value);

62 void onlineChanged(bool value);

60 void limitedBandwithChanged(bool value);

63 void limitedBandwithChanged(bool value);

64+

65+private:

66+ QVector<NetworkingStatus::Limitations> m_limitations;

61};

67};

62

68

63Q_DECLARE_METATYPE(NetworkingStatus::Limitations)

69Q_DECLARE_METATYPE(NetworkingStatus::Limitations)

tests/qmltests/Dash/tst_Card.qml+21

@@ -17,6 +17,7 @@

17import QtQuick 2.0

18import QtTest 1.0

19import Ubuntu.Components 0.1

20+import Ubuntu.Connectivity 1.0

20import Unity.Test 0.1 as UT

21import Unity.Test 0.1 as UT

21import "../../../qml/Dash"

22import "../../../qml/Dash"

22import "CardHelpers.js" as Helpers

23import "CardHelpers.js" as Helpers

@@ -566,5 +567,25 @@ Rectangle {

566 verify((card.width - titleToCard.x - titleToCard.width) === units.gu(1));

567 verify((card.width - titleToCard.x - titleToCard.width) === units.gu(1));

567 }

568 }

569 }

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+ }

569 }

590 }

570}

591}