ae59de5 · unity8 · git.iko.soy

git.iko.soy/unity8

improve countEmblem test and fix some warnings along the way

commitae59de50f8a68c77c5d8053cd5445d72c4218026 authorMichael Zanetti <michael.zanetti@canonical.com> dateWed 3 Sep 2014, 15:30 (12 years ago) parentb06c57c

4 files changed+9−1

compare with xenial

unifiedsplit

qml/Launcher/LauncherDelegate.qml+1 tests/mocks/Unity/Launcher/MockLauncherItem.cpp+1 tests/mocks/Unity/Launcher/MockLauncherModel.cpp+4 tests/qmltests/Launcher/tst_Launcher.qml+3−1

qml/Launcher/LauncherDelegate.qml+1

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

8686

8787 Label {

8888 id: countLabel

89+ objectName: "countLabel"

8990 text: root.count

9091 anchors.centerIn: parent

9192 // FIXME: verticalCenter seems to be off wee bit and QML doesn't have a centerLine

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

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

3535 m_recent(false),

3636 m_progress(-1),

3737 m_count(0),

38+ m_countVisible(false),

3839 m_focused(false),

3940 m_quickList(new MockQuickListModel(this))

4041{

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

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

7676 LauncherItemInterface *item = m_list.at(index.row());

7777 switch(role)

7878 {

79+ case RoleAppId:

80+ return item->appId();

7981 case RoleName:

8082 return item->name();

8183 case RoleIcon:

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

9092 return item->progress();

9193 case RoleCount:

9294 return item->count();

95+ case RoleCountVisible:

96+ return item->countVisible();

9397 case RoleFocused:

9498 return item->focused();

9599 }

tests/qmltests/Launcher/tst_Launcher.qml+3−1

@@ -194,7 +194,9 @@ Item {

194194 var launcherListView = findChild(launcher, "launcherListView");

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

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

197− compare(findChild(delegate, "countEmblem").visible, LauncherModel.get(i).count > 0)

197+ compare(findChild(delegate, "countEmblem").visible, LauncherModel.get(i).countVisible)

198+ // Intentionally allow type coercion (string/number)

199+ compare(findChild(delegate, "countLabel").text == LauncherModel.get(i).count, true)

198200 }

199201 }

200202