1
=== modified file 'debian/control'
2
--- debian/control	2015-08-25 13:56:58 +0000
3
+++ debian/control	2015-09-02 16:48:16 +0000
4
@@ -122,6 +122,7 @@
5
122
         autopilot-qt5,
122
         autopilot-qt5,
6
123
         python3-autopilot,
123
         python3-autopilot,
7
124
         python3-fixtures,
124
         python3-fixtures,
8
125
         python3-psutil,
9
125
         ubuntu-ui-toolkit-autopilot,
126
         ubuntu-ui-toolkit-autopilot,
10
126
         webbrowser-app (>= ${binary:Version}),
127
         webbrowser-app (>= ${binary:Version}),
11
127
Description: Ubuntu web browser autopilot tests
128
Description: Ubuntu web browser autopilot tests
12
128
129
13
=== added file 'src/app/WebProcessMonitor.qml'
14
--- src/app/WebProcessMonitor.qml	1970-01-01 00:00:00 +0000
15
+++ src/app/WebProcessMonitor.qml	2015-09-02 16:48:16 +0000
16
@@ -0,0 +1,79 @@
17
1
/*
18
2
 * Copyright 2015 Canonical Ltd.
19
3
 *
20
4
 * This file is part of webbrowser-app.
21
5
 *
22
6
 * webbrowser-app is free software; you can redistribute it and/or modify
23
7
 * it under the terms of the GNU General Public License as published by
24
8
 * the Free Software Foundation; version 3.
25
9
 *
26
10
 * webbrowser-app is distributed in the hope that it will be useful,
27
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
28
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
29
13
 * GNU General Public License for more details.
30
14
 *
31
15
 * You should have received a copy of the GNU General Public License
32
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
33
17
 */
34
18
35
19
import QtQuick 2.4
36
20
import com.canonical.Oxide 1.8 as Oxide
37
21
38
22
Item {
39
23
    id: monitor
40
24
41
25
    visible: false
42
26
43
27
    property var webview: null
44
28
45
29
    readonly property bool killed: webview &&
46
30
                                   (webview.webProcessStatus == Oxide.WebView.WebProcessKilled)
47
31
    readonly property bool crashed: webview &&
48
32
                                    (webview.webProcessStatus == Oxide.WebView.WebProcessCrashed)
49
33
50
34
    // When the renderer process is killed (most likely by the system’s
51
35
    // OOM killer), try to reload the page once, and if this results in
52
36
    // the process being killed again within one minute, then display
53
37
    // the sad tab.
54
38
55
39
    readonly property int killedRetries: internal.killedRetries
56
40
57
41
    QtObject {
58
42
        id: internal
59
43
        property int killedRetries: 0
60
44
    }
61
45
62
46
    Connections {
63
47
        target: webview
64
48
        onWebProcessStatusChanged: {
65
49
            if (webview.webProcessStatus == Oxide.WebView.WebProcessKilled) {
66
50
                if (internal.killedRetries == 0) {
67
51
                    // Do not attempt reloading right away, this would result in a crash
68
52
                    delayedReload.restart()
69
53
                }
70
54
            }
71
55
        }
72
56
    }
73
57
74
58
    Timer {
75
59
        id: delayedReload
76
60
        interval: 100
77
61
        onTriggered: {
78
62
            monitorTimer.restart()
79
63
            monitor.webview.reload()
80
64
            internal.killedRetries++
81
65
        }
82
66
    }
83
67
84
68
    Timer {
85
69
        id: monitorTimer
86
70
        interval: 60000 // 1 minute
87
71
        onTriggered: internal.killedRetries = 0
88
72
    }
89
73
90
74
    onWebviewChanged: {
91
75
        internal.killedRetries = 0
92
76
        delayedReload.stop()
93
77
        monitorTimer.stop()
94
78
    }
95
79
}
96
0
80
97
=== modified file 'src/app/webbrowser/Browser.qml'
98
--- src/app/webbrowser/Browser.qml	2015-08-27 14:02:05 +0000
99
+++ src/app/webbrowser/Browser.qml	2015-09-02 16:48:16 +0000
100
@@ -206,6 +206,7 @@
101
206
206
102
207
        Loader {
207
        Loader {
103
208
            id: newTabViewLoader
208
            id: newTabViewLoader
104
209
105
209
            anchors {
210
            anchors {
106
210
                fill: tabContainer
211
                fill: tabContainer
107
211
                topMargin: (chrome.state == "shown") ? chrome.height : 0
212
                topMargin: (chrome.state == "shown") ? chrome.height : 0
108
@@ -290,6 +291,27 @@
109
290
            }
291
            }
110
291
        }
292
        }
