Merge lp:~osomon/webbrowser-app/bookmarks-proxy-model into lp:webbrowser-app
- bookmarks-proxy-model
- Merge into trunk
Proposed by
Olivier Tilloy
| Status: | Needs review |
|---|---|
| Proposed branch: | lp:~osomon/webbrowser-app/bookmarks-proxy-model |
| Merge into: | lp:webbrowser-app |
| Diff against target: |
2398 lines (+1610/-331) 20 files modified
src/app/webbrowser/BookmarksFoldersView.qml (+92/-156) src/app/webbrowser/BookmarksView.qml (+3/-3) src/app/webbrowser/CMakeLists.txt (+1/-0) src/app/webbrowser/NewTabView.qml (+9/-7) src/app/webbrowser/bookmarks-model.cpp (+1/-1) src/app/webbrowser/collapsible-bookmarks-model.cpp (+572/-0) src/app/webbrowser/collapsible-bookmarks-model.h (+98/-0) src/app/webbrowser/webbrowser-app.cpp (+2/-0) tests/autopilot/webbrowser_app/emulators/browser.py (+83/-43) tests/autopilot/webbrowser_app/tests/__init__.py (+1/-6) tests/autopilot/webbrowser_app/tests/test_bookmark_options.py (+33/-29) tests/autopilot/webbrowser_app/tests/test_new_tab_view.py (+43/-77) tests/autopilot/webbrowser_app/tests/test_private.py (+4/-2) tests/autopilot/webbrowser_app/tests/test_site_previews.py (+1/-1) tests/unittests/CMakeLists.txt (+1/-0) tests/unittests/collapsible-bookmarks-model/CMakeLists.txt (+13/-0) tests/unittests/collapsible-bookmarks-model/tst_CollapsibleBookmarksModelTests.cpp (+645/-0) tests/unittests/qml/CMakeLists.txt (+1/-0) tests/unittests/qml/tst_BookmarksView.qml (+5/-6) tests/unittests/qml/tst_QmlTests.cpp (+2/-0) |
| To merge this branch: | bzr merge lp:~osomon/webbrowser-app/bookmarks-proxy-model |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| system-apps-ci-bot | continuous-integration | Needs Fixing | |
| PS Jenkins bot | continuous-integration | Approve | |
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
Commit message
Add a C++ model for the narrow bookmarks view: CollapsibleBook
Description of the change
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:1308
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
Revision history for this message
| Olivier Tilloy (osomon) wrote : | # |
For reference, I measured the memory overhead induced by duplicating in memory all the entries of the source model, and this is roughly 1MB per 1000 bookmarks, i.e. 1KB per bookmark (tested with 10000 bookmarks, and with 100000).
I’ll see if this can be optimized by keeping in memory only the bookmarks for the expanded folders, and reconstructing the entries for a folder when it is being expanded, and will share my observations here.
Revision history for this message
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1308
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
Unmerged revisions
- 1308. By Olivier Tilloy
-
Add documentation to the CollapsibleBook
marksModel class. - 1307. By Olivier Tilloy
-
Use the top-level bookmarks view in test_bookmark_
options. py, instead of going through the new tab view. - 1306. By Olivier Tilloy
-
Minor autopilot test improvements.
- 1305. By Olivier Tilloy
-
Fix a number of autopilot test failures.
- 1304. By Olivier Tilloy
-
More test coverage.
- 1303. By Olivier Tilloy
-
More test coverage.
- 1302. By Olivier Tilloy
-
More test coverage.
- 1301. By Olivier Tilloy
-
More test coverage.
- 1300. By Olivier Tilloy
-
More test coverage.
- 1299. By Olivier Tilloy
-
More test coverage.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'src/app/webbrowser/BookmarksFoldersView.qml' | |||
| 2 | --- src/app/webbrowser/BookmarksFoldersView.qml 2015-11-12 16:16:15 +0000 | |||
| 3 | +++ src/app/webbrowser/BookmarksFoldersView.qml 2015-12-02 14:15:47 +0000 | |||
| 4 | @@ -20,171 +20,107 @@ | |||
| 5 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
| 6 | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem |
| 7 | 22 | import webbrowserapp.private 0.1 | 22 | import webbrowserapp.private 0.1 |
| 15 | 23 | import "BookmarksModelUtils.js" as BookmarksModelUtils | 23 | |
| 16 | 24 | 24 | ListView { | |
| 17 | 25 | FocusScope { | 25 | objectName: "bookmarksFolderListView" |
| 18 | 26 | id: bookmarksFoldersViewItem | 26 | |
| 19 | 27 | 27 | property url homepageUrl | |
| 13 | 28 | property alias interactive: bookmarksFolderListView.interactive | ||
| 14 | 29 | property url homeBookmarkUrl | ||
| 20 | 30 | 28 | ||
| 21 | 31 | signal bookmarkClicked(url url) | 29 | signal bookmarkClicked(url url) |
| 22 | 32 | signal bookmarkRemoved(url url) | 30 | signal bookmarkRemoved(url url) |
| 23 | 33 | 31 | ||
| 28 | 34 | height: bookmarksFolderListView.contentHeight | 32 | model: CollapsibleBookmarksModel { |
| 29 | 35 | 33 | id: bookmarksProxyModel | |
| 26 | 36 | BookmarksFolderListModel { | ||
| 27 | 37 | id: bookmarksFolderListModel | ||
| 30 | 38 | sourceModel: BookmarksModel | 34 | sourceModel: BookmarksModel |
| 31 | 39 | } | 35 | } |
| 32 | 40 | 36 | ||
| 46 | 41 | ListView { | 37 | delegate: Loader { |
| 47 | 42 | id: bookmarksFolderListView | 38 | objectName: "bookmarkViewDelegateLoader" |
| 48 | 43 | objectName: "bookmarksFolderListView" | 39 | anchors { |
| 49 | 44 | anchors.fill: parent | 40 | left: parent.left |
| 50 | 45 | interactive: false | 41 | right: parent.right |
| 51 | 46 | focus: true | 42 | } |
| 52 | 47 | 43 | readonly property string type: model.type | |
| 53 | 48 | model: bookmarksFolderListModel | 44 | readonly property bool isBookmark: type == "bookmark" |
| 54 | 49 | delegate: Loader { | 45 | readonly property bool isHomepage: type == "homepage" |
| 55 | 50 | objectName: "bookmarkFolderDelegateLoader" | 46 | readonly property string folder: model.folder |
| 56 | 51 | anchors { | 47 | height: (isBookmark || isHomepage) ? units.gu(5) : units.gu(6.5) |
| 57 | 52 | left: parent.left | 48 | |
| 58 | 53 | right: parent.right | 49 | sourceComponent: (isBookmark || isHomepage) ? bookmarkComponent : folderComponent |
| 59 | 50 | |||
| 60 | 51 | Component { | ||
| 61 | 52 | id: bookmarkComponent | ||
| 62 | 53 | UrlDelegate { | ||
| 63 | 54 | objectName: "bookmarkViewBookmarkDelegate" | ||
| 64 | 55 | readonly property string folderName: folder | ||
| 65 | 56 | anchors.fill: parent | ||
| 66 | 57 | removable: !isHomepage | ||
| 67 | 58 | icon: isHomepage ? "" : model.icon | ||
| 68 | 59 | title: isHomepage ? i18n.tr("Homepage") : model.title | ||
| 69 | 60 | url: isHomepage ? homepageUrl : model.url | ||
| 70 | 61 | onClicked: bookmarkClicked(url) | ||
| 71 | 62 | onRemoved: bookmarkRemoved(url) | ||
| 72 | 54 | } | 63 | } |
| 82 | 55 | 64 | } | |
| 83 | 56 | height: active ? item.height : 0 | 65 | |
| 84 | 57 | active: entries.count > 0 | 66 | Component { |
| 85 | 58 | 67 | id: folderComponent | |
| 86 | 59 | sourceComponent: Item { | 68 | Item { |
| 87 | 60 | objectName: "bookmarkFolderDelegate" | 69 | objectName: "bookmarkViewFolderDelegate" |
| 88 | 61 | 70 | readonly property string name: folder | |
| 80 | 62 | property string folderName: folder | ||
| 81 | 63 | |||
| 89 | 64 | anchors { | 71 | anchors { |
| 213 | 65 | left: parent ? parent.left : undefined | 72 | fill: parent |
| 214 | 66 | right: parent ? parent.right : undefined | 73 | leftMargin: units.gu(2) |
| 215 | 67 | } | 74 | rightMargin: units.gu(2) |
| 216 | 68 | 75 | } | |
| 217 | 69 | height: delegateColumn.height | 76 | |
| 218 | 70 | 77 | Row { | |
| 219 | 71 | Column { | 78 | anchors { |
| 220 | 72 | id: delegateColumn | 79 | left: parent.left |
| 221 | 73 | 80 | leftMargin: units.gu(1.5) | |
| 222 | 74 | property bool expanded: folderName ? false : true | 81 | right: parent.right |
| 223 | 75 | 82 | } | |
| 224 | 76 | anchors { | 83 | |
| 225 | 77 | left: parent.left | 84 | height: units.gu(6) |
| 226 | 78 | right: parent.right | 85 | spacing: units.gu(1.5) |
| 227 | 79 | } | 86 | |
| 228 | 80 | 87 | opacity: (type == "emptyFolder") ? 0.3 : 1.0 | |
| 229 | 81 | Item { | 88 | |
| 230 | 82 | objectName: "bookmarkFolderHeader" | 89 | Icon { |
| 231 | 83 | 90 | id: expandedIcon | |
| 232 | 84 | anchors { | 91 | name: (type == "expandedFolder") ? "go-down" : "go-next" |
| 233 | 85 | left: parent.left | 92 | |
| 234 | 86 | right: parent.right | 93 | height: units.gu(2) |
| 235 | 87 | leftMargin: units.gu(2) | 94 | width: height |
| 236 | 88 | rightMargin: units.gu(2) | 95 | |
| 237 | 89 | } | 96 | anchors { |
| 238 | 90 | 97 | leftMargin: units.gu(1) | |
| 239 | 91 | height: units.gu(6.5) | 98 | topMargin: units.gu(2) |
| 240 | 92 | 99 | top: parent.top | |
| 241 | 93 | Row { | 100 | } |
| 242 | 94 | anchors { | 101 | } |
| 243 | 95 | left: parent.left | 102 | |
| 244 | 96 | leftMargin: units.gu(1.5) | 103 | Label { |
| 245 | 97 | right: parent.right | 104 | width: parent.width - expandedIcon.width - units.gu(3) |
| 246 | 98 | } | 105 | anchors.verticalCenter: expandedIcon.verticalCenter |
| 247 | 99 | 106 | ||
| 248 | 100 | height: units.gu(6) | 107 | text: folder || i18n.tr("All Bookmarks") |
| 249 | 101 | spacing: units.gu(1.5) | 108 | fontSize: "small" |
| 250 | 102 | 109 | } | |
| 251 | 103 | Icon { | 110 | } |
| 252 | 104 | id: expandedIcon | 111 | |
| 253 | 105 | name: delegateColumn.expanded ? "go-down" : "go-next" | 112 | ListItem.ThinDivider { |
| 254 | 106 | 113 | anchors { | |
| 255 | 107 | height: units.gu(2) | 114 | left: parent.left |
| 256 | 108 | width: height | 115 | right: parent.right |
| 257 | 109 | 116 | bottom: parent.bottom | |
| 258 | 110 | anchors { | 117 | bottomMargin: units.gu(1) |
| 259 | 111 | leftMargin: units.gu(1) | 118 | } |
| 260 | 112 | topMargin: units.gu(2) | 119 | } |
| 261 | 113 | top: parent.top | 120 | |
| 262 | 114 | } | 121 | MouseArea { |
| 263 | 115 | } | 122 | anchors.fill: parent |
| 264 | 116 | 123 | onClicked: bookmarksProxyModel.toggleFolderState(folder) | |
| 142 | 117 | Label { | ||
| 143 | 118 | width: parent.width - expandedIcon.width - units.gu(3) | ||
| 144 | 119 | anchors.verticalCenter: expandedIcon.verticalCenter | ||
| 145 | 120 | |||
| 146 | 121 | text: folderName ? folderName : i18n.tr("All Bookmarks") | ||
| 147 | 122 | fontSize: "small" | ||
| 148 | 123 | } | ||
| 149 | 124 | } | ||
| 150 | 125 | |||
| 151 | 126 | ListItem.ThinDivider { | ||
| 152 | 127 | anchors { | ||
| 153 | 128 | left: parent.left | ||
| 154 | 129 | right: parent.right | ||
| 155 | 130 | bottom: parent.bottom | ||
| 156 | 131 | bottomMargin: units.gu(1) | ||
| 157 | 132 | } | ||
| 158 | 133 | } | ||
| 159 | 134 | |||
| 160 | 135 | MouseArea { | ||
| 161 | 136 | anchors.fill: parent | ||
| 162 | 137 | onClicked: delegateColumn.expanded = !delegateColumn.expanded | ||
| 163 | 138 | } | ||
| 164 | 139 | } | ||
| 165 | 140 | |||
| 166 | 141 | Loader { | ||
| 167 | 142 | anchors { | ||
| 168 | 143 | left: parent.left | ||
| 169 | 144 | right: parent.right | ||
| 170 | 145 | } | ||
| 171 | 146 | |||
| 172 | 147 | height: item ? item.contentHeight : 0 | ||
| 173 | 148 | |||
| 174 | 149 | visible: status == Loader.Ready | ||
| 175 | 150 | |||
| 176 | 151 | active: delegateColumn.expanded | ||
| 177 | 152 | sourceComponent: ListView { | ||
| 178 | 153 | readonly property bool isAllBookmarksFolder: folder === "" | ||
| 179 | 154 | |||
| 180 | 155 | interactive: false | ||
| 181 | 156 | |||
| 182 | 157 | model: { | ||
| 183 | 158 | if (isAllBookmarksFolder) { | ||
| 184 | 159 | return BookmarksModelUtils.prependHomepageToBookmarks(entries, { | ||
| 185 | 160 | title: i18n.tr("Homepage"), | ||
| 186 | 161 | url: bookmarksFoldersViewItem.homeBookmarkUrl | ||
| 187 | 162 | }) | ||
| 188 | 163 | } | ||
| 189 | 164 | |||
| 190 | 165 | return entries | ||
| 191 | 166 | } | ||
| 192 | 167 | |||
| 193 | 168 | delegate: UrlDelegate{ | ||
| 194 | 169 | id: urlDelegate | ||
| 195 | 170 | objectName: "urlDelegate_" + index | ||
| 196 | 171 | |||
| 197 | 172 | property var entry: isAllBookmarksFolder ? modelData : model | ||
| 198 | 173 | |||
| 199 | 174 | width: parent.width | ||
| 200 | 175 | height: units.gu(5) | ||
| 201 | 176 | |||
| 202 | 177 | removable: !isAllBookmarksFolder || index !== 0 | ||
| 203 | 178 | |||
| 204 | 179 | icon: entry.icon ? entry.icon : "" | ||
| 205 | 180 | title: entry.title ? entry.title : entry.url | ||
| 206 | 181 | url: entry.url | ||
| 207 | 182 | |||
| 208 | 183 | onClicked: bookmarksFoldersViewItem.bookmarkClicked(url) | ||
| 209 | 184 | onRemoved: bookmarksFoldersViewItem.bookmarkRemoved(url) | ||
| 210 | 185 | } | ||
| 211 | 186 | } | ||
| 212 | 187 | } | ||
| 265 | 188 | } | 124 | } |
| 266 | 189 | } | 125 | } |
| 267 | 190 | } | 126 | } |
| 268 | 191 | 127 | ||
| 269 | === modified file 'src/app/webbrowser/BookmarksView.qml' | |||
| 270 | --- src/app/webbrowser/BookmarksView.qml 2015-11-12 16:16:45 +0000 | |||
| 271 | +++ src/app/webbrowser/BookmarksView.qml 2015-12-02 14:15:47 +0000 | |||
| 272 | @@ -24,7 +24,7 @@ | |||
| 273 | 24 | FocusScope { | 24 | FocusScope { |
| 274 | 25 | id: bookmarksView | 25 | id: bookmarksView |
| 275 | 26 | 26 | ||
| 277 | 27 | property alias homepageUrl: bookmarksFoldersView.homeBookmarkUrl | 27 | property alias homepageUrl: bookmarksFoldersView.homepageUrl |
| 278 | 28 | 28 | ||
| 279 | 29 | signal bookmarkEntryClicked(url url) | 29 | signal bookmarkEntryClicked(url url) |
| 280 | 30 | signal done() | 30 | signal done() |
| 281 | @@ -51,10 +51,10 @@ | |||
| 282 | 51 | 51 | ||
| 283 | 52 | onBookmarkClicked: bookmarksView.bookmarkEntryClicked(url) | 52 | onBookmarkClicked: bookmarksView.bookmarkEntryClicked(url) |
| 284 | 53 | onBookmarkRemoved: { | 53 | onBookmarkRemoved: { |
| 286 | 54 | if (BookmarksModel.count == 1) { | 54 | BookmarksModel.remove(url) |
| 287 | 55 | if (count == 0) { | ||
| 288 | 55 | done() | 56 | done() |
| 289 | 56 | } | 57 | } |
| 290 | 57 | BookmarksModel.remove(url) | ||
| 291 | 58 | } | 58 | } |
| 292 | 59 | } | 59 | } |
| 293 | 60 | 60 | ||
| 294 | 61 | 61 | ||
| 295 | === modified file 'src/app/webbrowser/CMakeLists.txt' | |||
| 296 | --- src/app/webbrowser/CMakeLists.txt 2015-10-18 19:21:48 +0000 | |||
| 297 | +++ src/app/webbrowser/CMakeLists.txt 2015-12-02 14:15:47 +0000 | |||
| 298 | @@ -13,6 +13,7 @@ | |||
| 299 | 13 | bookmarks-model.cpp | 13 | bookmarks-model.cpp |
| 300 | 14 | bookmarks-folder-model.cpp | 14 | bookmarks-folder-model.cpp |
| 301 | 15 | bookmarks-folderlist-model.cpp | 15 | bookmarks-folderlist-model.cpp |
| 302 | 16 | collapsible-bookmarks-model.cpp | ||
| 303 | 16 | history-domain-model.cpp | 17 | history-domain-model.cpp |
| 304 | 17 | history-domainlist-chronological-model.cpp | 18 | history-domainlist-chronological-model.cpp |
| 305 | 18 | history-domainlist-model.cpp | 19 | history-domainlist-model.cpp |
| 306 | 19 | 20 | ||
| 307 | === modified file 'src/app/webbrowser/NewTabView.qml' | |||
| 308 | --- src/app/webbrowser/NewTabView.qml 2015-10-22 08:12:32 +0000 | |||
| 309 | +++ src/app/webbrowser/NewTabView.qml 2015-12-02 14:15:47 +0000 | |||
| 310 | @@ -63,10 +63,11 @@ | |||
| 311 | 63 | } | 63 | } |
| 312 | 64 | 64 | ||
| 313 | 65 | Flickable { | 65 | Flickable { |
| 314 | 66 | id: flickable | ||
| 315 | 66 | anchors.fill: parent | 67 | anchors.fill: parent |
| 316 | 67 | contentHeight: internal.seeMoreBookmarksView ? | 68 | contentHeight: internal.seeMoreBookmarksView ? |
| 319 | 68 | bookmarksFolderListViewLoader.height + units.gu(6) : | 69 | title.height + separator.height + bookmarksViewLoader.height : |
| 320 | 69 | contentColumn.height | 70 | contentColumn.height |
| 321 | 70 | 71 | ||
| 322 | 71 | Column { | 72 | Column { |
| 323 | 72 | id: contentColumn | 73 | id: contentColumn |
| 324 | @@ -78,6 +79,7 @@ | |||
| 325 | 78 | height: childrenRect.height | 79 | height: childrenRect.height |
| 326 | 79 | 80 | ||
| 327 | 80 | Row { | 81 | Row { |
| 328 | 82 | id: title | ||
| 329 | 81 | height: units.gu(6) | 83 | height: units.gu(6) |
| 330 | 82 | anchors { | 84 | anchors { |
| 331 | 83 | left: parent.left | 85 | left: parent.left |
| 332 | @@ -127,6 +129,7 @@ | |||
| 333 | 127 | } | 129 | } |
| 334 | 128 | 130 | ||
| 335 | 129 | Rectangle { | 131 | Rectangle { |
| 336 | 132 | id: separator | ||
| 337 | 130 | height: units.gu(0.1) | 133 | height: units.gu(0.1) |
| 338 | 131 | anchors { | 134 | anchors { |
| 339 | 132 | left: parent.left | 135 | left: parent.left |
| 340 | @@ -137,20 +140,19 @@ | |||
| 341 | 137 | } | 140 | } |
| 342 | 138 | 141 | ||
| 343 | 139 | Loader { | 142 | Loader { |
| 345 | 140 | id: bookmarksFolderListViewLoader | 143 | id: bookmarksViewLoader |
| 346 | 141 | 144 | ||
| 347 | 142 | anchors { | 145 | anchors { |
| 348 | 143 | left: parent.left | 146 | left: parent.left |
| 349 | 144 | right: parent.right | 147 | right: parent.right |
| 350 | 145 | } | 148 | } |
| 353 | 146 | 149 | height: active ? (flickable.height - title.height - separator.height) : 0 | |
| 352 | 147 | height: status == Loader.Ready ? item.height : 0 | ||
| 354 | 148 | 150 | ||
| 355 | 149 | active: internal.seeMoreBookmarksView | 151 | active: internal.seeMoreBookmarksView |
| 356 | 152 | clip: active | ||
| 357 | 150 | 153 | ||
| 358 | 151 | sourceComponent: BookmarksFoldersView { | 154 | sourceComponent: BookmarksFoldersView { |
| 361 | 152 | homeBookmarkUrl: newTabView.settingsObject.homepage | 155 | homepageUrl: newTabView.settingsObject.homepage |
| 360 | 153 | |||
| 362 | 154 | onBookmarkClicked: newTabView.bookmarkClicked(url) | 156 | onBookmarkClicked: newTabView.bookmarkClicked(url) |
| 363 | 155 | onBookmarkRemoved: newTabView.bookmarkRemoved(url) | 157 | onBookmarkRemoved: newTabView.bookmarkRemoved(url) |
| 364 | 156 | } | 158 | } |
| 365 | 157 | 159 | ||
| 366 | === modified file 'src/app/webbrowser/bookmarks-model.cpp' | |||
| 367 | --- src/app/webbrowser/bookmarks-model.cpp 2015-07-27 15:36:59 +0000 | |||
| 368 | +++ src/app/webbrowser/bookmarks-model.cpp 2015-12-02 14:15:47 +0000 | |||
| 369 | @@ -31,7 +31,7 @@ | |||
| 370 | 31 | BookmarksModel is a list model that stores bookmark entries for quick access | 31 | BookmarksModel is a list model that stores bookmark entries for quick access |
| 371 | 32 | to favourite websites. For a given URL, the following information is stored: | 32 | to favourite websites. For a given URL, the following information is stored: |
| 372 | 33 | page title and URL to the favorite icon if any. | 33 | page title and URL to the favorite icon if any. |
| 374 | 34 | The model is sorted alphabetically at all times (by URL). | 34 | The model is sorted by recency at all times (most recently created bookmark first). |
| 375 | 35 | 35 | ||
| 376 | 36 | The information is persistently stored on disk in a SQLite database. | 36 | The information is persistently stored on disk in a SQLite database. |
| 377 | 37 | The database is read at startup to populate the model, and whenever a new | 37 | The database is read at startup to populate the model, and whenever a new |
| 378 | 38 | 38 | ||
| 379 | === added file 'src/app/webbrowser/collapsible-bookmarks-model.cpp' | |||
| 380 | --- src/app/webbrowser/collapsible-bookmarks-model.cpp 1970-01-01 00:00:00 +0000 | |||
| 381 | +++ src/app/webbrowser/collapsible-bookmarks-model.cpp 2015-12-02 14:15:47 +0000 | |||
| 382 | @@ -0,0 +1,572 @@ | |||
| 383 | 1 | /* | ||
| 384 | 2 | * Copyright 2015 Canonical Ltd. | ||
| 385 | 3 | * | ||
| 386 | 4 | * This file is part of webbrowser-app. | ||
| 387 | 5 | * | ||
| 388 | 6 | * webbrowser-app is free software; you can redistribute it and/or modify | ||
| 389 | 7 | * it under the terms of the GNU General Public License as published by | ||
| 390 | 8 | * the Free Software Foundation; version 3. | ||
| 391 | 9 | * | ||
| 392 | 10 | * webbrowser-app is distributed in the hope that it will be useful, | ||
| 393 | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 394 | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 395 | 13 | * GNU General Public License for more details. | ||
| 396 | 14 | * | ||
| 397 | 15 | * You should have received a copy of the GNU General Public License | ||
| 398 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 399 | 17 | */ | ||
| 400 | 18 | |||
| 401 | 19 | #include "collapsible-bookmarks-model.h" | ||
| 402 | 20 | |||
| 403 | 21 | // Qt | ||
| 404 | 22 | #include <QtCore/QUrl> | ||
| 405 | 23 | |||
| 406 | 24 | /*! | ||
| 407 | 25 | \class CollapsibleBookmarksModel | ||
| 408 | 26 | \brief List model that exposes bookmarked websites in collapsible folders. | ||
| 409 | 27 | |||
| 410 | 28 | CollapsibleBookmarksModel is a proxy model that takes a BookmarksModel as | ||
| 411 | 29 | source and exposes its folders and bookmarks. Folders are collapsed by | ||
| 412 | 30 | default (meaning that no bookmarks under them are advertised by the model) | ||
| 413 | 31 | and can be expanded or collapsed again using the toggleFolderState() | ||
| 414 | 32 | method. | ||
| 415 | 33 | |||
| 416 | 34 | The first folder in the model has no name, it contains all bookmarks that | ||
| 417 | 35 | are not in any other folder. It may also contain a special placeholder | ||
| 418 | 36 | entry (always first) that can be used to display a special homepage | ||
| 419 | 37 | bookmark. This is controlled by setting the 'prependHomepage' property | ||
| 420 | 38 | (true by default). | ||
| 421 | 39 | |||
| 422 | 40 | The folders are sorted by alphabetical order in the model, and inside each | ||
| 423 | 41 | folder bookmarks are sorted by recency (most recently created first). | ||
| 424 | 42 | |||
| 425 | 43 | By default, empty folders are hidden, but they can be shown by setting the | ||
| 426 | 44 | 'showEmptyFolders' property to true. | ||
| 427 | 45 | |||
| 428 | 46 | The roles exposed by the model are as follows: | ||
| 429 | 47 | - "url" (url): for a bookmark, the associated URL | ||
| 430 | 48 | - "title" (string): for a bookmark, the associated title | ||
| 431 | 49 | - "icon" (url): for a bookmark, the associated favicon | ||
| 432 | 50 | - "created" (datetime): for a bookmark, the creation timestamp | ||
| 433 | 51 | - "folder" (string): the folder name | ||
| 434 | 52 | - "type" (string): one of "homepage", "bookmark", "emptyFolder", | ||
| 435 | 53 | "collapsedFolder", "expandedFolder" | ||
| 436 | 54 | */ | ||
| 437 | 55 | CollapsibleBookmarksModel::CollapsibleBookmarksModel(QObject* parent) | ||
| 438 | 56 | : QAbstractListModel(parent) | ||
| 439 | 57 | , m_sourceModel(nullptr) | ||
| 440 | 58 | , m_prependHomepage(true) | ||
| 441 | 59 | , m_showEmptyFolders(false) | ||
| 442 | 60 | , m_count(0) | ||
| 443 | 61 | {} | ||
| 444 | 62 | |||
| 445 | 63 | CollapsibleBookmarksModel::~CollapsibleBookmarksModel() | ||
| 446 | 64 | {} | ||
| 447 | 65 | |||
| 448 | 66 | BookmarksModel* CollapsibleBookmarksModel::sourceModel() const | ||
| 449 | 67 | { | ||
| 450 | 68 | return m_sourceModel; | ||
| 451 | 69 | } | ||
| 452 | 70 | |||
| 453 | 71 | void CollapsibleBookmarksModel::setSourceModel(BookmarksModel* sourceModel) | ||
| 454 | 72 | { | ||
| 455 | 73 | if (sourceModel != m_sourceModel) { | ||
| 456 | 74 | beginResetModel(); | ||
| 457 | 75 | if (m_sourceModel) { | ||
| 458 | 76 | m_sourceModel->disconnect(this); | ||
| 459 | 77 | } | ||
| 460 | 78 | m_folders.clear(); | ||
| 461 | 79 | m_sourceModel = sourceModel; | ||
| 462 | 80 | populateModel(); | ||
| 463 | 81 | if (m_sourceModel) { | ||
| 464 | 82 | connect(m_sourceModel, SIGNAL(folderAdded(const QString&)), | ||
| 465 | 83 | SLOT(onFolderAdded(const QString&))); | ||
| 466 | 84 | connect(m_sourceModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)), | ||
| 467 | 85 | SLOT(onRowsInserted(const QModelIndex&, int, int))); | ||
| 468 | 86 | connect(m_sourceModel, SIGNAL(removed(const QUrl&)), SLOT(onBookmarkRemoved(const QUrl&))); | ||
| 469 | 87 | connect(m_sourceModel, SIGNAL(modelReset()), SLOT(onModelReset())); | ||
| 470 | 88 | connect(m_sourceModel, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, QVector<int>)), | ||
| 471 | 89 | SLOT(onDataChanged(const QModelIndex&, const QModelIndex&, QVector<int>))); | ||
| 472 | 90 | } | ||
| 473 | 91 | endResetModel(); | ||
| 474 | 92 | Q_EMIT sourceModelChanged(); | ||
| 475 | 93 | } | ||
| 476 | 94 | } | ||
| 477 | 95 | |||
| 478 | 96 | bool CollapsibleBookmarksModel::prependHomepage() const | ||
| 479 | 97 | { | ||
| 480 | 98 | return m_prependHomepage; | ||
| 481 | 99 | } | ||
| 482 | 100 | |||
| 483 | 101 | void CollapsibleBookmarksModel::setPrependHomepage(bool value) | ||
| 484 | 102 | { | ||
| 485 | 103 | if (value != m_prependHomepage) { | ||
| 486 | 104 | m_prependHomepage = value; | ||
| 487 | 105 | if (m_sourceModel) { | ||
| 488 | 106 | QPair<bool, QList<QVariantMap>>& allFolder = m_folders[QStringLiteral("")]; | ||
| 489 | 107 | int first = ((allFolder.second.isEmpty() && !m_showEmptyFolders) ? 0 : 1); | ||
| 490 | 108 | int last = allFolder.first ? 1 : 0; | ||
| 491 | 109 | if (last >= first) { | ||
| 492 | 110 | if (m_prependHomepage) { | ||
| 493 | 111 | beginInsertRows(QModelIndex(), first, last); | ||
| 494 | 112 | m_count += (last - first + 1); | ||
| 495 | 113 | endInsertRows(); | ||
| 496 | 114 | } else { | ||
| 497 | 115 | beginRemoveRows(QModelIndex(), first, last); | ||
| 498 | 116 | m_count -= (last - first + 1); | ||
| 499 | 117 | endRemoveRows(); | ||
| 500 | 118 | } | ||
| 501 | 119 | } | ||
| 502 | 120 | } | ||
| 503 | 121 | Q_EMIT prependHomepageChanged(); | ||
| 504 | 122 | } | ||
| 505 | 123 | } | ||
| 506 | 124 | |||
| 507 | 125 | bool CollapsibleBookmarksModel::showEmptyFolders() const | ||
| 508 | 126 | { | ||
| 509 | 127 | return m_showEmptyFolders; | ||
| 510 | 128 | } | ||
| 511 | 129 | |||
| 512 | 130 | void CollapsibleBookmarksModel::setShowEmptyFolders(bool value) | ||
| 513 | 131 | { | ||
| 514 | 132 | if (value != m_showEmptyFolders) { | ||
| 515 | 133 | m_showEmptyFolders = value; | ||
| 516 | 134 | FoldersMap::const_iterator i; | ||
| 517 | 135 | int index = -1; | ||
| 518 | 136 | for (i = m_folders.constBegin(); i != m_folders.constEnd(); ++i) { | ||
| 519 | 137 | ++index; | ||
| 520 | 138 | if (i.value().second.isEmpty() && !(i.key().isEmpty() && m_prependHomepage)) { | ||
| 521 | 139 | if (m_showEmptyFolders) { | ||
| 522 | 140 | beginInsertRows(QModelIndex(), index, index); | ||
| 523 | 141 | ++m_count; | ||
| 524 | 142 | endInsertRows(); | ||
| 525 | 143 | } else { | ||
| 526 | 144 | beginRemoveRows(QModelIndex(), index, index); | ||
| 527 | 145 | --m_count; | ||
| 528 | 146 | endRemoveRows(); | ||
| 529 | 147 | --index; | ||
| 530 | 148 | } | ||
| 531 | 149 | } else { | ||
| 532 | 150 | index += (i.value().first ? i.value().second.count() : 0); | ||
| 533 | 151 | index += ((i.key().isEmpty() && i.value().first && m_prependHomepage) ? 1 : 0); | ||
| 534 | 152 | } | ||
| 535 | 153 | } | ||
| 536 | 154 | Q_EMIT showEmptyFoldersChanged(); | ||
| 537 | 155 | } | ||
| 538 | 156 | } | ||
| 539 | 157 | |||
| 540 | 158 | QHash<int, QByteArray> CollapsibleBookmarksModel::roleNames() const | ||
| 541 | 159 | { | ||
| 542 | 160 | static QHash<int, QByteArray> roles; | ||
| 543 | 161 | if (roles.isEmpty()) { | ||
| 544 | 162 | roles[Url] = "url"; | ||
| 545 | 163 | roles[Title] = "title"; | ||
| 546 | 164 | roles[Icon] = "icon"; | ||
| 547 | 165 | roles[Created] = "created"; | ||
| 548 | 166 | roles[Folder] = "folder"; | ||
| 549 | 167 | roles[Type] = "type"; | ||
| 550 | 168 | } | ||
| 551 | 169 | return roles; | ||
| 552 | 170 | } | ||
| 553 | 171 | |||
| 554 | 172 | int CollapsibleBookmarksModel::rowCount(const QModelIndex& parent) const | ||
| 555 | 173 | { | ||
| 556 | 174 | Q_UNUSED(parent); | ||
| 557 | 175 | return m_count; | ||
| 558 | 176 | } | ||
| 559 | 177 | |||
| 560 | 178 | QVariant CollapsibleBookmarksModel::data(const QModelIndex& index, int role) const | ||
| 561 | 179 | { | ||
| 562 | 180 | if (!index.isValid()) { | ||
| 563 | 181 | return QVariant(); | ||
| 564 | 182 | } | ||
| 565 | 183 | QString folder; | ||
| 566 | 184 | QVariantMap bookmark; | ||
| 567 | 185 | bool homepage = false; | ||
| 568 | 186 | int row = index.row(); | ||
| 569 | 187 | FoldersMap::const_iterator i; | ||
| 570 | 188 | for (i = m_folders.constBegin(); i != m_folders.constEnd(); ++i) { | ||
| 571 | 189 | if (!m_showEmptyFolders && i.value().second.isEmpty() && | ||
| 572 | 190 | !(i.key().isEmpty() && m_prependHomepage)) { | ||
| 573 | 191 | continue; | ||
| 574 | 192 | } | ||
| 575 | 193 | if (row == 0) { | ||
| 576 | 194 | folder = i.key(); | ||
| 577 | 195 | break; | ||
| 578 | 196 | } else if (i.value().first) { | ||
| 579 | 197 | bool allBookmarksWithHomepage = (i.key().isEmpty() && m_prependHomepage); | ||
| 580 | 198 | if (allBookmarksWithHomepage) { | ||
| 581 | 199 | if (row == 1) { | ||
| 582 | 200 | homepage = true; | ||
| 583 | 201 | break; | ||
| 584 | 202 | } else { | ||
| 585 | 203 | --row; | ||
| 586 | 204 | } | ||
| 587 | 205 | } | ||
| 588 | 206 | int count = i.value().second.count(); | ||
| 589 | 207 | if (row <= count) { | ||
| 590 | 208 | bookmark = i.value().second.at(row - 1); | ||
| 591 | 209 | break; | ||
| 592 | 210 | } else { | ||
| 593 | 211 | row -= (count + 1); | ||
| 594 | 212 | } | ||
| 595 | 213 | } else { | ||
| 596 | 214 | --row; | ||
| 597 | 215 | } | ||
| 598 | 216 | } | ||
| 599 | 217 | switch(role) { | ||
| 600 | 218 | case Url: | ||
| 601 | 219 | return bookmark[QStringLiteral("url")]; | ||
| 602 | 220 | case Title: | ||
| 603 | 221 | return bookmark[QStringLiteral("title")]; | ||
| 604 | 222 | case Icon: | ||
| 605 | 223 | return bookmark[QStringLiteral("icon")]; | ||
| 606 | 224 | case Created: | ||
| 607 | 225 | return bookmark[QStringLiteral("created")]; | ||
| 608 | 226 | case Folder: | ||
| 609 | 227 | return (homepage ? QStringLiteral("") : (folder.isNull() ? bookmark[QStringLiteral("folder")] : folder)); | ||
| 610 | 228 | case Type: | ||
| 611 | 229 | if (homepage) { | ||
| 612 | 230 | return QStringLiteral("homepage"); | ||
| 613 | 231 | } else if (folder.isNull()) { | ||
| 614 | 232 | return QStringLiteral("bookmark"); | ||
| 615 | 233 | } else if (i.value().second.isEmpty() && !(i.key().isEmpty() && m_prependHomepage)) { | ||
| 616 | 234 | return QStringLiteral("emptyFolder"); | ||
| 617 | 235 | } else if (i.value().first) { | ||
| 618 | 236 | return QStringLiteral("expandedFolder"); | ||
| 619 | 237 | } else { | ||
| 620 | 238 | return QStringLiteral("collapsedFolder"); | ||
| 621 | 239 | } | ||
| 622 | 240 | default: | ||
| 623 | 241 | return QVariant(); | ||
| 624 | 242 | } | ||
| 625 | 243 | } | ||
| 626 | 244 | |||
| 627 | 245 | void CollapsibleBookmarksModel::toggleFolderState(const QString& folder) { | ||
| 628 | 246 | int index = folderIndex(folder); | ||
| 629 | 247 | if (index == -1) { | ||
| 630 | 248 | return; | ||
| 631 | 249 | } | ||
| 632 | 250 | QPair<bool, QList<QVariantMap>>& folderInfo = m_folders[folder]; | ||
| 633 | 251 | if (folderInfo.second.isEmpty() && !(folder.isEmpty() && m_prependHomepage)) { | ||
| 634 | 252 | return; | ||
| 635 | 253 | } | ||
| 636 | 254 | bool expanded = folderInfo.first; | ||
| 637 | 255 | int first = index + 1; | ||
| 638 | 256 | int last = index + folderInfo.second.count(); | ||
| 639 | 257 | if (folder.isEmpty() && m_prependHomepage) { | ||
| 640 | 258 | ++last; | ||
| 641 | 259 | } | ||
| 642 | 260 | if (expanded) { | ||
| 643 | 261 | beginRemoveRows(QModelIndex(), first, last); | ||
| 644 | 262 | m_count -= (last - first + 1); | ||
| 645 | 263 | } else { | ||
| 646 | 264 | beginInsertRows(QModelIndex(), first, last); | ||
| 647 | 265 | m_count += (last - first + 1); | ||
| 648 | 266 | } | ||
| 649 | 267 | folderInfo.first = !expanded; | ||
| 650 | 268 | if (expanded) { | ||
| 651 | 269 | endRemoveRows(); | ||
| 652 | 270 | } else { | ||
| 653 | 271 | endInsertRows(); | ||
| 654 | 272 | } | ||
| 655 | 273 | QModelIndex modelIndex = this->index(index, 0); | ||
| 656 | 274 | Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << Type); | ||
| 657 | 275 | } | ||
| 658 | 276 | |||
| 659 | 277 | void CollapsibleBookmarksModel::populateModel() | ||
| 660 | 278 | { | ||
| 661 | 279 | if (!m_sourceModel) { | ||
| 662 | 280 | return; | ||
| 663 | 281 | } | ||
| 664 | 282 | Q_FOREACH(const QString& folder, m_sourceModel->folders()) { | ||
| 665 | 283 | m_folders[folder].first = false; | ||
| 666 | 284 | } | ||
| 667 | 285 | m_folders[QStringLiteral("")].first = true; | ||
| 668 | 286 | int count = m_sourceModel->rowCount(); | ||
| 669 | 287 | for (int i = 0; i < count; ++i) { | ||
| 670 | 288 | QModelIndex index = m_sourceModel->index(i); | ||
| 671 | 289 | QVariantMap variant; | ||
| 672 | 290 | variant[QStringLiteral("url")] = m_sourceModel->data(index, BookmarksModel::Url); | ||
| 673 | 291 | variant[QStringLiteral("title")] = m_sourceModel->data(index, BookmarksModel::Title); | ||
| 674 | 292 | variant[QStringLiteral("icon")] = m_sourceModel->data(index, BookmarksModel::Icon); | ||
| 675 | 293 | variant[QStringLiteral("created")] = m_sourceModel->data(index, BookmarksModel::Created); | ||
| 676 | 294 | QString folder = m_sourceModel->data(index, BookmarksModel::Folder).toString(); | ||
| 677 | 295 | variant[QStringLiteral("folder")] = folder; | ||
| 678 | 296 | m_folders[folder].second.append(variant); | ||
| 679 | 297 | } | ||
| 680 | 298 | m_count = 0; | ||
| 681 | 299 | FoldersMap::const_iterator i; | ||
| 682 | 300 | for (i = m_folders.constBegin(); i != m_folders.constEnd(); ++i) { | ||
| 683 | 301 | bool empty = i.value().second.isEmpty(); | ||
| 684 | 302 | if (!empty || m_showEmptyFolders || (i.key().isEmpty() && m_prependHomepage)) { | ||
| 685 | 303 | ++m_count; | ||
| 686 | 304 | } | ||
| 687 | 305 | m_count += (i.value().first ? i.value().second.count() : 0); | ||
| 688 | 306 | m_count += ((i.key().isEmpty() && i.value().first && m_prependHomepage) ? 1 : 0); | ||
| 689 | 307 | } | ||
| 690 | 308 | } | ||
| 691 | 309 | |||
| 692 | 310 | int CollapsibleBookmarksModel::folderIndex(const QString& folder) const | ||
| 693 | 311 | { | ||
| 694 | 312 | if (!m_showEmptyFolders && m_folders[folder].second.isEmpty() && | ||
| 695 | 313 | !(folder.isEmpty() && m_prependHomepage)) { | ||
| 696 | 314 | return -1; | ||
| 697 | 315 | } | ||
| 698 | 316 | int index = 0; | ||
| 699 | 317 | FoldersMap::const_iterator i; | ||
| 700 | 318 | for (i = m_folders.constBegin(); i != m_folders.constEnd(); ++i) { | ||
| 701 | 319 | if (i.key() == folder) { | ||
| 702 | 320 | return index; | ||
| 703 | 321 | } | ||
| 704 | 322 | if (m_showEmptyFolders || !i.value().second.isEmpty() || | ||
| 705 | 323 | (i.key().isEmpty() && m_prependHomepage)) { | ||
| 706 | 324 | ++index; | ||
| 707 | 325 | } | ||
| 708 | 326 | if (i.value().first) { | ||
| 709 | 327 | index += i.value().second.count(); | ||
| 710 | 328 | index += ((i.key().isEmpty() && m_prependHomepage) ? 1 : 0); | ||
| 711 | 329 | } | ||
| 712 | 330 | } | ||
| 713 | 331 | return -1; | ||
| 714 | 332 | } | ||
| 715 | 333 | |||
| 716 | 334 | QPair<QString, int> CollapsibleBookmarksModel::bookmarkPosition(const QUrl& url) const | ||
| 717 | 335 | { | ||
| 718 | 336 | // This assumes url is not equal to the homepage, which should be safe as | ||
| 719 | 337 | // the homepage is not supposed to be stored in the bookmarks model anyway. | ||
| 720 | 338 | int index = 0; | ||
| 721 | 339 | int homepageOffset = 0; | ||
| 722 | 340 | FoldersMap::const_iterator i; | ||
| 723 | 341 | for (i = m_folders.constBegin(); i != m_folders.constEnd(); ++i) { | ||
| 724 | 342 | if (m_showEmptyFolders || !i.value().second.isEmpty() || | ||
| 725 | 343 | (i.key().isEmpty() && m_prependHomepage)) { | ||
| 726 | 344 | ++index; | ||
| 727 | 345 | } | ||
| 728 | 346 | if (i.key().isEmpty() && m_prependHomepage && i.value().first) { | ||
| 729 | 347 | homepageOffset = 1; | ||
| 730 | 348 | } | ||
| 731 | 349 | const QList<QVariantMap>& bookmarks = i.value().second; | ||
| 732 | 350 | for (int j = 0; j < bookmarks.count(); ++j) { | ||
| 733 | 351 | if (bookmarks.at(j)["url"].toUrl() == url) { | ||
| 734 | 352 | if (i.value().first) { | ||
| 735 | 353 | return QPair<QString, int>(i.key(), index + j + homepageOffset); | ||
| 736 | 354 | } else { | ||
| 737 | 355 | return QPair<QString, int>(i.key(), -1); | ||
| 738 | 356 | } | ||
| 739 | 357 | } | ||
| 740 | 358 | } | ||
| 741 | 359 | index += (i.value().first ? bookmarks.count() : 0); | ||
| 742 | 360 | } | ||
| 743 | 361 | return QPair<QString, int>(QString(), -1); | ||
| 744 | 362 | } | ||
| 745 | 363 | |||
| 746 | 364 | void CollapsibleBookmarksModel::onFolderAdded(const QString& folder) | ||
| 747 | 365 | { | ||
| 748 | 366 | if (m_folders.contains(folder)) { | ||
| 749 | 367 | return; | ||
| 750 | 368 | } | ||
| 751 | 369 | m_folders[folder].first = false; | ||
| 752 | 370 | int index = folderIndex(folder); | ||
| 753 | 371 | if (index != -1) { | ||
| 754 | 372 | beginInsertRows(QModelIndex(), index, index); | ||
| 755 | 373 | ++m_count; | ||
| 756 | 374 | endInsertRows(); | ||
| 757 | 375 | } | ||
| 758 | 376 | } | ||
| 759 | 377 | |||
| 760 | 378 | void CollapsibleBookmarksModel::onRowsInserted(const QModelIndex& parent, int start, int end) | ||
| 761 | 379 | { | ||
| 762 | 380 | for (int i = start; i <= end; ++i) { | ||
| 763 | 381 | QModelIndex index = m_sourceModel->index(i); | ||
| 764 | 382 | QString folder = m_sourceModel->data(index, BookmarksModel::Folder).toString(); | ||
| 765 | 383 | int folderIndex = this->folderIndex(folder); | ||
| 766 | 384 | QDateTime created = m_sourceModel->data(index, BookmarksModel::Created).toDateTime(); | ||
| 767 | 385 | if (folderIndex == -1) { | ||
| 768 | 386 | // new folder, insert it | ||
| 769 | 387 | m_folders[folder].first = false; | ||
| 770 | 388 | } | ||
| 771 | 389 | bool expanded = m_folders[folder].first; | ||
| 772 | 390 | QList<QVariantMap>& bookmarks = m_folders[folder].second; | ||
| 773 | 391 | int newIndexInFolder = bookmarks.count(); | ||
| 774 | 392 | for (int j = 0; j < newIndexInFolder; ++j) { | ||
| 775 | 393 | if (created >= bookmarks.at(j)[QStringLiteral("created")].toDateTime()) { | ||
| 776 | 394 | newIndexInFolder = j; | ||
| 777 | 395 | break; | ||
| 778 | 396 | } | ||
| 779 | 397 | } | ||
| 780 | 398 | if (expanded) { | ||
| 781 | 399 | int newGlobalIndex = folderIndex + newIndexInFolder + 1; | ||
| 782 | 400 | if (folder.isEmpty() && m_prependHomepage) { | ||
| 783 | 401 | ++newGlobalIndex; | ||
| 784 | 402 | } | ||
| 785 | 403 | beginInsertRows(QModelIndex(), newGlobalIndex, newGlobalIndex); | ||
| 786 | 404 | } | ||
| 787 | 405 | QVariantMap variant; | ||
| 788 | 406 | variant[QStringLiteral("url")] = m_sourceModel->data(index, BookmarksModel::Url); | ||
| 789 | 407 | variant[QStringLiteral("title")] = m_sourceModel->data(index, BookmarksModel::Title); | ||
| 790 | 408 | variant[QStringLiteral("icon")] = m_sourceModel->data(index, BookmarksModel::Icon); | ||
| 791 | 409 | variant[QStringLiteral("created")] = created; | ||
| 792 | 410 | variant[QStringLiteral("folder")] = folder; | ||
| 793 | 411 | m_folders[folder].second.insert(newIndexInFolder, variant); | ||
| 794 | 412 | if (expanded) { | ||
| 795 | 413 | ++m_count; | ||
| 796 | 414 | endInsertRows(); | ||
| 797 | 415 | } else if (folderIndex == -1) { | ||
| 798 | 416 | // this is a new folder, doing that now (after inserting the bookmark) | ||
| 799 | 417 | // otherwise folderIndex() would return -1 | ||
| 800 | 418 | folderIndex = this->folderIndex(folder); | ||
| 801 | 419 | beginInsertRows(QModelIndex(), folderIndex, folderIndex); | ||
| 802 | 420 | ++m_count; | ||
| 803 | 421 | endInsertRows(); | ||
| 804 | 422 | } | ||
| 805 | 423 | } | ||
| 806 | 424 | } | ||
| 807 | 425 | |||
| 808 | 426 | void CollapsibleBookmarksModel::onBookmarkRemoved(const QUrl& url) | ||
| 809 | 427 | { | ||
| 810 | 428 | QPair<QString, int> position = bookmarkPosition(url); | ||
| 811 | 429 | if (position.second != -1) { | ||
| 812 | 430 | int first = position.second; | ||
| 813 | 431 | if (!m_showEmptyFolders && (m_folders[position.first].second.count() == 1) && | ||
| 814 | 432 | !(position.first.isEmpty() && m_prependHomepage)) { | ||
| 815 | 433 | // removed the last bookmark from the folder, which becomes empty: hide it | ||
| 816 | 434 | --first; | ||
| 817 | 435 | } | ||
| 818 | 436 | beginRemoveRows(QModelIndex(), first, position.second); | ||
| 819 | 437 | m_count -= (position.second - first + 1); | ||
| 820 | 438 | } | ||
| 821 | 439 | QList<QVariantMap>& bookmarks = m_folders[position.first].second; | ||
| 822 | 440 | for (int i = 0; i < bookmarks.count(); ++i) { | ||
| 823 | 441 | if (bookmarks.at(i)[QStringLiteral("url")].toUrl() == url) { | ||
| 824 | 442 | bookmarks.removeAt(i); | ||
| 825 | 443 | break; | ||
| 826 | 444 | } | ||
| 827 | 445 | } | ||
| 828 | 446 | if (bookmarks.isEmpty() && !(position.first.isEmpty() && m_prependHomepage)) { | ||
| 829 | 447 | // the folder has become empty, collapse it | ||
| 830 | 448 | m_folders[position.first].first = false; | ||
| 831 | 449 | if (m_showEmptyFolders) { | ||
| 832 | 450 | QModelIndex folderModelIndex = this->index(folderIndex(position.first)); | ||
| 833 | 451 | Q_EMIT dataChanged(folderModelIndex, folderModelIndex, QVector<int>() << Type); | ||
| 834 | 452 | } | ||
| 835 | 453 | } | ||
| 836 | 454 | if (position.second != -1) { | ||
| 837 | 455 | endRemoveRows(); | ||
| 838 | 456 | } | ||
| 839 | 457 | } | ||
| 840 | 458 | |||
| 841 | 459 | void CollapsibleBookmarksModel::onModelReset() | ||
| 842 | 460 | { | ||
| 843 | 461 | beginResetModel(); | ||
| 844 | 462 | populateModel(); | ||
| 845 | 463 | endResetModel(); | ||
| 846 | 464 | } | ||
| 847 | 465 | |||
| 848 | 466 | void CollapsibleBookmarksModel::onDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, QVector<int> roles) | ||
| 849 | 467 | { | ||
| 850 | 468 | Q_UNUSED(roles); | ||
| 851 | 469 | int first = topLeft.row(); | ||
| 852 | 470 | int last = bottomRight.row(); | ||
| 853 | 471 | for (int i = first; i <= last; ++i) { | ||
| 854 | 472 | QModelIndex index = m_sourceModel->index(i); | ||
| 855 | 473 | QUrl url = m_sourceModel->data(index, BookmarksModel::Url).toUrl(); | ||
| 856 | 474 | QString title = m_sourceModel->data(index, BookmarksModel::Title).toString(); | ||
| 857 | 475 | QUrl icon = m_sourceModel->data(index, BookmarksModel::Icon).toUrl(); | ||
| 858 | 476 | QString folder = m_sourceModel->data(index, BookmarksModel::Folder).toString(); | ||
| 859 | 477 | int folderIndex = this->folderIndex(folder); | ||
| 860 | 478 | QDateTime created = m_sourceModel->data(index, BookmarksModel::Created).toDateTime(); | ||
| 861 | 479 | bool expanded = m_folders[folder].first; | ||
| 862 | 480 | QPair<QString, int> position = bookmarkPosition(url); | ||
| 863 | 481 | if (position.first != folder) { | ||
| 864 | 482 | // the bookmark was moved to a different folder | ||
| 865 | 483 | QList<QVariantMap>& targetFolder = m_folders[folder].second; | ||
| 866 | 484 | int newIndexInFolder = targetFolder.count(); | ||
| 867 | 485 | int newGlobalIndex = 0; | ||
| 868 | 486 | for (int j = 0; j < newIndexInFolder; ++j) { | ||
| 869 | 487 | if (created >= targetFolder.at(j)[QStringLiteral("created")].toDateTime()) { | ||
| 870 | 488 | newIndexInFolder = j; | ||
| 871 | 489 | break; | ||
| 872 | 490 | } | ||
| 873 | 491 | } | ||
| 874 | 492 | if (expanded) { | ||
| 875 | 493 | newGlobalIndex = folderIndex + newIndexInFolder + 1; | ||
| 876 | 494 | if (folder.isEmpty() && m_prependHomepage) { | ||
| 877 | 495 | ++newGlobalIndex; | ||
| 878 | 496 | } | ||
| 879 | 497 | } | ||
| 880 | 498 | int sourceFolderIndex = this->folderIndex(position.first); | ||
| 881 | 499 | if (expanded && (position.second != -1)) { | ||
| 882 | 500 | // both source folder and target folder are expanded | ||
| 883 | 501 | beginMoveRows(QModelIndex(), position.second, position.second, | ||
| 884 | 502 | QModelIndex(), newGlobalIndex); | ||
| 885 | 503 | if (position.second > newGlobalIndex) { | ||
| 886 | 504 | ++sourceFolderIndex; | ||
| 887 | 505 | } | ||
| 888 | 506 | } else if (expanded) { | ||
| 889 | 507 | // source folder is collapsed, target folder is expanded | ||
| 890 | 508 | beginInsertRows(QModelIndex(), newGlobalIndex, newGlobalIndex); | ||
| 891 | 509 | } else if (position.second != -1) { | ||
| 892 | 510 | // source folder is expanded, target folder is collapsed | ||
| 893 | 511 | beginRemoveRows(QModelIndex(), position.second, position.second); | ||
| 894 | 512 | } | ||
| 895 | 513 | // actually move the bookmark from one folder to the other | ||
| 896 | 514 | QList<QVariantMap>& sourceFolder = m_folders[position.first].second; | ||
| 897 | 515 | QList<QVariantMap>::iterator j; | ||
| 898 | 516 | for (j = sourceFolder.begin(); j != sourceFolder.end(); ++j) { | ||
| 899 | 517 | if ((*j)["url"].toUrl() == url) { | ||
| 900 | 518 | sourceFolder.erase(j); | ||
| 901 | 519 | break; | ||
| 902 | 520 | } | ||
| 903 | 521 | } | ||
| 904 | 522 | QVariantMap bookmark; | ||
| 905 | 523 | bookmark["url"] = url; | ||
| 906 | 524 | bookmark["title"] = title; | ||
| 907 | 525 | bookmark["icon"] = icon; | ||
| 908 | 526 | bookmark["folder"] = folder; | ||
| 909 | 527 | bookmark["created"] = created; | ||
| 910 | 528 | targetFolder.insert(newIndexInFolder, bookmark); | ||
| 911 | 529 | if (expanded && (position.second != -1)) { | ||
| 912 | 530 | endMoveRows(); | ||
| 913 | 531 | if (newGlobalIndex > position.second) { | ||
| 914 | 532 | --newGlobalIndex; | ||
| 915 | 533 | } | ||
| 916 | 534 | QModelIndex changedIndex = this->index(newGlobalIndex); | ||
| 917 | 535 | Q_EMIT dataChanged(changedIndex, changedIndex); | ||
| 918 | 536 | } else if (expanded) { | ||
| 919 | 537 | ++m_count; | ||
| 920 | 538 | endInsertRows(); | ||
| 921 | 539 | } else if (position.second != -1) { | ||
| 922 | 540 | --m_count; | ||
| 923 | 541 | endRemoveRows(); | ||
| 924 | 542 | } | ||
| 925 | 543 | if (sourceFolder.isEmpty() && !(position.first.isEmpty() && m_prependHomepage)) { | ||
| 926 | 544 | // removed the last bookmark from the folder, which becomes empty, collapse it | ||
| 927 | 545 | m_folders[position.first].first = false; | ||
| 928 | 546 | if (m_showEmptyFolders) { | ||
| 929 | 547 | QModelIndex folderModelIndex = this->index(sourceFolderIndex); | ||
| 930 | 548 | Q_EMIT dataChanged(folderModelIndex, folderModelIndex, QVector<int>() << Type); | ||
| 931 | 549 | } else { | ||
| 932 | 550 | // hide it | ||
| 933 | 551 | beginRemoveRows(QModelIndex(), sourceFolderIndex, sourceFolderIndex); | ||
| 934 | 552 | --m_count; | ||
| 935 | 553 | endRemoveRows(); | ||
| 936 | 554 | } | ||
| 937 | 555 | } | ||
| 938 | 556 | } else if (position.second != -1) { | ||
| 939 | 557 | // the bookmark has changed and its folder is currently expanded | ||
| 940 | 558 | QList<QVariantMap>& bookmarks = m_folders[position.first].second; | ||
| 941 | 559 | QList<QVariantMap>::iterator j = bookmarks.begin(); | ||
| 942 | 560 | for (j = bookmarks.begin(); j != bookmarks.end(); ++j) { | ||
| 943 | 561 | if ((*j)["url"].toUrl() == url) { | ||
| 944 | 562 | (*j)["title"] = title; | ||
| 945 | 563 | (*j)["icon"] = icon; | ||
| 946 | 564 | (*j)["created"] = created; | ||
| 947 | 565 | break; | ||
| 948 | 566 | } | ||
| 949 | 567 | } | ||
| 950 | 568 | QModelIndex changedIndex = this->index(position.second); | ||
| 951 | 569 | Q_EMIT dataChanged(changedIndex, changedIndex); | ||
| 952 | 570 | } | ||
| 953 | 571 | } | ||
| 954 | 572 | } | ||
| 955 | 0 | 573 | ||
| 956 | === added file 'src/app/webbrowser/collapsible-bookmarks-model.h' | |||
| 957 | --- src/app/webbrowser/collapsible-bookmarks-model.h 1970-01-01 00:00:00 +0000 | |||
| 958 | +++ src/app/webbrowser/collapsible-bookmarks-model.h 2015-12-02 14:15:47 +0000 | |||
| 959 | @@ -0,0 +1,98 @@ | |||
| 960 | 1 | /* | ||
| 961 | 2 | * Copyright 2015 Canonical Ltd. | ||
| 962 | 3 | * | ||
| 963 | 4 | * This file is part of webbrowser-app. | ||
| 964 | 5 | * | ||
| 965 | 6 | * webbrowser-app is free software; you can redistribute it and/or modify | ||
| 966 | 7 | * it under the terms of the GNU General Public License as published by | ||
| 967 | 8 | * the Free Software Foundation; version 3. | ||
| 968 | 9 | * | ||
| 969 | 10 | * webbrowser-app is distributed in the hope that it will be useful, | ||
| 970 | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 971 | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 972 | 13 | * GNU General Public License for more details. | ||
| 973 | 14 | * | ||
| 974 | 15 | * You should have received a copy of the GNU General Public License | ||
| 975 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 976 | 17 | */ | ||
| 977 | 18 | |||
| 978 | 19 | #ifndef __BOOKMARKS_PROXY_MODEL_H__ | ||
| 979 | 20 | #define __BOOKMARKS_PROXY_MODEL_H__ | ||
| 980 | 21 | |||
| 981 | 22 | // Qt | ||
| 982 | 23 | #include <QtCore/QAbstractListModel> | ||
| 983 | 24 | #include <QtCore/QMap> | ||
| 984 | 25 | #include <QtCore/QPair> | ||
| 985 | 26 | #include <QtCore/QString> | ||
| 986 | 27 | #include <QtCore/QVariant> | ||
| 987 | 28 | |||
| 988 | 29 | #include "bookmarks-model.h" | ||
| 989 | 30 | |||
| 990 | 31 | class QUrl; | ||
| 991 | 32 | |||
| 992 | 33 | class CollapsibleBookmarksModel : public QAbstractListModel | ||
| 993 | 34 | { | ||
| 994 | 35 | Q_OBJECT | ||
| 995 | 36 | |||
| 996 | 37 | Q_PROPERTY(BookmarksModel* sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged) | ||
| 997 | 38 | Q_PROPERTY(bool prependHomepage READ prependHomepage WRITE setPrependHomepage NOTIFY prependHomepageChanged) | ||
| 998 | 39 | Q_PROPERTY(bool showEmptyFolders READ showEmptyFolders WRITE setShowEmptyFolders NOTIFY showEmptyFoldersChanged) | ||
| 999 | 40 | |||
| 1000 | 41 | Q_ENUMS(Roles) | ||
| 1001 | 42 | |||
| 1002 | 43 | public: | ||
| 1003 | 44 | CollapsibleBookmarksModel(QObject* parent=0); | ||
| 1004 | 45 | ~CollapsibleBookmarksModel(); | ||
| 1005 | 46 | |||
| 1006 | 47 | enum Roles { | ||
| 1007 | 48 | Url = BookmarksModel::Url, | ||
| 1008 | 49 | Title = BookmarksModel::Title, | ||
| 1009 | 50 | Icon = BookmarksModel::Icon, | ||
| 1010 | 51 | Created = BookmarksModel::Created, | ||
| 1011 | 52 | Folder = BookmarksModel::Folder, | ||
| 1012 | 53 | Type | ||
| 1013 | 54 | }; | ||
| 1014 | 55 | |||
| 1015 | 56 | // reimplemented from QAbstractListModel | ||
| 1016 | 57 | QHash<int, QByteArray> roleNames() const; | ||
| 1017 | 58 | int rowCount(const QModelIndex& parent=QModelIndex()) const; | ||
| 1018 | 59 | QVariant data(const QModelIndex& index, int role) const; | ||
| 1019 | 60 | |||
| 1020 | 61 | BookmarksModel* sourceModel() const; | ||
| 1021 | 62 | void setSourceModel(BookmarksModel* sourceModel); | ||
| 1022 | 63 | |||
| 1023 | 64 | bool prependHomepage() const; | ||
| 1024 | 65 | void setPrependHomepage(bool value); | ||
| 1025 | 66 | |||
| 1026 | 67 | bool showEmptyFolders() const; | ||
| 1027 | 68 | void setShowEmptyFolders(bool value); | ||
| 1028 | 69 | |||
| 1029 | 70 | Q_INVOKABLE void toggleFolderState(const QString& folder); | ||
| 1030 | 71 | |||
| 1031 | 72 | Q_SIGNALS: | ||
| 1032 | 73 | void sourceModelChanged(); | ||
| 1033 | 74 | void prependHomepageChanged(); | ||
| 1034 | 75 | void showEmptyFoldersChanged(); | ||
| 1035 | 76 | |||
| 1036 | 77 | private: | ||
| 1037 | 78 | BookmarksModel* m_sourceModel; | ||
| 1038 | 79 | bool m_prependHomepage; | ||
| 1039 | 80 | bool m_showEmptyFolders; | ||
| 1040 | 81 | // the first folder in the map has an empty (non null) name, it contains all bookmarks that are not in a specific folder | ||
| 1041 | 82 | typedef QMap<QString, QPair<bool, QList<QVariantMap>>> FoldersMap; | ||
| 1042 | 83 | FoldersMap m_folders; | ||
| 1043 | 84 | int m_count; | ||
| 1044 | 85 | |||
| 1045 | 86 | void populateModel(); | ||
| 1046 | 87 | int folderIndex(const QString& folder) const; | ||
| 1047 | 88 | QPair<QString, int> bookmarkPosition(const QUrl& url) const; | ||
| 1048 | 89 | |||
| 1049 | 90 | private Q_SLOTS: | ||
| 1050 | 91 | void onFolderAdded(const QString& folder); | ||
| 1051 | 92 | void onRowsInserted(const QModelIndex& parent, int start, int end); | ||
| 1052 | 93 | void onBookmarkRemoved(const QUrl& url); | ||
| 1053 | 94 | void onModelReset(); | ||
| 1054 | 95 | void onDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, QVector<int> roles); | ||
| 1055 | 96 | }; | ||
| 1056 | 97 | |||
| 1057 | 98 | #endif // __BOOKMARKS_PROXY_MODEL_H__ | ||
| 1058 | 0 | 99 | ||
| 1059 | === modified file 'src/app/webbrowser/webbrowser-app.cpp' | |||
| 1060 | --- src/app/webbrowser/webbrowser-app.cpp 2015-10-22 15:07:26 +0000 | |||
| 1061 | +++ src/app/webbrowser/webbrowser-app.cpp 2015-12-02 14:15:47 +0000 | |||
| 1062 | @@ -19,6 +19,7 @@ | |||
| 1063 | 19 | #include "bookmarks-model.h" | 19 | #include "bookmarks-model.h" |
| 1064 | 20 | #include "bookmarks-folderlist-model.h" | 20 | #include "bookmarks-folderlist-model.h" |
| 1065 | 21 | #include "cache-deleter.h" | 21 | #include "cache-deleter.h" |
| 1066 | 22 | #include "collapsible-bookmarks-model.h" | ||
| 1067 | 22 | #include "config.h" | 23 | #include "config.h" |
| 1068 | 23 | #include "file-operations.h" | 24 | #include "file-operations.h" |
| 1069 | 24 | #include "history-domainlist-chronological-model.h" | 25 | #include "history-domainlist-chronological-model.h" |
| 1070 | @@ -92,6 +93,7 @@ | |||
| 1071 | 92 | qmlRegisterType<TabsModel>(uri, 0, 1, "TabsModel"); | 93 | qmlRegisterType<TabsModel>(uri, 0, 1, "TabsModel"); |
| 1072 | 93 | qmlRegisterSingletonType<BookmarksModel>(uri, 0, 1, "BookmarksModel", BookmarksModel_singleton_factory); | 94 | qmlRegisterSingletonType<BookmarksModel>(uri, 0, 1, "BookmarksModel", BookmarksModel_singleton_factory); |
| 1073 | 94 | qmlRegisterType<BookmarksFolderListModel>(uri, 0, 1, "BookmarksFolderListModel"); | 95 | qmlRegisterType<BookmarksFolderListModel>(uri, 0, 1, "BookmarksFolderListModel"); |
| 1074 | 96 | qmlRegisterType<CollapsibleBookmarksModel>(uri, 0, 1, "CollapsibleBookmarksModel"); | ||
| 1075 | 95 | qmlRegisterSingletonType<FileOperations>(uri, 0, 1, "FileOperations", FileOperations_singleton_factory); | 97 | qmlRegisterSingletonType<FileOperations>(uri, 0, 1, "FileOperations", FileOperations_singleton_factory); |
| 1076 | 96 | qmlRegisterType<SearchEngine>(uri, 0, 1, "SearchEngine"); | 98 | qmlRegisterType<SearchEngine>(uri, 0, 1, "SearchEngine"); |
| 1077 | 97 | qmlRegisterSingletonType<CacheDeleter>(uri, 0, 1, "CacheDeleter", CacheDeleter_singleton_factory); | 99 | qmlRegisterSingletonType<CacheDeleter>(uri, 0, 1, "CacheDeleter", CacheDeleter_singleton_factory); |
| 1078 | 98 | 100 | ||
| 1079 | === modified file 'tests/autopilot/webbrowser_app/emulators/browser.py' | |||
| 1080 | --- tests/autopilot/webbrowser_app/emulators/browser.py 2015-11-26 13:42:12 +0000 | |||
| 1081 | +++ tests/autopilot/webbrowser_app/emulators/browser.py 2015-12-02 14:15:47 +0000 | |||
| 1082 | @@ -134,9 +134,9 @@ | |||
| 1083 | 134 | 134 | ||
| 1084 | 135 | def get_new_tab_view(self): | 135 | def get_new_tab_view(self): |
| 1085 | 136 | if self.wide: | 136 | if self.wide: |
| 1087 | 137 | return self.wait_select_single("NewTabViewWide", visible=True) | 137 | return self.wait_select_single(NewTabViewWide, visible=True) |
| 1088 | 138 | else: | 138 | else: |
| 1090 | 139 | return self.wait_select_single("NewTabView", visible=True) | 139 | return self.wait_select_single(NewTabView, visible=True) |
| 1091 | 140 | 140 | ||
| 1092 | 141 | # Since the NewPrivateTabView does not define any new QML property in its | 141 | # Since the NewPrivateTabView does not define any new QML property in its |
| 1093 | 142 | # extended file, it does not report itself to autopilot with the same name | 142 | # extended file, it does not report itself to autopilot with the same name |
| 1094 | @@ -169,9 +169,9 @@ | |||
| 1095 | 169 | def get_bookmarks_view(self): | 169 | def get_bookmarks_view(self): |
| 1096 | 170 | try: | 170 | try: |
| 1097 | 171 | if self.wide: | 171 | if self.wide: |
| 1099 | 172 | return self.select_single("BookmarksViewWide") | 172 | return self.select_single(BookmarksViewWide) |
| 1100 | 173 | else: | 173 | else: |
| 1102 | 174 | return self.select_single("BookmarksView") | 174 | return self.select_single(BookmarksView) |
| 1103 | 175 | except exceptions.StateNotFoundError: | 175 | except exceptions.StateNotFoundError: |
| 1104 | 176 | return None | 176 | return None |
| 1105 | 177 | 177 | ||
| 1106 | @@ -286,8 +286,7 @@ | |||
| 1107 | 286 | return self.select_single("ChromeButton", objectName="drawerButton") | 286 | return self.select_single("ChromeButton", objectName="drawerButton") |
| 1108 | 287 | 287 | ||
| 1109 | 288 | def get_drawer(self): | 288 | def get_drawer(self): |
| 1112 | 289 | return self.wait_select_single("QQuickItem", objectName="drawer", | 289 | return self.wait_select_single(objectName="drawer", clip=False) |
| 1111 | 290 | clip=False) | ||
| 1113 | 291 | 290 | ||
| 1114 | 292 | def get_drawer_action(self, actionName): | 291 | def get_drawer_action(self, actionName): |
| 1115 | 293 | drawer = self.get_drawer() | 292 | drawer = self.get_drawer() |
| 1116 | @@ -567,21 +566,19 @@ | |||
| 1117 | 567 | def get_notopsites_label(self): | 566 | def get_notopsites_label(self): |
| 1118 | 568 | return self.select_single(objectName="notopsites") | 567 | return self.select_single(objectName="notopsites") |
| 1119 | 569 | 568 | ||
| 1124 | 570 | def get_top_site_items(self): | 569 | def _get_bookmarks_folder_list_view(self): |
| 1121 | 571 | return self.get_top_sites_list().get_delegates() | ||
| 1122 | 572 | |||
| 1123 | 573 | def get_bookmarks_folder_list_view(self): | ||
| 1125 | 574 | return self.wait_select_single(BookmarksFoldersView) | 570 | return self.wait_select_single(BookmarksFoldersView) |
| 1126 | 575 | 571 | ||
| 1127 | 572 | def get_bookmark_folders(self): | ||
| 1128 | 573 | return self._get_bookmarks_folder_list_view().get_folder_delegates() | ||
| 1129 | 574 | |||
| 1130 | 575 | def get_bookmark_folder(self, folder): | ||
| 1131 | 576 | view = self._get_bookmarks_folder_list_view() | ||
| 1132 | 577 | return view.get_folder_delegate(folder) | ||
| 1133 | 578 | |||
| 1134 | 576 | def get_bookmarks(self, folder_name): | 579 | def get_bookmarks(self, folder_name): |
| 1143 | 577 | # assumes that the "more" button has been clicked | 580 | view = self._get_bookmarks_folder_list_view() |
| 1144 | 578 | folders = self.get_bookmarks_folder_list_view() | 581 | return view.get_ordered_bookmark_delegates(folder_name) |
| 1137 | 579 | folder_delegate = folders.get_folder_delegate(folder_name) | ||
| 1138 | 580 | return folders.get_urls_from_folder(folder_delegate) | ||
| 1139 | 581 | |||
| 1140 | 582 | def get_folder_names(self): | ||
| 1141 | 583 | folders = self.get_bookmarks_folder_list_view().get_delegates() | ||
| 1142 | 584 | return [folder.folderName for folder in folders] | ||
| 1145 | 585 | 582 | ||
| 1146 | 586 | 583 | ||
| 1147 | 587 | class NewTabViewWide(uitk.UbuntuUIToolkitCustomProxyObjectBase): | 584 | class NewTabViewWide(uitk.UbuntuUIToolkitCustomProxyObjectBase): |
| 1148 | @@ -596,7 +593,7 @@ | |||
| 1149 | 596 | list = self.select_single(uitk.QQuickListView, | 593 | list = self.select_single(uitk.QQuickListView, |
| 1150 | 597 | objectName="bookmarksList") | 594 | objectName="bookmarksList") |
| 1151 | 598 | return sorted(list.select_many("DraggableUrlDelegateWide", | 595 | return sorted(list.select_many("DraggableUrlDelegateWide", |
| 1153 | 599 | objectName="bookmarkItem"), | 596 | objectName="bookmarkItem"), |
| 1154 | 600 | key=lambda delegate: delegate.globalRect.y) | 597 | key=lambda delegate: delegate.globalRect.y) |
| 1155 | 601 | 598 | ||
| 1156 | 602 | def get_top_sites_list(self): | 599 | def get_top_sites_list(self): |
| 1157 | @@ -610,19 +607,63 @@ | |||
| 1158 | 610 | return sorted(list.select_many(objectName="folderItem"), | 607 | return sorted(list.select_many(objectName="folderItem"), |
| 1159 | 611 | key=lambda delegate: delegate.globalRect.y) | 608 | key=lambda delegate: delegate.globalRect.y) |
| 1160 | 612 | 609 | ||
| 1161 | 613 | def get_top_site_items(self): | ||
| 1162 | 614 | return self.get_top_sites_list().get_delegates() | ||
| 1163 | 615 | |||
| 1164 | 616 | def get_bookmarks(self, folder_name): | 610 | def get_bookmarks(self, folder_name): |
| 1170 | 617 | folders = self.get_folders_list() | 611 | folder = self.get_bookmark_folder(folder_name) |
| 1171 | 618 | matches = [folder for folder in folders if folder.name == folder_name] | 612 | self.pointing_device.click_object(folder) |
| 1167 | 619 | if not len(matches) == 1: | ||
| 1168 | 620 | return [] | ||
| 1169 | 621 | self.pointing_device.click_object(matches[0]) | ||
| 1172 | 622 | return self.get_bookmarks_list() | 613 | return self.get_bookmarks_list() |
| 1173 | 623 | 614 | ||
| 1176 | 624 | def get_folder_names(self): | 615 | def get_bookmark_folders(self): |
| 1177 | 625 | return [folder.name for folder in self.get_folders_list()] | 616 | return self.get_folders_list() |
| 1178 | 617 | |||
| 1179 | 618 | def get_bookmark_folder(self, folder): | ||
| 1180 | 619 | self.go_to_section(1) | ||
| 1181 | 620 | list = self.select_single(uitk.QQuickListView, | ||
| 1182 | 621 | objectName="foldersList") | ||
| 1183 | 622 | return list.select_single(objectName="folderItem", name=folder) | ||
| 1184 | 623 | |||
| 1185 | 624 | |||
| 1186 | 625 | class BookmarksViewBase(uitk.UbuntuUIToolkitCustomProxyObjectBase): | ||
| 1187 | 626 | |||
| 1188 | 627 | def close(self): | ||
| 1189 | 628 | button = self.select_single(objectName="doneButton") | ||
| 1190 | 629 | self.pointing_device.click_object(button) | ||
| 1191 | 630 | |||
| 1192 | 631 | |||
| 1193 | 632 | class BookmarksView(BookmarksViewBase): | ||
| 1194 | 633 | |||
| 1195 | 634 | def get_bookmark_folders(self): | ||
| 1196 | 635 | return self.select_many(objectName="bookmarkViewFolderDelegate") | ||
| 1197 | 636 | |||
| 1198 | 637 | def get_bookmark_folder(self, folder): | ||
| 1199 | 638 | return self.select_single(objectName="bookmarkViewFolderDelegate", | ||
| 1200 | 639 | name=folder) | ||
| 1201 | 640 | |||
| 1202 | 641 | def get_bookmarks(self, folder_name): | ||
| 1203 | 642 | bookmarks = self.select_many(objectName="bookmarkViewBookmarkDelegate", | ||
| 1204 | 643 | folderName=folder_name) | ||
| 1205 | 644 | return sorted(bookmarks, key=lambda delegate: delegate.globalRect.y) | ||
| 1206 | 645 | |||
| 1207 | 646 | |||
| 1208 | 647 | class BookmarksViewWide(BookmarksViewBase): | ||
| 1209 | 648 | |||
| 1210 | 649 | def get_bookmark_folders(self): | ||
| 1211 | 650 | list = self.select_single(uitk.QQuickListView, | ||
| 1212 | 651 | objectName="foldersList") | ||
| 1213 | 652 | return list.select_many(objectName="folderItem") | ||
| 1214 | 653 | |||
| 1215 | 654 | def get_bookmark_folder(self, folder): | ||
| 1216 | 655 | list = self.select_single(uitk.QQuickListView, | ||
| 1217 | 656 | objectName="foldersList") | ||
| 1218 | 657 | return list.select_single(objectName="folderItem", name=folder) | ||
| 1219 | 658 | |||
| 1220 | 659 | def get_bookmarks(self, folder_name): | ||
| 1221 | 660 | folder = self.get_bookmark_folder(folder_name) | ||
| 1222 | 661 | self.pointing_device.click_object(folder) | ||
| 1223 | 662 | bookmarks = self.select_single(uitk.QQuickListView, | ||
| 1224 | 663 | objectName="bookmarksList") | ||
| 1225 | 664 | return sorted(bookmarks.select_many("DraggableUrlDelegateWide", | ||
| 1226 | 665 | objectName="bookmarkItem"), | ||
| 1227 | 666 | key=lambda delegate: delegate.globalRect.y) | ||
| 1228 | 626 | 667 | ||
| 1229 | 627 | 668 | ||
| 1230 | 628 | class UrlsList(uitk.UbuntuUIToolkitCustomProxyObjectBase): | 669 | class UrlsList(uitk.UbuntuUIToolkitCustomProxyObjectBase): |
| 1231 | @@ -700,24 +741,23 @@ | |||
| 1232 | 700 | 741 | ||
| 1233 | 701 | class BookmarksFoldersView(uitk.UbuntuUIToolkitCustomProxyObjectBase): | 742 | class BookmarksFoldersView(uitk.UbuntuUIToolkitCustomProxyObjectBase): |
| 1234 | 702 | 743 | ||
| 1239 | 703 | def get_delegates(self): | 744 | def get_folder_delegates(self): |
| 1240 | 704 | return sorted(self.select_many("QQuickItem", | 745 | return sorted( |
| 1241 | 705 | objectName="bookmarkFolderDelegate"), | 746 | self.select_many(objectName="bookmarkViewFolderDelegate"), |
| 1242 | 706 | key=lambda delegate: delegate.globalRect.y) | 747 | key=lambda delegate: delegate.globalRect.y) |
| 1243 | 707 | 748 | ||
| 1244 | 708 | def get_folder_delegate(self, folder): | 749 | def get_folder_delegate(self, folder): |
| 1251 | 709 | return self.select_single("QQuickItem", | 750 | return self.select_single(objectName="bookmarkViewFolderDelegate", |
| 1252 | 710 | objectName="bookmarkFolderDelegate", | 751 | name=folder) |
| 1253 | 711 | folderName=folder) | 752 | |
| 1254 | 712 | 753 | def get_bookmark_delegates(self, folder): | |
| 1255 | 713 | def get_urls_from_folder(self, folder): | 754 | return self.select_many(objectName="bookmarkViewBookmarkDelegate", |
| 1256 | 714 | return sorted(folder.select_many(UrlDelegate), | 755 | folderName=folder) |
| 1257 | 756 | |||
| 1258 | 757 | def get_ordered_bookmark_delegates(self, folder): | ||
| 1259 | 758 | return sorted(self.get_bookmark_delegates(folder), | ||
| 1260 | 715 | key=lambda delegate: delegate.globalRect.y) | 759 | key=lambda delegate: delegate.globalRect.y) |
| 1261 | 716 | 760 | ||
| 1262 | 717 | def get_header_from_folder(self, folder): | ||
| 1263 | 718 | return folder.wait_select_single("QQuickItem", | ||
| 1264 | 719 | objectName="bookmarkFolderHeader") | ||
| 1265 | 720 | |||
| 1266 | 721 | 761 | ||
| 1267 | 722 | class ContextMenuBase(uitk.UbuntuUIToolkitCustomProxyObjectBase): | 762 | class ContextMenuBase(uitk.UbuntuUIToolkitCustomProxyObjectBase): |
| 1268 | 723 | 763 | ||
| 1269 | 724 | 764 | ||
| 1270 | === modified file 'tests/autopilot/webbrowser_app/tests/__init__.py' | |||
| 1271 | --- tests/autopilot/webbrowser_app/tests/__init__.py 2015-10-15 19:09:59 +0000 | |||
| 1272 | +++ tests/autopilot/webbrowser_app/tests/__init__.py 2015-12-02 14:15:47 +0000 | |||
| 1273 | @@ -146,7 +146,7 @@ | |||
| 1274 | 146 | time.sleep(1) | 146 | time.sleep(1) |
| 1275 | 147 | return tabs_view | 147 | return tabs_view |
| 1276 | 148 | 148 | ||
| 1278 | 149 | def open_new_tab(self, open_tabs_view=False, expand_view=False): | 149 | def open_new_tab(self, open_tabs_view=False): |
| 1279 | 150 | if (self.main_window.incognito): | 150 | if (self.main_window.incognito): |
| 1280 | 151 | count = len(self.main_window.get_incognito_webviews()) | 151 | count = len(self.main_window.get_incognito_webviews()) |
| 1281 | 152 | else: | 152 | else: |
| 1282 | @@ -179,11 +179,6 @@ | |||
| 1283 | 179 | self.main_window.address_bar.activeFocus, | 179 | self.main_window.address_bar.activeFocus, |
| 1284 | 180 | Eventually(Equals(True))) | 180 | Eventually(Equals(True))) |
| 1285 | 181 | 181 | ||
| 1286 | 182 | if not self.main_window.wide and expand_view: | ||
| 1287 | 183 | more_button = new_tab_view.get_bookmarks_more_button() | ||
| 1288 | 184 | self.assertThat(more_button.visible, Equals(True)) | ||
| 1289 | 185 | self.pointing_device.click_object(more_button) | ||
| 1290 | 186 | |||
| 1291 | 187 | return new_tab_view | 182 | return new_tab_view |
| 1292 | 188 | 183 | ||
| 1293 | 189 | def open_settings(self): | 184 | def open_settings(self): |
| 1294 | 190 | 185 | ||
| 1295 | === modified file 'tests/autopilot/webbrowser_app/tests/test_bookmark_options.py' | |||
| 1296 | --- tests/autopilot/webbrowser_app/tests/test_bookmark_options.py 2015-10-13 13:40:29 +0000 | |||
| 1297 | +++ tests/autopilot/webbrowser_app/tests/test_bookmark_options.py 2015-12-02 14:15:47 +0000 | |||
| 1298 | @@ -91,19 +91,19 @@ | |||
| 1299 | 91 | self.pointing_device.click_object(bookmark_toggle) | 91 | self.pointing_device.click_object(bookmark_toggle) |
| 1300 | 92 | return self.main_window.get_bookmark_options() | 92 | return self.main_window.get_bookmark_options() |
| 1301 | 93 | 93 | ||
| 1305 | 94 | def _assert_bookmark_count_in_folder(self, tab, folder_name, count): | 94 | def _assert_bookmark_count_in_folder(self, view, folder_name, count): |
| 1306 | 95 | urls = tab.get_bookmarks(folder_name) | 95 | self.assertThat(lambda: len(view.get_bookmarks(folder_name)), |
| 1307 | 96 | self.assertThat(lambda: len(urls), Eventually(Equals(count))) | 96 | Eventually(Equals(count))) |
| 1308 | 97 | 97 | ||
| 1314 | 98 | def _toggle_bookmark_folder(self, tab, folder_name): | 98 | def _toggle_bookmark_folder(self, view, folder_name): |
| 1315 | 99 | folders = tab.get_bookmarks_folder_list_view() | 99 | delegate = view.get_bookmark_folder(folder_name) |
| 1316 | 100 | folder_delegate = folders.get_folder_delegate(folder_name) | 100 | self.pointing_device.click_object(delegate) |
| 1312 | 101 | self.pointing_device.click_object( | ||
| 1313 | 102 | folders.get_header_from_folder(folder_delegate)) | ||
| 1317 | 103 | 101 | ||
| 1318 | 104 | def test_save_bookmarked_url_in_default_folder(self): | 102 | def test_save_bookmarked_url_in_default_folder(self): |
| 1321 | 105 | new_tab = self.open_new_tab(open_tabs_view=True, expand_view=True) | 103 | view = self.open_bookmarks() |
| 1322 | 106 | self._assert_bookmark_count_in_folder(new_tab, "", 5) | 104 | self._assert_bookmark_count_in_folder(view, "", 5) |
| 1323 | 105 | view.close() | ||
| 1324 | 106 | view.wait_until_destroyed() | ||
| 1325 | 107 | 107 | ||
| 1326 | 108 | url = self.base_url + "/test2" | 108 | url = self.base_url + "/test2" |
| 1327 | 109 | self.main_window.go_to_url(url) | 109 | self.main_window.go_to_url(url) |
| 1328 | @@ -118,16 +118,18 @@ | |||
| 1329 | 118 | 118 | ||
| 1330 | 119 | self.assertThat(chrome.bookmarked, Eventually(Equals(True))) | 119 | self.assertThat(chrome.bookmarked, Eventually(Equals(True))) |
| 1331 | 120 | 120 | ||
| 1334 | 121 | new_tab = self.open_new_tab(open_tabs_view=True, expand_view=True) | 121 | view = self.open_bookmarks() |
| 1335 | 122 | self._assert_bookmark_count_in_folder(new_tab, "", 6) | 122 | self._assert_bookmark_count_in_folder(view, "", 6) |
| 1336 | 123 | 123 | ||
| 1337 | 124 | def test_save_bookmarked_url_in_existing_folder(self): | 124 | def test_save_bookmarked_url_in_existing_folder(self): |
| 1340 | 125 | new_tab = self.open_new_tab(open_tabs_view=True, expand_view=True) | 125 | view = self.open_bookmarks() |
| 1341 | 126 | self.assertThat(lambda: len(new_tab.get_folder_names()), | 126 | self.assertThat(lambda: len(view.get_bookmark_folders()), |
| 1342 | 127 | Eventually(Equals(3))) | 127 | Eventually(Equals(3))) |
| 1343 | 128 | if not self.main_window.wide: | 128 | if not self.main_window.wide: |
| 1346 | 129 | self._toggle_bookmark_folder(new_tab, "Actinide") | 129 | self._toggle_bookmark_folder(view, "Actinide") |
| 1347 | 130 | self._assert_bookmark_count_in_folder(new_tab, "Actinide", 1) | 130 | self._assert_bookmark_count_in_folder(view, "Actinide", 1) |
| 1348 | 131 | view.close() | ||
| 1349 | 132 | view.wait_until_destroyed() | ||
| 1350 | 131 | 133 | ||
| 1351 | 132 | url = self.base_url + "/test2" | 134 | url = self.base_url + "/test2" |
| 1352 | 133 | self.main_window.go_to_url(url) | 135 | self.main_window.go_to_url(url) |
| 1353 | @@ -154,17 +156,19 @@ | |||
| 1354 | 154 | 156 | ||
| 1355 | 155 | self.assertThat(chrome.bookmarked, Eventually(Equals(True))) | 157 | self.assertThat(chrome.bookmarked, Eventually(Equals(True))) |
| 1356 | 156 | 158 | ||
| 1359 | 157 | new_tab = self.open_new_tab(open_tabs_view=True, expand_view=True) | 159 | view = self.open_bookmarks() |
| 1360 | 158 | self.assertThat(lambda: len(new_tab.get_folder_names()), | 160 | self.assertThat(lambda: len(view.get_bookmark_folders()), |
| 1361 | 159 | Eventually(Equals(3))) | 161 | Eventually(Equals(3))) |
| 1362 | 160 | if not self.main_window.wide: | 162 | if not self.main_window.wide: |
| 1365 | 161 | self._toggle_bookmark_folder(new_tab, "Actinide") | 163 | self._toggle_bookmark_folder(view, "Actinide") |
| 1366 | 162 | self._assert_bookmark_count_in_folder(new_tab, "Actinide", 2) | 164 | self._assert_bookmark_count_in_folder(view, "Actinide", 2) |
| 1367 | 163 | 165 | ||
| 1368 | 164 | def test_save_bookmarked_url_in_new_folder(self): | 166 | def test_save_bookmarked_url_in_new_folder(self): |
| 1371 | 165 | new_tab = self.open_new_tab(open_tabs_view=True, expand_view=True) | 167 | view = self.open_bookmarks() |
| 1372 | 166 | self.assertThat(lambda: len(new_tab.get_folder_names()), | 168 | self.assertThat(lambda: len(view.get_bookmark_folders()), |
| 1373 | 167 | Eventually(Equals(3))) | 169 | Eventually(Equals(3))) |
| 1374 | 170 | view.close() | ||
| 1375 | 171 | view.wait_until_destroyed() | ||
| 1376 | 168 | 172 | ||
| 1377 | 169 | url = self.base_url + "/test2" | 173 | url = self.base_url + "/test2" |
| 1378 | 170 | self.main_window.go_to_url(url) | 174 | self.main_window.go_to_url(url) |
| 1379 | @@ -200,12 +204,12 @@ | |||
| 1380 | 200 | 204 | ||
| 1381 | 201 | self.assertThat(chrome.bookmarked, Eventually(Equals(True))) | 205 | self.assertThat(chrome.bookmarked, Eventually(Equals(True))) |
| 1382 | 202 | 206 | ||
| 1385 | 203 | new_tab = self.open_new_tab(open_tabs_view=True, expand_view=True) | 207 | view = self.open_bookmarks() |
| 1386 | 204 | self.assertThat(lambda: len(new_tab.get_folder_names()), | 208 | self.assertThat(lambda: len(view.get_bookmark_folders()), |
| 1387 | 205 | Eventually(Equals(4))) | 209 | Eventually(Equals(4))) |
| 1388 | 206 | if not self.main_window.wide: | 210 | if not self.main_window.wide: |
| 1391 | 207 | self._toggle_bookmark_folder(new_tab, "NewFolder") | 211 | self._toggle_bookmark_folder(view, "NewFolder") |
| 1392 | 208 | self._assert_bookmark_count_in_folder(new_tab, "NewFolder", 1) | 212 | self._assert_bookmark_count_in_folder(view, "NewFolder", 1) |
| 1393 | 209 | 213 | ||
| 1394 | 210 | def test_set_bookmark_title(self): | 214 | def test_set_bookmark_title(self): |
| 1395 | 211 | url = self.base_url + "/blanktargetlink" | 215 | url = self.base_url + "/blanktargetlink" |
| 1396 | @@ -229,10 +233,10 @@ | |||
| 1397 | 229 | 233 | ||
| 1398 | 230 | self.assertThat(chrome.bookmarked, Eventually(Equals(True))) | 234 | self.assertThat(chrome.bookmarked, Eventually(Equals(True))) |
| 1399 | 231 | 235 | ||
| 1402 | 232 | new_tab = self.open_new_tab(open_tabs_view=True, expand_view=True) | 236 | view = self.open_bookmarks() |
| 1403 | 233 | self._assert_bookmark_count_in_folder(new_tab, "", 6) | 237 | self._assert_bookmark_count_in_folder(view, "", 6) |
| 1404 | 234 | 238 | ||
| 1406 | 235 | bookmark = new_tab.get_bookmarks("")[1] | 239 | bookmark = view.get_bookmarks("")[1] |
| 1407 | 236 | self.assertThat(bookmark.title, Equals("NewTitle")) | 240 | self.assertThat(bookmark.title, Equals("NewTitle")) |
| 1408 | 237 | 241 | ||
| 1409 | 238 | def test_bookmark_options_from_contextual_menu(self): | 242 | def test_bookmark_options_from_contextual_menu(self): |
| 1410 | 239 | 243 | ||
| 1411 | === modified file 'tests/autopilot/webbrowser_app/tests/test_new_tab_view.py' | |||
| 1412 | --- tests/autopilot/webbrowser_app/tests/test_new_tab_view.py 2015-10-15 19:09:59 +0000 | |||
| 1413 | +++ tests/autopilot/webbrowser_app/tests/test_new_tab_view.py 2015-12-02 14:15:47 +0000 | |||
| 1414 | @@ -251,12 +251,9 @@ | |||
| 1415 | 251 | more_button = self.new_tab_view.get_bookmarks_more_button() | 251 | more_button = self.new_tab_view.get_bookmarks_more_button() |
| 1416 | 252 | self.assertThat(more_button.visible, Equals(True)) | 252 | self.assertThat(more_button.visible, Equals(True)) |
| 1417 | 253 | self.pointing_device.click_object(more_button) | 253 | self.pointing_device.click_object(more_button) |
| 1422 | 254 | folders = self.new_tab_view.get_bookmarks_folder_list_view() | 254 | self.assertThat(lambda: len(self.new_tab_view.get_bookmarks("")), |
| 1419 | 255 | folder_delegate = folders.get_folder_delegate("") | ||
| 1420 | 256 | self.assertThat(lambda: len(folders.get_urls_from_folder( | ||
| 1421 | 257 | folder_delegate)), | ||
| 1423 | 258 | Eventually(Equals(5))) | 255 | Eventually(Equals(5))) |
| 1425 | 259 | bookmark = folders.get_urls_from_folder(folder_delegate)[0] | 256 | bookmark = self.new_tab_view.get_bookmarks("")[0] |
| 1426 | 260 | url = bookmark.url | 257 | url = bookmark.url |
| 1427 | 261 | self.pointing_device.click_object(bookmark) | 258 | self.pointing_device.click_object(bookmark) |
| 1428 | 262 | self.new_tab_view.wait_until_destroyed() | 259 | self.new_tab_view.wait_until_destroyed() |
| 1429 | @@ -273,10 +270,7 @@ | |||
| 1430 | 273 | more_button = self.new_tab_view.get_bookmarks_more_button() | 270 | more_button = self.new_tab_view.get_bookmarks_more_button() |
| 1431 | 274 | self.assertThat(more_button.visible, Equals(True)) | 271 | self.assertThat(more_button.visible, Equals(True)) |
| 1432 | 275 | self.pointing_device.click_object(more_button) | 272 | self.pointing_device.click_object(more_button) |
| 1437 | 276 | folders = self.new_tab_view.get_bookmarks_folder_list_view() | 273 | self.assertThat(lambda: len(self.new_tab_view.get_bookmarks("")), |
| 1434 | 277 | folder_delegate = folders.get_folder_delegate("") | ||
| 1435 | 278 | self.assertThat(lambda: len(folders.get_urls_from_folder( | ||
| 1436 | 279 | folder_delegate)), | ||
| 1438 | 280 | Eventually(Equals(5))) | 274 | Eventually(Equals(5))) |
| 1439 | 281 | self.assertThat(top_sites.visible, Eventually(Equals(False))) | 275 | self.assertThat(top_sites.visible, Eventually(Equals(False))) |
| 1440 | 282 | # Collapse again | 276 | # Collapse again |
| 1441 | @@ -296,23 +290,20 @@ | |||
| 1442 | 296 | Eventually(NotEquals(url))) | 290 | Eventually(NotEquals(url))) |
| 1443 | 297 | 291 | ||
| 1444 | 298 | def _remove_first_bookmark_from_folder(self, folder): | 292 | def _remove_first_bookmark_from_folder(self, folder): |
| 1448 | 299 | folders = self.new_tab_view.get_bookmarks_folder_list_view() | 293 | delegates = self.new_tab_view.get_bookmarks(folder) |
| 1449 | 300 | folder_delegate = folders.get_folder_delegate(folder) | 294 | delegate = delegates[0] |
| 1447 | 301 | delegate = folders.get_urls_from_folder(folder_delegate)[0] | ||
| 1450 | 302 | url = delegate.url | 295 | url = delegate.url |
| 1452 | 303 | count = len(folders.get_urls_from_folder(folder_delegate)) | 296 | count = len(delegates) |
| 1453 | 304 | delegate.trigger_leading_action("leadingAction.delete", | 297 | delegate.trigger_leading_action("leadingAction.delete", |
| 1454 | 305 | delegate.wait_until_destroyed) | 298 | delegate.wait_until_destroyed) |
| 1455 | 306 | if ((count - 1) > 4): | 299 | if ((count - 1) > 4): |
| 1456 | 307 | self.assertThat( | 300 | self.assertThat( |
| 1458 | 308 | lambda: folders.get_urls_from_folder(folder_delegate)[0], | 301 | lambda: self.new_tab_view.get_bookmarks(folder)[0].url, |
| 1459 | 309 | Eventually(NotEquals(url))) | 302 | Eventually(NotEquals(url))) |
| 1460 | 310 | 303 | ||
| 1461 | 311 | def _toggle_bookmark_folder(self, folder): | 304 | def _toggle_bookmark_folder(self, folder): |
| 1466 | 312 | folders = self.new_tab_view.get_bookmarks_folder_list_view() | 305 | delegate = self.new_tab_view.get_bookmark_folder(folder) |
| 1467 | 313 | folder_delegate = folders.get_folder_delegate(folder) | 306 | self.pointing_device.click_object(delegate) |
| 1464 | 314 | self.pointing_device.click_object( | ||
| 1465 | 315 | folders.get_header_from_folder(folder_delegate)) | ||
| 1468 | 316 | 307 | ||
| 1469 | 317 | def test_remove_bookmarks_when_collapsed(self): | 308 | def test_remove_bookmarks_when_collapsed(self): |
| 1470 | 318 | bookmarks = self.new_tab_view.get_bookmarks_list() | 309 | bookmarks = self.new_tab_view.get_bookmarks_list() |
| 1471 | @@ -329,10 +320,7 @@ | |||
| 1472 | 329 | more_button = self.new_tab_view.get_bookmarks_more_button() | 320 | more_button = self.new_tab_view.get_bookmarks_more_button() |
| 1473 | 330 | self.assertThat(more_button.visible, Equals(True)) | 321 | self.assertThat(more_button.visible, Equals(True)) |
| 1474 | 331 | self.pointing_device.click_object(more_button) | 322 | self.pointing_device.click_object(more_button) |
| 1479 | 332 | folders = self.new_tab_view.get_bookmarks_folder_list_view() | 323 | self.assertThat(lambda: len(self.new_tab_view.get_bookmarks("")), |
| 1476 | 333 | folder_delegate = folders.get_folder_delegate("") | ||
| 1477 | 334 | self.assertThat(lambda: len(folders.get_urls_from_folder( | ||
| 1478 | 335 | folder_delegate)), | ||
| 1480 | 336 | Eventually(Equals(5))) | 324 | Eventually(Equals(5))) |
| 1481 | 337 | more_button = self.new_tab_view.get_bookmarks_more_button() | 325 | more_button = self.new_tab_view.get_bookmarks_more_button() |
| 1482 | 338 | top_sites = self.new_tab_view.get_top_sites_list() | 326 | top_sites = self.new_tab_view.get_top_sites_list() |
| 1483 | @@ -347,89 +335,67 @@ | |||
| 1484 | 347 | more_button = self.new_tab_view.get_bookmarks_more_button() | 335 | more_button = self.new_tab_view.get_bookmarks_more_button() |
| 1485 | 348 | self.assertThat(more_button.visible, Equals(True)) | 336 | self.assertThat(more_button.visible, Equals(True)) |
| 1486 | 349 | self.pointing_device.click_object(more_button) | 337 | self.pointing_device.click_object(more_button) |
| 1489 | 350 | folders = self.new_tab_view.get_bookmarks_folder_list_view() | 338 | self.assertThat(lambda: len(self.new_tab_view.get_bookmark_folders()), |
| 1488 | 351 | self.assertThat(lambda: len(folders.get_delegates()), | ||
| 1490 | 352 | Eventually(Equals(3))) | 339 | Eventually(Equals(3))) |
| 1494 | 353 | folder_delegate = folders.get_folder_delegate("") | 340 | self.assertThat(lambda: len(self.new_tab_view.get_bookmarks("")), |
| 1492 | 354 | self.assertThat(lambda: len(folders.get_urls_from_folder( | ||
| 1493 | 355 | folder_delegate)), | ||
| 1495 | 356 | Eventually(Equals(5))) | 341 | Eventually(Equals(5))) |
| 1496 | 357 | self._toggle_bookmark_folder("Actinide") | 342 | self._toggle_bookmark_folder("Actinide") |
| 1501 | 358 | folder_delegate = folders.get_folder_delegate("Actinide") | 343 | self.assertThat( |
| 1502 | 359 | self.assertThat(lambda: len(folders.get_urls_from_folder( | 344 | lambda: len(self.new_tab_view.get_bookmarks("Actinide")), |
| 1503 | 360 | folder_delegate)), | 345 | Eventually(Equals(1))) |
| 1500 | 361 | Eventually(Equals(1))) | ||
| 1504 | 362 | self._toggle_bookmark_folder("NobleGas") | 346 | self._toggle_bookmark_folder("NobleGas") |
| 1509 | 363 | folder_delegate = folders.get_folder_delegate("NobleGas") | 347 | self.assertThat( |
| 1510 | 364 | self.assertThat(lambda: len(folders.get_urls_from_folder( | 348 | lambda: len(self.new_tab_view.get_bookmarks("NobleGas")), |
| 1511 | 365 | folder_delegate)), | 349 | Eventually(Equals(1))) |
| 1508 | 366 | Eventually(Equals(1))) | ||
| 1512 | 367 | 350 | ||
| 1513 | 368 | def test_collapsed_bookmarks_folders_when_expanded(self): | 351 | def test_collapsed_bookmarks_folders_when_expanded(self): |
| 1514 | 369 | more_button = self.new_tab_view.get_bookmarks_more_button() | 352 | more_button = self.new_tab_view.get_bookmarks_more_button() |
| 1515 | 370 | self.assertThat(more_button.visible, Equals(True)) | 353 | self.assertThat(more_button.visible, Equals(True)) |
| 1516 | 371 | self.pointing_device.click_object(more_button) | 354 | self.pointing_device.click_object(more_button) |
| 1519 | 372 | folders = self.new_tab_view.get_bookmarks_folder_list_view() | 355 | self.assertThat(lambda: len(self.new_tab_view.get_bookmark_folders()), |
| 1518 | 373 | self.assertThat(lambda: len(folders.get_delegates()), | ||
| 1520 | 374 | Eventually(Equals(3))) | 356 | Eventually(Equals(3))) |
| 1524 | 375 | folder_delegate = folders.get_folder_delegate("") | 357 | self.assertThat(lambda: len(self.new_tab_view.get_bookmarks("")), |
| 1522 | 376 | self.assertThat(lambda: len(folders.get_urls_from_folder( | ||
| 1523 | 377 | folder_delegate)), | ||
| 1525 | 378 | Eventually(Equals(5))) | 358 | Eventually(Equals(5))) |
| 1534 | 379 | folder_delegate = folders.get_folder_delegate("Actinide") | 359 | self.assertThat( |
| 1535 | 380 | self.assertThat(lambda: len(folders.get_urls_from_folder( | 360 | lambda: len(self.new_tab_view.get_bookmarks("Actinide")), |
| 1536 | 381 | folder_delegate)), | 361 | Eventually(Equals(0))) |
| 1537 | 382 | Eventually(Equals(0))) | 362 | self.assertThat( |
| 1538 | 383 | folder_delegate = folders.get_folder_delegate("NobleGas") | 363 | lambda: len(self.new_tab_view.get_bookmarks("NobleGas")), |
| 1539 | 384 | self.assertThat(lambda: len(folders.get_urls_from_folder( | 364 | Eventually(Equals(0))) |
| 1532 | 385 | folder_delegate)), | ||
| 1533 | 386 | Eventually(Equals(0))) | ||
| 1540 | 387 | 365 | ||
| 1541 | 388 | def test_hide_empty_bookmarks_folders_when_expanded(self): | 366 | def test_hide_empty_bookmarks_folders_when_expanded(self): |
| 1542 | 389 | more_button = self.new_tab_view.get_bookmarks_more_button() | 367 | more_button = self.new_tab_view.get_bookmarks_more_button() |
| 1543 | 390 | self.assertThat(more_button.visible, Equals(True)) | 368 | self.assertThat(more_button.visible, Equals(True)) |
| 1544 | 391 | self.pointing_device.click_object(more_button) | 369 | self.pointing_device.click_object(more_button) |
| 1547 | 392 | folders = self.new_tab_view.get_bookmarks_folder_list_view() | 370 | self.assertThat(lambda: len(self.new_tab_view.get_bookmark_folders()), |
| 1546 | 393 | self.assertThat(lambda: len(folders.get_delegates()), | ||
| 1548 | 394 | Eventually(Equals(3))) | 371 | Eventually(Equals(3))) |
| 1549 | 395 | self._toggle_bookmark_folder("Actinide") | 372 | self._toggle_bookmark_folder("Actinide") |
| 1554 | 396 | folder_delegate = folders.get_folder_delegate("Actinide") | 373 | self.assertThat( |
| 1555 | 397 | self.assertThat(lambda: len(folders.get_urls_from_folder( | 374 | lambda: len(self.new_tab_view.get_bookmarks("Actinide")), |
| 1556 | 398 | folder_delegate)), | 375 | Eventually(Equals(1))) |
| 1553 | 399 | Eventually(Equals(1))) | ||
| 1557 | 400 | self._remove_first_bookmark_from_folder("Actinide") | 376 | self._remove_first_bookmark_from_folder("Actinide") |
| 1559 | 401 | self.assertThat(lambda: len(folders.get_delegates()), | 377 | self.assertThat(lambda: len(self.new_tab_view.get_bookmark_folders()), |
| 1560 | 402 | Eventually(Equals(2))) | 378 | Eventually(Equals(2))) |
| 1564 | 403 | folder_delegate = folders.get_folder_delegate("") | 379 | self.assertThat(lambda: len(self.new_tab_view.get_bookmarks("")), |
| 1562 | 404 | self.assertThat(lambda: len(folders.get_urls_from_folder( | ||
| 1563 | 405 | folder_delegate)), | ||
| 1565 | 406 | Eventually(Equals(5))) | 380 | Eventually(Equals(5))) |
| 1566 | 407 | self._toggle_bookmark_folder("NobleGas") | 381 | self._toggle_bookmark_folder("NobleGas") |
| 1571 | 408 | folder_delegate = folders.get_folder_delegate("NobleGas") | 382 | self.assertThat( |
| 1572 | 409 | self.assertThat(lambda: len(folders.get_urls_from_folder( | 383 | lambda: len(self.new_tab_view.get_bookmarks("NobleGas")), |
| 1573 | 410 | folder_delegate)), | 384 | Eventually(Equals(1))) |
| 1570 | 411 | Eventually(Equals(1))) | ||
| 1574 | 412 | 385 | ||
| 1575 | 413 | def test_bookmarks_folder_expands_and_collapses(self): | 386 | def test_bookmarks_folder_expands_and_collapses(self): |
| 1576 | 414 | more_button = self.new_tab_view.get_bookmarks_more_button() | 387 | more_button = self.new_tab_view.get_bookmarks_more_button() |
| 1577 | 415 | self.assertThat(more_button.visible, Equals(True)) | 388 | self.assertThat(more_button.visible, Equals(True)) |
| 1578 | 416 | self.pointing_device.click_object(more_button) | 389 | self.pointing_device.click_object(more_button) |
| 1581 | 417 | folders = self.new_tab_view.get_bookmarks_folder_list_view() | 390 | self.assertThat(lambda: len(self.new_tab_view.get_bookmark_folders()), |
| 1580 | 418 | self.assertThat(lambda: len(folders.get_delegates()), | ||
| 1582 | 419 | Eventually(Equals(3))) | 391 | Eventually(Equals(3))) |
| 1586 | 420 | folder_delegate = folders.get_folder_delegate("") | 392 | self.assertThat(lambda: len(self.new_tab_view.get_bookmarks("")), |
| 1584 | 421 | self.assertThat(lambda: len(folders.get_urls_from_folder( | ||
| 1585 | 422 | folder_delegate)), | ||
| 1587 | 423 | Eventually(Equals(5))) | 393 | Eventually(Equals(5))) |
| 1592 | 424 | self.pointing_device.click_object( | 394 | self._toggle_bookmark_folder("") |
| 1593 | 425 | folders.get_header_from_folder(folder_delegate)) | 395 | self.assertThat(lambda: len(self.new_tab_view.get_bookmarks("")), |
| 1590 | 426 | self.assertThat(lambda: len(folders.get_urls_from_folder( | ||
| 1591 | 427 | folder_delegate)), | ||
| 1594 | 428 | Eventually(Equals(0))) | 396 | Eventually(Equals(0))) |
| 1599 | 429 | self.pointing_device.click_object( | 397 | self._toggle_bookmark_folder("") |
| 1600 | 430 | folders.get_header_from_folder(folder_delegate)) | 398 | self.assertThat(lambda: len(self.new_tab_view.get_bookmarks("")), |
| 1597 | 431 | self.assertThat(lambda: len(folders.get_urls_from_folder( | ||
| 1598 | 432 | folder_delegate)), | ||
| 1601 | 433 | Eventually(Equals(5))) | 399 | Eventually(Equals(5))) |
| 1602 | 434 | 400 | ||
| 1603 | 435 | def test_remove_top_sites(self): | 401 | def test_remove_top_sites(self): |
| 1604 | @@ -475,10 +441,10 @@ | |||
| 1605 | 475 | 441 | ||
| 1606 | 476 | def test_remove_top_sites(self): | 442 | def test_remove_top_sites(self): |
| 1607 | 477 | view = self.new_tab_view | 443 | view = self.new_tab_view |
| 1609 | 478 | topsites = view.get_top_site_items() | 444 | topsites = view.get_top_sites_list().get_delegates() |
| 1610 | 479 | previous_count = len(topsites) | 445 | previous_count = len(topsites) |
| 1611 | 480 | topsites[0].hide_from_history(self.main_window) | 446 | topsites[0].hide_from_history(self.main_window) |
| 1613 | 481 | self.assertThat(len(view.get_top_site_items()), | 447 | self.assertThat(len(view.get_top_sites_list().get_delegates()), |
| 1614 | 482 | Equals(previous_count - 1)) | 448 | Equals(previous_count - 1)) |
| 1615 | 483 | 449 | ||
| 1616 | 484 | def test_drag_bookmarks(self): | 450 | def test_drag_bookmarks(self): |
| 1617 | 485 | 451 | ||
| 1618 | === modified file 'tests/autopilot/webbrowser_app/tests/test_private.py' | |||
| 1619 | --- tests/autopilot/webbrowser_app/tests/test_private.py 2015-11-23 17:12:15 +0000 | |||
| 1620 | +++ tests/autopilot/webbrowser_app/tests/test_private.py 2015-12-02 14:15:47 +0000 | |||
| 1621 | @@ -68,7 +68,8 @@ | |||
| 1622 | 68 | 68 | ||
| 1623 | 69 | def test_url_showing_in_top_sites_in_and_out_private_mode(self): | 69 | def test_url_showing_in_top_sites_in_and_out_private_mode(self): |
| 1624 | 70 | new_tab = self.open_new_tab(open_tabs_view=True) | 70 | new_tab = self.open_new_tab(open_tabs_view=True) |
| 1626 | 71 | urls = [site.url for site in new_tab.get_top_site_items()] | 71 | top_sites = new_tab.get_top_sites_list().get_delegates() |
| 1627 | 72 | urls = [site.url for site in top_sites] | ||
| 1628 | 72 | self.assertIn(self.url, urls) | 73 | self.assertIn(self.url, urls) |
| 1629 | 73 | 74 | ||
| 1630 | 74 | self.main_window.enter_private_mode() | 75 | self.main_window.enter_private_mode() |
| 1631 | @@ -82,7 +83,8 @@ | |||
| 1632 | 82 | Eventually(Equals(False))) | 83 | Eventually(Equals(False))) |
| 1633 | 83 | 84 | ||
| 1634 | 84 | new_tab = self.open_new_tab(open_tabs_view=True) | 85 | new_tab = self.open_new_tab(open_tabs_view=True) |
| 1636 | 85 | urls = [site.url for site in new_tab.get_top_site_items()] | 86 | top_sites = new_tab.get_top_sites_list().get_delegates() |
| 1637 | 87 | urls = [site.url for site in top_sites] | ||
| 1638 | 86 | self.assertNotIn(url, urls) | 88 | self.assertNotIn(url, urls) |
| 1639 | 87 | 89 | ||
| 1640 | 88 | def test_public_tabs_should_not_be_visible_in_private_mode(self): | 90 | def test_public_tabs_should_not_be_visible_in_private_mode(self): |
| 1641 | 89 | 91 | ||
| 1642 | === modified file 'tests/autopilot/webbrowser_app/tests/test_site_previews.py' | |||
| 1643 | --- tests/autopilot/webbrowser_app/tests/test_site_previews.py 2015-11-19 11:48:10 +0000 | |||
| 1644 | +++ tests/autopilot/webbrowser_app/tests/test_site_previews.py 2015-12-02 14:15:47 +0000 | |||
| 1645 | @@ -123,7 +123,7 @@ | |||
| 1646 | 123 | return cap | 123 | return cap |
| 1647 | 124 | 124 | ||
| 1648 | 125 | def remove_top_site(self, new_tab_view, url): | 125 | def remove_top_site(self, new_tab_view, url): |
| 1650 | 126 | top_sites = new_tab_view.get_top_site_items() | 126 | top_sites = new_tab_view.get_top_sites_list().get_delegates() |
| 1651 | 127 | top_sites = [d for d in top_sites if d.url == url] | 127 | top_sites = [d for d in top_sites if d.url == url] |
| 1652 | 128 | self.assertThat(len(top_sites), Equals(1)) | 128 | self.assertThat(len(top_sites), Equals(1)) |
| 1653 | 129 | delegate = top_sites[0] | 129 | delegate = top_sites[0] |
| 1654 | 130 | 130 | ||
| 1655 | === modified file 'tests/unittests/CMakeLists.txt' | |||
| 1656 | --- tests/unittests/CMakeLists.txt 2015-10-06 09:48:38 +0000 | |||
| 1657 | +++ tests/unittests/CMakeLists.txt 2015-12-02 14:15:47 +0000 | |||
| 1658 | @@ -14,6 +14,7 @@ | |||
| 1659 | 14 | add_subdirectory(bookmarks-model) | 14 | add_subdirectory(bookmarks-model) |
| 1660 | 15 | add_subdirectory(bookmarks-folder-model) | 15 | add_subdirectory(bookmarks-folder-model) |
| 1661 | 16 | add_subdirectory(bookmarks-folderlist-model) | 16 | add_subdirectory(bookmarks-folderlist-model) |
| 1662 | 17 | add_subdirectory(collapsible-bookmarks-model) | ||
| 1663 | 17 | add_subdirectory(limit-proxy-model) | 18 | add_subdirectory(limit-proxy-model) |
| 1664 | 18 | add_subdirectory(container-url-patterns) | 19 | add_subdirectory(container-url-patterns) |
| 1665 | 19 | add_subdirectory(cookie-store) | 20 | add_subdirectory(cookie-store) |
| 1666 | 20 | 21 | ||
| 1667 | === added directory 'tests/unittests/collapsible-bookmarks-model' | |||
| 1668 | === added file 'tests/unittests/collapsible-bookmarks-model/CMakeLists.txt' | |||
| 1669 | --- tests/unittests/collapsible-bookmarks-model/CMakeLists.txt 1970-01-01 00:00:00 +0000 | |||
| 1670 | +++ tests/unittests/collapsible-bookmarks-model/CMakeLists.txt 2015-12-02 14:15:47 +0000 | |||
| 1671 | @@ -0,0 +1,13 @@ | |||
| 1672 | 1 | find_package(Qt5Core REQUIRED) | ||
| 1673 | 2 | find_package(Qt5Sql REQUIRED) | ||
| 1674 | 3 | find_package(Qt5Test REQUIRED) | ||
| 1675 | 4 | set(TEST tst_CollapsibleBookmarksModelTests) | ||
| 1676 | 5 | add_executable(${TEST} tst_CollapsibleBookmarksModelTests.cpp) | ||
| 1677 | 6 | include_directories(${webbrowser-app_SOURCE_DIR}) | ||
| 1678 | 7 | target_link_libraries(${TEST} | ||
| 1679 | 8 | Qt5::Core | ||
| 1680 | 9 | Qt5::Sql | ||
| 1681 | 10 | Qt5::Test | ||
| 1682 | 11 | webbrowser-app-models | ||
| 1683 | 12 | ) | ||
| 1684 | 13 | add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST} -xunitxml -o ${TEST}.xml) | ||
| 1685 | 0 | 14 | ||
| 1686 | === added file 'tests/unittests/collapsible-bookmarks-model/tst_CollapsibleBookmarksModelTests.cpp' | |||
| 1687 | --- tests/unittests/collapsible-bookmarks-model/tst_CollapsibleBookmarksModelTests.cpp 1970-01-01 00:00:00 +0000 | |||
| 1688 | +++ tests/unittests/collapsible-bookmarks-model/tst_CollapsibleBookmarksModelTests.cpp 2015-12-02 14:15:47 +0000 | |||
| 1689 | @@ -0,0 +1,645 @@ | |||
| 1690 | 1 | /* | ||
| 1691 | 2 | * Copyright 2015 Canonical Ltd. | ||
| 1692 | 3 | * | ||
| 1693 | 4 | * This file is part of webbrowser-app. | ||
| 1694 | 5 | * | ||
| 1695 | 6 | * webbrowser-app is free software; you can redistribute it and/or modify | ||
| 1696 | 7 | * it under the terms of the GNU General Public License as published by | ||
| 1697 | 8 | * the Free Software Foundation; version 3. | ||
| 1698 | 9 | * | ||
| 1699 | 10 | * webbrowser-app is distributed in the hope that it will be useful, | ||
| 1700 | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 1701 | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 1702 | 13 | * GNU General Public License for more details. | ||
| 1703 | 14 | * | ||
| 1704 | 15 | * You should have received a copy of the GNU General Public License | ||
| 1705 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 1706 | 17 | */ | ||
| 1707 | 18 | |||
| 1708 | 19 | // Qt | ||
| 1709 | 20 | #include <QtCore/QMetaType> | ||
| 1710 | 21 | #include <QtCore/QVariant> | ||
| 1711 | 22 | #include <QtTest/QSignalSpy> | ||
| 1712 | 23 | #include <QtTest/QtTest> | ||
| 1713 | 24 | |||
| 1714 | 25 | // local | ||
| 1715 | 26 | #include "collapsible-bookmarks-model.h" | ||
| 1716 | 27 | |||
| 1717 | 28 | class CollapsibleBookmarksModelTests : public QObject | ||
| 1718 | 29 | { | ||
| 1719 | 30 | Q_OBJECT | ||
| 1720 | 31 | |||
| 1721 | 32 | private: | ||
| 1722 | 33 | BookmarksModel* bookmarks; | ||
| 1723 | 34 | CollapsibleBookmarksModel* model; | ||
| 1724 | 35 | |||
| 1725 | 36 | private Q_SLOTS: | ||
| 1726 | 37 | void init() | ||
| 1727 | 38 | { | ||
| 1728 | 39 | bookmarks = new BookmarksModel; | ||
| 1729 | 40 | bookmarks->setDatabasePath(":memory:"); | ||
| 1730 | 41 | model = new CollapsibleBookmarksModel; | ||
| 1731 | 42 | model->setSourceModel(bookmarks); | ||
| 1732 | 43 | } | ||
| 1733 | 44 | |||
| 1734 | 45 | void populateBookmarksModel() | ||
| 1735 | 46 | { | ||
| 1736 | 47 | bookmarks->add(QUrl(QStringLiteral("http://test/url1")), QStringLiteral("url1"), | ||
| 1737 | 48 | QUrl(QStringLiteral("http://test/icon1")), QStringLiteral("")); | ||
| 1738 | 49 | QTest::qWait(1); | ||
| 1739 | 50 | bookmarks->add(QUrl(QStringLiteral("http://test/url2")), QStringLiteral("url2"), | ||
| 1740 | 51 | QUrl(QStringLiteral("http://test/icon2")), QStringLiteral("folder1")); | ||
| 1741 | 52 | QTest::qWait(1); | ||
| 1742 | 53 | bookmarks->add(QUrl(QStringLiteral("http://test/url3")), QStringLiteral("url3"), | ||
| 1743 | 54 | QUrl(QStringLiteral("http://test/icon3")), QStringLiteral("folder2")); | ||
| 1744 | 55 | QTest::qWait(1); | ||
| 1745 | 56 | bookmarks->addFolder(QStringLiteral("folder3")); | ||
| 1746 | 57 | bookmarks->add(QUrl(QStringLiteral("http://test/url4")), QStringLiteral("url4"), | ||
| 1747 | 58 | QUrl(QStringLiteral("http://test/icon4")), QStringLiteral("folder4")); | ||
| 1748 | 59 | } | ||
| 1749 | 60 | |||
| 1750 | 61 | void cleanup() | ||
| 1751 | 62 | { | ||
| 1752 | 63 | delete model; | ||
| 1753 | 64 | delete bookmarks; | ||
| 1754 | 65 | } | ||
| 1755 | 66 | |||
| 1756 | 67 | void test_default_values() | ||
| 1757 | 68 | { | ||
| 1758 | 69 | QCOMPARE(model->prependHomepage(), true); | ||
| 1759 | 70 | QCOMPARE(model->showEmptyFolders(), false); | ||
| 1760 | 71 | } | ||
| 1761 | 72 | |||
| 1762 | 73 | void test_initial_contents_data() | ||
| 1763 | 74 | { | ||
| 1764 | 75 | QTest::addColumn<bool>("prependHomepage"); | ||
| 1765 | 76 | QTest::addColumn<bool>("showEmptyFolders"); | ||
| 1766 | 77 | QTest::addColumn<int>("count"); | ||
| 1767 | 78 | QTest::newRow("no/no") << false << false << 0; | ||
| 1768 | 79 | QTest::newRow("no/yes") << false << true << 1; | ||
| 1769 | 80 | QTest::newRow("yes/no") << true << false << 2; | ||
| 1770 | 81 | QTest::newRow("yes/yes") << true << true << 2; | ||
| 1771 | 82 | } | ||
| 1772 | 83 | |||
| 1773 | 84 | void test_initial_contents() | ||
| 1774 | 85 | { | ||
| 1775 | 86 | QFETCH(bool, prependHomepage); | ||
| 1776 | 87 | QFETCH(bool, showEmptyFolders); | ||
| 1777 | 88 | QFETCH(int, count); | ||
| 1778 | 89 | model->setPrependHomepage(prependHomepage); | ||
| 1779 | 90 | model->setShowEmptyFolders(showEmptyFolders); | ||
| 1780 | 91 | QCOMPARE(model->rowCount(), count); | ||
| 1781 | 92 | } | ||
| 1782 | 93 | |||
| 1783 | 94 | void test_roleNames() | ||
| 1784 | 95 | { | ||
| 1785 | 96 | QList<QByteArray> roleNames = model->roleNames().values(); | ||
| 1786 | 97 | QCOMPARE(roleNames.size(), 6); | ||
| 1787 | 98 | QVERIFY(roleNames.contains("url")); | ||
| 1788 | 99 | QVERIFY(roleNames.contains("title")); | ||
| 1789 | 100 | QVERIFY(roleNames.contains("icon")); | ||
| 1790 | 101 | QVERIFY(roleNames.contains("created")); | ||
| 1791 | 102 | QVERIFY(roleNames.contains("folder")); | ||
| 1792 | 103 | QVERIFY(roleNames.contains("type")); | ||
| 1793 | 104 | } | ||
| 1794 | 105 | |||
| 1795 | 106 | void test_setSourceModel() | ||
| 1796 | 107 | { | ||
| 1797 | 108 | QSignalSpy spy(model, SIGNAL(sourceModelChanged())); | ||
| 1798 | 109 | QCOMPARE(model->sourceModel(), bookmarks); | ||
| 1799 | 110 | |||
| 1800 | 111 | model->setSourceModel(bookmarks); | ||
| 1801 | 112 | QVERIFY(spy.isEmpty()); | ||
| 1802 | 113 | QCOMPARE(model->sourceModel(), bookmarks); | ||
| 1803 | 114 | |||
| 1804 | 115 | model->setSourceModel(nullptr); | ||
| 1805 | 116 | QCOMPARE(spy.count(), 1); | ||
| 1806 | 117 | QCOMPARE(model->sourceModel(), (BookmarksModel*) nullptr); | ||
| 1807 | 118 | |||
| 1808 | 119 | model->setSourceModel(bookmarks); | ||
| 1809 | 120 | QCOMPARE(spy.count(), 2); | ||
| 1810 | 121 | QCOMPARE(model->sourceModel(), bookmarks); | ||
| 1811 | 122 | } | ||
| 1812 | 123 | |||
| 1813 | 124 | void test_allBookmarks_initially_expanded() | ||
| 1814 | 125 | { | ||
| 1815 | 126 | populateBookmarksModel(); | ||
| 1816 | 127 | model->setPrependHomepage(true); | ||
| 1817 | 128 | model->setShowEmptyFolders(true); | ||
| 1818 | 129 | QStringList expectedTypes; | ||
| 1819 | 130 | expectedTypes << QStringLiteral("expandedFolder") << QStringLiteral("homepage") | ||
| 1820 | 131 | << QStringLiteral("bookmark") << QStringLiteral("collapsedFolder") | ||
| 1821 | 132 | << QStringLiteral("collapsedFolder") << QStringLiteral("emptyFolder") | ||
| 1822 | 133 | << QStringLiteral("collapsedFolder"); | ||
| 1823 | 134 | int count = expectedTypes.count(); | ||
| 1824 | 135 | QCOMPARE(model->rowCount(), count); | ||
| 1825 | 136 | for (int i = 0; i < count; ++i) { | ||
| 1826 | 137 | QCOMPARE(model->data(model->index(i), CollapsibleBookmarksModel::Type).toString(), expectedTypes.at(i)); | ||
| 1827 | 138 | } | ||
| 1828 | 139 | } | ||
| 1829 | 140 | |||
| 1830 | 141 | void test_modelData_data() { | ||
| 1831 | 142 | QTest::addColumn<bool>("showEmptyFolders"); | ||
| 1832 | 143 | QTest::addColumn<int>("index"); | ||
| 1833 | 144 | QTest::addColumn<int>("role"); | ||
| 1834 | 145 | QTest::addColumn<QVariant>("value"); | ||
| 1835 | 146 | |||
| 1836 | 147 | int url = CollapsibleBookmarksModel::Url; | ||
| 1837 | 148 | int title = CollapsibleBookmarksModel::Title; | ||
| 1838 | 149 | int icon = CollapsibleBookmarksModel::Icon; | ||
| 1839 | 150 | int created = CollapsibleBookmarksModel::Created; | ||
| 1840 | 151 | int folder = CollapsibleBookmarksModel::Folder; | ||
| 1841 | 152 | int type = CollapsibleBookmarksModel::Type; | ||
| 1842 | 153 | |||
| 1843 | 154 | QTest::newRow("invalid index") << true << -1 << type << QVariant(); | ||
| 1844 | 155 | QTest::newRow("invalid index 2") << true << 10 << type << QVariant(); | ||
| 1845 | 156 | QTest::newRow("invalid role") << true << 0 << 25 << QVariant(); | ||
| 1846 | 157 | |||
| 1847 | 158 | QTest::newRow("expanded folder url") << true << 0 << url << QVariant(); | ||
| 1848 | 159 | QTest::newRow("expanded folder title") << true << 0 << title << QVariant(); | ||
| 1849 | 160 | QTest::newRow("expanded folder icon") << true << 0 << icon << QVariant(); | ||
| 1850 | 161 | QTest::newRow("expanded folder created") << true << 0 << created << QVariant(); | ||
| 1851 | 162 | QTest::newRow("expanded folder name") << true << 0 << folder << QVariant(QStringLiteral("")); | ||
| 1852 | 163 | QTest::newRow("expanded folder type") << true << 0 << type << QVariant(QStringLiteral("expandedFolder")); | ||
| 1853 | 164 | |||
| 1854 | 165 | QTest::newRow("homepage url") << true << 1 << url << QVariant(); | ||
| 1855 | 166 | QTest::newRow("homepage title") << true << 1 << title << QVariant(); | ||
| 1856 | 167 | QTest::newRow("homepage icon") << true << 1 << icon << QVariant(); | ||
| 1857 | 168 | QTest::newRow("homepage created") << true << 1 << created << QVariant(); | ||
| 1858 | 169 | QTest::newRow("homepage folder") << true << 1 << folder << QVariant(QStringLiteral("")); | ||
| 1859 | 170 | QTest::newRow("homepage type") << true << 1 << type << QVariant(QStringLiteral("homepage")); | ||
| 1860 | 171 | |||
| 1861 | 172 | QTest::newRow("bookmark url") << true << 2 << url << QVariant(QUrl("http://test/url1")); | ||
| 1862 | 173 | QTest::newRow("bookmark title") << true << 2 << title << QVariant(QStringLiteral("url1")); | ||
| 1863 | 174 | QTest::newRow("bookmark icon") << true << 2 << icon << QVariant(QUrl("http://test/icon1")); | ||
| 1864 | 175 | QTest::newRow("bookmark folder") << true << 2 << folder << QVariant(QStringLiteral("")); | ||
| 1865 | 176 | QTest::newRow("bookmark type") << true << 2 << type << QVariant(QStringLiteral("bookmark")); | ||
| 1866 | 177 | |||
| 1867 | 178 | QTest::newRow("collapsed folder url") << true << 3 << url << QVariant(); | ||
| 1868 | 179 | QTest::newRow("collapsed folder title") << true << 3 << title << QVariant(); | ||
| 1869 | 180 | QTest::newRow("collapsed folder icon") << true << 3 << icon << QVariant(); | ||
| 1870 | 181 | QTest::newRow("collapsed folder created") << true << 3 << created << QVariant(); | ||
| 1871 | 182 | QTest::newRow("collapsed folder name") << true << 3 << folder << QVariant(QStringLiteral("folder1")); | ||
| 1872 | 183 | QTest::newRow("collapsed folder type") << true << 3 << type << QVariant(QStringLiteral("collapsedFolder")); | ||
| 1873 | 184 | |||
| 1874 | 185 | QTest::newRow("empty folder url") << true << 5 << url << QVariant(); | ||
| 1875 | 186 | QTest::newRow("empty folder title") << true << 5 << title << QVariant(); | ||
| 1876 | 187 | QTest::newRow("empty folder icon") << true << 5 << icon << QVariant(); | ||
| 1877 | 188 | QTest::newRow("empty folder created") << true << 5 << created << QVariant(); | ||
| 1878 | 189 | QTest::newRow("empty folder name") << true << 5 << folder << QVariant(QStringLiteral("folder3")); | ||
| 1879 | 190 | QTest::newRow("empty folder type") << true << 5 << type << QVariant(QStringLiteral("emptyFolder")); | ||
| 1880 | 191 | |||
| 1881 | 192 | QTest::newRow("another collapsed folder name") << false << 5 << folder << QVariant(QStringLiteral("folder4")); | ||
| 1882 | 193 | QTest::newRow("another collapsed folder type") << false << 5 << type << QVariant(QStringLiteral("collapsedFolder")); | ||
| 1883 | 194 | } | ||
| 1884 | 195 | |||
| 1885 | 196 | void test_modelData() { | ||
| 1886 | 197 | QFETCH(bool, showEmptyFolders); | ||
| 1887 | 198 | QFETCH(int, index); | ||
| 1888 | 199 | QFETCH(int, role); | ||
| 1889 | 200 | QFETCH(QVariant, value); | ||
| 1890 | 201 | |||
| 1891 | 202 | populateBookmarksModel(); | ||
| 1892 | 203 | model->setPrependHomepage(true); | ||
| 1893 | 204 | model->setShowEmptyFolders(showEmptyFolders); | ||
| 1894 | 205 | |||
| 1895 | 206 | QVariant actualValue = model->data(model->index(index), role); | ||
| 1896 | 207 | if (!value.isValid()) { | ||
| 1897 | 208 | QVERIFY(!actualValue.isValid()); | ||
| 1898 | 209 | } else { | ||
| 1899 | 210 | QCOMPARE(actualValue, value); | ||
| 1900 | 211 | } | ||
| 1901 | 212 | } | ||
| 1902 | 213 | |||
| 1903 | 214 | void test_initialModelPopulation() { | ||
| 1904 | 215 | populateBookmarksModel(); | ||
| 1905 | 216 | model->setPrependHomepage(true); | ||
| 1906 | 217 | model->setShowEmptyFolders(false); | ||
| 1907 | 218 | model->setSourceModel(nullptr); | ||
| 1908 | 219 | |||
| 1909 | 220 | QSignalSpy spy(model, SIGNAL(modelReset())); | ||
| 1910 | 221 | model->setSourceModel(bookmarks); | ||
| 1911 | 222 | QCOMPARE(spy.count(), 1); | ||
| 1912 | 223 | QCOMPARE(model->rowCount(), 6); | ||
| 1913 | 224 | } | ||
| 1914 | 225 | |||
| 1915 | 226 | void test_expandAndCollapseFolders() { | ||
| 1916 | 227 | populateBookmarksModel(); | ||
| 1917 | 228 | model->setPrependHomepage(true); | ||
| 1918 | 229 | model->setShowEmptyFolders(true); | ||
| 1919 | 230 | |||
| 1920 | 231 | qRegisterMetaType<QVector<int>>(); | ||
| 1921 | 232 | QSignalSpy removalSpy(model, SIGNAL(rowsRemoved(const QModelIndex&, int, int))); | ||
| 1922 | 233 | QSignalSpy insertionSpy(model, SIGNAL(rowsInserted(const QModelIndex&, int, int))); | ||
| 1923 | 234 | QSignalSpy dataSpy(model, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&))); | ||
| 1924 | 235 | QCOMPARE(model->rowCount(), 7); | ||
| 1925 | 236 | |||
| 1926 | 237 | // collapse the "All Bookmarks" folder | ||
| 1927 | 238 | QCOMPARE(model->data(model->index(0), CollapsibleBookmarksModel::Type).toString(), QStringLiteral("expandedFolder")); | ||
| 1928 | 239 | model->toggleFolderState(QStringLiteral("")); | ||
| 1929 | 240 | QCOMPARE(model->data(model->index(0), CollapsibleBookmarksModel::Type).toString(), QStringLiteral("collapsedFolder")); | ||
| 1930 | 241 | QCOMPARE(model->rowCount(), 5); | ||
| 1931 | 242 | QVERIFY(insertionSpy.isEmpty()); | ||
| 1932 | 243 | QCOMPARE(removalSpy.count(), 1); | ||
| 1933 | 244 | QCOMPARE(dataSpy.count(), 1); | ||
| 1934 | 245 | QVariantList args = removalSpy.takeFirst(); | ||
| 1935 | 246 | QCOMPARE(args.at(1).toInt(), 1); | ||
| 1936 | 247 | QCOMPARE(args.at(2).toInt(), 2); | ||
| 1937 | 248 | args = dataSpy.takeFirst(); | ||
| 1938 | 249 | QCOMPARE(args.at(0).toModelIndex().row(), 0); | ||
| 1939 | 250 | QCOMPARE(args.at(1).toModelIndex().row(), 0); | ||
| 1940 | 251 | QVector<int> dataChanged = args.at(2).value<QVector<int>>(); | ||
| 1941 | 252 | QCOMPARE(dataChanged.size(), 1); | ||
| 1942 | 253 | QVERIFY(dataChanged.contains((int) CollapsibleBookmarksModel::Type)); | ||
| 1943 | 254 | |||
| 1944 | 255 | // expand the "All Bookmarks" folder | ||
| 1945 | 256 | model->toggleFolderState(QStringLiteral("")); | ||
| 1946 | 257 | QCOMPARE(model->data(model->index(0), CollapsibleBookmarksModel::Type).toString(), QStringLiteral("expandedFolder")); | ||
| 1947 | 258 | QCOMPARE(model->rowCount(), 7); | ||
| 1948 | 259 | QVERIFY(removalSpy.isEmpty()); | ||
| 1949 | 260 | QCOMPARE(insertionSpy.count(), 1); | ||
| 1950 | 261 | QCOMPARE(dataSpy.count(), 1); | ||
| 1951 | 262 | args = insertionSpy.takeFirst(); | ||
| 1952 | 263 | QCOMPARE(args.at(1).toInt(), 1); | ||
| 1953 | 264 | QCOMPARE(args.at(2).toInt(), 2); | ||
| 1954 | 265 | args = dataSpy.takeFirst(); | ||
| 1955 | 266 | QCOMPARE(args.at(0).toModelIndex().row(), 0); | ||
| 1956 | 267 | QCOMPARE(args.at(1).toModelIndex().row(), 0); | ||
| 1957 | 268 | dataChanged = args.at(2).value<QVector<int>>(); | ||
| 1958 | 269 | QCOMPARE(dataChanged.size(), 1); | ||
| 1959 | 270 | QVERIFY(dataChanged.contains((int) CollapsibleBookmarksModel::Type)); | ||
| 1960 | 271 | |||
| 1961 | 272 | // expand another folder | ||
| 1962 | 273 | QCOMPARE(model->data(model->index(3), CollapsibleBookmarksModel::Type).toString(), QStringLiteral("collapsedFolder")); | ||
| 1963 | 274 | model->toggleFolderState(QStringLiteral("folder1")); | ||
| 1964 | 275 | QCOMPARE(model->data(model->index(3), CollapsibleBookmarksModel::Type).toString(), QStringLiteral("expandedFolder")); | ||
| 1965 | 276 | QCOMPARE(model->rowCount(), 8); | ||
| 1966 | 277 | QVERIFY(removalSpy.isEmpty()); | ||
| 1967 | 278 | QCOMPARE(insertionSpy.count(), 1); | ||
| 1968 | 279 | QCOMPARE(dataSpy.count(), 1); | ||
| 1969 | 280 | args = insertionSpy.takeFirst(); | ||
| 1970 | 281 | QCOMPARE(args.at(1).toInt(), 4); | ||
| 1971 | 282 | QCOMPARE(args.at(2).toInt(), 4); | ||
| 1972 | 283 | args = dataSpy.takeFirst(); | ||
| 1973 | 284 | QCOMPARE(args.at(0).toModelIndex().row(), 3); | ||
| 1974 | 285 | QCOMPARE(args.at(1).toModelIndex().row(), 3); | ||
| 1975 | 286 | dataChanged = args.at(2).value<QVector<int>>(); | ||
| 1976 | 287 | QCOMPARE(dataChanged.size(), 1); | ||
| 1977 | 288 | QVERIFY(dataChanged.contains((int) CollapsibleBookmarksModel::Type)); | ||
| 1978 | 289 | |||
| 1979 | 290 | // toggle the state of an empty folder: nothing should happen | ||
| 1980 | 291 | QCOMPARE(model->data(model->index(6), CollapsibleBookmarksModel::Type).toString(), QStringLiteral("emptyFolder")); | ||
| 1981 | 292 | model->toggleFolderState(QStringLiteral("folder3")); | ||
| 1982 | 293 | QCOMPARE(model->data(model->index(6), CollapsibleBookmarksModel::Type).toString(), QStringLiteral("emptyFolder")); | ||
| 1983 | 294 | QCOMPARE(model->rowCount(), 8); | ||
| 1984 | 295 | QVERIFY(removalSpy.isEmpty()); | ||
| 1985 | 296 | QVERIFY(insertionSpy.isEmpty()); | ||
| 1986 | 297 | QVERIFY(dataSpy.isEmpty()); | ||
| 1987 | 298 | } | ||
| 1988 | 299 | |||
| 1989 | 300 | void test_setShowEmptyFolders() | ||
| 1990 | 301 | { | ||
| 1991 | 302 | populateBookmarksModel(); | ||
| 1992 | 303 | model->setPrependHomepage(true); | ||
| 1993 | 304 | model->setShowEmptyFolders(true); | ||
| 1994 | 305 | |||
| 1995 | 306 | QSignalSpy removalSpy(model, SIGNAL(rowsRemoved(const QModelIndex&, int, int))); | ||
| 1996 | 307 | QSignalSpy insertionSpy(model, SIGNAL(rowsInserted(const QModelIndex&, int, int))); | ||
| 1997 | 308 | QCOMPARE(model->rowCount(), 7); | ||
| 1998 | 309 | QVERIFY(model->showEmptyFolders()); | ||
| 1999 | 310 | |||
| 2000 | 311 | // hide empty folders, "folder3" gets hidden | ||
| 2001 | 312 | model->setShowEmptyFolders(false); | ||
| 2002 | 313 | QVERIFY(!model->showEmptyFolders()); | ||
| 2003 | 314 | QCOMPARE(model->rowCount(), 6); | ||
| 2004 | 315 | QVERIFY(insertionSpy.isEmpty()); | ||
| 2005 | 316 | QCOMPARE(removalSpy.count(), 1); | ||
| 2006 | 317 | QVariantList args = removalSpy.takeFirst(); | ||
| 2007 | 318 | QCOMPARE(args.at(1).toInt(), 5); | ||
| 2008 | 319 | QCOMPARE(args.at(2).toInt(), 5); | ||
| 2009 | 320 | |||
| 2010 | 321 | // add a new empty folder, it should remain hidden | ||
| 2011 | 322 | bookmarks->addFolder(QStringLiteral("folder5")); | ||
| 2012 | 323 | QCOMPARE(model->rowCount(), 6); | ||
| 2013 | 324 | QVERIFY(insertionSpy.isEmpty()); | ||
| 2014 | 325 | QVERIFY(removalSpy.isEmpty()); | ||
| 2015 | 326 | |||
| 2016 | 327 | // show empty folders, "folder3" and "folder5" should appear | ||
| 2017 | 328 | model->setShowEmptyFolders(true); | ||
| 2018 | 329 | QVERIFY(model->showEmptyFolders()); | ||
| 2019 | 330 | QCOMPARE(model->rowCount(), 8); | ||
| 2020 | 331 | QVERIFY(removalSpy.isEmpty()); | ||
| 2021 | 332 | QCOMPARE(insertionSpy.count(), 2); | ||
| 2022 | 333 | args = insertionSpy.takeFirst(); | ||
| 2023 | 334 | QCOMPARE(args.at(1).toInt(), 5); | ||
| 2024 | 335 | QCOMPARE(args.at(2).toInt(), 5); | ||
| 2025 | 336 | args = insertionSpy.takeFirst(); | ||
| 2026 | 337 | QCOMPARE(args.at(1).toInt(), 7); | ||
| 2027 | 338 | QCOMPARE(args.at(2).toInt(), 7); | ||
| 2028 | 339 | |||
| 2029 | 340 | // add a new empty folder, it should appear | ||
| 2030 | 341 | bookmarks->addFolder(QStringLiteral("a new folder")); | ||
| 2031 | 342 | QCOMPARE(model->rowCount(), 9); | ||
| 2032 | 343 | QVERIFY(removalSpy.isEmpty()); | ||
| 2033 | 344 | QCOMPARE(insertionSpy.count(), 1); | ||
| 2034 | 345 | args = insertionSpy.takeFirst(); | ||
| 2035 | 346 | QCOMPARE(args.at(1).toInt(), 3); | ||
| 2036 | 347 | QCOMPARE(args.at(2).toInt(), 3); | ||
| 2037 | 348 | } | ||
| 2038 | 349 | |||
| 2039 | 350 | void test_setPrependHomepage() | ||
| 2040 | 351 | { | ||
| 2041 | 352 | model->setPrependHomepage(true); | ||
| 2042 | 353 | model->setShowEmptyFolders(true); | ||
| 2043 | 354 | |||
| 2044 | 355 | QSignalSpy removalSpy(model, SIGNAL(rowsRemoved(const QModelIndex&, int, int))); | ||
| 2045 | 356 | QSignalSpy insertionSpy(model, SIGNAL(rowsInserted(const QModelIndex&, int, int))); | ||
| 2046 | 357 | QCOMPARE(model->rowCount(), 2); | ||
| 2047 | 358 | QVERIFY(model->prependHomepage()); | ||
| 2048 | 359 | |||
| 2049 | 360 | // do not prepend the homepage bookmark, the "All Bookmarks" folder | ||
| 2050 | 361 | // should remain visible though (because showEmptyFolders is true) | ||
| 2051 | 362 | model->setPrependHomepage(false); | ||
| 2052 | 363 | QVERIFY(!model->prependHomepage()); | ||
| 2053 | 364 | QCOMPARE(model->rowCount(), 1); | ||
| 2054 | 365 | QVERIFY(insertionSpy.isEmpty()); | ||
| 2055 | 366 | QCOMPARE(removalSpy.count(), 1); | ||
| 2056 | 367 | QVariantList args = removalSpy.takeFirst(); | ||
| 2057 | 368 | QCOMPARE(args.at(1).toInt(), 1); | ||
| 2058 | 369 | QCOMPARE(args.at(2).toInt(), 1); | ||
| 2059 | 370 | |||
| 2060 | 371 | // hide empty folders, the model should become empty | ||
| 2061 | 372 | model->setShowEmptyFolders(false); | ||
| 2062 | 373 | QVERIFY(!model->showEmptyFolders()); | ||
| 2063 | 374 | QCOMPARE(model->rowCount(), 0); | ||
| 2064 | 375 | QVERIFY(insertionSpy.isEmpty()); | ||
| 2065 | 376 | QCOMPARE(removalSpy.count(), 1); | ||
| 2066 | 377 | args = removalSpy.takeFirst(); | ||
| 2067 | 378 | QCOMPARE(args.at(1).toInt(), 0); | ||
| 2068 | 379 | QCOMPARE(args.at(2).toInt(), 0); | ||
| 2069 | 380 | |||
| 2070 | 381 | // add bookmark to "All Bookmarks" folder, which should become | ||
| 2071 | 382 | // visible again (but collapsed) | ||
| 2072 | 383 | bookmarks->add(QUrl(QStringLiteral("http://test/url1")), QStringLiteral("url1"), | ||
| 2073 | 384 | QUrl(QStringLiteral("http://test/icon1")), QStringLiteral("")); | ||
| 2074 | 385 | QCOMPARE(model->rowCount(), 1); | ||
| 2075 | 386 | QVERIFY(removalSpy.isEmpty()); | ||
| 2076 | 387 | QCOMPARE(insertionSpy.count(), 1); | ||
| 2077 | 388 | args = insertionSpy.takeFirst(); | ||
| 2078 | 389 | QCOMPARE(args.at(1).toInt(), 0); | ||
| 2079 | 390 | QCOMPARE(args.at(2).toInt(), 0); | ||
| 2080 | 391 | |||
| 2081 | 392 | // expand the "All Bookmarks" folder | ||
| 2082 | 393 | model->toggleFolderState(QStringLiteral("")); | ||
| 2083 | 394 | QCOMPARE(model->rowCount(), 2); | ||
| 2084 | 395 | QVERIFY(removalSpy.isEmpty()); | ||
| 2085 | 396 | QCOMPARE(insertionSpy.count(), 1); | ||
| 2086 | 397 | args = insertionSpy.takeFirst(); | ||
| 2087 | 398 | QCOMPARE(args.at(1).toInt(), 1); | ||
| 2088 | 399 | QCOMPARE(args.at(2).toInt(), 1); | ||
| 2089 | 400 | |||
| 2090 | 401 | // prepend the homepage bookmark, it should be inserted again | ||
| 2091 | 402 | model->setPrependHomepage(true); | ||
| 2092 | 403 | QVERIFY(model->prependHomepage()); | ||
| 2093 | 404 | QCOMPARE(model->rowCount(), 3); | ||
| 2094 | 405 | QVERIFY(removalSpy.isEmpty()); | ||
| 2095 | 406 | QCOMPARE(insertionSpy.count(), 1); | ||
| 2096 | 407 | args = insertionSpy.takeFirst(); | ||
| 2097 | 408 | QCOMPARE(args.at(1).toInt(), 1); | ||
| 2098 | 409 | QCOMPARE(args.at(2).toInt(), 1); | ||
| 2099 | 410 | } | ||
| 2100 | 411 | |||
| 2101 | 412 | void test_removingBookmarks() | ||
| 2102 | 413 | { | ||
| 2103 | 414 | populateBookmarksModel(); | ||
| 2104 | 415 | model->setPrependHomepage(true); | ||
| 2105 | 416 | model->setShowEmptyFolders(true); | ||
| 2106 | 417 | |||
| 2107 | 418 | qRegisterMetaType<QVector<int>>(); | ||
| 2108 | 419 | QSignalSpy removalSpy(model, SIGNAL(rowsRemoved(const QModelIndex&, int, int))); | ||
| 2109 | 420 | QSignalSpy insertionSpy(model, SIGNAL(rowsInserted(const QModelIndex&, int, int))); | ||
| 2110 | 421 | QSignalSpy dataSpy(model, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&))); | ||
| 2111 | 422 | QCOMPARE(model->rowCount(), 7); | ||
| 2112 | 423 | |||
| 2113 | 424 | // remove last bookmark from "folder2", which becomes empty | ||
| 2114 | 425 | bookmarks->remove(QUrl(QStringLiteral("http://test/url3"))); | ||
| 2115 | 426 | QCOMPARE(model->rowCount(), 7); | ||
| 2116 | 427 | QVERIFY(removalSpy.isEmpty()); | ||
| 2117 | 428 | QVERIFY(insertionSpy.isEmpty()); | ||
| 2118 | 429 | QCOMPARE(dataSpy.count(), 1); | ||
| 2119 | 430 | QVariantList args = dataSpy.takeFirst(); | ||
| 2120 | 431 | QCOMPARE(args.at(0).toModelIndex().row(), 4); | ||
| 2121 | 432 | QCOMPARE(args.at(1).toModelIndex().row(), 4); | ||
| 2122 | 433 | QVector<int> dataChanged = args.at(2).value<QVector<int>>(); | ||
| 2123 | 434 | QCOMPARE(dataChanged.size(), 1); | ||
| 2124 | 435 | QVERIFY(dataChanged.contains((int) CollapsibleBookmarksModel::Type)); | ||
| 2125 | 436 | |||
| 2126 | 437 | // expand "folder1" | ||
| 2127 | 438 | model->toggleFolderState(QStringLiteral("folder1")); | ||
| 2128 | 439 | QCOMPARE(model->rowCount(), 8); | ||
| 2129 | 440 | QVERIFY(removalSpy.isEmpty()); | ||
| 2130 | 441 | QCOMPARE(insertionSpy.count(), 1); | ||
| 2131 | 442 | QCOMPARE(dataSpy.count(), 1); | ||
| 2132 | 443 | args = insertionSpy.takeFirst(); | ||
| 2133 | 444 | QCOMPARE(args.at(1).toInt(), 4); | ||
| 2134 | 445 | QCOMPARE(args.at(2).toInt(), 4); | ||
| 2135 | 446 | args = dataSpy.takeFirst(); | ||
| 2136 | 447 | QCOMPARE(args.at(0).toModelIndex().row(), 3); | ||
| 2137 | 448 | QCOMPARE(args.at(1).toModelIndex().row(), 3); | ||
| 2138 | 449 | dataChanged = args.at(2).value<QVector<int>>(); | ||
| 2139 | 450 | QCOMPARE(dataChanged.size(), 1); | ||
| 2140 | 451 | QVERIFY(dataChanged.contains((int) CollapsibleBookmarksModel::Type)); | ||
| 2141 | 452 | |||
| 2142 | 453 | // remove last bookmark from "folder1" | ||
| 2143 | 454 | bookmarks->remove(QUrl(QStringLiteral("http://test/url2"))); | ||
| 2144 | 455 | QCOMPARE(model->rowCount(), 7); | ||
| 2145 | 456 | QVERIFY(insertionSpy.isEmpty()); | ||
| 2146 | 457 | QCOMPARE(removalSpy.count(), 1); | ||
| 2147 | 458 | QCOMPARE(dataSpy.count(), 1); | ||
| 2148 | 459 | args = removalSpy.takeFirst(); | ||
| 2149 | 460 | QCOMPARE(args.at(1).toInt(), 4); | ||
| 2150 | 461 | QCOMPARE(args.at(2).toInt(), 4); | ||
| 2151 | 462 | args = dataSpy.takeFirst(); | ||
| 2152 | 463 | QCOMPARE(args.at(0).toModelIndex().row(), 3); | ||
| 2153 | 464 | QCOMPARE(args.at(1).toModelIndex().row(), 3); | ||
| 2154 | 465 | dataChanged = args.at(2).value<QVector<int>>(); | ||
| 2155 | 466 | QCOMPARE(dataChanged.size(), 1); | ||
| 2156 | 467 | QVERIFY(dataChanged.contains((int) CollapsibleBookmarksModel::Type)); | ||
| 2157 | 468 | |||
| 2158 | 469 | // add a bookmark to "folder1" | ||
| 2159 | 470 | bookmarks->add(QUrl(QStringLiteral("http://test/url5")), QStringLiteral("url5"), | ||
| 2160 | 471 | QUrl(QStringLiteral("http://test/icon5")), QStringLiteral("folder1")); | ||
| 2161 | 472 | QCOMPARE(model->rowCount(), 7); | ||
| 2162 | 473 | |||
| 2163 | 474 | // and expand it | ||
| 2164 | 475 | model->toggleFolderState(QStringLiteral("folder1")); | ||
| 2165 | 476 | QCOMPARE(model->rowCount(), 8); | ||
| 2166 | 477 | |||
| 2167 | 478 | // hide empty folders | ||
| 2168 | 479 | model->setShowEmptyFolders(false); | ||
| 2169 | 480 | QCOMPARE(model->rowCount(), 6); | ||
| 2170 | 481 | |||
| 2171 | 482 | // remove last bookmark from "folder1", which should be hidden | ||
| 2172 | 483 | insertionSpy.clear(); | ||
| 2173 | 484 | removalSpy.clear(); | ||
| 2174 | 485 | dataSpy.clear(); | ||
| 2175 | 486 | bookmarks->remove(QUrl(QStringLiteral("http://test/url5"))); | ||
| 2176 | 487 | QCOMPARE(model->rowCount(), 4); | ||
| 2177 | 488 | QVERIFY(insertionSpy.isEmpty()); | ||
| 2178 | 489 | QCOMPARE(removalSpy.count(), 1); | ||
| 2179 | 490 | QVERIFY(dataSpy.isEmpty()); | ||
| 2180 | 491 | args = removalSpy.takeFirst(); | ||
| 2181 | 492 | QCOMPARE(args.at(1).toInt(), 3); | ||
| 2182 | 493 | QCOMPARE(args.at(2).toInt(), 4); | ||
| 2183 | 494 | } | ||
| 2184 | 495 | |||
| 2185 | 496 | void test_updatingBookmarks() | ||
| 2186 | 497 | { | ||
| 2187 | 498 | populateBookmarksModel(); | ||
| 2188 | 499 | model->setPrependHomepage(true); | ||
| 2189 | 500 | model->setShowEmptyFolders(true); | ||
| 2190 | 501 | |||
| 2191 | 502 | qRegisterMetaType<QVector<int>>(); | ||
| 2192 | 503 | QSignalSpy removalSpy(model, SIGNAL(rowsRemoved(const QModelIndex&, int, int))); | ||
| 2193 | 504 | QSignalSpy insertionSpy(model, SIGNAL(rowsInserted(const QModelIndex&, int, int))); | ||
| 2194 | 505 | QSignalSpy movedSpy(model, SIGNAL(rowsMoved(const QModelIndex&, int, int, const QModelIndex&, int))); | ||
| 2195 | 506 | QSignalSpy dataSpy(model, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&))); | ||
| 2196 | 507 | QCOMPARE(model->rowCount(), 7); | ||
| 2197 | 508 | |||
| 2198 | 509 | // update a bookmark in a collapsed folder, nothing should happen | ||
| 2199 | 510 | bookmarks->update(QUrl(QStringLiteral("http://test/url2")), QStringLiteral("new title 2"), QStringLiteral("folder1")); | ||
| 2200 | 511 | QVERIFY(removalSpy.isEmpty()); | ||
| 2201 | 512 | QVERIFY(insertionSpy.isEmpty()); | ||
| 2202 | 513 | QVERIFY(movedSpy.isEmpty()); | ||
| 2203 | 514 | QVERIFY(dataSpy.isEmpty()); | ||
| 2204 | 515 | |||
| 2205 | 516 | // update a bookmark in an expanded folder | ||
| 2206 | 517 | bookmarks->update(QUrl(QStringLiteral("http://test/url1")), QStringLiteral("new title 1"), QStringLiteral("")); | ||
| 2207 | 518 | QVERIFY(removalSpy.isEmpty()); | ||
| 2208 | 519 | QVERIFY(insertionSpy.isEmpty()); | ||
| 2209 | 520 | QVERIFY(movedSpy.isEmpty()); | ||
| 2210 | 521 | QCOMPARE(dataSpy.count(), 1); | ||
| 2211 | 522 | QVariantList args = dataSpy.takeFirst(); | ||
| 2212 | 523 | QCOMPARE(args.at(0).toModelIndex().row(), 2); | ||
| 2213 | 524 | QCOMPARE(args.at(1).toModelIndex().row(), 2); | ||
| 2214 | 525 | QVERIFY(args.at(2).value<QVector<int>>().isEmpty()); | ||
| 2215 | 526 | QCOMPARE(model->data(model->index(2), CollapsibleBookmarksModel::Title).toString(), QStringLiteral("new title 1")); | ||
| 2216 | 527 | |||
| 2217 | 528 | // move a bookmark from an expanded folder to a collapsed folder | ||
| 2218 | 529 | bookmarks->update(QUrl(QStringLiteral("http://test/url1")), QStringLiteral("new title 1"), QStringLiteral("folder1")); | ||
| 2219 | 530 | QCOMPARE(removalSpy.count(), 1); | ||
| 2220 | 531 | QVERIFY(insertionSpy.isEmpty()); | ||
| 2221 | 532 | QVERIFY(movedSpy.isEmpty()); | ||
| 2222 | 533 | QVERIFY(dataSpy.isEmpty()); | ||
| 2223 | 534 | args = removalSpy.takeFirst(); | ||
| 2224 | 535 | QCOMPARE(args.at(1).toInt(), 2); | ||
| 2225 | 536 | QCOMPARE(args.at(2).toInt(), 2); | ||
| 2226 | 537 | |||
| 2227 | 538 | // move a bookmark from a collapsed folder to an expanded folder | ||
| 2228 | 539 | bookmarks->update(QUrl(QStringLiteral("http://test/url1")), QStringLiteral("new title 1"), QStringLiteral("")); | ||
| 2229 | 540 | QVERIFY(removalSpy.isEmpty()); | ||
| 2230 | 541 | QCOMPARE(insertionSpy.count(), 1); | ||
| 2231 | 542 | QVERIFY(movedSpy.isEmpty()); | ||
| 2232 | 543 | QVERIFY(dataSpy.isEmpty()); | ||
| 2233 | 544 | args = insertionSpy.takeFirst(); | ||
| 2234 | 545 | QCOMPARE(args.at(1).toInt(), 2); | ||
| 2235 | 546 | QCOMPARE(args.at(2).toInt(), 2); | ||
| 2236 | 547 | |||
| 2237 | 548 | // move a bookmark from a collapsed folder to another collapsed folder, | ||
| 2238 | 549 | // "folder1" becomes empty | ||
| 2239 | 550 | bookmarks->update(QUrl(QStringLiteral("http://test/url2")), QStringLiteral("url2"), QStringLiteral("folder2")); | ||
| 2240 | 551 | QVERIFY(removalSpy.isEmpty()); | ||
| 2241 | 552 | QVERIFY(insertionSpy.isEmpty()); | ||
| 2242 | 553 | QVERIFY(movedSpy.isEmpty()); | ||
| 2243 | 554 | QCOMPARE(dataSpy.count(), 1); | ||
| 2244 | 555 | args = dataSpy.takeFirst(); | ||
| 2245 | 556 | QCOMPARE(args.at(0).toModelIndex().row(), 3); | ||
| 2246 | 557 | QCOMPARE(args.at(1).toModelIndex().row(), 3); | ||
| 2247 | 558 | QVector<int> roles = args.at(2).value<QVector<int>>(); | ||
| 2248 | 559 | QCOMPARE(roles.count(), 1); | ||
| 2249 | 560 | QVERIFY(roles.contains(CollapsibleBookmarksModel::Type)); | ||
| 2250 | 561 | QCOMPARE(model->data(model->index(3), CollapsibleBookmarksModel::Type).toString(), QStringLiteral("emptyFolder")); | ||
| 2251 | 562 | |||
| 2252 | 563 | // expand "folder2" | ||
| 2253 | 564 | model->toggleFolderState(QStringLiteral("folder2")); | ||
| 2254 | 565 | insertionSpy.clear(); | ||
| 2255 | 566 | dataSpy.clear(); | ||
| 2256 | 567 | |||
| 2257 | 568 | // move a bookmark from an expanded folder to another expanded folder | ||
| 2258 | 569 | bookmarks->update(QUrl(QStringLiteral("http://test/url1")), QStringLiteral("new title 1"), QStringLiteral("folder2")); | ||
| 2259 | 570 | QVERIFY(removalSpy.isEmpty()); | ||
| 2260 | 571 | QVERIFY(insertionSpy.isEmpty()); | ||
| 2261 | 572 | QCOMPARE(movedSpy.count(), 1); | ||
| 2262 | 573 | QCOMPARE(dataSpy.count(), 1); | ||
| 2263 | 574 | args = movedSpy.takeFirst(); | ||
| 2264 | 575 | QCOMPARE(args.at(1).toInt(), 2); | ||
| 2265 | 576 | QCOMPARE(args.at(2).toInt(), 2); | ||
| 2266 | 577 | QCOMPARE(args.at(4).toInt(), 7); | ||
| 2267 | 578 | args = dataSpy.takeFirst(); | ||
| 2268 | 579 | QCOMPARE(args.at(0).toModelIndex().row(), 6); | ||
| 2269 | 580 | QCOMPARE(args.at(1).toModelIndex().row(), 6); | ||
| 2270 | 581 | QVERIFY(args.at(2).value<QVector<int>>().isEmpty()); | ||
| 2271 | 582 | |||
| 2272 | 583 | // move a bookmark from an expanded folder to a new folder | ||
| 2273 | 584 | bookmarks->update(QUrl(QStringLiteral("http://test/url2")), QStringLiteral("url2"), QStringLiteral("a new folder")); | ||
| 2274 | 585 | QCOMPARE(insertionSpy.count(), 1); | ||
| 2275 | 586 | QCOMPARE(removalSpy.count(), 1); | ||
| 2276 | 587 | QVERIFY(movedSpy.isEmpty()); | ||
| 2277 | 588 | QVERIFY(dataSpy.isEmpty()); | ||
| 2278 | 589 | args = insertionSpy.takeFirst(); | ||
| 2279 | 590 | QCOMPARE(args.at(1).toInt(), 2); | ||
| 2280 | 591 | QCOMPARE(args.at(2).toInt(), 2); | ||
| 2281 | 592 | QCOMPARE(model->data(model->index(2), CollapsibleBookmarksModel::Type).toString(), QStringLiteral("collapsedFolder")); | ||
| 2282 | 593 | QCOMPARE(model->data(model->index(2), CollapsibleBookmarksModel::Folder).toString(), QStringLiteral("a new folder")); | ||
| 2283 | 594 | args = removalSpy.takeFirst(); | ||
| 2284 | 595 | QCOMPARE(args.at(1).toInt(), 6); | ||
| 2285 | 596 | QCOMPARE(args.at(2).toInt(), 6); | ||
| 2286 | 597 | |||
| 2287 | 598 | // expand "a new folder" | ||
| 2288 | 599 | model->toggleFolderState(QStringLiteral("a new folder")); | ||
| 2289 | 600 | insertionSpy.clear(); | ||
| 2290 | 601 | dataSpy.clear(); | ||
| 2291 | 602 | |||
| 2292 | 603 | // do not show empty folders | ||
| 2293 | 604 | model->setShowEmptyFolders(false); | ||
| 2294 | 605 | removalSpy.clear(); | ||
| 2295 | 606 | |||
| 2296 | 607 | // move the last bookmark from a folder to another folder, | ||
| 2297 | 608 | // the source folder becomes empty and so should be hidden | ||
| 2298 | 609 | bookmarks->update(QUrl(QStringLiteral("http://test/url2")), QStringLiteral("url2"), QStringLiteral("folder2")); | ||
| 2299 | 610 | QVERIFY(insertionSpy.isEmpty()); | ||
| 2300 | 611 | QCOMPARE(removalSpy.count(), 1); | ||
| 2301 | 612 | QCOMPARE(movedSpy.count(), 1); | ||
| 2302 | 613 | QCOMPARE(dataSpy.count(), 1); | ||
| 2303 | 614 | args = movedSpy.takeFirst(); | ||
| 2304 | 615 | QCOMPARE(args.at(1).toInt(), 3); | ||
| 2305 | 616 | QCOMPARE(args.at(2).toInt(), 3); | ||
| 2306 | 617 | QCOMPARE(args.at(4).toInt(), 6); | ||
| 2307 | 618 | args = dataSpy.takeFirst(); | ||
| 2308 | 619 | QCOMPARE(args.at(0).toModelIndex().row(), 5); | ||
| 2309 | 620 | QCOMPARE(args.at(1).toModelIndex().row(), 5); | ||
| 2310 | 621 | QVERIFY(args.at(2).value<QVector<int>>().isEmpty()); | ||
| 2311 | 622 | args = removalSpy.takeFirst(); | ||
| 2312 | 623 | QCOMPARE(args.at(1).toInt(), 2); | ||
| 2313 | 624 | QCOMPARE(args.at(2).toInt(), 2); | ||
| 2314 | 625 | |||
| 2315 | 626 | // move a bookmark from an expanded folder to another expanded folder | ||
| 2316 | 627 | // that is positioned above in the model | ||
| 2317 | 628 | bookmarks->update(QUrl(QStringLiteral("http://test/url2")), QStringLiteral("url2"), QStringLiteral("")); | ||
| 2318 | 629 | QVERIFY(insertionSpy.isEmpty()); | ||
| 2319 | 630 | QVERIFY(removalSpy.isEmpty()); | ||
| 2320 | 631 | QCOMPARE(movedSpy.count(), 1); | ||
| 2321 | 632 | QCOMPARE(dataSpy.count(), 1); | ||
| 2322 | 633 | args = movedSpy.takeFirst(); | ||
| 2323 | 634 | QCOMPARE(args.at(1).toInt(), 4); | ||
| 2324 | 635 | QCOMPARE(args.at(2).toInt(), 4); | ||
| 2325 | 636 | QCOMPARE(args.at(4).toInt(), 2); | ||
| 2326 | 637 | args = dataSpy.takeFirst(); | ||
| 2327 | 638 | QCOMPARE(args.at(0).toModelIndex().row(), 2); | ||
| 2328 | 639 | QCOMPARE(args.at(1).toModelIndex().row(), 2); | ||
| 2329 | 640 | QVERIFY(args.at(2).value<QVector<int>>().isEmpty()); | ||
| 2330 | 641 | } | ||
| 2331 | 642 | }; | ||
| 2332 | 643 | |||
| 2333 | 644 | QTEST_MAIN(CollapsibleBookmarksModelTests) | ||
| 2334 | 645 | #include "tst_CollapsibleBookmarksModelTests.moc" | ||
| 2335 | 0 | 646 | ||
| 2336 | === modified file 'tests/unittests/qml/CMakeLists.txt' | |||
| 2337 | --- tests/unittests/qml/CMakeLists.txt 2015-10-06 09:48:38 +0000 | |||
| 2338 | +++ tests/unittests/qml/CMakeLists.txt 2015-12-02 14:15:47 +0000 | |||
| 2339 | @@ -20,6 +20,7 @@ | |||
| 2340 | 20 | ${webbrowser-app_SOURCE_DIR}/bookmarks-model.cpp | 20 | ${webbrowser-app_SOURCE_DIR}/bookmarks-model.cpp |
| 2341 | 21 | ${webbrowser-app_SOURCE_DIR}/bookmarks-folder-model.cpp | 21 | ${webbrowser-app_SOURCE_DIR}/bookmarks-folder-model.cpp |
| 2342 | 22 | ${webbrowser-app_SOURCE_DIR}/bookmarks-folderlist-model.cpp | 22 | ${webbrowser-app_SOURCE_DIR}/bookmarks-folderlist-model.cpp |
| 2343 | 23 | ${webbrowser-app_SOURCE_DIR}/collapsible-bookmarks-model.cpp | ||
| 2344 | 23 | ${webbrowser-app_SOURCE_DIR}/file-operations.cpp | 24 | ${webbrowser-app_SOURCE_DIR}/file-operations.cpp |
| 2345 | 24 | ${webbrowser-app_SOURCE_DIR}/history-model.cpp | 25 | ${webbrowser-app_SOURCE_DIR}/history-model.cpp |
| 2346 | 25 | ${webbrowser-app_SOURCE_DIR}/history-lastvisitdate-model.cpp | 26 | ${webbrowser-app_SOURCE_DIR}/history-lastvisitdate-model.cpp |
| 2347 | 26 | 27 | ||
| 2348 | === modified file 'tests/unittests/qml/tst_BookmarksView.qml' | |||
| 2349 | --- tests/unittests/qml/tst_BookmarksView.qml 2015-11-17 17:19:13 +0000 | |||
| 2350 | +++ tests/unittests/qml/tst_BookmarksView.qml 2015-12-02 14:15:47 +0000 | |||
| 2351 | @@ -92,22 +92,21 @@ | |||
| 2352 | 92 | 92 | ||
| 2353 | 93 | function test_click_bookmark() { | 93 | function test_click_bookmark() { |
| 2354 | 94 | var items = getListItems(findChild(view, "bookmarksFolderListView"), | 94 | var items = getListItems(findChild(view, "bookmarksFolderListView"), |
| 2356 | 95 | "bookmarkFolderDelegateLoader") | 95 | "bookmarkViewDelegateLoader") |
| 2357 | 96 | 96 | ||
| 2359 | 97 | clickItem(findChild(items[0], "urlDelegate_0")) | 97 | clickItem(items[1]) |
| 2360 | 98 | compare(bookmarkEntryClickedSpy.count, 1) | 98 | compare(bookmarkEntryClickedSpy.count, 1) |
| 2361 | 99 | compare(bookmarkEntryClickedSpy.signalArguments[0][0], view.homepageUrl) | 99 | compare(bookmarkEntryClickedSpy.signalArguments[0][0], view.homepageUrl) |
| 2362 | 100 | 100 | ||
| 2364 | 101 | clickItem(findChild(items[0], "urlDelegate_1")) | 101 | clickItem(items[2]) |
| 2365 | 102 | compare(bookmarkEntryClickedSpy.count, 2) | 102 | compare(bookmarkEntryClickedSpy.count, 2) |
| 2366 | 103 | compare(bookmarkEntryClickedSpy.signalArguments[1][0], "http://example.com") | 103 | compare(bookmarkEntryClickedSpy.signalArguments[1][0], "http://example.com") |
| 2367 | 104 | } | 104 | } |
| 2368 | 105 | 105 | ||
| 2369 | 106 | function test_delete_bookmark() { | 106 | function test_delete_bookmark() { |
| 2370 | 107 | var items = getListItems(findChild(view, "bookmarksFolderListView"), | 107 | var items = getListItems(findChild(view, "bookmarksFolderListView"), |
| 2374 | 108 | "bookmarkFolderDelegateLoader") | 108 | "bookmarkViewDelegateLoader") |
| 2375 | 109 | var bookmark = findChild(items[0], "urlDelegate_1") | 109 | swipeToDeleteAndConfirm(items[2]) |
| 2373 | 110 | swipeToDeleteAndConfirm(bookmark) | ||
| 2376 | 111 | tryCompare(BookmarksModel, "count", 2) | 110 | tryCompare(BookmarksModel, "count", 2) |
| 2377 | 112 | } | 111 | } |
| 2378 | 113 | } | 112 | } |
| 2379 | 114 | 113 | ||
| 2380 | === modified file 'tests/unittests/qml/tst_QmlTests.cpp' | |||
| 2381 | --- tests/unittests/qml/tst_QmlTests.cpp 2015-10-22 15:07:26 +0000 | |||
| 2382 | +++ tests/unittests/qml/tst_QmlTests.cpp 2015-12-02 14:15:47 +0000 | |||
| 2383 | @@ -27,6 +27,7 @@ | |||
| 2384 | 27 | // local | 27 | // local |
| 2385 | 28 | #include "bookmarks-model.h" | 28 | #include "bookmarks-model.h" |
| 2386 | 29 | #include "bookmarks-folderlist-model.h" | 29 | #include "bookmarks-folderlist-model.h" |
| 2387 | 30 | #include "collapsible-bookmarks-model.h" | ||
| 2388 | 30 | #include "favicon-fetcher.h" | 31 | #include "favicon-fetcher.h" |
| 2389 | 31 | #include "file-operations.h" | 32 | #include "file-operations.h" |
| 2390 | 32 | #include "history-model.h" | 33 | #include "history-model.h" |
| 2391 | @@ -192,6 +193,7 @@ | |||
| 2392 | 192 | qmlRegisterType<TabsModel>(browserUri, 0, 1, "TabsModel"); | 193 | qmlRegisterType<TabsModel>(browserUri, 0, 1, "TabsModel"); |
| 2393 | 193 | qmlRegisterSingletonType<BookmarksModel>(browserUri, 0, 1, "BookmarksModel", BookmarksModel_singleton_factory); | 194 | qmlRegisterSingletonType<BookmarksModel>(browserUri, 0, 1, "BookmarksModel", BookmarksModel_singleton_factory); |
| 2394 | 194 | qmlRegisterType<BookmarksFolderListModel>(browserUri, 0, 1, "BookmarksFolderListModel"); | 195 | qmlRegisterType<BookmarksFolderListModel>(browserUri, 0, 1, "BookmarksFolderListModel"); |
| 2395 | 196 | qmlRegisterType<CollapsibleBookmarksModel>(browserUri, 0, 1, "CollapsibleBookmarksModel"); | ||
| 2396 | 195 | qmlRegisterSingletonType<HistoryModel>(browserUri, 0, 1, "HistoryModel", HistoryModel_singleton_factory); | 197 | qmlRegisterSingletonType<HistoryModel>(browserUri, 0, 1, "HistoryModel", HistoryModel_singleton_factory); |
| 2397 | 196 | qmlRegisterType<HistoryTimeframeModel>(browserUri, 0, 1, "HistoryTimeframeModel"); | 198 | qmlRegisterType<HistoryTimeframeModel>(browserUri, 0, 1, "HistoryTimeframeModel"); |
| 2398 | 197 | qmlRegisterType<HistoryLastVisitDateListModel>(browserUri, 0, 1, "HistoryLastVisitDateListModel"); | 199 | qmlRegisterType<HistoryLastVisitDateListModel>(browserUri, 0, 1, "HistoryLastVisitDateListModel"); |
PASSED: Continuous integration, rev:1308
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://