5974f54 · unity8 · git.iko.soy

qml/Components/PageHeader.qml+1

compare with xenial

unifiedsplit

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

74

75 AbstractButton {

76 id: backButton

77+ objectName: root.objectName + "_backButton"

77 visible: false

78 visible: false

78 height: header.height

79 height: header.height

79 y: header.contentY

80 y: header.contentY

qml/Dash/CardCarousel.qml+1−1

@@ -60,7 +60,7 @@ DashRenderer {

60

61 itemComponent: Card {

62 id: card

63− objectName: "delegate" + index

63+ objectName: "carouselDelegate" + index

64 headerHeight: carousel.headerHeight

65 cardData: model

66 template: cardCarousel.template

qml/Dash/DashContent.qml+6−4

@@ -103,7 +103,7 @@ Item {

103 id: dashContentList

104 objectName: "dashContentList"

105

106− interactive: dashContent.scopes.loaded && !previewListView.open && !currentItem.moving

106+ interactive: dashContent.scopes.loaded && !previewListView.open && currentItem && !currentItem.moving

107

108 anchors.fill: parent

109 model: dashContent.model

@@ -150,11 +150,12 @@ Item {

150 readonly property bool isLoaded: status == Loader.Ready

151

152 onLoaded: {

153+ item.objectName = scope.id

154+ item.pageHeader = dashPageHeader;

155+ item.previewListView = previewListView;

153 item.scope = Qt.binding(function() { return scope })

156 item.scope = Qt.binding(function() { return scope })

154 item.isCurrent = Qt.binding(function() { return visible && ListView.isCurrentItem })

157 item.isCurrent = Qt.binding(function() { return visible && ListView.isCurrentItem })

155 item.tabBarHeight = dashPageHeader.implicitHeight;

158 item.tabBarHeight = dashPageHeader.implicitHeight;

156− item.pageHeader = dashPageHeader;

157− item.previewListView = previewListView;

158 dashContentList.movementStarted.connect(item.movementStarted)

159 dashContentList.movementStarted.connect(item.movementStarted)

159 dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)

160 dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)

160 dashContent.scopeLoaded(item.scope.id)

161 dashContent.scopeLoaded(item.scope.id)

@@ -185,7 +186,7 @@ Item {

185 width: parent.width

186 width: parent.width

186 searchEntryEnabled: true

187 searchEntryEnabled: true

187 searchHistory: dashContent.searchHistory

188 searchHistory: dashContent.searchHistory

188− scope: dashContentList.currentItem.theScope

189+ scope: dashContentList.currentItem && dashContentList.currentItem.theScope

189

190

190 childItem: TabBar {

191 childItem: TabBar {

191 id: tabBar

192 id: tabBar

@@ -225,6 +226,7 @@ Item {

225

226

226 PreviewListView {

227 PreviewListView {

227 id: previewListView

228 id: previewListView

229+ objectName: "dashContentPreviewList"

228 visible: x != width

230 visible: x != width

229 scope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null

231 scope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null

230 pageHeader: dashPageHeader

232 pageHeader: dashPageHeader

qml/Dash/GenericScopeView.qml+4−9

@@ -24,9 +24,9 @@ import "../Components/ListItems" as ListItems

24FocusScope {

25 id: scopeView

26

27− property Scope scope

27+ property Scope scope: null

28 property SortFilterProxyModel categories: categoryFilter

29− property bool isCurrent

29+ property bool isCurrent: false

30 property alias moving: categoryView.moving

31 property int tabBarHeight: 0

32 property PageHeader pageHeader: null

@@ -92,7 +92,7 @@ FocusScope {

92 Binding {

93 target: pageHeader

94 property: "searchQuery"

95− value: scopeView.scope.searchQuery

95+ value: scopeView.scope ? scopeView.scope.searchQuery : ""

96 when: isCurrent

97 }

98

@@ -126,11 +126,6 @@ FocusScope {

126 onOriginYChanged: pageHeader.positionRealHeader();

127 onContentHeightChanged: pageHeader.positionRealHeader();

128

129− Behavior on contentY {

130− enabled: previewListView.open

131− UbuntuNumberAnimation {}

132− }

133−

134 delegate: ListItems.Base {

129 delegate: ListItems.Base {

135 id: baseItem

130 id: baseItem

136 objectName: "dashCategory" + category

131 objectName: "dashCategory" + category

@@ -275,7 +270,7 @@ FocusScope {

275

270

276 sectionProperty: "name"

271 sectionProperty: "name"

277 sectionDelegate: ListItems.Header {

272 sectionDelegate: ListItems.Header {

278− objectName: "dashSectionHeader" + delegate.category

273+ objectName: "dashSectionHeader" + (delegate ? delegate.category : "")

279 property var delegate: categoryView.item(delegateIndex)

274 property var delegate: categoryView.item(delegateIndex)

280 width: categoryView.width

275 width: categoryView.width

281 text: section

276 text: section

qml/Dash/PreviewListView.qml+4−2

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

34

35 PageHeader {

36 id: header

37+ objectName: root.objectName + "_pageHeader"

37 width: parent.width

38 width: parent.width

38 searchEntryEnabled: false

39 searchEntryEnabled: false

39 scope: root.scope

40 scope: root.scope

@@ -59,7 +60,7 @@ Item {

59

60

60 ListView {

61 ListView {

61 id: previewListView

62 id: previewListView

62− objectName: "previewListView"

63+ objectName: root.objectName + "_listView"

63 anchors {

64 anchors {

64 top: header.bottom

65 top: header.bottom

65 bottom: parent.bottom

66 bottom: parent.bottom

@@ -90,7 +91,7 @@ Item {

90 pageHeader.unfocus();

91 pageHeader.unfocus();

91 } else {

92 } else {

92 // Cancel any pending preview requests or actions

93 // Cancel any pending preview requests or actions

93− if (previewListView.currentItem.previewData !== undefined) {

94+ if (previewListView.currentItem && previewListView.currentItem.previewData !== undefined) {

94 previewListView.currentItem.previewData.cancelAction();

95 previewListView.currentItem.previewData.cancelAction();

95 }

96 }

96 scope.cancelActivation();

97 scope.cancelActivation();

@@ -99,6 +100,7 @@ Item {

99 }

100 }

100

101

101 delegate: Item {

102 delegate: Item {

103+ objectName: "previewItem" + index

102 height: previewListView.height

104 height: previewListView.height

103 width: previewListView.width

105 width: previewListView.width

104

106

tests/mocks/Unity/CMakeLists.txt+4−4

@@ -18,14 +18,14 @@ include_directories(

18add_definitions(-DQT_NO_KEYWORDS)

19

20set(UnityQML_SOURCES

21− categoryresults.cpp

22 iconutils.cpp

21 iconutils.cpp

23− fake_applications_scope.cpp

24− fake_preview.cpp

25 fake_scope.cpp

22 fake_scope.cpp

26 fake_scopes.cpp

23 fake_scopes.cpp

27 fake_categories.cpp

24 fake_categories.cpp

28− scopes-ng/fake_preview_model.cpp

25+ fake_resultsmodel.cpp

26+ fake_previewmodel.cpp

27+ fake_previewstack.cpp

28+ fake_previewwidgetmodel.cpp

29 fake_unity_plugin.cpp

30)

31

tests/mocks/Unity/categoryresults.cppdeleted−121

@@ -1,121 +0,0 @@

1−/*

3− *

4− * Authors:

5− * Michal Hruby <michal.hruby@canonical.com>

6− *

7− * This program is free software; you can redistribute it and/or modify

8− * it under the terms of the GNU General Public License as published by

9− * the Free Software Foundation; version 3.

10− *

11− * This program is distributed in the hope that it will be useful,

12− * but WITHOUT ANY WARRANTY; without even the implied warranty of

13− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

14− * GNU General Public License for more details.

15− *

16− * You should have received a copy of the GNU General Public License

17− * along with this program. If not, see <http://www.gnu.org/licenses/>.

18− */

19−

20−// self

21−#include "categoryresults.h"

22−#include "iconutils.h"

23−

24−// TODO: use something from libunity once it's public

25−enum ResultsColumn {

26− URI,

27− ICON_HINT,

28− CATEGORY,

29− RESULT_TYPE,

30− MIMETYPE,

31− TITLE,

32− COMMENT,

33− DND_URI,

34− METADATA

35−};

36−

37−CategoryResults::CategoryResults(QObject* parent)

38− : DeeListModel(parent)

39− , m_categoryIndex(-1)

40−{

41− m_roles[CategoryResults::RoleUri] = "uri";

42− m_roles[CategoryResults::RoleIconHint] = "icon";

43− m_roles[CategoryResults::RoleCategory] = "category";

44− m_roles[CategoryResults::RoleMimetype] = "mimetype";

45− m_roles[CategoryResults::RoleTitle] = "title";

46− m_roles[CategoryResults::RoleComment] = "comment";

47− m_roles[CategoryResults::RoleDndUri] = "dndUri";

48− m_roles[CategoryResults::RoleMetadata] = "metadata";

49− m_roles[CategoryResults::RoleRendererHints] = "rendererHints";

50−}

51−

52−int CategoryResults::categoryIndex() const

53−{

54− return m_categoryIndex;

55−}

56−

57−void CategoryResults::setCategoryIndex(int index)

58−{

59− if (m_categoryIndex != index) {

60− m_categoryIndex = index;

61− Q_EMIT categoryIndexChanged(m_categoryIndex);

62− }

63−}

64−

65−QHash<int, QByteArray>

66−CategoryResults::roleNames() const

67−{

68− return m_roles;

69−}

70−

71−QVariant

72−CategoryResults::data(const QModelIndex& index, int role) const

73−{

74− if (!index.isValid()) {

75− return QVariant();

76− }

77−

78− switch (role) {

79− case RoleUri:

80− return DeeListModel::data(index, ResultsColumn::URI);

81− case RoleIconHint: {

82− QString giconString(DeeListModel::data(index, ResultsColumn::ICON_HINT).toString());

83− if (giconString.isEmpty()) {

84− QString mimetype(DeeListModel::data(index, ResultsColumn::MIMETYPE).toString());

85− QString uri(DeeListModel::data(index, ResultsColumn::URI).toString());

86− QString thumbnailerUri(uriToThumbnailerProviderString(uri, mimetype, DeeListModel::data(index, ResultsColumn::METADATA).toHash()));

87− if (!thumbnailerUri.isNull()) {

88− return QVariant::fromValue(thumbnailerUri);

89− }

90− }

91− return QVariant::fromValue(gIconToDeclarativeImageProviderString(giconString));

92− }

93− case RoleCategory:

94− return DeeListModel::data(index, ResultsColumn::CATEGORY);

95− case RoleMimetype:

96− return DeeListModel::data(index, ResultsColumn::MIMETYPE);

97− case RoleTitle:

98− return DeeListModel::data(index, ResultsColumn::TITLE);

99− case RoleComment:

100− return DeeListModel::data(index, ResultsColumn::COMMENT);

101− case RoleDndUri:

102− return DeeListModel::data(index, ResultsColumn::DND_URI);

103− case RoleMetadata:

104− return DeeListModel::data(index, ResultsColumn::METADATA);

105− case RoleRendererHints:

106− {

107− QVariantHash hash(DeeListModel::data(index, ResultsColumn::METADATA).toHash());

108− if (hash.contains("content")) {

109− QVariantMap hints;

110− QVariantHash innerHash(hash["content"].toHash());

111− if (innerHash.contains("scope_disabled")) {

112− hints["scope_disabled"] = innerHash["scope_disabled"];

113− }

114− return hints.empty() ? QVariant() : QVariant::fromValue(hints);

115− }

116− return QVariant();

117− }

118− default:

119− return QVariant();

120− }

121−}

tests/mocks/Unity/categoryresults.hdeleted−68

@@ -1,68 +0,0 @@

1−/*

3− *

4− * Authors:

5− * Michal Hruby <michal.hruby@canonical.com>

6− *

7− * This program is free software; you can redistribute it and/or modify

8− * it under the terms of the GNU General Public License as published by

9− * the Free Software Foundation; version 3.

10− *

11− * This program is distributed in the hope that it will be useful,

12− * but WITHOUT ANY WARRANTY; without even the implied warranty of

13− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

14− * GNU General Public License for more details.

15− *

16− * You should have received a copy of the GNU General Public License

17− * along with this program. If not, see <http://www.gnu.org/licenses/>.

18− */

19−

20−

21−#ifndef CATEGORY_RESULTS_H

22−#define CATEGORY_RESULTS_H

23−

24−// dee-qt

25−#include "deelistmodel.h"

26−

27−class Q_DECL_EXPORT CategoryResults : public DeeListModel

28−{

29− Q_OBJECT

30−

31− Q_ENUMS(Roles)

32−

33− Q_PROPERTY(int categoryIndex READ categoryIndex WRITE setCategoryIndex NOTIFY categoryIndexChanged)

34−

35−public:

36− explicit CategoryResults(QObject* parent = 0);

37−

38− enum Roles {

39− RoleUri,

40− RoleIconHint,

41− RoleCategory,

42− RoleMimetype,

43− RoleTitle,

44− RoleComment,

45− RoleDndUri,

46− RoleMetadata,

47− RoleRendererHints

48− };

49−

50− QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;

51−

52− QHash<int, QByteArray> roleNames() const;

53−

54− /* getters */

55− int categoryIndex() const;

56−

57− /* setters */

58− void setCategoryIndex(int index);

59−

60−Q_SIGNALS:

61− void categoryIndexChanged(int index);

62−

63−private:

64− QHash<int, QByteArray> m_roles;

65− int m_categoryIndex;

66−};

67−

68−#endif // CATEGORY_RESULTS_H

tests/mocks/Unity/fake_applications_scope.cppdeleted−76

@@ -1,76 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#include "fake_applications_scope.h"

18−

19−static const gchar * categories_model_schema[] = {

20− "s", //ID

21− "s", // DISPLAY_NAME

22− "s", // ICON_HINT

23− "s", // RENDERER_NAME

24− "a{sv}" // HINTS

25−};

26−

27−ApplicationsScope::ApplicationsScope(bool visible, QObject* parent)

28− : Scope(parent)

29−{

30− m_id = "applications.scope";

31− m_name = "Applications";

32− m_visible = visible;

33− m_previewRendererName = "preview-application";

34− m_categories->setModel(createCategoriesModel());

35−}

36−

37−DeeModel* ApplicationsScope::createCategoriesModel()

38−{

39− DeeModel* category_model = dee_sequence_model_new();

40− dee_model_set_schema_full(category_model, categories_model_schema, G_N_ELEMENTS(categories_model_schema));

41− GVariant* hints = g_variant_new_array(g_variant_type_element(G_VARIANT_TYPE_VARDICT), NULL, 0);

42−

43− GVariant* children[1];

44− children[0] = g_variant_new_dict_entry(g_variant_new_string("content-type"),

45− g_variant_new_variant(g_variant_new_string("apps")));

46− GVariant* recentHints = g_variant_new_array(g_variant_type_element(G_VARIANT_TYPE_VARDICT), children, 1);

47− dee_model_append(category_model,

48− "recent",

49− "Recent",

50− "gtk-apply",

51− "special",

52− recentHints);

53−

54− dee_model_append(category_model,

55− "installed",

56− "Installed",

57− "gtk-apply",

58− "grid",

59− hints);

60−

61− dee_model_append(category_model,

62− "suggested",

63− "Suggested",

64− "gtk-apply",

65− "grid",

66− hints);

67−

68− dee_model_append(category_model,

69− "outdated",

70− "Outdaded",

71− "gtk-apply",

72− "grid",

73− hints);

74−

75− return category_model;

76−}

tests/mocks/Unity/fake_applications_scope.hdeleted−33

@@ -1,33 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#ifndef FAKE_APPLICATIONS_SCOPE_H

18−#define FAKE_APPLICATIONS_SCOPE_H

19−

20−#include "fake_scope.h"

21−

22−class ApplicationsScope : public Scope

23−{

24− Q_OBJECT

25−

26−public:

27− ApplicationsScope(bool visible, QObject* parent = 0);

28−

29−private:

30− DeeModel* createCategoriesModel();

31−};

32−

33−#endif // FAKE_APPLICATIONS_SCOPE_H

tests/mocks/Unity/fake_categories.cpp+109−194

@@ -19,100 +19,21 @@

19// self

20#include "fake_categories.h"

21

22−// local

22+#include "fake_resultsmodel.h"

23−#include "categoryresults.h"

24

23

25−#define CATEGORY_COLUMN 2

26−

27−// TODO: use something from libunity once it's public

28−enum CategoryColumn {

29− ID,

30− DISPLAY_NAME,

31− ICON_HINT,

32− RENDERER_NAME,

33− HINTS

34−};

35−

36−Categories::Categories(QObject* parent)

24+Categories::Categories(int category_count, QObject* parent)

37− : DeeListModel(parent)

25+ : QAbstractListModel(parent)

26+ , m_category_count(category_count)

38{

27{

39− // FIXME: need to clean up unused filters on countChanged

40 m_roles[Categories::RoleCategoryId] = "categoryId";

28 m_roles[Categories::RoleCategoryId] = "categoryId";

41 m_roles[Categories::RoleName] = "name";

29 m_roles[Categories::RoleName] = "name";

42 m_roles[Categories::RoleIcon] = "icon";

30 m_roles[Categories::RoleIcon] = "icon";

31+ m_roles[Categories::RoleRawRendererTemplate] = "rawRendererTemplate";

43 m_roles[Categories::RoleRenderer] = "renderer";

32 m_roles[Categories::RoleRenderer] = "renderer";

44− m_roles[Categories::RoleContentType] = "contentType";

33+ m_roles[Categories::RoleComponents] = "components";

45− m_roles[Categories::RoleRendererHint] = "rendererHint";

46− m_roles[Categories::RoleHints] = "hints";

34+ m_roles[Categories::RoleProgressSource] = "progressSource";

47 m_roles[Categories::RoleResults] = "results";

35 m_roles[Categories::RoleResults] = "results";

48 m_roles[Categories::RoleCount] = "count";

36 m_roles[Categories::RoleCount] = "count";

49−

50− // TODO This should not be needed but accumulatting the count changes

51− // makes the visualization more stable and also makes crashes on fast

52− // change of the search term harder to reproduce

53− m_timer.setSingleShot(true);

54− m_timer.setInterval(50);

55− connect(&m_timer, SIGNAL(timeout()), this, SLOT(onEmitCountChanged()));

56−}

57−

58−DeeListModel*

59−Categories::getFilter(int index) const

60−{

61− if (!m_filters.contains(index)) {

62− auto results = new CategoryResults ();

63− results->setCategoryIndex(index);

64− connect(results, SIGNAL(countChanged()), this, SLOT(onCountChanged()));

65−

66− unsigned cat_index = static_cast<unsigned>(index);

67− auto model = getResultsForCategory(cat_index);

68− results->setModel(model);

69−

70− m_filters.insert(index, results);

71− }

72−

73− return m_filters[index];

74−}

75−

76−void

77−Categories::onCountChanged()

78−{

79− DeeListModel* filter = qobject_cast<DeeListModel*>(sender());

80− if (filter) {

81− m_timerFilters << filter;

82− m_timer.start();

83− }

84−}

85−

86−void Categories::onRowCountChanged()

87−{

88− QAbstractItemModel* model = qobject_cast<QAbstractItemModel*>(sender());

89− // find the corresponding category index

90− for (auto iter = m_overriddenCategories.begin(); iter != m_overriddenCategories.end(); ++iter) {

91− if (iter.value() == model) {

92− for (int i = 0; i < rowCount(); i++) {

93− auto id = data(index(i), RoleCategoryId).toString();

94− if (id != iter.key()) continue;

95− QVector<int> roles;

96− roles.append(RoleCount);

97− QModelIndex changedIndex = index(i);

98− Q_EMIT dataChanged(changedIndex, changedIndex, roles);

99− break;

100− }

101− }

102− }

103−}

104−

105−void

106−Categories::onEmitCountChanged()

107−{

108− QVector<int> roles;

109− roles.append(Categories::RoleCount);

110− Q_FOREACH(DeeListModel* results, m_timerFilters) {

111− auto cat_results = qobject_cast<CategoryResults*>(results);

112− QModelIndex changedIndex = index(cat_results->categoryIndex());

113− Q_EMIT dataChanged(changedIndex, changedIndex, roles);

114− }

115− m_timerFilters.clear();

116}

37}

117

38

118QHash<int, QByteArray>

39QHash<int, QByteArray>

@@ -121,94 +42,46 @@ Categories::roleNames() const

121 return m_roles;

42 return m_roles;

122}

43}

123

44

124−void Categories::onOverrideModelDestroyed()

45+int Categories::rowCount(const QModelIndex& /*parent*/) const

125{

46{

126− QObject* model = sender();

47+ return m_category_count + m_specialCategories.count();

127− auto iter = m_overriddenCategories.begin();

128− while (iter != m_overriddenCategories.end()) {

129− if (iter.value() == model) {

130− iter = m_overriddenCategories.erase(iter);

131− continue;

132− }

133− ++iter;

134− }

135}

48}

136

49

137−void Categories::overrideResults(const QString& categoryId, QAbstractItemModel* model)

50+void Categories::addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject)

138{

51{

139− m_overriddenCategories[categoryId] = model;

52+ CategoryData catData;

140− // watch the model

53+ catData.categoryId = categoryId;

141− connect(model, &QObject::destroyed, this, &Categories::onOverrideModelDestroyed);

54+ catData.name = name;

142− connect(model, &QAbstractItemModel::rowsInserted, this, &Categories::onRowCountChanged);

55+ catData.icon = icon;

143− connect(model, &QAbstractItemModel::rowsRemoved, this, &Categories::onRowCountChanged);

56+ catData.rawTemplate = rawTemplate;

144− connect(model, &QAbstractItemModel::modelReset, this, &Categories::onRowCountChanged);

57+ catData.countObject = countObject;

145−

58+

146− // emit the dataChanged signal if the category is already in the model

59+ beginInsertRows(QModelIndex(), 0, 0);

147− for (int i = 0; i < rowCount(); i++) {

60+ m_specialCategories.prepend(catData);

148− auto id = data(index(i), RoleCategoryId).toString();

61+ endInsertRows();

149− if (id != categoryId) continue;

62+

150− QVector<int> roles;

63+ if (countObject) {

151− roles.append(RoleCount);

64+ connect(countObject, SIGNAL(countChanged()), this, SLOT(countChanged()));

152− roles.append(RoleResults);

153− QModelIndex changedIndex = index(i);

154− Q_EMIT dataChanged(changedIndex, changedIndex, roles);

155− break;

156 }

65 }

157}

66}

158

67

159−void Categories::setResultModel(DeeModel* model)

68+void Categories::countChanged()

160{

69{

161− // FIXME: should ref it

70+ QObject* countObject = sender();

162− m_dee_results = model;

163−}

164−

165

71

166−static void category_filter_map_func (DeeModel* orig_model,

72+ for (int i = 0; i < m_specialCategories.count(); ++i) {

167− DeeFilterModel* filter_model,

73+ const CategoryData &catData = m_specialCategories.at(i);

168− gpointer user_data)

74+ if (catData.countObject == countObject) {

169−{

75+ QVector<int> roles;

170− DeeModelIter* iter;

76+ roles.append(RoleCount);

171− DeeModelIter* end;

172− unsigned index = GPOINTER_TO_UINT(user_data);

173

77

174− iter = dee_model_get_first_iter(orig_model);

78+ QModelIndex changedIndex(index(i));

175− end = dee_model_get_last_iter(orig_model);

79+ dataChanged(changedIndex, changedIndex, roles);

176− while (iter != end) {

80+ break;

177− unsigned category_index = dee_model_get_uint32(orig_model, iter, CATEGORY_COLUMN);

178− if (index == category_index) {

179− dee_filter_model_append_iter(filter_model, iter);

180 }

81 }

181− iter = dee_model_next(orig_model, iter);

182 }

82 }

183}

83}

184

84

185−static gboolean category_filter_notify_func (DeeModel* orig_model,

186− DeeModelIter* orig_iter,

187− DeeFilterModel* filter_model,

188− gpointer user_data)

189−{

190− unsigned index = GPOINTER_TO_UINT(user_data);

191− unsigned category_index = dee_model_get_uint32(orig_model, orig_iter, CATEGORY_COLUMN);

192−

193− if (index != category_index)

194− return FALSE;

195−

196− dee_filter_model_insert_iter_with_original_order(filter_model, orig_iter);

197− return TRUE;

198−}

199−

200−DeeModel* Categories::getResultsForCategory(unsigned cat_index) const

201−{

202− DeeFilter filter;

203− filter.map_func = category_filter_map_func;

204− filter.map_notify = category_filter_notify_func;

205− filter.destroy = nullptr;

206− filter.userdata = GUINT_TO_POINTER(cat_index);

207−

208− DeeModel* filtered_model = dee_filter_model_new(m_dee_results, &filter);

209− return filtered_model;

210−}

211−

212QVariant

85QVariant

213Categories::data(const QModelIndex& index, int role) const

86Categories::data(const QModelIndex& index, int role) const

214{

87{

@@ -216,44 +89,86 @@ Categories::data(const QModelIndex& index, int role) const

216 return QVariant();

89 return QVariant();

217 }

90 }

218

91

92+ ResultsModel *resultsModel = m_resultsModels[index.row()];

93+ if (!resultsModel) {

94+ resultsModel = new ResultsModel(15, index.row());

95+ m_resultsModels[index.row()] = resultsModel;

96+ }

97+ if (index.row() < m_specialCategories.count()) {

98+ const CategoryData &catData = m_specialCategories.at(index.row());

219− switch (role) {

99+ switch (role) {

220− case RoleCategoryId:

100+ case RoleCategoryId:

221− return DeeListModel::data(index, CategoryColumn::ID);

101+ return catData.categoryId;

222− case RoleName:

102+ case RoleName:

223− return DeeListModel::data(index, CategoryColumn::DISPLAY_NAME);

103+ return catData.name;

224− case RoleIcon:

104+ case RoleIcon:

225− return DeeListModel::data(index, CategoryColumn::ICON_HINT);

105+ return catData.icon;

106+ case RoleRawRendererTemplate:

107+ return catData.rawTemplate;

226− case RoleRenderer:

108+ case RoleRenderer:

227− return DeeListModel::data(index, CategoryColumn::RENDERER_NAME);

109+ {

228− case RoleContentType:

110+ QVariantMap map;

111+ map["category-layout"] = index.row() % 2 == 0 ? "grid" : "carousel";

112+ map["card-size"] = "small";

113+ return map;

114+ }

115+ case RoleComponents:

229− {

116+ {

230− auto hints = DeeListModel::data(index, CategoryColumn::HINTS).toHash();

117+ QVariantMap map, artMap;

231− return hints.contains("content-type") ? hints["content-type"] : QVariant(QString("default"));

118+ artMap["aspect-ratio"] = "1.0";

232− }

119+ artMap["field"] = "art";

233− case RoleRendererHint:

120+ map["art"] = artMap;

234− {

121+ map["title"] = "HOLA";

235− auto hints = DeeListModel::data(index, CategoryColumn::HINTS).toHash();

122+ return map;

236− return hints.contains("renderer-hint") ? hints["renderer-hint"] : QVariant(QString());

123+ }

124+ case RoleProgressSource:

125+ qFatal("Using un-implemented RoleProgressSource Categories role");

126+ return QVariant();

127+ case RoleResults:

128+ return QVariant();

129+ case RoleCount:

130+ return catData.countObject->property("count");

131+ default:

132+ qFatal("Using un-implemented Categories role");

133+ return QVariant();

237 }

134 }

238− case RoleHints:

135+ } else {

239− return DeeListModel::data(index, CategoryColumn::HINTS);

136+ switch (role) {

240− case RoleResults:

137+ case RoleCategoryId:

241− if (m_overriddenCategories.size() > 0)

138+ return QString("%1").arg(index.row());

139+ case RoleName:

140+ return QString("Category %1").arg(index.row());

141+ case RoleIcon:

142+ return "gtk-apply";

143+ case RoleRawRendererTemplate:

144+ qFatal("Using un-implemented RoleRawRendererTemplate Categories role");

145+ return QVariant();

146+ case RoleRenderer:

242 {

147 {

243− auto id = DeeListModel::data(index, CategoryColumn::ID).toString();

148+ QVariantMap map;

244− if (m_overriddenCategories.find(id) != m_overriddenCategories.end())

149+ map["category-layout"] = index.row() % 2 == 0 ? "grid" : "carousel";

245− return QVariant::fromValue(m_overriddenCategories[id]);

150+ map["card-size"] = "small";

151+ return map;

246 }

152 }

247− return QVariant::fromValue(getFilter(index.row()));

153+ case RoleComponents:

248− case RoleCount:

249− if (m_overriddenCategories.size() > 0)

250 {

154 {

251− auto id = DeeListModel::data(index, CategoryColumn::ID).toString();

155+ QVariantMap map, artMap;

252− if (m_overriddenCategories.find(id) != m_overriddenCategories.end())

156+ artMap["aspect-ratio"] = "1.0";

253− return QVariant::fromValue(m_overriddenCategories[id]->rowCount());

157+ artMap["field"] = "art";

158+ map["art"] = artMap;

159+ map["title"] = "HOLA";

160+ return map;

254 }

161 }

162+ case RoleProgressSource:

163+ qFatal("Using un-implemented RoleProgressSource Categories role");

164+ return QVariant();

165+ case RoleResults:

255− return QVariant::fromValue(getFilter(index.row())->rowCount());

166+ return QVariant::fromValue(resultsModel);

167+ case RoleCount:

168+ return resultsModel->rowCount();

256− default:

169+ default:

170+ qFatal("Using un-implemented Categories role");

257− return QVariant();

171+ return QVariant();

172+ }

258 }

173 }

259}

174}

tests/mocks/Unity/fake_categories.h+25−29

@@ -18,58 +18,54 @@

18#define FAKE_CATEGORIES_H

19

20// Qt

21−#include <QObject>

21+#include <QAbstractListModel>

22−#include <QSet>

23−#include <QTimer>

22+#include <QList>

24

23

25−#include <dee.h>

24+class ResultsModel;

26−#include <deelistmodel.h>

27

25

28−class Categories : public DeeListModel

26+class Categories : public QAbstractListModel

29{

27{

30 Q_OBJECT

28 Q_OBJECT

31

29

32 Q_ENUMS(Roles)

30 Q_ENUMS(Roles)

33

31

34public:

32public:

35− Categories(QObject* parent = 0);

33+ Categories(int category_count, QObject* parent = 0);

36 enum Roles {

34 enum Roles {

37 RoleCategoryId,

35 RoleCategoryId,

38 RoleName,

36 RoleName,

39 RoleIcon,

37 RoleIcon,

38+ RoleRawRendererTemplate,

40 RoleRenderer,

39 RoleRenderer,

41− RoleContentType,

40+ RoleComponents,

42− RoleRendererHint,

41+ RoleProgressSource, // maybe

43− RoleHints,

44 RoleResults,

42 RoleResults,

45 RoleCount

43 RoleCount

46 };

44 };

47

45

48− Q_INVOKABLE void overrideResults(const QString& categoryId, QAbstractItemModel* model);

46+ QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;

47+ QHash<int, QByteArray> roleNames() const override;

48+ int rowCount(const QModelIndex& parent = QModelIndex()) const override;

49

50− QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;

50+ Q_INVOKABLE void addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject);

51−

52− QHash<int, QByteArray> roleNames() const;

53−

54− /* setters */

55− void setResultModel(DeeModel* model);

56

51

57private Q_SLOTS:

52private Q_SLOTS:

58− void onCountChanged();

53+ void countChanged();

59− void onRowCountChanged();

60− void onEmitCountChanged();

61− void onOverrideModelDestroyed();

62

54

63private:

55private:

64− DeeModel* getResultsForCategory(unsigned index) const;

56+ mutable QHash<int, ResultsModel*> m_resultsModels;

65− DeeListModel* getFilter(int index) const;

66−

67− DeeModel* m_dee_results;

68− QTimer m_timer;

69− QSet<DeeListModel*> m_timerFilters;

70 QHash<int, QByteArray> m_roles;

57 QHash<int, QByteArray> m_roles;

71− QMap<QString, QAbstractItemModel*> m_overriddenCategories;

58+ int m_category_count;

72− mutable QMap<int, DeeListModel*> m_filters;

59+

60+ struct CategoryData {

61+ QString categoryId;

62+ QString name;

63+ QString icon;

64+ QString rawTemplate;

65+ QObject* countObject;

66+ };

67+

68+ QList<CategoryData> m_specialCategories;

73};

69};

74

70

75#endif // FAKE_CATEGORIES_H

71#endif // FAKE_CATEGORIES_H

tests/mocks/Unity/fake_preview.cppdeleted−73

@@ -1,73 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#include "fake_preview.h"

18−

19−Preview::Preview(const QString &rendererName, QObject *parent):

20− QObject(parent),

21− m_rendererName(rendererName)

22−{

23−}

24−

25−QString Preview::rendererName() const

26−{

27− return m_rendererName;

28−}

29−

30−QString Preview::title() const

31−{

32− return "Title";

33−}

34−

35−QString Preview::subtitle() const

36−{

37− return "Subtitle";

38−}

39−

40−QString Preview::description() const

41−{

42− return "Description";

43−}

44−

45−QVariant Preview::actions()

46−{

47− return QVariant();

48−}

49−

50−QVariant Preview::infoHints()

51−{

52− return QVariant();

53−}

54−

55−QVariantMap Preview::infoHintsHash() const

56−{

57− return QVariantMap();

58−}

59−

60−QString Preview::image() const

61−{

62− return "";

63−}

64−

65−void Preview::execute(const QString& actionId, const QHash<QString, QVariant>& hints)

66−{

67− Q_UNUSED(actionId);

68− Q_UNUSED(hints);

69−}

70−

71−void Preview::cancelAction()

72−{

73−}

tests/mocks/Unity/fake_preview.hdeleted−65

@@ -1,65 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#ifndef FAKE_PREVIEW_H

18−#define FAKE_PREVIEW_H

19−

20−// Qt

21−#include <QObject>

22−#include <QString>

23−#include <QMetaType>

24−#include <QList>

25−#include <QVariantMap>

26−

27−class Q_DECL_EXPORT Preview : public QObject

28−{

29− Q_OBJECT

30−

31− Q_PROPERTY(QString rendererName READ rendererName NOTIFY previewChanged)

32− Q_PROPERTY(QString title READ title NOTIFY previewChanged)

33− Q_PROPERTY(QString subtitle READ subtitle NOTIFY previewChanged)

34− Q_PROPERTY(QString description READ description NOTIFY previewChanged)

35− Q_PROPERTY(QVariant actions READ actions NOTIFY previewChanged)

36− Q_PROPERTY(QVariant infoHints READ infoHints NOTIFY previewChanged)

37− Q_PROPERTY(QVariantMap infoMap READ infoHintsHash NOTIFY previewChanged)

38− Q_PROPERTY(QString image READ image NOTIFY previewChanged)

39−

40−public:

41− explicit Preview(const QString &rendererName, QObject *parent = 0);

42−

43− QString rendererName() const;

44− QString title() const;

45− QString subtitle() const;

46− QString description() const;

47− QVariant actions();

48− QVariant infoHints();

49− QVariantMap infoHintsHash() const;

50− QString image() const;

51−

52− Q_INVOKABLE void execute(const QString& actionId, const QHash<QString, QVariant>& hints);

53−

54− Q_INVOKABLE void cancelAction();

55−

56−Q_SIGNALS:

57− void previewChanged();

58−

59−private:

60− QString m_rendererName;

61−};

62−

63−Q_DECLARE_METATYPE(Preview *)

64−

65−#endif // FAKE_PREVIEW_H

tests/mocks/Unity/fake_previewmodel.cppnew file+87

@@ -0,0 +1,87 @@

1+/*

3+ *

4+ * Authors:

5+ * Michał Sawicz <michal.sawicz@canonical.com>

6+ * Michal Hruby <michal.hruby@canonical.com>

7+ *

8+ * This program is free software; you can redistribute it and/or modify

9+ * it under the terms of the GNU General Public License as published by

10+ * the Free Software Foundation; version 3.

11+ *

12+ * This program 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

15+ * GNU General Public License for more details.

16+ *

17+ * You should have received a copy of the GNU General Public License

18+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

19+ */

20+

21+// self

22+#include "fake_previewmodel.h"

23+

24+// local

25+#include "fake_previewwidgetmodel.h"

26+

27+// Qt

28+#include <QDebug>

29+

30+PreviewModel::PreviewModel(QObject* parent) : QAbstractListModel(parent)

31+{

32+ // we have one column by default

33+ PreviewWidgetModel* columnModel = new PreviewWidgetModel(this);

34+ m_previewWidgetModels.append(columnModel);

35+}

36+

37+QHash<int, QByteArray> PreviewModel::roleNames() const

38+{

39+ QHash<int, QByteArray> roles;

40+

41+ roles[Roles::RoleColumnModel] = "columnModel";

42+

43+ return roles;

44+}

45+

46+void PreviewModel::setWidgetColumnCount(int count)

47+{

48+ if (count != 1) {

49+ qFatal("PreviewModel::setWidgetColumnCount != 1 not implemented");

50+ }

51+}

52+

53+int PreviewModel::widgetColumnCount() const

54+{

55+ return 1;

56+}

57+

58+bool PreviewModel::loaded() const

59+{

60+ return true;

61+}

62+

63+bool PreviewModel::processingAction() const

64+{

65+ return false;

66+}

67+

68+void PreviewModel::setProcessingAction(bool /*processing*/)

69+{

70+ qFatal("PreviewModel::setProcessingAction not implemented");

71+}

72+

73+int PreviewModel::rowCount(const QModelIndex&) const

74+{

75+ return m_previewWidgetModels.size();

76+}

77+

78+QVariant PreviewModel::data(const QModelIndex& index, int role) const

79+{

80+ switch (role) {

81+ case RoleColumnModel:

82+ return QVariant::fromValue(m_previewWidgetModels.at(index.row()));

83+ default:

84+ return QVariant();

85+ }

86+}

87+

tests/mocks/Unity/fake_previewmodel.hnew file+67

@@ -0,0 +1,67 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+

18+#ifndef FAKE_PREVIEWMODEL_H

19+#define FAKE_PREVIEWMODEL_H

20+

21+#include <QAbstractListModel>

22+#include <QSharedPointer>

23+#include <QVariantMap>

24+

25+class PreviewWidgetModel;

26+

27+class PreviewModel : public QAbstractListModel

28+{

29+ Q_OBJECT

30+

31+ Q_ENUMS(Roles)

32+

33+ Q_PROPERTY(int widgetColumnCount READ widgetColumnCount WRITE setWidgetColumnCount NOTIFY widgetColumnCountChanged)

34+ Q_PROPERTY(bool loaded READ loaded NOTIFY loadedChanged)

35+ Q_PROPERTY(bool processingAction READ processingAction NOTIFY processingActionChanged)

36+

37+public:

38+ explicit PreviewModel(QObject* parent = 0);

39+

40+ enum Roles {

41+ RoleColumnModel

42+ };

43+

44+ QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;

45+ QHash<int, QByteArray> roleNames() const override;

46+ int rowCount(const QModelIndex& parent = QModelIndex()) const override;

47+

48+ void setWidgetColumnCount(int count);

49+ int widgetColumnCount() const;

50+ bool loaded() const;

51+ bool processingAction() const;

52+ void setProcessingAction(bool processing);

53+

54+Q_SIGNALS:

55+ void widgetColumnCountChanged();

56+ void loadedChanged();

57+ void processingActionChanged();

58+ void triggered(QString const&, QString const&, QVariantMap const&);

59+

60+private:

61+ QHash<int, QByteArray> m_roles;

62+ QList<PreviewWidgetModel*> m_previewWidgetModels;

63+};

64+

65+Q_DECLARE_METATYPE(PreviewModel*)

66+

67+#endif // FAKE_PREVIEWMODEL_H

tests/mocks/Unity/fake_previewstack.cppnew file+76

@@ -0,0 +1,76 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+// self

18+#include "fake_previewstack.h"

19+

20+// local

21+#include "fake_previewmodel.h"

22+#include "fake_scope.h"

23+

24+PreviewStack::PreviewStack(QObject* parent) : QAbstractListModel(parent)

25+{

26+ m_previews << new PreviewModel(this);

27+}

28+

29+PreviewStack::~PreviewStack()

30+{

31+}

32+

33+QHash<int, QByteArray> PreviewStack::roleNames() const

34+{

35+ QHash<int, QByteArray> roles;

36+

37+ roles[Roles::RolePreviewModel] = "previewModel";

38+

39+ return roles;

40+}

41+

42+void PreviewStack::setWidgetColumnCount(int columnCount)

43+{

44+ if (columnCount != 1) {

45+ qFatal("PreviewStack::setWidgetColumnCount != 1 not implemented");

46+ }

47+}

48+

49+int PreviewStack::widgetColumnCount() const

50+{

51+ return 1;

52+}

53+

54+int PreviewStack::rowCount(const QModelIndex&) const

55+{

56+ return m_previews.size();

57+}

58+

59+PreviewModel* PreviewStack::get(int index) const

60+{

61+ if (index >= m_previews.size()) {

62+ return nullptr;

63+ }

64+

65+ return m_previews.at(index);

66+}

67+

68+QVariant PreviewStack::data(const QModelIndex& index, int role) const

69+{

70+ switch (role) {

71+ case RolePreviewModel:

72+ return QVariant::fromValue(m_previews.at(index.row()));

73+ default:

74+ return QVariant();

75+ }

76+}

tests/mocks/Unity/fake_previewstack.hnew file+61

@@ -0,0 +1,61 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+

18+#ifndef FAKE_PREVIEWSTACK_H

19+#define FAKE_PREVIEWSTACK_H

20+

21+#include <QAbstractListModel>

22+#include <QSharedPointer>

23+#include <QVariantMap>

24+

25+class PreviewModel;

26+

27+class PreviewStack : public QAbstractListModel

28+{

29+ Q_OBJECT

30+

31+ Q_ENUMS(Roles)

32+

33+ Q_PROPERTY(int widgetColumnCount READ widgetColumnCount WRITE setWidgetColumnCount NOTIFY widgetColumnCountChanged)

34+

35+public:

36+ explicit PreviewStack(QObject* parent = 0);

37+ virtual ~PreviewStack();

38+

39+ enum Roles {

40+ RolePreviewModel

41+ };

42+

43+ QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;

44+ QHash<int, QByteArray> roleNames() const override;

45+ int rowCount(const QModelIndex& parent = QModelIndex()) const override;

46+

47+ Q_INVOKABLE PreviewModel* get(int index) const;

48+

49+ void setWidgetColumnCount(int columnCount);

50+ int widgetColumnCount() const;

51+

52+Q_SIGNALS:

53+ void widgetColumnCountChanged();

54+

55+private:

56+ QList<PreviewModel*> m_previews;

57+};

58+

59+Q_DECLARE_METATYPE(PreviewStack*)

60+

61+#endif // FAKE_PREVIEWSTACK_H

tests/mocks/Unity/scopes-ng/fake_preview_model.cpp → tests/mocks/Unity/fake_previewwidgetmodel.cpprenamed+6−16

@@ -19,14 +19,11 @@

19 */

20

21// self

22−#include "fake_preview_model.h"

22+#include "fake_previewwidgetmodel.h"

23

24// Qt

25#include <QVariantMap>

26

27−namespace scopes_ng

28−{

29−

30struct PreviewData

27struct PreviewData

31{

28{

32 QString id;

29 QString id;

@@ -38,7 +35,7 @@ struct PreviewData

38 }

35 }

39};

36};

40

37

41−PreviewModel::PreviewModel(QObject* parent) : QAbstractListModel(parent)

38+PreviewWidgetModel::PreviewWidgetModel(QObject* parent) : QAbstractListModel(parent)

42{

39{

43 m_roles[Roles::RoleWidgetId] = "widgetId";

40 m_roles[Roles::RoleWidgetId] = "widgetId";

44 m_roles[Roles::RoleType] = "type";

41 m_roles[Roles::RoleType] = "type";

@@ -47,7 +44,7 @@ PreviewModel::PreviewModel(QObject* parent) : QAbstractListModel(parent)

47 populateWidgets();

44 populateWidgets();

48}

45}

49

46

50−void PreviewModel::populateWidgets()

47+void PreviewWidgetModel::populateWidgets()

51{

48{

52 beginResetModel();

49 beginResetModel();

53 m_previewWidgets.clear();

50 m_previewWidgets.clear();

@@ -63,22 +60,17 @@ void PreviewModel::populateWidgets()

63

60

64}

61}

65

62

66−void PreviewModel::triggered(QString widgetId, QString actionId, QVariantMap data)

67−{

68− Q_EMIT actionTriggered(widgetId, actionId, data);

69−}

70−

71−QHash<int, QByteArray> PreviewModel::roleNames() const

63+QHash<int, QByteArray> PreviewWidgetModel::roleNames() const

72{

64{

73 return m_roles;

65 return m_roles;

74}

66}

75

67

76−int PreviewModel::rowCount(const QModelIndex&) const

68+int PreviewWidgetModel::rowCount(const QModelIndex&) const

77{

69{

78 return m_previewWidgets.size();

70 return m_previewWidgets.size();

79}

71}

80

72

81−QVariant PreviewModel::data(const QModelIndex& index, int role) const

73+QVariant PreviewWidgetModel::data(const QModelIndex& index, int role) const

82{

74{

83 auto widget_data = m_previewWidgets.at(index.row());

75 auto widget_data = m_previewWidgets.at(index.row());

84 switch (role) {

76 switch (role) {

@@ -92,5 +84,3 @@ QVariant PreviewModel::data(const QModelIndex& index, int role) const

92 return QVariant();

84 return QVariant();

93 }

85 }

94}

86}

95−

96−} // namespace scopes_ng

tests/mocks/Unity/scopes-ng/fake_preview_model.h → tests/mocks/Unity/fake_previewwidgetmodel.hrenamed+6−18

@@ -15,26 +15,23 @@

15 */

16

17

18−#ifndef NG_FAKE_PREVIEW_H

18+#ifndef FAKE_PREVIEWWIDGETMODEL_H

19−#define NG_FAKE_PREVIEW_H

19+#define FAKE_PREVIEWWIDGETMODEL_H

20

21#include <QAbstractListModel>

22#include <QSharedPointer>

23#include <QVariantMap>

24

25−namespace scopes_ng

26−{

27−

28class PreviewData;

25class PreviewData;

29

26

30−class Q_DECL_EXPORT PreviewModel : public QAbstractListModel

27+class PreviewWidgetModel : public QAbstractListModel

31{

28{

32 Q_OBJECT

29 Q_OBJECT

33

30

34 Q_ENUMS(Roles)

31 Q_ENUMS(Roles)

35

32

36public:

33public:

37− explicit PreviewModel(QObject* parent = 0);

34+ explicit PreviewWidgetModel(QObject* parent = 0);

38

35

39 enum Roles {

36 enum Roles {

40 RoleWidgetId,

37 RoleWidgetId,

@@ -46,12 +43,6 @@ public:

46 QHash<int, QByteArray> roleNames() const override;

43 QHash<int, QByteArray> roleNames() const override;

47 int rowCount(const QModelIndex& parent = QModelIndex()) const override;

44 int rowCount(const QModelIndex& parent = QModelIndex()) const override;

48

45

49−Q_SIGNALS:

50− void actionTriggered(QString widgetId, QString actionId, QVariantMap data);

51−

52−public Q_SLOTS:

53− void triggered(QString widgetId, QString actionId, QVariantMap data);

54−

55private:

46private:

56 QHash<int, QByteArray> m_roles;

47 QHash<int, QByteArray> m_roles;

57 QList<QSharedPointer<PreviewData>> m_previewWidgets;

48 QList<QSharedPointer<PreviewData>> m_previewWidgets;

@@ -60,9 +51,6 @@ private:

60

51

61};

52};

62

53

63−} // namespace scopes_ng

64−

65−

66−Q_DECLARE_METATYPE(scopes_ng::PreviewModel*)

54+Q_DECLARE_METATYPE(PreviewWidgetModel*)

67

55

68−#endif // NG_FAKE_PREVIW_H

56+#endif // FAKE_PREVIEWWIDGETMODEL_H

tests/mocks/Unity/fake_resultsmodel.cppnew file+116

@@ -0,0 +1,116 @@

1+/*

3+ *

4+ * Authors:

5+ * Michal Hruby <michal.hruby@canonical.com>

6+ *

7+ * This program is free software; you can redistribute it and/or modify

8+ * it under the terms of the GNU General Public License as published by

9+ * the Free Software Foundation; version 3.

10+ *

11+ * This program is distributed in the hope that it will be useful,

12+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

13+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

14+ * GNU General Public License for more details.

15+ *

16+ * You should have received a copy of the GNU General Public License

17+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

18+ */

19+

20+// self

21+#include "fake_resultsmodel.h"

22+

23+#include <paths.h>

24+

25+ResultsModel::ResultsModel(int result_count, int categoryId, QObject* parent)

26+ : QAbstractListModel(parent)

27+ , m_result_count(result_count)

28+ , m_categoryId(categoryId)

29+{

30+ m_roles[ResultsModel::RoleUri] = "uri";

31+ m_roles[ResultsModel::RoleCategoryId] = "categoryId";

32+ m_roles[ResultsModel::RoleDndUri] = "dndUri";

33+ m_roles[ResultsModel::RoleResult] = "result";

34+ m_roles[ResultsModel::RoleTitle] = "title";

35+ m_roles[ResultsModel::RoleArt] = "art";

36+ m_roles[ResultsModel::RoleSubtitle] = "subtitle";

37+ m_roles[ResultsModel::RoleMascot] = "mascot";

38+ m_roles[ResultsModel::RoleEmblem] = "emblem";

39+ m_roles[ResultsModel::RoleOldPrice] = "oldPrice";

40+ m_roles[ResultsModel::RolePrice] = "price";

41+ m_roles[ResultsModel::RoleAltPrice] = "altPrice";

42+ m_roles[ResultsModel::RoleRating] = "rating";

43+ m_roles[ResultsModel::RoleAltRating] = "altRating";

44+ m_roles[ResultsModel::RoleSummary] = "summary";

45+}

46+

47+QString ResultsModel::categoryId() const

48+{

49+ return QString::number(m_categoryId);

50+}

51+

52+void ResultsModel::setCategoryId(QString const& /*id*/)

53+{

54+ qFatal("Calling un-implemented ResultsModel::setCategoryId");

55+}

56+

57+QHash<int, QByteArray>

58+ResultsModel::roleNames() const

59+{

60+ return m_roles;

61+}

62+

63+int ResultsModel::rowCount(const QModelIndex& parent) const

64+{

65+ Q_UNUSED(parent);

66+

67+ return m_result_count;

68+}

69+

70+int ResultsModel::count() const

71+{

72+ return rowCount();

73+}

74+

75+QVariant ResultsModel::get(int row) const

76+{

77+ if (row >= m_result_count || row < 0) return QVariantMap();

78+

79+ QVariantMap result;

80+ QModelIndex modelIndex(index(row));

81+ QHashIterator<int, QByteArray> it(roleNames());

82+ while (it.hasNext()) {

83+ it.next();

84+ QVariant val(data(modelIndex, it.key()));

85+ if (val.isNull()) continue;

86+ result[it.value()] = val;

87+ }

88+

89+ return result;

90+}

91+

92+QVariant

93+ResultsModel::data(const QModelIndex& /*index*/, int role) const

94+{

95+ switch (role) {

96+ case RoleUri:

97+ case RoleCategoryId:

98+ case RoleDndUri:

99+ case RoleResult:

100+ case RoleTitle:

101+ return QString();

102+ case RoleArt:

103+ return qmlDirectory() + "graphics/applicationIcons/dash.png";

104+ case RoleSubtitle:

105+ case RoleMascot:

106+ case RoleEmblem:

107+ case RoleOldPrice:

108+ case RolePrice:

109+ case RoleAltPrice:

110+ case RoleRating:

111+ case RoleAltRating:

112+ case RoleSummary:

113+ default:

114+ return QVariant();

115+ }

116+}

tests/mocks/Unity/fake_resultsmodel.hnew file+80

@@ -0,0 +1,80 @@

1+/*

3+ *

4+ * Authors:

5+ * Michal Hruby <michal.hruby@canonical.com>

6+ *

7+ * This program is free software; you can redistribute it and/or modify

8+ * it under the terms of the GNU General Public License as published by

9+ * the Free Software Foundation; version 3.

10+ *

11+ * This program is distributed in the hope that it will be useful,

12+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

13+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

14+ * GNU General Public License for more details.

15+ *

16+ * You should have received a copy of the GNU General Public License

17+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

18+ */

19+

20+

21+#ifndef FAKE_RESULTS_MODEL_H

22+#define FAKE_RESULTS_MODEL_H

23+

24+#include <QAbstractListModel>

25+

26+class ResultsModel : public QAbstractListModel

27+{

28+ Q_OBJECT

29+

30+ Q_ENUMS(Roles)

31+

32+ Q_PROPERTY(QString categoryId READ categoryId WRITE setCategoryId NOTIFY categoryIdChanged)

33+ Q_PROPERTY(int count READ count NOTIFY countChanged)

34+

35+public:

36+ explicit ResultsModel(int result_count, int categoryId, QObject* parent = 0);

37+

38+ enum Roles {

39+ RoleUri,

40+ RoleCategoryId,

41+ RoleDndUri,

42+ RoleResult,

43+ // card components

44+ RoleTitle,

45+ RoleArt,

46+ RoleSubtitle,

47+ RoleMascot,

48+ RoleEmblem,

49+ RoleOldPrice,

50+ RolePrice,

51+ RoleAltPrice,

52+ RoleRating,

53+ RoleAltRating,

54+ RoleSummary

55+ };

56+

57+ int rowCount(const QModelIndex& parent = QModelIndex()) const override;

58+ QHash<int, QByteArray> roleNames() const override;

59+ QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;

60+

61+ Q_INVOKABLE QVariant get(int row) const;

62+

63+ /* getters */

64+ QString categoryId() const;

65+ int count() const;

66+

67+ /* setters */

68+ void setCategoryId(QString const& id);

69+

70+Q_SIGNALS:

71+ void categoryIdChanged();

72+ void countChanged();

73+

74+private:

75+ QHash<int, QByteArray> m_roles;

76+ int m_result_count;

77+ int m_categoryId;

78+};

79+

80+#endif // FAKE_RESULTS_MODEL_H

tests/mocks/Unity/fake_scope.cpp+18−118

@@ -15,15 +15,7 @@

15 */

16

17#include "fake_scope.h"

18−#include "fake_preview.h"

18+#include "fake_resultsmodel.h"

19−#include <paths.h>

20−

21−#include <dee.h>

22−

23−static DeeModel* create_categories_model(unsigned category_count);

24−static DeeModel* create_results_model(unsigned category_count, unsigned result_count);

25−

26−// TODO: Implement remaining pieces

27

19

28Scope::Scope(QObject* parent) : Scope(QString(), QString(), false, parent)

20Scope::Scope(QObject* parent) : Scope(QString(), QString(), false, parent)

29{

21{

@@ -37,20 +29,8 @@ Scope::Scope(QString const& id, QString const& name, bool visible, QObject* pare

37 , m_searching(false)

29 , m_searching(false)

38 , m_isActive(false)

30 , m_isActive(false)

39 , m_previewRendererName("preview-generic")

31 , m_previewRendererName("preview-generic")

40− , m_categories(new Categories(this))

32+ , m_categories(new Categories(20, this))

41− , m_results(new DeeListModel(this))

42{

33{

43− DeeModel* results_model = create_results_model(20, 300);

44− m_categories->setResultModel(results_model);

45− m_categories->setModel(create_categories_model(20));

46− m_results->setModel(results_model);

47−

48− m_timer.setInterval(1000);

49− m_timer.setSingleShot(true);

50− connect(&m_timer, &QTimer::timeout, [this]() {

51− Preview *p = new Preview(m_previewRendererName, this);

52− Q_EMIT previewReady(p);

53− });

54}

34}

55

35

56QString Scope::id() const {

36QString Scope::id() const {

@@ -133,7 +113,7 @@ void Scope::setFormFactor(const QString &str) {

133void Scope::setActive(const bool active) {

113void Scope::setActive(const bool active) {

134 if (active != m_isActive) {

114 if (active != m_isActive) {

135 m_isActive = active;

115 m_isActive = active;

136− Q_EMIT isActiveChanged();

116+ Q_EMIT isActiveChanged(active);

137 }

117 }

138}

118}

139

119

@@ -151,105 +131,25 @@ void Scope::setNoResultsHint(const QString& str) {

151 }

131 }

152}

132}

153

133

154−void Scope::activate(const QVariant &uri, const QVariant &icon_hint, const QVariant &category,

134+void Scope::activate(QVariant const& result)

155− const QVariant &result_type, const QVariant &mimetype, const QVariant &title,

156− const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata)

157{

135{

158− Q_UNUSED(icon_hint);

136+ Q_UNUSED(result);

159− Q_UNUSED(category);

160− Q_UNUSED(result_type);

161− Q_UNUSED(mimetype);

162− Q_UNUSED(title);

163− Q_UNUSED(comment);

164− Q_UNUSED(dnd_uri);

165− Q_UNUSED(metadata);

166−

167− if (uri != "uri://result.2")

168− m_timer.start();

169−}

137+}

170−

138+

171−void Scope::preview(const QVariant &uri, const QVariant &icon_hint, const QVariant &category,

139+PreviewStack* Scope::preview(QVariant const& result)

172− const QVariant &result_type, const QVariant &mimetype, const QVariant &title,

173− const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata)

174{

140{

175− Q_UNUSED(uri);

141+ Q_UNUSED(result);

176− Q_UNUSED(icon_hint);

142+

177− Q_UNUSED(category);

143+ // This probably leaks, do we don't care

178− Q_UNUSED(result_type);

144+ // it's a test after all

179− Q_UNUSED(mimetype);

145+ return new PreviewStack;

180− Q_UNUSED(title);

181− Q_UNUSED(comment);

182− Q_UNUSED(dnd_uri);

183− Q_UNUSED(metadata);

184−

185− m_timer.start();

186−}

187−

188−static const gchar * categories_model_schema[] = {

189− "s", //ID

190− "s", // DISPLAY_NAME

191− "s", // ICON_HINT

192− "s", // RENDERER_NAME

193− "a{sv}" // HINTS

194−};

195−

196−

197−DeeModel* create_categories_model(unsigned category_count) {

198− DeeModel* category_model = dee_sequence_model_new();

199− dee_model_set_schema_full(category_model, categories_model_schema, G_N_ELEMENTS(categories_model_schema));

200− GVariant* hints = g_variant_new_array(g_variant_type_element(G_VARIANT_TYPE_VARDICT), NULL, 0);

201−

202− for(unsigned i = 0; i < category_count; ++i)

203− {

204− dee_model_append(category_model,

205− (i == 2) ? "applications.scope" : std::to_string(i).c_str(),

206− ("Category "+std::to_string(i)).c_str(),

207− "gtk-apply",

208− i % 2 == 0 ? "grid" : "carousel",

209− hints);

210− }

211− return category_model;

212−}

213−

214−

215−/* Schema that is used in the DeeModel representing

216− the results */

217−static const gchar * results_model_schema[] = {

218− "s", // URI

219− "s", // ICON_HINT

220− "u", // CATEGORY

221− "u", // RESULT_TYPE

222− "s", // MIMETYPE

223− "s", // TITLE

224− "s", // COMMENT

225− "s", // DND_URI

226− "a{sv}" // METADATA

227−};

228−

229−DeeModel* create_results_model(unsigned category_count, unsigned result_count) {

230− DeeModel* results_model = dee_sequence_model_new();

231− dee_model_set_schema_full(results_model, results_model_schema, G_N_ELEMENTS(results_model_schema));

232− GVariant* hints = g_variant_new_array(g_variant_type_element(G_VARIANT_TYPE_VARDICT), NULL, 0);

233−

234− for(unsigned i = 0; i < result_count; ++i)

235− {

236− unsigned category = i % category_count;

237−

238− dee_model_append(results_model,

239− ("uri://result."+std::to_string(i)).c_str(),

240− (qmlDirectory() + "graphics/applicationIcons/dash.png").toLatin1().data(),

241− category,

242− 0,

243− "application/x-desktop",

244− ("Title."+std::to_string(i)).c_str(),

245− ("Comment."+std::to_string(i)).c_str(),

246− ("uri://result."+std::to_string(i)).c_str(),

247− hints);

248− }

249− return results_model;

250}

146}

251

147

252void Scope::cancelActivation()

148void Scope::cancelActivation()

253{

149{

254− m_timer.stop();

150+}

151+

152+void Scope::closeScope(Scope* /*scope*/)

153+{

154+ qFatal("Scope::closeScope is not implemented");

255}

155}

tests/mocks/Unity/fake_scope.h+17−18

@@ -18,9 +18,10 @@

18#define FAKE_SCOPE_H

19

20#include "fake_categories.h"

21+#include "fake_previewstack.h"

21

22

22#include <QObject>

23#include <QObject>

23−#include <QDebug>

24+#include <QTimer>

24

25

25class Preview;

26class Preview;

26

27

@@ -33,12 +34,12 @@ class Scope : public QObject

33 Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)

34 Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)

34 Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)

35 Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)

35 Q_PROPERTY(QString searchHint READ searchHint NOTIFY searchHintChanged)

36 Q_PROPERTY(QString searchHint READ searchHint NOTIFY searchHintChanged)

37+ Q_PROPERTY(bool searchInProgress READ searchInProgress WRITE setSearchInProgress NOTIFY searchInProgressChanged)

36 Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)

38 Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)

37 Q_PROPERTY(QString shortcut READ shortcut NOTIFY shortcutChanged)

39 Q_PROPERTY(QString shortcut READ shortcut NOTIFY shortcutChanged)

38− Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged)

39 Q_PROPERTY(Categories* categories READ categories NOTIFY categoriesChanged)

40 Q_PROPERTY(Categories* categories READ categories NOTIFY categoriesChanged)

41+ //Q_PROPERTY(Filters* filters READ filters NOTIFY filtersChanged)

40

42

41− Q_PROPERTY(bool searchInProgress READ searchInProgress WRITE setSearchInProgress NOTIFY searchInProgressChanged)

42 Q_PROPERTY(QString searchQuery READ searchQuery WRITE setSearchQuery NOTIFY searchQueryChanged)

43 Q_PROPERTY(QString searchQuery READ searchQuery WRITE setSearchQuery NOTIFY searchQueryChanged)

43 Q_PROPERTY(QString noResultsHint READ noResultsHint WRITE setNoResultsHint NOTIFY noResultsHintChanged)

44 Q_PROPERTY(QString noResultsHint READ noResultsHint WRITE setNoResultsHint NOTIFY noResultsHintChanged)

44 Q_PROPERTY(QString formFactor READ formFactor WRITE setFormFactor NOTIFY formFactorChanged)

45 Q_PROPERTY(QString formFactor READ formFactor WRITE setFormFactor NOTIFY formFactorChanged)

@@ -72,17 +73,13 @@ public:

72 void setActive(const bool);

73 void setActive(const bool);

73 void setSearchInProgress(const bool inProg);

74 void setSearchInProgress(const bool inProg);

74

75

75− Q_INVOKABLE void activate(const QVariant &uri, const QVariant &icon_hint, const QVariant &category,

76+ Q_INVOKABLE void activate(QVariant const& result);

76− const QVariant &result_type, const QVariant &mimetype, const QVariant &title,

77− const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata);

78− Q_INVOKABLE void preview(const QVariant &uri, const QVariant &icon_hint, const QVariant &category,

77+ Q_INVOKABLE PreviewStack* preview(QVariant const& result);

79− const QVariant &result_type, const QVariant &mimetype, const QVariant &title,

80− const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata);

81−

82 Q_INVOKABLE void cancelActivation();

78 Q_INVOKABLE void cancelActivation();

79+ Q_INVOKABLE void closeScope(Scope* scope);

83

80

84Q_SIGNALS:

81Q_SIGNALS:

85− void idChanged(const QString&);

82+ void idChanged();

86 void nameChanged(const QString&);

83 void nameChanged(const QString&);

87 void iconHintChanged(const QString&);

84 void iconHintChanged(const QString&);

88 void descriptionChanged(const QString&);

85 void descriptionChanged(const QString&);

@@ -90,18 +87,23 @@ Q_SIGNALS:

90 void searchInProgressChanged();

87 void searchInProgressChanged();

91 void visibleChanged(bool);

88 void visibleChanged(bool);

92 void shortcutChanged(const QString&);

89 void shortcutChanged(const QString&);

93− void connectedChanged(bool);

94 void categoriesChanged();

90 void categoriesChanged();

91+ //void filtersChanged();

95 void searchQueryChanged();

92 void searchQueryChanged();

96 void noResultsHintChanged();

93 void noResultsHintChanged();

97 void formFactorChanged();

94 void formFactorChanged();

98− void isActiveChanged();

95+ void isActiveChanged(bool);

99

96

100 // signals triggered by activate(..) or preview(..) requests.

97 // signals triggered by activate(..) or preview(..) requests.

101− void previewReady(Preview *preview);

102− void activateApplication(const QString &desktop);

103 void showDash();

98 void showDash();

104 void hideDash();

99 void hideDash();

100+ void gotoUri(const QString &uri);

101+ void activated();

102+ void previewRequested(QVariant const& result);

103+ void gotoScope(QString const& scopeId);

104+ void openScope(Scope* scope);

105+

106+ void activateApplication(const QString &desktop);

105

107

106protected:

108protected:

107

109

@@ -119,9 +121,6 @@ protected:

119 QString m_previewRendererName;

121 QString m_previewRendererName;

120

122

121 Categories* m_categories;

123 Categories* m_categories;

122− DeeListModel* m_results;

123−

124− QTimer m_timer;

125};

124};

126

125

127#endif // FAKE_SCOPE_H

126#endif // FAKE_SCOPE_H

tests/mocks/Unity/fake_scopes.cpp+1−5

@@ -19,9 +19,6 @@

19// Self

20#include "fake_scopes.h"

21

22−// Local

23−#include "fake_applications_scope.h"

24−

25// TODO: Implement remaining pieces, like Categories (i.e. LensView now gives warnings)

22// TODO: Implement remaining pieces, like Categories (i.e. LensView now gives warnings)

26

23

27// Qt

24// Qt

@@ -56,8 +53,7 @@ void Scopes::updateScopes()

56 clear();

53 clear();

57 addScope(new Scope("MockScope1", "People", true, this));

54 addScope(new Scope("MockScope1", "People", true, this));

58 addScope(new Scope("MockScope2", "Music", false, this));

55 addScope(new Scope("MockScope2", "Music", false, this));

59− addScope(new Scope("home.scope", "Home", true, this));

56+ addScope(new Scope("clickscope", "Apps", true, this));

60− addScope(new ApplicationsScope(true, this));

61 addScope(new Scope("MockScope5", "Videos", true, this));

57 addScope(new Scope("MockScope5", "Videos", true, this));

62

58

63 if (!m_loaded) {

59 if (!m_loaded) {

tests/mocks/Unity/fake_unity_plugin.cpp+8−18

@@ -22,11 +22,9 @@

22// local

23#include "fake_scopes.h"

24#include "fake_categories.h"

25−#include "fake_preview.h"

25+#include "fake_previewmodel.h"

26−#include "categoryresults.h"

26+#include "fake_previewwidgetmodel.h"

27−

27+#include "fake_resultsmodel.h"

28−// scopes-ng

29−#include "scopes-ng/fake_preview_model.h"

30

28

31// External

29// External

32#include <glib-object.h>

30#include <glib-object.h>

@@ -41,19 +39,11 @@ void FakeUnityPlugin::registerTypes(const char *uri)

41

39

42 Q_ASSERT(uri == QLatin1String("Unity"));

40 Q_ASSERT(uri == QLatin1String("Unity"));

43

41

44− qmlRegisterUncreatableType<Preview>(uri, 0, 1, "Preview", "Can't create Preview object in QML.");

45− qmlRegisterType<Scopes>(uri, 0, 1, "Scopes");

46− qmlRegisterType<Scope>(uri, 0, 1, "Scope");

47− qmlRegisterType<Categories>(uri, 0, 1, "Categories");

48− qmlRegisterUncreatableType<CategoryResults>(uri, 0, 1, "CategoryResults", "Can't create");

49− qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");

50−

51− // same for version 0.2

52− qmlRegisterUncreatableType<Preview>(uri, 0, 2, "Preview", "Can't create Preview object in QML.");

53 qmlRegisterType<Scopes>(uri, 0, 2, "Scopes");

42 qmlRegisterType<Scopes>(uri, 0, 2, "Scopes");

54 qmlRegisterType<Scope>(uri, 0, 2, "Scope");

43 qmlRegisterType<Scope>(uri, 0, 2, "Scope");

55− qmlRegisterType<Categories>(uri, 0, 2, "Categories");

44+ qmlRegisterUncreatableType<Categories>(uri, 0, 2, "Categories", "Can't create Categories object in QML.");

56− qmlRegisterUncreatableType<CategoryResults>(uri, 0, 2, "CategoryResults", "Can't create");

45+ qmlRegisterUncreatableType<ResultsModel>(uri, 0, 2, "ResultsModel", "Can't create ResultsModel object in QML.");

57− qmlRegisterType<DeeListModel>(uri, 0, 2, "DeeListModel");

58− qmlRegisterType<scopes_ng::PreviewModel>(uri, 0, 2, "FakePreviewModel");

46+ qmlRegisterType<PreviewModel>(uri, 0, 2, "FakePreviewModel");

47+ qmlRegisterUncreatableType<PreviewWidgetModel>(uri, 0, 2, "PreviewWidgetModel", "Can't create new PreviewWidgetModel in QML. Get them from PreviewModel instance.");

48+ qmlRegisterUncreatableType<PreviewStack>(uri, 0, 2, "PreviewStack", "Can't create new PreviewStack in QML. Get them from Scope instance.");

59}

49}

tests/qmltests/Dash/Previews/tst_Preview.qml+3−17

@@ -47,7 +47,7 @@ Rectangle {

47 SignalSpy {

48 id: triggeredSpy

49 target: mockPreviewModel

50− signalName: "actionTriggered"

50+ signalName: "triggered"

51 }

52

53 UT.UnityTestCase {

@@ -60,9 +60,9 @@ Rectangle {

60

61 compare(typeof widget, "object", "Could not find the widget object.");

62

63+ compare(triggeredSpy.count, 0)

63 widget.triggered(widget.widgetId, "mockAction", {"mock": "data"});

64 widget.triggered(widget.widgetId, "mockAction", {"mock": "data"});

64−

65− triggeredSpy.wait();

65+ compare(triggeredSpy.count, 1)

66

67 var args = triggeredSpy.signalArguments[0];

68

@@ -71,20 +71,6 @@ Rectangle {

71 compare(args[2]["mock"], "data", "Data not passed correctly.");

72 }

73

74− function test_showProcessing() {

75− waitForRendering(preview);

76− var widget = findChild(preview, "widget-3");

77− widget.triggered(widget.widgetId, "mockAction", {"mock": "data"});

78−

79− var processing = findChild(preview, "processingMouseArea");

80−

81− tryCompare(processing, "enabled", true);

82−

83− preview.previewModelChanged();

84−

85− tryCompare(processing, "enabled", false);

86− }

87−

88 function test_containOnFocus() {

74 function test_containOnFocus() {

89 waitForRendering(preview);

75 waitForRendering(preview);

90 tryCompareFunction(function () { return findChild(preview, "widget-9") != null }, true);

76 tryCompareFunction(function () { return findChild(preview, "widget-9") != null }, true);

tests/qmltests/Dash/qml/FakeScopeView.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Unity 0.1

18+import Unity 0.2

19

20import "../../../../qml/Dash"

21

tests/qmltests/Dash/qml/fake_scopeView1.qml+1−1

@@ -20,5 +20,5 @@ FakeScopeView {

20 id: fake_scopeView1

21 objectName: "fake_scopeView1"

22

23− backColor: "#909090"

23+ backColor: "#90E090"

24}

tests/qmltests/Dash/qml/fake_scopeView2.qml+1−1

@@ -20,5 +20,5 @@ FakeScopeView {

20 id: fake_scopeView2

21 objectName: "fake_scopeView2"

22

23− backColor: "#A0A0A0"

23+ backColor: "#A0D0A0"

24}

tests/qmltests/Dash/qml/fake_scopeView3.qml+1−1

@@ -20,5 +20,5 @@ FakeScopeView {

20 id: fake_scopeView3

21 objectName: "fake_scopeView3"

22

23− backColor: "#B0B0B0"

23+ backColor: "#B0C0B0"

24}

tests/qmltests/Dash/tst_Dash.qml+12−6

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

25 width: units.gu(40)

26 height: units.gu(80)

27

28+ // BEGIN To reduce warnings

29+ // TODO I think it we should pass down these variables

30+ // as needed instead of hoping they will be globally around

31+ property var greeter: null

32+ property var panel: null

33+ // BEGIN To reduce warnings

34+

35+

28 Dash {

36 Dash {

29 id: dash

37 id: dash

30 anchors.fill: parent

38 anchors.fill: parent

@@ -36,8 +44,7 @@ Item {

36 scopeDelegateMapping: {

44 scopeDelegateMapping: {

37 "MockScope1": Qt.resolvedUrl("qml/fake_scopeView1.qml"),

45 "MockScope1": Qt.resolvedUrl("qml/fake_scopeView1.qml"),

38 "MockScope2": Qt.resolvedUrl("qml/fake_scopeView2.qml"),

46 "MockScope2": Qt.resolvedUrl("qml/fake_scopeView2.qml"),

39− "home.scope": Qt.resolvedUrl("qml/fake_scopeView3.qml"),

47+ "clickscope": Qt.resolvedUrl("qml/fake_scopeView3.qml")

40− "applications.scope": Qt.resolvedUrl("qml/fake_scopeView4.qml")

41 }

48 }

42 genericScope: Qt.resolvedUrl("qml/fake_generic_scopeView.qml")

49 genericScope: Qt.resolvedUrl("qml/fake_generic_scopeView.qml")

43 }

50 }

@@ -67,9 +74,8 @@ Item {

67 return [

74 return [

68 { tag: "MockScope1", visualIndex: 0, shouldBeVisible: true },

75 { tag: "MockScope1", visualIndex: 0, shouldBeVisible: true },

69 { tag: "MockScope2", visualIndex: -1, shouldBeVisible: false },

76 { tag: "MockScope2", visualIndex: -1, shouldBeVisible: false },

70− { tag: "home.scope", visualIndex: 1, shouldBeVisible: true },

77+ { tag: "clickscope", visualIndex: 1, shouldBeVisible: true },

71− { tag: "applications.scope", visualIndex: 2, shouldBeVisible: true },

72− { tag: "MockScope5", visualIndex: 3, shouldBeVisible: true },

78+ { tag: "MockScope5", visualIndex: 2, shouldBeVisible: true },

73 ]

79 ]

74 }

80 }

75

81

@@ -107,7 +113,7 @@ Item {

107 tryCompare(dashContentList, "count", 0);

113 tryCompare(dashContentList, "count", 0);

108 scopes.load();

114 scopes.load();

109 tryCompare(scopes, "loaded", true);

115 tryCompare(scopes, "loaded", true);

110− tryCompare(dashContentList, "count", 4);

116+ tryCompare(dashContentList, "count", 3);

111

117

112 verify(dashContentList != undefined);

118 verify(dashContentList != undefined);

113 tryCompare(dashContentList, "currentIndex", data.visualIndex);

119 tryCompare(dashContentList, "currentIndex", data.visualIndex);

tests/qmltests/Dash/tst_DashContent.qml+103−37

@@ -19,7 +19,7 @@ import QtTest 1.0

19import "../../../qml/Dash"

20import "../../../qml/Components"

21import Ubuntu.Components 0.1

22−import Unity 0.1

22+import Unity 0.2

23import Unity.Test 0.1 as UT

24import Utils 0.1

25

@@ -28,23 +28,17 @@ Item {

28 width: units.gu(40)

29 height: units.gu(80)

30

31− Item {

31+ // BEGIN To reduce warnings

32− // Fake. Make a few components less noisy

32+ // TODO I think it we should pass down these variables

33+ // as needed instead of hoping they will be globally around

33− id: greeter

34+ property var greeter: null

34− signal shownChanged

35+ property var panel: null

35− }

36+ // BEGIN To reduce warnings

36−

37− Item {

38− // Fake. Make a few components less noisy

39− id: panel

40− signal searchClicked

41− }

42

37

43 property var scopeStatus: {

38 property var scopeStatus: {

44 'MockScope1': { 'movementStarted': 0, 'positionedAtBeginning': 0 },

39 'MockScope1': { 'movementStarted': 0, 'positionedAtBeginning': 0 },

45 'MockScope2': { 'movementStarted': 0, 'positionedAtBeginning': 0 },

40 'MockScope2': { 'movementStarted': 0, 'positionedAtBeginning': 0 },

46− 'home.scope': { 'movementStarted': 0, 'positionedAtBeginning': 0 },

47− 'applications.scope': { 'movementStarted': 0, 'positionedAtBeginning': 0 },

41+ 'clickscope': { 'movementStarted': 0, 'positionedAtBeginning': 0 },

48 'MockScope5': { 'movementStarted': 0, 'positionedAtBeginning': 0 }

42 'MockScope5': { 'movementStarted': 0, 'positionedAtBeginning': 0 }

49 }

43 }

50

44

@@ -70,8 +64,7 @@ Item {

70 scopeDelegateMapping: {

64 scopeDelegateMapping: {

71 "MockScope1": Qt.resolvedUrl("qml/fake_scopeView1.qml"),

65 "MockScope1": Qt.resolvedUrl("qml/fake_scopeView1.qml"),

72 "MockScope2": Qt.resolvedUrl("qml/fake_scopeView2.qml"),

66 "MockScope2": Qt.resolvedUrl("qml/fake_scopeView2.qml"),

73− "home.scope": Qt.resolvedUrl("qml/fake_scopeView3.qml"),

67+ "clickscope": Qt.resolvedUrl("qml/fake_scopeView3.qml"),

74− "applications.scope": Qt.resolvedUrl("qml/fake_scopeView4.qml")

75 }

68 }

76 genericScope: Qt.resolvedUrl("qml/fake_generic_scopeView.qml")

69 genericScope: Qt.resolvedUrl("qml/fake_generic_scopeView.qml")

77 }

70 }

@@ -83,11 +76,8 @@ Item {

83 scopeStatus["MockScope2"].movementStarted = 0;

76 scopeStatus["MockScope2"].movementStarted = 0;

84 scopeStatus["MockScope2"].positionedAtBeginning = 0;

77 scopeStatus["MockScope2"].positionedAtBeginning = 0;

85

78

86− scopeStatus["home.scope"].movementStarted = 0;

79+ scopeStatus["clickscope"].movementStarted = 0;

87− scopeStatus["home.scope"].positionedAtBeginning = 0;

88−

89− scopeStatus["applications.scope"].movementStarted = 0;

90− scopeStatus["applications.scope"].positionedAtBeginning = 0;

80+ scopeStatus["clickscope"].positionedAtBeginning = 0;

91

81

92 scopeStatus["MockScope5"].movementStarted = 0;

82 scopeStatus["MockScope5"].movementStarted = 0;

93 scopeStatus["MockScope5"].positionedAtBeginning = 0;

83 scopeStatus["MockScope5"].positionedAtBeginning = 0;

@@ -143,7 +133,7 @@ Item {

143 compare(dashContentList.count, 0, "DashContent should have 0 items when it starts");

133 compare(dashContentList.count, 0, "DashContent should have 0 items when it starts");

144 compare(dashContentList.currentIndex, -1, "DashContent's currentIndex should be -1 while there have been no items in the model");

134 compare(dashContentList.currentIndex, -1, "DashContent's currentIndex should be -1 while there have been no items in the model");

145

135

146− tryCompare(scopeLoadedSpy, "count", 5);

136+ tryCompare(scopeLoadedSpy, "count", 4);

147

137

148 verify(dashContentList.currentIndex >= 0);

138 verify(dashContentList.currentIndex >= 0);

149 }

139 }

@@ -156,7 +146,7 @@ Item {

156 // pretend we're running after a model reset

146 // pretend we're running after a model reset

157 dashContentList.currentIndex = 27;

147 dashContentList.currentIndex = 27;

158

148

159− tryCompare(scopeLoadedSpy, "count", 5);

149+ tryCompare(scopeLoadedSpy, "count", 4);

160

150

161 verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < 5);

151 verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < 5);

162 }

152 }

@@ -167,40 +157,38 @@ Item {

167 var dashContentList = findChild(dashContent, "dashContentList");

157 var dashContentList = findChild(dashContent, "dashContentList");

168 verify(dashContentList != undefined)

158 verify(dashContentList != undefined)

169

159

170− tryCompare(scopeLoadedSpy, "count", 5);

160+ tryCompare(scopeLoadedSpy, "count", 4);

171

161

172 dashContentList.movementStarted();

162 dashContentList.movementStarted();

173

163

174 compare(movementStartedSpy.count, 1, "DashContent should have emitted movementStarted signal when content list did.");

164 compare(movementStartedSpy.count, 1, "DashContent should have emitted movementStarted signal when content list did.");

175 compare(scopeStatus["MockScope1"].movementStarted, 1, "MockScope1 should have emitted movementStarted signal when content list did.");

165 compare(scopeStatus["MockScope1"].movementStarted, 1, "MockScope1 should have emitted movementStarted signal when content list did.");

176 compare(scopeStatus["MockScope2"].movementStarted, 1, "MockScope2 should have emitted movementStarted signal when content list did.");

166 compare(scopeStatus["MockScope2"].movementStarted, 1, "MockScope2 should have emitted movementStarted signal when content list did.");

177− compare(scopeStatus["home.scope"].movementStarted, 1, "home.scope should have emitted movementStarted signal when content list did.");

178− compare(scopeStatus["applications.scope"].movementStarted, 1, "applications.scope should have emitted movementStarted signal when content list did.");

167+ compare(scopeStatus["clickscope"].movementStarted, 1, "clickscope should have emitted movementStarted signal when content list did.");

179 compare(scopeStatus["MockScope5"].movementStarted, 1, "MockScope5 should have emitted movementStarted signal when content list did.");

168 compare(scopeStatus["MockScope5"].movementStarted, 1, "MockScope5 should have emitted movementStarted signal when content list did.");

180 }

169 }

181

170

182 function test_positioned_at_beginning_signal() {

171 function test_positioned_at_beginning_signal() {

183 dashContent.setCurrentScopeAtIndex(3, true, false);

172 dashContent.setCurrentScopeAtIndex(3, true, false);

184

173

185− tryCompare(scopeLoadedSpy, "count", 5);

174+ tryCompare(scopeLoadedSpy, "count", 4);

186

175

187 dashContent.positionedAtBeginning();

176 dashContent.positionedAtBeginning();

188 compare(scopeStatus["MockScope1"].positionedAtBeginning, 1, "MockScope1 should have emitted positionedAtBeginning signal when DashContent did.");

177 compare(scopeStatus["MockScope1"].positionedAtBeginning, 1, "MockScope1 should have emitted positionedAtBeginning signal when DashContent did.");

189 compare(scopeStatus["MockScope2"].positionedAtBeginning, 1, "MockScope2 should have emitted positionedAtBeginning signal when DashContent did.");

178 compare(scopeStatus["MockScope2"].positionedAtBeginning, 1, "MockScope2 should have emitted positionedAtBeginning signal when DashContent did.");

190− compare(scopeStatus["home.scope"].positionedAtBeginning, 1, "home.scope should have emitted positionedAtBeginning signal when DashContent did.");

191− compare(scopeStatus["applications.scope"].positionedAtBeginning, 1, "applications.scope should have emitted positionedAtBeginning signal when DashContent did.");

179+ compare(scopeStatus["clickscope"].positionedAtBeginning, 1, "clickscope should have emitted positionedAtBeginning signal when DashContent did.");

192 compare(scopeStatus["MockScope5"].positionedAtBeginning, 1, "MockScope5 should have emitted positionedAtBeginning signal when DashContent did.");

180 compare(scopeStatus["MockScope5"].positionedAtBeginning, 1, "MockScope5 should have emitted positionedAtBeginning signal when DashContent did.");

193 }

181 }

194

182

195 function test_scope_loaded() {

183 function test_scope_loaded() {

196− tryCompare(scopeLoadedSpy, "count", 5);

184+ tryCompare(scopeLoadedSpy, "count", 4);

197 }

185 }

198

186

199 function test_content_end_reached() {

187 function test_content_end_reached() {

200 var dashContentList = findChild(dashContent, "dashContentList");

188 var dashContentList = findChild(dashContent, "dashContentList");

201 verify(dashContentList != undefined);

189 verify(dashContentList != undefined);

202

190

203− tryCompare(scopeLoadedSpy, "count", 5);

191+ tryCompare(scopeLoadedSpy, "count", 4);

204 dashContent.setCurrentScopeAtIndex(0, true, false);

192 dashContent.setCurrentScopeAtIndex(0, true, false);

205 dashContentList.currentItem.item.endReached();

193 dashContentList.currentItem.item.endReached();

206

194

@@ -239,11 +227,10 @@ Item {

239

227

240 function test_scope_mapping_data() {

228 function test_scope_mapping_data() {

241 return [

229 return [

242− {tag: "index0", index: 0, objectName: "fake_scopeView1"},

230+ {tag: "index0", index: 0, objectName: "MockScope1"},

243− {tag: "index1", index: 1, objectName: "fake_scopeView2"},

231+ {tag: "index1", index: 1, objectName: "MockScope2"},

244− {tag: "index2", index: 2, objectName: "fake_scopeView3"},

232+ {tag: "index2", index: 2, objectName: "clickscope"},

245− {tag: "index3", index: 3, objectName: "fake_scopeView4"},

233+ {tag: "index3", index: 3, objectName: "MockScope5"}

246− {tag: "index4", index: 4, objectName: "fake_generic_scopeView"}

247 ]

234 ]

248 }

235 }

249

236

@@ -265,7 +252,7 @@ Item {

265 function test_is_active(data) {

252 function test_is_active(data) {

266 var dashContentList = findChild(dashContent, "dashContentList");

253 var dashContentList = findChild(dashContent, "dashContentList");

267

254

268− tryCompare(scopeLoadedSpy, "count", 5);

255+ tryCompare(scopeLoadedSpy, "count", 4);

269

256

270 dashContent.setCurrentScopeAtIndex(data.select, true, false);

257 dashContent.setCurrentScopeAtIndex(data.select, true, false);

271 dashContent.visible = data.visible;

258 dashContent.visible = data.visible;

@@ -355,5 +342,84 @@ Item {

355

342

356 tryCompareFunction(checkFlickMovingAndNotInteractive, true);

343 tryCompareFunction(checkFlickMovingAndNotInteractive, true);

357 }

344 }

345+

346+ function openPreview() {

347+ tryCompareFunction(function() {

348+ var filterGrid = findChild(dashContent, "0");

349+ if (filterGrid != null) {

350+ var tile = findChild(filterGrid, "delegate0");

351+ return tile != null;

352+ }

353+ return false;

354+ },

355+ true);

356+ var tile = findChild(findChild(dashContent, "0"), "delegate0");

357+ mouseClick(tile, tile.width / 2, tile.height / 2);

358+ var previewListView = findChild(dashContent, "dashContentPreviewList");

359+ tryCompare(previewListView, "open", true);

360+ tryCompare(previewListView, "x", 0);

361+ }

362+

363+ function closePreview() {

364+ var closePreviewMouseArea = findChild(dashContent, "dashContentPreviewList_pageHeader_backButton");

365+ mouseClick(closePreviewMouseArea, closePreviewMouseArea.width / 2, closePreviewMouseArea.height / 2);

366+

367+ var previewListView = findChild(dashContent, "dashContentPreviewList");

368+ tryCompare(previewListView, "open", false);

369+ }

370+

371+ function test_previewOpenClose() {

372+ tryCompare(scopeLoadedSpy, "count", 4);

373+

374+ var previewListView = findChild(dashContent, "dashContentPreviewList");

375+ tryCompare(previewListView, "open", false);

376+

377+ var categoryListView = findChild(dashContent, "categoryListView");

378+ categoryListView.positionAtBeginning();

379+

380+ openPreview();

381+ closePreview();

382+ }

383+

384+ function test_showPreviewCarousel() {

385+ tryCompare(scopeLoadedSpy, "count", 4);

386+

387+ var previewListView = findChild(dashContent, "dashContentPreviewList");

388+ tryCompare(previewListView, "open", false);

389+

390+ var dashCategory1 = findChild(dashContent, "dashCategory1");

391+ var tile = findChild(dashCategory1, "carouselDelegate1");

392+ mouseClick(tile, tile.width / 2, tile.height / 2);

393+ tryCompare(previewListView, "open", true);

394+ tryCompare(previewListView, "x", 0);

395+

396+ closePreview();

397+ }

398+

399+ function test_previewCycle() {

400+ tryCompare(scopeLoadedSpy, "count", 4);

401+

402+ var categoryListView = findChild(dashContent, "categoryListView");

403+ categoryListView.positionAtBeginning();

404+

405+ var previewListView = findChild(dashContent, "dashContentPreviewList");

406+ tryCompare(previewListView, "open", false);

407+ var previewListViewList = findChild(dashContent, "dashContentPreviewList_listView");

408+

409+ openPreview();

410+

411+ // flick to the next previews

412+ tryCompare(previewListView, "count", 15);

413+ for (var i = 1; i < previewListView.count; ++i) {

414+ mouseFlick(previewListView, previewListView.width - units.gu(1),

415+ previewListView.height / 2,

416+ units.gu(2),

417+ previewListView.height / 2);

418+ tryCompare(previewListViewList, "moving", false);

419+ tryCompare(previewListView.currentItem, "objectName", "previewItem" + i);

420+

421+ }

422+ closePreview();

423+ }

358 }

424 }

359}

425}

tests/qmltests/Dash/tst_GenericScopeView.qml+24−225

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtTest 1.0

19−import Unity 0.1

19+import Unity 0.2

20import ".."

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

22import "../../../qml/Components"

@@ -26,7 +26,14 @@ import Unity.Test 0.1 as UT

26Item {

27 id: shell

28 width: units.gu(120)

29− height: units.gu(80)

29+ height: units.gu(100)

30+

31+ // BEGIN To reduce warnings

32+ // TODO I think it we should pass down these variables

33+ // as needed instead of hoping they will be globally around

34+ property var greeter: null

35+ property var panel: null

36+ // BEGIN To reduce warnings

30

37

31 Scopes {

38 Scopes {

32 id: scopes

39 id: scopes

@@ -42,17 +49,18 @@ Item {

42 }

49 }

43

50

44 PageHeaderLabel {

51 PageHeaderLabel {

45− id: pageHeader

52+ id: testPageHeader

46 searchHistory: SearchHistoryModel {}

53 searchHistory: SearchHistoryModel {}

54+ text: genericScopeView.scope ? genericScopeView.scope.name : ""

55+ width: parent.width

47 }

56 }

48

57

49 GenericScopeView {

58 GenericScopeView {

50 id: genericScopeView

59 id: genericScopeView

51 anchors.fill: parent

60 anchors.fill: parent

52 previewListView: previewListView

61 previewListView: previewListView

53− openEffect: openEffect

54− pageHeader: pageHeader

62+ pageHeader: testPageHeader

55− tabBarHeight: pageHeader.implicitHeight

63+ tabBarHeight: testPageHeader.implicitHeight

56

64

57 UT.UnityTestCase {

65 UT.UnityTestCase {

58 name: "GenericScopeView"

66 name: "GenericScopeView"

@@ -66,10 +74,10 @@ Item {

66

74

67 function test_isCurrent() {

75 function test_isCurrent() {

68 genericScopeView.isCurrent = true

76 genericScopeView.isCurrent = true

69− pageHeader.searchQuery = "test"

77+ testPageHeader.searchQuery = "test"

70 previewListView.open = true

78 previewListView.open = true

71 genericScopeView.isCurrent = false

79 genericScopeView.isCurrent = false

72− tryCompare(pageHeader, "searchQuery", "")

80+ tryCompare(testPageHeader, "searchQuery", "")

73 tryCompare(previewListView, "open", false);

81 tryCompare(previewListView, "open", false);

74 }

82 }

75

83

@@ -87,181 +95,14 @@ Item {

87

95

88 function test_showDash() {

96 function test_showDash() {

89 previewListView.open = true;

97 previewListView.open = true;

90− tryCompare(openEffect, "live", true);

91 scopes.get(2).showDash();

98 scopes.get(2).showDash();

92 tryCompare(previewListView, "open", false);

99 tryCompare(previewListView, "open", false);

93− tryCompare(openEffect, "live", true);

94 }

100 }

95

101

96 function test_hideDash() {

102 function test_hideDash() {

97 previewListView.open = true;

103 previewListView.open = true;

98 scopes.get(2).hideDash();

104 scopes.get(2).hideDash();

99 tryCompare(previewListView, "open", false);

105 tryCompare(previewListView, "open", false);

100− tryCompare(openEffect, "gap", 0);

101− }

102−

103− function openPreview(filterGridName, willOpen) {

104− if (filterGridName === undefined)

105− filterGridName = "0";

106− if (willOpen === undefined)

107− willOpen = true;

108− tryCompareFunction(function() {

109− var filterGrid = findChild(genericScopeView, filterGridName);

110− if (filterGrid != null) {

111− var tile = findChild(filterGrid, "delegate0");

112− return tile != null;

113− }

114− return false;

115− },

116− true);

117− var tile = findChild(findChild(genericScopeView, filterGridName), "delegate0");

118− mouseClick(tile, tile.width / 2, tile.height / 2);

119− tryCompare(previewListView, "open", willOpen);

120− tryCompare(openEffect, "gap", willOpen ? 1 : 0);

121− }

122−

123− function checkArrowPosition(index) {

124− tryCompareFunction(function() {

125− var tile = findChild(findChild(genericScopeView, "0"), "delegate" + index);

126− return tile != null;

127− },

128− true);

129− var tile = findChild(findChild(genericScopeView, "0"), "delegate" + index);

130− var tileCenter = tile.x + tile.width/2;

131− var pointerArrow = findChild(previewListView, "pointerArrow");

132− var pointerArrowCenter = pointerArrow.x + pointerArrow.width/2;

133− compare(pointerArrowCenter, tileCenter, "Pointer did not move to tile");

134− }

135−

136− function closePreview() {

137− var closePreviewMouseArea = findChild(genericScopeView, "closePreviewMouseArea");

138− mouseClick(closePreviewMouseArea, closePreviewMouseArea.width / 2, closePreviewMouseArea.height / 2);

139−

140− tryCompare(previewListView, "open", false);

141− tryCompare(openEffect, "gap", 0);

142−

143− var categoryListView = findChild(genericScopeView, "categoryListView");

144− categoryListView.flick(0, units.gu(200));

145− tryCompare(categoryListView, "flicking", false);

146− }

147−

148− function test_previewOpenClose() {

149− tryCompare(previewListView, "open", false);

150− var categoryListView = findChild(genericScopeView, "categoryListView");

151− categoryListView.positionAtBeginning();

152−

153− openPreview();

154−

155− // check for it opening successfully

156− var currentPreviewItem = findChild(previewListView, "previewLoader0");

157− tryCompareFunction(function() {

158− var parts = currentPreviewItem.source.toString().split("/");

159− var name = parts[parts.length - 1];

160− return name == "DashPreviewPlaceholder.qml";

161− },

162− true);

163− tryCompareFunction(function() {

164− var parts = currentPreviewItem.source.toString().split("/");

165− var name = parts[parts.length - 1];

166− return name == "GenericPreview.qml";

167− },

168− true);

169− tryCompare(currentPreviewItem, "progress", 1);

170− tryCompare(previewListView, "open", true);

171−

172− closePreview();

173− tryCompare(previewListView, "open", false);

174− }

175−

176− function test_hiddenPreviewOpen() {

177− var categoryListView = findChild(genericScopeView, "categoryListView");

178− categoryListView.positionAtBeginning();

179− waitForRendering(categoryListView);

180− categoryListView.flick(0, -units.gu(60));

181− tryCompare(categoryListView.flicking, false);

182−

183− var tile = findChild(findChild(genericScopeView, "0"), "delegate0");

184− mouseClick(tile, tile.width / 2, tile.height - 1);

185− tryCompare(openEffect, "gap", 1);

186−

187− verify(openEffect.positionPx >= pageHeader.height + categoryListView.stickyHeaderHeight);

188− }

189−

190− function test_previewCycle() {

191− var categoryListView = findChild(genericScopeView, "categoryListView");

192− categoryListView.positionAtBeginning();

193−

194− tryCompare(previewListView, "open", false);

195− tryCompare(openEffect, "gap", 0);

196−

197− openPreview();

198−

199− // wait for it to be loaded

200− var currentPreviewItem = findChild(previewListView, "previewLoader0");

201− tryCompareFunction(function() {

202− var parts = currentPreviewItem.source.toString().split("/");

203− var name = parts[parts.length - 1];

204− return name == "GenericPreview.qml";

205− },

206− true);

207− tryCompare(currentPreviewItem, "progress", 1);

208− waitForRendering(currentPreviewItem);

209−

210− checkArrowPosition(0);

211−

212− // flick to the next previews

213− tryCompare(previewListView, "count", 15);

214− for (var i = 1; i < previewListView.count; ++i) {

215−

216− mouseFlick(previewListView, previewListView.width - units.gu(1),

217− previewListView.height / 2,

218− units.gu(2),

219− previewListView.height / 2);

220−

221− // wait for it to be loaded

222− var nextPreviewItem = findChild(previewListView, "previewLoader" + i);

223− tryCompareFunction(function() {

224− var parts = nextPreviewItem.source.toString().split("/");

225− var name = parts[parts.length - 1];

226− return name == "GenericPreview.qml";

227− },

228− true);

229− tryCompare(nextPreviewItem, "progress", 1);

230− waitForRendering(nextPreviewItem);

231− tryCompareFunction(function() {return nextPreviewItem.item !== null}, true);

232−

233− checkArrowPosition(i);

234−

235− // Make sure only the new one has isCurrent set to true

236− compare(nextPreviewItem.item.isCurrent, true);

237−

238− if (currentPreviewItem.item !== undefined && currentPreviewItem.item !== null) {

239− compare(currentPreviewItem.item.isCurrent, false);

240− }

241−

242− currentPreviewItem = nextPreviewItem;

243− }

244− closePreview();

245− }

246−

247− function test_show_spinner() {

248− var categoryListView = findChild(genericScopeView, "categoryListView");

249− waitForRendering(categoryListView);

250− categoryListView.contentY = units.gu(13);

251− openPreview();

252− var previewLoader = findChild(previewListView, "previewLoader0");

253− compare(previewLoader.source.toString().split("/").pop(), "DashPreviewPlaceholder.qml");

254− compare(categoryListView.contentY, 0)

255− tryCompare(previewLoader, "progress", 1.0);

256− tryCompareFunction(function() { return previewLoader.item != undefined; }, true);

257−

258− previewLoader.item.showProcessingAction = true;

259− var waitingForAction = findChild(previewListView, "waitingForActionMouseArea");

260− tryCompare(waitingForAction, "enabled", true);

261− previewLoader.closePreviewSpinner();

262− tryCompare(waitingForAction, "enabled", false);

263−

264− closePreview();

265 }

106 }

266

107

267 function test_changeScope() {

108 function test_changeScope() {

@@ -309,44 +150,17 @@ Item {

309 compare(renderer, "CardFilterGrid.qml")

150 compare(renderer, "CardFilterGrid.qml")

310 }

151 }

311

152

312− function test_showPreviewCarousel() {

313− tryCompareFunction(function() { return findChild(genericScopeView, "carouselDelegate") != null; }, true);

314− var tile = findChild(genericScopeView, "carouselDelegate");

315− mouseClick(tile, tile.width / 2, tile.height / 2);

316− tryCompare(openEffect, "gap", 1);

317−

318− // check for it opening successfully

319− var currentPreviewItem = findChild(previewListView, "previewLoader0");

320− tryCompareFunction(function() {

321− var parts = currentPreviewItem.source.toString().split("/");

322− var name = parts[parts.length - 1];

323− return name == "DashPreviewPlaceholder.qml";

324− },

325− true);

326− tryCompareFunction(function() {

327− var parts = currentPreviewItem.source.toString().split("/");

328− var name = parts[parts.length - 1];

329− return name == "GenericPreview.qml";

330− },

331− true);

332− tryCompare(currentPreviewItem, "progress", 1);

333− tryCompare(previewListView, "open", true);

334−

335− closePreview();

336− tryCompare(previewListView, "open", false);

337− }

338−

339 function test_filter_expand_expand_collapse() {

153 function test_filter_expand_expand_collapse() {

340 // wait for the item to be there

154 // wait for the item to be there

341− tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeaderapplications.scope") != null; }, true);

155+ tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader2") != null; }, true);

342

156

343 var categoryListView = findChild(genericScopeView, "categoryListView");

157 var categoryListView = findChild(genericScopeView, "categoryListView");

344 categoryListView.contentY = categoryListView.height;

158 categoryListView.contentY = categoryListView.height;

345

159

346− var header2 = findChild(genericScopeView, "dashSectionHeaderapplications.scope")

160+ var header2 = findChild(genericScopeView, "dashSectionHeader2")

347− var category2 = findChild(genericScopeView, "dashCategoryapplications.scope")

161+ var category2 = findChild(genericScopeView, "dashCategory2")

348− var category2FilterGrid = category2.children[0].children[0].children[0];

162+ var category2FilterGrid = category2.children[0].children[0];

349− verify(UT.Util.isInstanceOf(category2FilterGrid, "FilterGrid"));

163+ verify(UT.Util.isInstanceOf(category2FilterGrid, "DashFilterGrid"));

350

164

351 waitForRendering(header2);

165 waitForRendering(header2);

352 verify(category2.expandable);

166 verify(category2.expandable);

@@ -362,7 +176,7 @@ Item {

362 tryCompareFunction(

176 tryCompareFunction(

363 function() {

177 function() {

364 var header0 = findChild(genericScopeView, "dashSectionHeader0")

178 var header0 = findChild(genericScopeView, "dashSectionHeader0")

365− return header0.y == pageHeader.height;

179+ return header0.y == testPageHeader.height;

366 },

180 },

367 true);

181 true);

368

182

@@ -377,21 +191,6 @@ Item {

377 tryCompare(category2, "filtered", true);

191 tryCompare(category2, "filtered", true);

378 }

192 }

379

193

380− function test_bug1271676_no_move_y_no_preview() {

381− waitForRendering(genericScopeView);

382− var categoryListView = findChild(genericScopeView, "categoryListView");

383− waitForRendering(categoryListView);

384− tryCompareFunction(function() { return findChild(genericScopeView, "dashCategoryapplications.scope") != null; }, true);

385− var category = findChild(genericScopeView, "dashCategoryapplications.scope")

386− categoryListView.contentY = category.y;

387− waitForRendering(categoryListView);

388− var contentYBefore = categoryListView.contentY

389− openPreview("applications.scope", false); // This actually doesn't open anything because we

390− // have code so that the item of installed

391− // does activate instead of preview and never shows a preview

392− compare(categoryListView.contentY, contentYBefore);

393− }

394−

395 function test_narrow_delegate_ranges_expand() {

194 function test_narrow_delegate_ranges_expand() {

396 tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory0") != undefined; }, true);

195 tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory0") != undefined; }, true);

397 var category = findChild(genericScopeView, "dashCategory0")

196 var category = findChild(genericScopeView, "dashCategory0")

@@ -413,8 +212,8 @@ Item {

413 PreviewListView {

212 PreviewListView {

414 id: previewListView

213 id: previewListView

415 anchors.fill: parent

214 anchors.fill: parent

416− openEffect: openEffect

215+ visible: false

417− categoryView: genericScopeView.categoryView

216+ pageHeader: testPageHeader

418 scope: genericScopeView.scope

217 scope: genericScopeView.scope

419 }

218 }

420}

219}

tests/qmltests/tst_Shell.qml+6−25

@@ -68,13 +68,10 @@ Item {

68 do {

69 var dashContentList = findChild(shell, "dashContentList");

70 waitForRendering(dashContentList);

71− var homeLoader = findChild(dashContentList, "home.scope loader");

71+ var homeLoader = findChild(dashContentList, "clickscope loader");

72 ok = homeLoader !== null

73 && homeLoader.item !== undefined;

74

75− var dashHome = findChild(shell, "DashHome");

76− ok &= dashHome !== null;

77−

78 var greeter = findChild(shell, "greeter");

75 var greeter = findChild(shell, "greeter");

79 ok &= greeter !== null;

76 ok &= greeter !== null;

80

77

@@ -106,7 +103,7 @@ Item {

106 // kill all (fake) running apps

103 // kill all (fake) running apps

107 killApps(ApplicationManager);

104 killApps(ApplicationManager);

108

105

109− var dashHome = findChild(shell, "DashHome");

106+ var dashHome = findChild(shell, "clickscope loader");

110 swipeUntilScopeViewIsReached(dashHome);

107 swipeUntilScopeViewIsReached(dashHome);

111

108

112 hideIndicators();

109 hideIndicators();

@@ -298,8 +295,7 @@ Item {

298 - apps lens shown and Running Apps visible on screen

295 - apps lens shown and Running Apps visible on screen

299 */

296 */

300 function test_minimizingAppTakesToRunningApps() {

297 function test_minimizingAppTakesToRunningApps() {

301− var dashApps = findChild(shell, "DashApps");

298+ var dashApps = findChild(shell, "clickscope");

302−

303 swipeUntilScopeViewIsReached(dashApps);

299 swipeUntilScopeViewIsReached(dashApps);

304

300

305 // swipe finger up until the running/recent apps section (which we assume

301 // swipe finger up until the running/recent apps section (which we assume

@@ -337,7 +333,7 @@ Item {

337

333

338 verify(itemIsOnScreen(dashApps));

334 verify(itemIsOnScreen(dashApps));

339

335

340− var runningApplicationsGrid = findChild(appsCategoryListView, "recent");

336+ var runningApplicationsGrid = findChild(appsCategoryListView, "running.apps.category");

341 verify(runningApplicationsGrid);

337 verify(runningApplicationsGrid);

342 verify(itemIsOnScreen(runningApplicationsGrid));

338 verify(itemIsOnScreen(runningApplicationsGrid));

343 }

339 }

@@ -418,13 +414,13 @@ Item {

418 }

414 }

419

415

420 function swipeLeftFromCenter() {

416 function swipeLeftFromCenter() {

421− var touchStartX = shell.width / 2;

417+ var touchStartX = shell.width * 3 / 4;

422 var touchStartY = shell.height / 2;

418 var touchStartY = shell.height / 2;

423 touchFlick(shell, touchStartX, touchStartY, 0, touchStartY);

419 touchFlick(shell, touchStartX, touchStartY, 0, touchStartY);

424 }

420 }

425

421

426 function swipeRightFromCenter() {

422 function swipeRightFromCenter() {

427− var touchStartX = shell.width / 2;

423+ var touchStartX = shell.width * 3 / 4;

428 var touchStartY = shell.height / 2;

424 var touchStartY = shell.height / 2;

429 touchFlick(shell, touchStartX, touchStartY, shell.width, touchStartY);

425 touchFlick(shell, touchStartX, touchStartY, shell.width, touchStartY);

430 }

426 }

@@ -476,21 +472,6 @@ Item {

476 ]

472 ]

477 }

473 }

478

474

479− function test_background(data) {

480− var backgroundImage = findChild(shell, "backgroundImage")

481− GSettingsController.setPictureUri(data.url)

482− tryCompareFunction(function() { return backgroundImage.source.toString().indexOf(data.expectedUrl) !== -1; }, true)

483− tryCompare(backgroundImage, "status", Image.Ready)

484− }

485−

486− function test_lockscreen_background() {

487− var backgroundImage = findChild(shell, "backgroundImage")

488− var lockscreen = findChild(shell, "lockscreen")

489− var lockscreenBackground = findChild(lockscreen, "lockscreenBackground")

490− var lockscreenBackgroundMapped = lockscreenBackground.mapToItem(shell, 0, 0)

491− compare(backgroundImage.y, lockscreenBackgroundMapped.y)

492− }

493−

494 function test_DashShown_data() {

475 function test_DashShown_data() {

495 return [

476 return [

496 {tag: "in focus", greeter: false, app: false, launcher: false, indicators: false, expectedShown: true},

477 {tag: "in focus", greeter: false, app: false, launcher: false, indicators: false, expectedShown: true},