111
292
293
112
294
        Loader {
113
295
            anchors {
114
296
                fill: tabContainer
115
297
                topMargin: (chrome.state == "shown") ? chrome.height : 0
116
298
            }
117
299
118
300
            active: webProcessMonitor.crashed || (webProcessMonitor.killed && !currentWebview.loading)
119
301
120
302
            sourceComponent: SadTab {
121
303
                webview: currentWebview
122
304
                onCloseTabRequested: internal.closeCurrentTab()
123
305
            }
124
306
125
307
            WebProcessMonitor {
126
308
                id: webProcessMonitor
127
309
                webview: currentWebview
128
310
            }
129
311
130
312
            asynchronous: true
131
313
        }
132
314
133
293
        SearchEngine {
315
        SearchEngine {
134
294
            id: currentSearchEngine
316
            id: currentSearchEngine
135
295
            searchPaths: searchEnginesSearchPaths
317
            searchPaths: searchEnginesSearchPaths
136
@@ -603,16 +625,7 @@
137
603
            }
625
            }
138
604
            chromeOffset: chrome.height - invisibleTabChrome.height
626
            chromeOffset: chrome.height - invisibleTabChrome.height
139
605
            onTabSelected: recentView.closeAndSwitchToTab(index)
627
            onTabSelected: recentView.closeAndSwitchToTab(index)
150
606
            onTabClosed: {
628
            onTabClosed: internal.closeTab(index)
141
607
                var tab = tabsModel.remove(index)
142
608
                if (tab) {
143
609
                    tab.close()
144
610
                }
145
611
                if (tabsModel.count === 0) {
146
612
                    browser.openUrlInNewTab("", true)
147
613
                    recentView.reset()
148
614
                }
149
615
            }
151
616
        }
629
        }
152
617
630
153
618
        Toolbar {
631
        Toolbar {
154
@@ -1192,6 +1205,23 @@
155
1192
            }
1205
            }
156
1193
        }
1206
        }
157
1194
1207
158
1208
        function closeTab(index) {
159
1209
            var tab = tabsModel.remove(index)
160
1210
            if (tab) {
161
1211
                tab.close()
162
1212
            }
163
1213
            if (tabsModel.count === 0) {
164
1214
                browser.openUrlInNewTab("", true)
165
1215
                recentView.reset()
166
1216
            }
167
1217
        }
168
1218
169
1219
        function closeCurrentTab() {
170
1220
            if (tabsModel.count > 0) {
171
1221
                closeTab(tabsModel.currentIndex)
172
1222
            }
173
1223
        }
174
1224
175
1195
        function switchToTab(index) {
1225
        function switchToTab(index) {
176
1196
            tabsModel.currentIndex = index
1226
            tabsModel.currentIndex = index
177
1197
            var tab = tabsModel.currentTab
1227
            var tab = tabsModel.currentTab
178
@@ -1205,15 +1235,6 @@
179
1205
            }
1235
            }
180
1206
        }
1236
        }
181
1207
1237
182
1208
        function closeCurrentTab() {
183
1209
            if (tabsModel.count > 0) {
184
1210
                var tab = tabsModel.remove(tabsModel.currentIndex)
185
1211
                if (tab) {
186
1212
                    tab.close()
187
1213
                }
188
1214
            }
189
1215
        }
