1
=== modified file 'Dash/GenericLensView.qml'
2
--- Dash/GenericLensView.qml	2013-02-15 09:49:36 +0000
3
+++ Dash/GenericLensView.qml	2013-04-26 10:04:39 +0000
4
@@ -86,6 +86,7 @@
5
86
        }
86
        }
6
87
        pageHeader: PageHeader {
87
        pageHeader: PageHeader {
7
88
            id: pageHeader
88
            id: pageHeader
8
89
            objectName: "pageHeader"
9
89
            width: categoryView.width
90
            width: categoryView.width
10
90
            text: lensView.lens.name
91
            text: lensView.lens.name
11
91
            searchEntryEnabled: true
92
            searchEntryEnabled: true
12
92
93
13
=== modified file 'tests/qmltests/CMakeLists.txt'
14
--- tests/qmltests/CMakeLists.txt	2013-04-24 14:21:44 +0000
15
+++ tests/qmltests/CMakeLists.txt	2013-04-26 10:04:39 +0000
16
@@ -42,6 +42,7 @@
17
42
add_qml_test(Components Tile)
42
add_qml_test(Components Tile)
18
43
add_qml_test(Components PageHeader)
43
add_qml_test(Components PageHeader)
19
44
add_qml_test(Dash DashPreview)
44
add_qml_test(Dash DashPreview)
20
45
add_qml_test(Dash GenericLensView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
21
45
add_qml_test(Dash LensView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_BINARY_DIR}/plugins)
46
add_qml_test(Dash LensView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_BINARY_DIR}/plugins)
22
46
add_qml_test(Dash PeoplePreview)
47
add_qml_test(Dash PeoplePreview)
23
47
add_qml_test(Dash FilterGrids IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins)
48
add_qml_test(Dash FilterGrids IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins)
24
48
49
25
=== added file 'tests/qmltests/Dash/tst_GenericLensView.qml'
26
--- tests/qmltests/Dash/tst_GenericLensView.qml	1970-01-01 00:00:00 +0000
27
+++ tests/qmltests/Dash/tst_GenericLensView.qml	2013-04-26 10:04:39 +0000
28
@@ -0,0 +1,54 @@
29
1
/*
30
2
 * Copyright 2013 Canonical Ltd.
31
3
 *
32
4
 * This program is free software; you can redistribute it and/or modify
33
5
 * it under the terms of the GNU General Public License as published by
34
6
 * the Free Software Foundation; version 3.
35
7
 *
36
8
 * This program is distributed in the hope that it will be useful,
37
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
38
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
39
11
 * GNU General Public License for more details.
40
12
 *
41
13
 * You should have received a copy of the GNU General Public License
42
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
43
15
 */
44
16
45
17
import QtQuick 2.0
46
18
import QtTest 1.0
47
19
import Unity 0.1
48
20
import ".."
49
21
import "../../../Dash"
50
22
import Ubuntu.Components 0.1
51
23
import Unity.Test 0.1 as UT
52
24
53
25
Item {
54
26
    width: units.gu(120)
55
27
    height: units.gu(80)
56
28
57
29
    Lenses {
58
30
        id: lenses
59
31
    }
60
32
61
33
    GenericLensView {
62
34
        id: genericLensView
63
35
        anchors.fill: parent
64
36
65
37
        UT.UnityTestCase {
66
38
            name: "GenericLensView"
67
39
            when: lenses.loaded
68
40
69
41
            function init() {
70
42
                genericLensView.lens = lenses.get(0)
71
43
            }
72
44
73
45
            function test_isCurrent() {
74
46
                var pageHeader = findChild(genericLensView, "pageHeader");
75
47
                genericLensView.isCurrent = true
76
48
                pageHeader.searchQuery = "test"
77
49
                genericLensView.isCurrent = false
78
50
                tryCompare(pageHeader, "searchQuery", "")
79
51
            }
80
52
        }
81
53
    }
82
54
}
Status:	Merged
Approved by:	Albert Astals Cid on 2013-04-26
Approved revision:	no longer in the source branch.
Merged at revision:	636
Proposed branch:	lp:~unity-team/unity/phablet.test_GenericLensView
Merge into:	lp:unity/phablet
Prerequisite:	lp:~unity-team/unity/phablet.fake-unity-plugin_categories
Diff against target:	82 lines (+56/-0) 3 files modified Dash/GenericLensView.qml (+1/-0) tests/qmltests/CMakeLists.txt (+1/-0) tests/qmltests/Dash/tst_GenericLensView.qml (+54/-0)
To merge this branch:	bzr merge lp:~unity-team/unity/phablet.test_GenericLensView
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2013-04-23	Approve on 2013-04-26
Albert Astals Cid (community)		2013-04-23	Approve on 2013-04-26
Review via email: mp+160335@code.launchpad.net