0b0282c · unity8 · git.iko.soy

git.iko.soy/unity8

add qmltests for focused overlay

commit0b0282c148a3119d315d5682d279278f537cbc08 authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 5 Sep 2013, 00:44 (13 years ago) parentcf3f1c7

5 files changed+33

compare with xenial

unifiedsplit

Launcher/LauncherDelegate.qml+1 tests/mocks/Unity/Launcher/MockLauncherItem.cpp+16 tests/mocks/Unity/Launcher/MockLauncherItem.h+4 tests/mocks/Unity/Launcher/MockLauncherModel.cpp+4 tests/qmltests/Launcher/tst_Launcher.qml+8

Launcher/LauncherDelegate.qml+1

@@ -139,6 +139,7 @@ Item {

139139 }

140140 }

141141 Image {

142+ objectName: "focusedHighlight"

142143 anchors {

143144 right: parent.right

144145 verticalCenter: parent.verticalCenter

tests/mocks/Unity/Launcher/MockLauncherItem.cpp+16

@@ -33,6 +33,7 @@ MockLauncherItem::MockLauncherItem(const QString &appId, const QString& desktopF

3333 m_recent(false),

3434 m_progress(-1),

3535 m_count(0),

36+ m_focused(false),

3637 m_quickList(new MockQuickListModel(this))

3738{

3839

@@ -128,6 +129,21 @@ void MockLauncherItem::setCount(int count)

128129 }

129130}

130131

132+bool MockLauncherItem::focused() const

133+{

134+ return m_focused;

135+}

136+

137+void MockLauncherItem::setFocused(bool focused)

138+{

139+ if (m_focused != focused)

140+ {

141+ m_focused = focused;

142+ Q_EMIT focusedChanged(focused);

143+ }

144+}

145+

146+

131147unity::shell::launcher::QuickListModelInterface *MockLauncherItem::quickList() const

132148{

133149 return m_quickList;

tests/mocks/Unity/Launcher/MockLauncherItem.h+4

@@ -52,6 +52,9 @@ public:

5252 int count() const;

5353 void setCount(int count);

5454

55+ bool focused() const;

56+ void setFocused(bool focused);

57+

5558 unity::shell::launcher::QuickListModelInterface *quickList() const;

5659

5760private:

@@ -64,6 +67,7 @@ private:

6467 bool m_recent;

6568 int m_progress;

6669 int m_count;

70+ bool m_focused;

6771 MockQuickListModel *m_quickList;

6872};

6973

tests/mocks/Unity/Launcher/MockLauncherModel.cpp+4

@@ -25,6 +25,7 @@ MockLauncherModel::MockLauncherModel(QObject* parent): LauncherModelInterface(pa

2525 MockLauncherItem *item = new MockLauncherItem("phone-app", "/usr/share/applications/phone-app.desktop", "Phone", "phone-app", this);

2626 item->setProgress(0);

2727 m_list.append(item);

28+ item->setFocused(true);

2829 item = new MockLauncherItem("camera-app", "/usr/share/applications/camera-app.desktop", "Camera", "camera", this);

2930 item->setProgress(10);

3031 m_list.append(item);

@@ -49,6 +50,7 @@ MockLauncherModel::MockLauncherModel(QObject* parent): LauncherModelInterface(pa

4950 item = new MockLauncherItem("notes-app", "/usr/share/applications/notes-app.desktop", "Notepad", "notepad", this);

5051 item->setProgress(50);

5152 item->setCount(5);

53+ item->setFocused(true);

5254 m_list.append(item);

5355 item = new MockLauncherItem("calendar-app", "/usr/share/applications/calendar-app.desktop","Calendar", "calendar", this);

5456 m_list.append(item);

@@ -85,6 +87,8 @@ QVariant MockLauncherModel::data(const QModelIndex& index, int role) const

8587 return item->progress();

8688 case RoleCount:

8789 return item->count();

90+ case RoleFocused:

91+ return item->focused();

8892 }

8993

9094 return QVariant();

tests/qmltests/Launcher/tst_Launcher.qml+8

@@ -198,6 +198,14 @@ Item {

198198 compare(findChild(delegate, "progressOverlay").visible, LauncherModel.get(i).progress >= 0)

199199 }

200200 }

201+

202+ function test_focusedHighlight() {

203+ var launcherListView = findChild(launcher, "launcherListView");

204+ for (var i = 0; i < launcherListView.count; ++i) {

205+ var delegate = findChild(launcherListView, "launcherDelegate" + i)

206+ compare(findChild(delegate, "focusedHighlight").visible, LauncherModel.get(i).focused)

207+ }

208+ }

201209 }

202210

203211 UT.UnityTestCase {