190
1216
191
1217
        function focusAddressBar(selectContent) {
1238
        function focusAddressBar(selectContent) {
192
1218
            chrome.forceActiveFocus()
1239
            chrome.forceActiveFocus()
193
1219
            Qt.inputMethod.show() // work around http://pad.lv/1316057
1240
            Qt.inputMethod.show() // work around http://pad.lv/1316057
194
1220
1241
195
=== added file 'src/app/webbrowser/SadTab.qml'
196
--- src/app/webbrowser/SadTab.qml	1970-01-01 00:00:00 +0000
197
+++ src/app/webbrowser/SadTab.qml	2015-09-02 16:48:16 +0000
198
@@ -0,0 +1,92 @@
199
1
/*
200
2
 * Copyright 2015 Canonical Ltd.
201
3
 *
202
4
 * This file is part of webbrowser-app.
203
5
 *
204
6
 * webbrowser-app is free software; you can redistribute it and/or modify
205
7
 * it under the terms of the GNU General Public License as published by
206
8
 * the Free Software Foundation; version 3.
207
9
 *
208
10
 * webbrowser-app is distributed in the hope that it will be useful,
209
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
210
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
211
13
 * GNU General Public License for more details.
212
14
 *
213
15
 * You should have received a copy of the GNU General Public License
214
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
215
17
 */
216
18
217
19
import QtQuick 2.4
218
20
import Ubuntu.Components 1.3
219
21
import com.canonical.Oxide 1.8 as Oxide
220
22
221
23
Rectangle {
222
24
    property var webview
223
25
224
26
    signal closeTabRequested()
225
27
226
28
    Column {
227
29
        anchors {
228
30
            fill: parent
229
31
            margins: units.gu(4)
230
32
        }
231
33
        spacing: units.gu(4)
232
34
233
35
        Image {
234
36
            anchors.horizontalCenter: parent.horizontalCenter
235
37
            source: "assets/tab-error.png"
236
38
        }
237
39
238
40
        Label {
239
41
            anchors {
240
42
                left: parent.left
241
43
                right: parent.right
242
44
            }
243
45
244
46
            wrapMode: Text.Wrap
245
47
            horizontalAlignment: Text.AlignHCenter
246
48
            text: webview ? i18n.tr("The rendering process has been closed for this tab.") : ""
247
49
        }
248
50
249
51
        Label {
250
52
            anchors {
251
53
                left: parent.left
252
54
                right: parent.right
253
55
            }
254
56
255
57
            wrapMode: Text.Wrap
256
58
            horizontalAlignment: Text.AlignHCenter
257
59
            font.weight: Font.Light
258
60
            text: {
259
61
                if (!webview) {
260
62
                    return ""
261
63
                } else if (webview.webProcessStatus == Oxide.WebView.WebProcessCrashed) {
262
64
                    // TRANSLATORS: %1 is the URL of the page that crashed the renderer process
263
65
                    return i18n.tr("Something went wrong while displaying %1.").arg(webview.url)
264
66
                } else if (webview.webProcessStatus == Oxide.WebView.WebProcessKilled) {
265
67
                    return i18n.tr("The system is low on memory and can't display this webpage. Try closing unneeded tabs and reloading.")
266
68
                } else {
267
69
                    return ""
268
70
                }
269
71
            }
270
72
        }
271
73
272
74
        Row {
273
75
            anchors.horizontalCenter: parent.horizontalCenter
274
76
            spacing: units.gu(2)
275
77
276
78
            Button {
277
79
                objectName: "closeTabButton"
278
80
                text: i18n.tr("Close tab")
279
81
                onClicked: closeTabRequested()
280
82
            }
281
83
282
84
            Button {
283
85
                objectName: "reloadButton"
284
86
                text: i18n.tr("Reload")
285
87
                color: UbuntuColors.green
286
88
                onClicked: webview.reload()
287
89
            }
288
90
        }
289
91
    }
290
92
}
291
0
93
292
=== added file 'src/app/webbrowser/assets/tab-error@27.png'
293
1
Binary files src/app/webbrowser/assets/tab-error@27.png	1970-01-01 00:00:00 +0000 and src/app/webbrowser/assets/tab-error@27.png	2015-09-02 16:48:16 +0000 differ
94
Binary files src/app/webbrowser/assets/tab-error@27.png	1970-01-01 00:00:00 +0000 and src/app/webbrowser/assets/tab-error@27.png	2015-09-02 16:48:16 +0000 differ
294
=== modified file 'src/app/webbrowser/tabs-model.cpp'
295
--- src/app/webbrowser/tabs-model.cpp	2015-06-22 11:46:54 +0000
296
+++ src/app/webbrowser/tabs-model.cpp	2015-09-02 16:48:16 +0000
297
@@ -154,10 +154,11 @@
298
154
        if (!checkValidTabIndex(index)) {
154
        if (!checkValidTabIndex(index)) {
299
155
            m_currentIndex = m_tabs.count() - 1;
155
            m_currentIndex = m_tabs.count() - 1;
300
156
            Q_EMIT currentIndexChanged();
156
            Q_EMIT currentIndexChanged();
301
157
            Q_EMIT currentTabChanged();
302
158
        } else {
303
159
            Q_EMIT currentTabChanged();
304
160
        }
157
        }
305
158
        Q_EMIT currentTabChanged();
306
159
    } else if (m_currentIndex > index) {
307
160
        m_currentIndex -= 1;
308
161
        Q_EMIT currentIndexChanged();
309
161
    }
162
    }
310
162
    return tab;
163
    return tab;
311
163
}
164
}
312
164
165
313
=== modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
314
--- tests/autopilot/webbrowser_app/emulators/browser.py	2015-08-25 13:56:58 +0000
315
+++ tests/autopilot/webbrowser_app/emulators/browser.py	2015-09-02 16:48:16 +0000
316
@@ -109,6 +109,9 @@
317
109
    def get_error_sheet(self):
109
    def get_error_sheet(self):
318
110
        return self.select_single("ErrorSheet")
110
        return self.select_single("ErrorSheet")
319
111
111
320
112
    def get_sad_tab(self):
321
113
        return self.wait_select_single(SadTab)
322
114
323
112
    def get_suggestions(self):
115
    def get_suggestions(self):
324
113
        return self.select_single(Suggestions)
116
        return self.select_single(Suggestions)
325
114
117
326
@@ -314,6 +317,19 @@
327
314
                      key=lambda item: item.globalRect.y)
317
                      key=lambda item: item.globalRect.y)
328
315
318
329
316
319
330
320
class SadTab(uitk.UbuntuUIToolkitCustomProxyObjectBase):
331
321
332
322
    @autopilot.logging.log_action(logger.info)
333
323
    def click_close_tab_button(self):
334
324
        button = self.select_single("Button", objectName="closeTabButton")
335
325
        self.pointing_device.click_object(button)
336
326
337
327
    @autopilot.logging.log_action(logger.info)
338
328
    def click_reload_button(self):
339
329
        button = self.select_single("Button", objectName="reloadButton")
340
330
        self.pointing_device.click_object(button)
341
331
342
332
343
317
class GeolocationPermissionRequest(uitk.UbuntuUIToolkitCustomProxyObjectBase):
333
class GeolocationPermissionRequest(uitk.UbuntuUIToolkitCustomProxyObjectBase):
344
318
334
345
319
    def get_deny_button(self):
335
    def get_deny_button(self):
346
320
336
347
=== modified file 'tests/autopilot/webbrowser_app/tests/__init__.py'
348
--- tests/autopilot/webbrowser_app/tests/__init__.py	2015-08-12 12:31:56 +0000
349
+++ tests/autopilot/webbrowser_app/tests/__init__.py	2015-09-02 16:48:16 +0000
350
@@ -18,11 +18,13 @@
351
18
18
352
19
import os
19
import os
353
20
import shutil
20
import shutil
354
21
import signal
355
21
import tempfile
22
import tempfile
356
22
import time
23
import time
357
23
import urllib.request
24
import urllib.request
358
24
25
359
25
import fixtures
26
import fixtures
360
27
import psutil
361
26
from testtools.matchers import Equals, NotEquals
28
from testtools.matchers import Equals, NotEquals
362
27
29
363
28
from autopilot.matchers import Eventually
30
from autopilot.matchers import Eventually
364
@@ -213,6 +215,15 @@
365
213
        ping = urllib.request.urlopen(url)
215
        ping = urllib.request.urlopen(url)
366
214
        self.assertThat(ping.read(), Equals(b"pong"))
216
        self.assertThat(ping.read(), Equals(b"pong"))
367
215
217
368
218
    def kill_web_processes(self, signal=signal.SIGKILL):
369
219
        children = psutil.Process(self.app.pid).children(True)
370
220
        for child in children:
371
221
            if child.name() == 'oxide-renderer':
372
222
                for arg in child.cmdline():
373
223
                    if '--type=renderer' in arg:
374
224
                        os.kill(child.pid, signal)
375
225
                        break
376
226
377
216
227
378
217
class StartOpenRemotePageTestCaseBase(BrowserTestCaseBase):
228
class StartOpenRemotePageTestCaseBase(BrowserTestCaseBase):
379
218
229
380
219
230
381
=== added file 'tests/autopilot/webbrowser_app/tests/test_sad_tab.py'
382
--- tests/autopilot/webbrowser_app/tests/test_sad_tab.py	1970-01-01 00:00:00 +0000
383
+++ tests/autopilot/webbrowser_app/tests/test_sad_tab.py	2015-09-02 16:48:16 +0000
384
@@ -0,0 +1,74 @@
385
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
386
2
#
387
3
# Copyright 2015 Canonical
388
4
#
389
5
# This program is free software: you can redistribute it and/or modify it
390
6
# under the terms of the GNU General Public License version 3, as published
391
7
# by the Free Software Foundation.
392
8
#
393
9
# This program is distributed in the hope that it will be useful,
394
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
395
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
396
12
# GNU General Public License for more details.
397
13
#
398
14
# You should have received a copy of the GNU General Public License
399
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
400
16
401
17
import signal
402
18
import time
403
19
404
20
from autopilot.platform import model
405
21
406
22
from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
407
23
408
24
409
25
class TestSadTab(StartOpenRemotePageTestCaseBase):
410
26
411
27
    def _kill_web_process(self):
412
28
        self.kill_web_processes()
413
29
        # The first time the web process is killed, the browser attempts to
414
30
        # reload the page gracefully (after a short delay), hoping the process
415
31
        # won’t be killed again.
416
32
        time.sleep(1)
417
33
        self.main_window.wait_until_page_loaded(self.url)
418
34
419
35
        self.kill_web_processes()
420
36
        # The second time around, the browser displays a sad tab.
421
37
        return self.main_window.get_sad_tab()
422
38
423
39
    def test_reload_web_process_killed(self):
424
40
        sad_tab = self._kill_web_process()
425
41
        sad_tab.click_reload_button()
426
42
        sad_tab.wait_until_destroyed()
427
43
        self.assert_home_page_eventually_loaded()
428
44
429
45
    def test_close_tab_web_process_killed(self):
430
46
        sad_tab = self._kill_web_process()
431
47
        sad_tab.click_close_tab_button()
432
48
        if model() == 'Desktop':
433
49
            # On desktop, closing the last open tab exits the application
434
50
            self.app.process.wait()
435
51
            return
436
52
        sad_tab.wait_until_destroyed()
437
53
        self.main_window.get_new_tab_view()
438
54
439
55
    def _crash_web_process(self):
440
56
        self.kill_web_processes(signal.SIGSEGV)
441
57
        # A crash of the web process displays the sad tab right away
442
58
        return self.main_window.get_sad_tab()
443
59
444
60
    def test_reload_web_process_crashed(self):
445
61
        sad_tab = self._crash_web_process()
446
62
        sad_tab.click_reload_button()
447
63
        sad_tab.wait_until_destroyed()
448
64
        self.assert_home_page_eventually_loaded()
449
65
450
66
    def test_close_tab_web_process_crashed(self):
451
67
        sad_tab = self._crash_web_process()
452
68
        sad_tab.click_close_tab_button()
453
69
        if model() == 'Desktop':
454
70
            # On desktop, closing the last open tab exits the application
455
71
            self.app.process.wait()
456
72
            return
457
73
        sad_tab.wait_until_destroyed()
458
74
        self.main_window.get_new_tab_view()
459
0
75
460
=== added file 'tests/unittests/qml/tst_WebProcessMonitor.qml'
461
--- tests/unittests/qml/tst_WebProcessMonitor.qml	1970-01-01 00:00:00 +0000
462
+++ tests/unittests/qml/tst_WebProcessMonitor.qml	2015-09-02 16:48:16 +0000
463
@@ -0,0 +1,108 @@
464
1
/*
465
2
 * Copyright 2015 Canonical Ltd.
466
3
 *
467
4
 * This file is part of webbrowser-app.
468
5
 *
469
6
 * webbrowser-app is free software; you can redistribute it and/or modify
470
7
 * it under the terms of the GNU General Public License as published by
471
8
 * the Free Software Foundation; version 3.
472
9
 *
473
10
 * webbrowser-app is distributed in the hope that it will be useful,
474
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
475
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
476
13
 * GNU General Public License for more details.
477
14
 *
478
15
 * You should have received a copy of the GNU General Public License
479
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
480
17
 */
481
18
482
19
import QtQuick 2.4
483
20
import QtTest 1.0
484
21
import com.canonical.Oxide 1.8 as Oxide
485
22
import "../../../src/app"
486
23
487
24
WebProcessMonitor {
488
25
    id: monitor
489
26
490
27
    Item {
491
28
        id: webviewMock
492
29
493
30
        property int webProcessStatus
494
31
495
32
        property int reloadCalled
496
33
        function reload() {
497
34
            webProcessStatus = Oxide.WebView.WebProcessRunning
498
35
            reloadCalled++
499
36
        }
500
37
    }
501
38
502
39
    TestCase {
503
40
        name: "WebProcessMonitor"
504
41
505
42
        function init() {
506
43
            webviewMock.webProcessStatus = Oxide.WebView.WebProcessRunning
507
44
            webviewMock.reloadCalled = 0
508
45
        }
509
46
510
47
        function test_no_webview() {
511
48
            monitor.webview = null
512
49
            compare(monitor.killedRetries, 0)
513
50
            verify(!monitor.killed)
514
51
            verify(!monitor.crashed)
515
52
        }
516
53
517
54
        function test_killed() {
518
55
            monitor.webview = webviewMock
519
56
            compare(monitor.killedRetries, 0)
520
57
521
58
            webviewMock.webProcessStatus = Oxide.WebView.WebProcessKilled
522
59
            verify(monitor.killed)
523
60
            verify(!monitor.crashed)
524
61
            tryCompare(monitor, "killedRetries", 1)
525
62
            tryCompare(webviewMock, "reloadCalled", 1)
526
63
            verify(!monitor.killed)
527
64
            verify(!monitor.crashed)
528
65
            compare(monitor.killedRetries, 1)
529
66
530
67
            webviewMock.webProcessStatus = Oxide.WebView.WebProcessKilled
531
68
            verify(monitor.killed)
532
69
            verify(!monitor.crashed)
533
70
            compare(monitor.killedRetries, 1)
534
71
            compare(webviewMock.reloadCalled, 1)
535
72
        }
536
73
537
74
        function test_crashed() {
538
75
            monitor.webview = webviewMock
539
76
            compare(monitor.killedRetries, 0)
540
77
541
78
            webviewMock.webProcessStatus = Oxide.WebView.WebProcessCrashed
542
79
            verify(!monitor.killed)
543
80
            verify(monitor.crashed)
544
81
            compare(monitor.killedRetries, 0)
545
82
            compare(webviewMock.reloadCalled, 0)
546
83
547
84
            webviewMock.webProcessStatus = Oxide.WebView.WebProcessRunning
548
85
            verify(!monitor.killed)
549
86
            verify(!monitor.crashed)
550
87
            compare(monitor.killedRetries, 0)
551
88
            compare(webviewMock.reloadCalled, 0)
552
89
        }
553
90
554
91
        function test_change_webview() {
555
92
            monitor.webview = webviewMock
556
93
            compare(monitor.killedRetries, 0)
557
94
            verify(!monitor.killed)
558
95
            verify(!monitor.crashed)
559
96
560
97
            webviewMock.webProcessStatus = Oxide.WebView.WebProcessKilled
561
98
            verify(monitor.killed)
562
99
            verify(!monitor.crashed)
563
100
            tryCompare(monitor, "killedRetries", 1)
564
101
565
102
            monitor.webview = null
566
103
            compare(monitor.killedRetries, 0)
567
104
            verify(!monitor.killed)
568
105
            verify(!monitor.crashed)
569
106
        }
570
107
    }
571
108
}
572
0
109
573
=== modified file 'tests/unittests/tabs-model/tst_TabsModelTests.cpp'
574
--- tests/unittests/tabs-model/tst_TabsModelTests.cpp	2015-08-10 15:22:00 +0000
575
+++ tests/unittests/tabs-model/tst_TabsModelTests.cpp	2015-09-02 16:48:16 +0000
576
@@ -246,39 +246,62 @@
577
246
246
578
247
    void shouldUpdateCurrentTabWhenRemoving()
247
    void shouldUpdateCurrentTabWhenRemoving()
579
248
    {
248
    {
581
249
        QSignalSpy spy(model, SIGNAL(currentTabChanged()));
249
        QSignalSpy tabSpy(model, SIGNAL(currentTabChanged()));
582
250
        QSignalSpy indexSpy(model, SIGNAL(currentIndexChanged()));
583
250
251
584
251
        // Adding a tab to an empty model should update the current tab.
252
        // Adding a tab to an empty model should update the current tab.
585
252
        // Removing the last tab from the model should update it too.
253
        // Removing the last tab from the model should update it too.
586
253
        model->add(createTab());
254
        model->add(createTab());
587
255
        tabSpy.clear();
588
256
        indexSpy.clear();
589
254
        delete model->remove(0);
257
        delete model->remove(0);
591
255
        QCOMPARE(spy.count(), 2);
258
        QCOMPARE(tabSpy.count(), 1);
592
259
        QCOMPARE(indexSpy.count(), 1);
593
256
260
596
257
        // When removing a tab after the current one,
261
        // When removing a tab after the current one, neither the
597
258
        // the current tab shouldn’t change.
262
        // current tab nor the current index should change.
598
259
        QQuickItem* tab1 = createTab();
263
        QQuickItem* tab1 = createTab();
599
260
        model->add(tab1);
264
        model->add(tab1);
600
261
        model->add(createTab());
265
        model->add(createTab());
602
262
        spy.clear();
266
        tabSpy.clear();
603
267
        indexSpy.clear();
604
263
        delete model->remove(1);
268
        delete model->remove(1);
605
264
        QCOMPARE(model->currentTab(), tab1);
269
        QCOMPARE(model->currentTab(), tab1);
607
265
        QVERIFY(spy.isEmpty());
270
        QVERIFY(tabSpy.isEmpty());
608
271
        QVERIFY(indexSpy.isEmpty());
609
266
272
612
267
        // When removing the current tab, if there is a tab after it,
273
        // When removing the current tab, if there is a tab after it, it
613
268
        // it becomes the current one.
274
        // becomes the current one, and thus the current index doesn’t change.
614
269
        QQuickItem* tab2 = createTab();
275
        QQuickItem* tab2 = createTab();
615
270
        model->add(tab2);
276
        model->add(tab2);
617
271
        spy.clear();
277
        tabSpy.clear();
618
278
        indexSpy.clear();
619
272
        delete model->remove(0);
279
        delete model->remove(0);
621
273
        QCOMPARE(spy.count(), 1);
280
        QCOMPARE(tabSpy.count(), 1);
622
281
        QVERIFY(indexSpy.isEmpty());
623
274
        QCOMPARE(model->currentTab(), tab2);
282
        QCOMPARE(model->currentTab(), tab2);
624
275
283
625
284
        // When removing a tab before the current one, the current
626
285
        // tab doesn’t change but the current index is updated.
627
286
        QQuickItem* tab3 = createTab();
628
287
        model->add(tab3);
629
288
        model->setCurrentIndex(1);
630
289
        tabSpy.clear();
631
290
        indexSpy.clear();
632
291
        delete model->remove(0);
633
292
        QVERIFY(tabSpy.isEmpty());
634
293
        QCOMPARE(indexSpy.count(), 1);
635
294
        QCOMPARE(model->currentIndex(), 0);
636
295
637
276
        // When removing the current tab, if it was the last one, the
296
        // When removing the current tab, if it was the last one, the
638
277
        // current tab should be reset to 0.
297
        // current tab should be reset to 0.
640
278
        spy.clear();
298
        tabSpy.clear();
641
299
        indexSpy.clear();
642
279
        delete model->remove(0);
300
        delete model->remove(0);
644
280
        QCOMPARE(spy.count(), 1);
301
        QCOMPARE(tabSpy.count(), 1);
645
302
        QCOMPARE(indexSpy.count(), 1);
646
281
        QCOMPARE(model->currentTab(), (QObject*) nullptr);
303
        QCOMPARE(model->currentTab(), (QObject*) nullptr);
647
304
        QCOMPARE(model->currentIndex(), -1);
648
282
    }
305
    }
649
283
306
650
284
    void shouldReturnData()
307
    void shouldReturnData()
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-09-02
Riccardo Padovani (community)			Approve on 2015-09-02
Ubuntu Phablet Team		2015-05-13	Pending
Review via email: mp+259040@code.launchpad.net