cf638df · unity8 · git.iko.soy

data/unity8.conf+2−1

compare with xenial

unifiedsplit

@@ -1,7 +1,7 @@

1description "Unity Shell v8"

2author "Ricardo Mendoza <ricmm@ubuntu.com>"

3

4−emits scope-ui-starting

4+emits scope-ui-starting indicator-services-start

5

6start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=ubuntu-touch-surfaceflinger)) and started dbus

7stop on desktop-end

@@ -42,6 +42,7 @@ pre-start script

42 fi

43

44 initctl emit scope-ui-starting

45+ initctl emit indicator-services-start

45end script

46end script

46

47

47exec ${BINARY:-unity8} $ARGS

48exec ${BINARY:-unity8} $ARGS

debian/changelog+74

@@ -1,3 +1,77 @@

1+unity8 (7.85+14.04.20140416-0ubuntu1) trusty; urgency=low

2+

3+ [ Albert Astals ]

4+ * Fix last item X position Fixes clicking on the last item sometimes

5+ not working (LP: #1301871)

6+ * Use upstart in ./run Makes it so that you can use the lock button on

7+ the device without getting that nasty hwc crash

8+ * Remove AnimationControllerWithSignals.

9+ * Use the correct delegate base item for the Carousel test

10+ * Some simplification in DashContent Kill the ScopeDelegateMapper in

11+ favour of a simple if (that will eventually go away). Removal of all

12+ the fake scopes in the tests that added nothing of value to the

13+ tests. Removal of movementEnded signal that was unused. Removal of

14+ movementStarted and positionedAtBeginning signals that were being

15+ used as function calls. Rework DashContent tests so they what the

16+ function does what it is supposed to do instead of just making sure

17+ QML signals work .

18+ * Improve Card creation time by adding loaders that make sure only

19+ what's needed is loaded In my computer it goes from RESULT :

20+ qmltestrunner::benchmark_time:"cardTitleArtSubtitleMascotSummaryMode

21+ l": 3.217 msecs per iteration (total: 3,218, iterations: 1000)

22+ RESULT :

23+ qmltestrunner::benchmark_time:"cardTitleArtSubtitleMascotModel":

24+ 1.647 msecs per iteration (total: 1,648, iterations: 1000) RESULT :

25+ qmltestrunner::benchmark_time:"cardTitleArtSubtitleModel": 1.514

26+ msecs per iteration (total: 1,515, iterations: 1000) RESULT :

27+ qmltestrunner::benchmark_time:"cardTitleArtModel": 1.471 msecs per

28+ iteration (total: 1,471, iterations: 1000) RESULT :

29+ qmltestrunner::benchmark_time:"cardArtModel": 1.447 msecs per

30+ iteration (total: 1,448, iterations: 1000) RESULT :

31+ qmltestrunner::benchmark_time:"cardTitleModel": 1.276 msecs per

32+ iteration (total: 1,276, iterations: 1000) to RESULT :

33+ qmltestrunner::benchmark_time:"cardTitleArtSubtitleMascotSummaryMode

34+ l": 2.916 msecs per iteration (total: 2,917, iterations: 1000)

35+ RESULT :

36+ qmltestrunner::benchmark_time:"cardTitleArtSubtitleMascotModel":

37+ 1.504 msecs per iteration (total: 1,504, iterations: 1000) RESULT :

38+ qmltestrunner::benchmark_time:"cardTitleArtSubtitleModel": 1.060

39+ msecs per iteration (total: 1,061, iterations: 1000) RESULT :

40+ qmltestrunner::benchmark_time:"cardTitleArtModel": 1.052 msecs per

41+ iteration (total: 1,053, iterations: 1000) RESULT :

42+ qmltestrunner::benchmark_time:"cardArtModel": 0.727 msecs per

43+ iteration (total: 728, iterations: 1000) RESULT :

44+ qmltestrunner::benchmark_time:"cardTitleModel": 0.817 msecs per

45+ iteration (total: 818, iterations: 1000) (LP: #1297197)

46+

47+ [ Allan LeSage ]

48+ * DashApps emulator get_applications should return a list ordered by

49+ visible y, x.

50+

51+ [ Andrea Cimitan ]

52+ * Workaround for lp1301309 until fixes for palette in ui toolkit (LP:

53+ #1301309)

54+

55+ [ Leo Arias ]

56+ * Reverted the change that returns application cards instead of

57+ titles.

58+

59+ [ Nick Dedekind ]

60+ * Indicator services started by unity8 upstart configuration rather

61+ than manual emmision from indicator manager.

62+

63+ [ Mirco Müller ]

64+ * Fix notification ap-test assertions.

65+

66+ [ Michael Terry ]

67+ * Use new tablet and phone backgrounds from Design.

68+

69+ [ Michael Zanetti ]

70+ * workaround the QTestLogger assertion issue with make tryXyz and our

71+ custom uqmlscene

72+

73+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 16 Apr 2014 13:45:01 +0000

74+

1unity8 (7.85+14.04.20140415.2-0ubuntu1) trusty; urgency=low

75unity8 (7.85+14.04.20140415.2-0ubuntu1) trusty; urgency=low

2

76

3 [ Michael Terry ]

77 [ Michael Terry ]

debian/control−3

@@ -13,13 +13,10 @@ Build-Depends: cmake,

13 libgles2-mesa-dev[armhf],

14 libgsettings-qt-dev,

15 libhud-client2-dev,

16− libnih-dbus-dev,

17− libnih-dev,

18 libpulse-dev,

16 libpulse-dev,

19 libqmenumodel-dev (>= 0.2.7),

17 libqmenumodel-dev (>= 0.2.7),

20 libunity-api-dev (>= 7.80.6),

18 libunity-api-dev (>= 7.80.6),

21 libunity-mir-dev,

19 libunity-mir-dev,

22− libupstart-dev,

23 libusermetricsoutput1-dev,

20 libusermetricsoutput1-dev,

24 libxcb1-dev,

21 libxcb1-dev,

25 libglib2.0-dev,

22 libglib2.0-dev,

plugins/Unity/Indicators/CMakeLists.txt−3

@@ -6,7 +6,6 @@ project(IndicatorsQml)

6pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)

7pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)

8pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)

9−pkg_check_modules(LIBUPSTART REQUIRED libupstart libnih libnih-dbus dbus-1)

10

9

11find_package(Qt5Core REQUIRED)

10find_package(Qt5Core REQUIRED)

12find_package(Qt5Quick REQUIRED)

11find_package(Qt5Quick REQUIRED)

@@ -19,7 +18,6 @@ include_directories(

19 ${GLIB_INCLUDE_DIRS}

18 ${GLIB_INCLUDE_DIRS}

20 ${GIO_INCLUDE_DIRS}

19 ${GIO_INCLUDE_DIRS}

21 ${QMENUMODEL_INCLUDE_DIRS}

20 ${QMENUMODEL_INCLUDE_DIRS}

22− ${LIBUPSTART_INCLUDE_DIRS}

23)

21)

24

22

25set(IndicatorsQML_SOURCES

23set(IndicatorsQML_SOURCES

@@ -54,7 +52,6 @@ target_link_libraries(IndicatorsQml

54 ${GLIB_LIBRARIES}

52 ${GLIB_LIBRARIES}

55 ${GIO_LIBRARIES}

53 ${GIO_LIBRARIES}

56 ${QMENUMODEL_LDFLAGS}

54 ${QMENUMODEL_LDFLAGS}

57− ${LIBUPSTART_LIBRARIES}

58)

55)

59

56

60qt5_use_modules(IndicatorsQml Core Qml Quick)

57qt5_use_modules(IndicatorsQml Core Qml Quick)

plugins/Unity/Indicators/indicatorsmanager.cpp−33

@@ -21,9 +21,6 @@

21#include <QSettings>

22#include <QDebug>

23

24−#include <upstart.h>

25−#include <nih/alloc.h>

26−

27#include <paths.h>

24#include <paths.h>

28

25

29

26

@@ -216,36 +213,6 @@ void IndicatorsManager::setLoaded(bool loaded)

216 {

213 {

217 m_loaded = loaded;

214 m_loaded = loaded;

218 Q_EMIT loadedChanged(m_loaded);

215 Q_EMIT loadedChanged(m_loaded);

219−

220− auto upstartsession = qgetenv("UPSTART_SESSION");

221− NihDBusProxy * upstart = NULL;

222−

223− if (!upstartsession.isNull()) {

224− DBusConnection * conn = NULL;

225− conn = dbus_connection_open(upstartsession.constData(), NULL);

226− if (conn != NULL) {

227− upstart = nih_dbus_proxy_new(NULL, conn,

228− NULL,

229− DBUS_PATH_UPSTART,

230− NULL, NULL);

231− dbus_connection_unref(conn);

232− }

233− }

234−

235− if (upstart != NULL) {

236− int event_sent = 0;

237− if (m_loaded) {

238− event_sent = upstart_emit_event_sync(NULL, upstart, "indicator-services-start", NULL, 0);

239− } else {

240− event_sent = upstart_emit_event_sync(NULL, upstart, "indicator-services-end", NULL, 0);

241− }

242−

243− if (event_sent != 0) {

244− qWarning() << "Unable to send indicator event to Upstart";

245− }

246− nih_unref(upstart, NULL);

247− upstart = NULL;

248− }

249 }

216 }

250}

217}

251

218

plugins/Unity/Indicators/indicatorsmanager.h−2

@@ -28,8 +28,6 @@

28#include <QHash>

29#include <QSharedPointer>

30

31−typedef struct nih_dbus_proxy NihDBusProxy;

32−

33class UNITYINDICATORS_EXPORT IndicatorsManager : public QObject

31class UNITYINDICATORS_EXPORT IndicatorsManager : public QObject

34{

32{

35 Q_OBJECT

33 Q_OBJECT

qml/Components/AnimationControllerWithSignals.qmldeleted−64

@@ -1,64 +0,0 @@

1−/*

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

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

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

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

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−import QtQuick 2.0

18−

19−AnimationController {

20− signal animationCompletedAtBeginning()

21− signal animationCompletedAtEnd()

22− readonly property bool completed: progress == 1.0 || progress == 0.0

23− property bool completing: false

24−

25− function __completeAtBeginning() {

26− completing = false;

27− animationCompletedAtBeginning();

28− }

29−

30− function __completeAtEnd() {

31− completing = false;

32− animationCompletedAtEnd();

33− }

34−

35− function completeToBeginningWithSignal() {

36− if (progress == 0.0) {

37− __completeAtBeginning()

38− } else {

39− completing = true;

40− completeToBeginning();

41− }

42− }

43−

44− function completeToEndWithSignal() {

45− if (progress == 1.0) {

46− __completeAtEnd()

47− } else {

48− completing = true;

49− completeToEnd();

50− }

51− }

52−

53− onProgressChanged: {

54− if (!completing) {

55− return;

56− }

57−

58− if (progress == 0.0) {

59− __completeAtBeginning()

60− } else if (progress == 1.0) {

61− __completeAtEnd()

62− }

63− }

64−}

qml/Components/Carousel.qml+13−19

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

75 The scaling of the items is controlled by the variable continuousIndex, described below. */

76 ListView {

77 id: listView

78+ objectName: "listView"

78

79

79 property int highlightIndex: -1

80 property int highlightIndex: -1

80 property real minimumTileWidth: 0

81 property real minimumTileWidth: 0

@@ -148,15 +149,19 @@ Item {

148 maximumFlickVelocity: Math.max(2500 * Math.pow(realWidth / referenceWidth, 1.5), 2500) // 2500 is platform default

149 maximumFlickVelocity: Math.max(2500 * Math.pow(realWidth / referenceWidth, 1.5), 2500) // 2500 is platform default

149 orientation: ListView.Horizontal

150 orientation: ListView.Horizontal

150

151

151− function itemClicked(index, delegateItem) {

152+ function getXFromContinuousIndex(index) {

152− listView.currentIndex = index

153− var x = CarouselJS.getXFromContinuousIndex(index,

153+ return CarouselJS.getXFromContinuousIndex(index,

154 realWidth,

155− realContentWidth,

155+ footerItem.x,

156 tileWidth,

157 gapToMiddlePhase,

158 gapToEndPhase,

159 carousel.drawBuffer)

160+ }

161+

162+ function itemClicked(index, delegateItem) {

163+ listView.currentIndex = index

164+ var x = getXFromContinuousIndex(index);

160

165

161 if (Math.abs(x - contentX) < 1 && delegateItem !== undefined) {

166 if (Math.abs(x - contentX) < 1 && delegateItem !== undefined) {

162 /* We're clicking the selected item and

167 /* We're clicking the selected item and

@@ -174,13 +179,7 @@ Item {

174 }

179 }

175

180

176 function itemPressAndHold(index, delegateItem) {

181 function itemPressAndHold(index, delegateItem) {

177− var x = CarouselJS.getXFromContinuousIndex(index,

182+ var x = getXFromContinuousIndex(index);

178− realWidth,

179− realContentWidth,

180− tileWidth,

181− gapToMiddlePhase,

182− gapToEndPhase,

183− carousel.drawBuffer);

184

183

185 if (Math.abs(x - contentX) < 1 && delegateItem !== undefined) {

184 if (Math.abs(x - contentX) < 1 && delegateItem !== undefined) {

186 /* We're pressAndHold the selected item and

185 /* We're pressAndHold the selected item and

@@ -209,22 +208,17 @@ Item {

209 newContentX = disabledNewContentX

208 newContentX = disabledNewContentX

210 }

209 }

211 onMovementEnded: {

210 onMovementEnded: {

212− if (realContentX > 0 && realContentX < realContentWidth - realWidth)

211+ if (realContentX > 0)

213 stepAnimation.start()

212 stepAnimation.start()

214 }

213 }

215

214

216 SmoothedAnimation {

215 SmoothedAnimation {

217 id: stepAnimation

216 id: stepAnimation

217+ objectName: "stepAnimation"

218

219 target: listView

220 property: "contentX"

221− to: CarouselJS.getXFromContinuousIndex(listView.selectedIndex,

221+ to: listView.getXFromContinuousIndex(listView.selectedIndex)

222− listView.realWidth,

223− listView.realContentWidth,

224− listView.tileWidth,

225− listView.gapToMiddlePhase,

226− listView.gapToEndPhase,

227− carousel.drawBuffer)

228 duration: 450

222 duration: 450

229 velocity: 200

223 velocity: 200

230 easing.type: Easing.InOutQuad

224 easing.type: Easing.InOutQuad

qml/Dash/DashContent.qml+5−10

@@ -27,13 +27,9 @@ Item {

27 readonly property alias currentIndex: dashContentList.currentIndex

28 property alias previewOpen: previewListView.open

29

30− property ScopeDelegateMapper scopeMapper : ScopeDelegateMapper {}

31 property ListModel searchHistory

30 property ListModel searchHistory

32

31

33− signal movementStarted()

34− signal movementEnded()

35 signal scopeLoaded(string scopeId)

32 signal scopeLoaded(string scopeId)

36− signal positionedAtBeginning()

37 signal gotoScope(string scopeId)

33 signal gotoScope(string scopeId)

38 signal openScope(var scope)

34 signal openScope(var scope)

39

35

@@ -71,7 +67,7 @@ Item {

71 dashContentList.currentIndex = index

67 dashContentList.currentIndex = index

72

68

73 if (reset) {

69 if (reset) {

74− dashContent.positionedAtBeginning()

70+ dashContentList.currentItem.item.positionAtBeginning()

75 }

71 }

76 }

72 }

77

73

@@ -114,8 +110,7 @@ Item {

114 highlightRangeMode: ListView.StrictlyEnforceRange

110 highlightRangeMode: ListView.StrictlyEnforceRange

115 // TODO Investigate if we can switch to a smaller cache buffer when/if UbuntuShape gets more performant

111 // TODO Investigate if we can switch to a smaller cache buffer when/if UbuntuShape gets more performant

116 cacheBuffer: 1073741823

112 cacheBuffer: 1073741823

117− onMovementStarted: dashContent.movementStarted()

113+ onMovementStarted: currentItem.item.showHeader();

118− onMovementEnded: dashContent.movementEnded()

119 clip: parent.x != 0

114 clip: parent.x != 0

120

115

121 // If the number of items is less than the current index, then need to reset to another item.

116 // If the number of items is less than the current index, then need to reset to another item.

@@ -135,7 +130,9 @@ Item {

135 width: ListView.view.width

130 width: ListView.view.width

136 height: ListView.view.height

131 height: ListView.view.height

137 asynchronous: true

132 asynchronous: true

138− source: scopeMapper.map(scope.id)

133+ // TODO This if will eventually go away since we're killing DashApps.qml

134+ // once we move app closing to the spread

135+ source: (scope.id == "clickscope") ? "DashApps.qml" : "GenericScopeView.qml"

139 objectName: scope.id + " loader"

136 objectName: scope.id + " loader"

140

137

141 readonly property bool moving: item ? item.moving : false

138 readonly property bool moving: item ? item.moving : false

@@ -154,8 +151,6 @@ Item {

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

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

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

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

156 item.tabBarHeight = dashPageHeader.implicitHeight;

153 item.tabBarHeight = dashPageHeader.implicitHeight;

157− dashContentList.movementStarted.connect(item.movementStarted)

158− dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)

159 dashContent.scopeLoaded(item.scope.id)

154 dashContent.scopeLoaded(item.scope.id)

160 }

155 }

161 Connections {

156 Connections {

qml/Dash/GenericScopeView.qml+8−7

@@ -33,9 +33,6 @@ FocusScope {

33 property PageHeader pageHeader: null

34 property Item previewListView: null

35

36− signal movementStarted

37− signal positionedAtBeginning

38−

39 property bool enableHeightBehaviorOnNextCreation: false

36 property bool enableHeightBehaviorOnNextCreation: false

40 property var categoryView: categoryView

37 property var categoryView: categoryView

41

38

@@ -49,6 +46,14 @@ FocusScope {

49 shell.activateApplication(appId);

46 shell.activateApplication(appId);

50 }

47 }

51

48

49+ function positionAtBeginning() {

50+ categoryView.positionAtBeginning()

51+ }

52+

53+ function showHeader() {

54+ categoryView.showHeader()

55+ }

56+

52 Binding {

57 Binding {

53 target: scope

58 target: scope

54 property: "isActive"

59 property: "isActive"

@@ -69,10 +74,6 @@ FocusScope {

69 previewListView.open = false;

74 previewListView.open = false;

70 }

75 }

71

76

72− onMovementStarted: categoryView.showHeader()

73−

74− onPositionedAtBeginning: categoryView.positionAtBeginning()

75−

76 Binding {

77 Binding {

77 target: scopeView.scope

78 target: scopeView.scope

78 property: "searchQuery"

79 property: "searchQuery"

qml/Dash/Previews/PreviewRatingDisplay.qml+4−2

@@ -71,7 +71,8 @@ PreviewWidget {

71 id: authorLabel

72 objectName: "authorLabel"

73 anchors { left: parent.left; right: parent.right }

74+ // TODO cimi: Yet another fix requiring Palette update.

74− color: Theme.palette.selected.backgroundText

75+ color: "grey" //Theme.palette.selected.backgroundText

75 opacity: .8

76 opacity: .8

76 text: modelData["author"] || ""

77 text: modelData["author"] || ""

77 visible: text !== ""

78 visible: text !== ""

@@ -82,7 +83,8 @@ PreviewWidget {

82 id: reviewLabel

83 id: reviewLabel

83 objectName: "reviewLabel"

84 objectName: "reviewLabel"

84 anchors { left: parent.left; right: parent.right }

85 anchors { left: parent.left; right: parent.right }

86+ // TODO cimi: Yet another fix requiring Palette update.

85− color: Theme.palette.selected.backgroundText

87+ color: "grey" //Theme.palette.selected.backgroundText

86 opacity: .8

88 opacity: .8

87 text: modelData["review"] || ""

89 text: modelData["review"] || ""

88 visible: text !== ""

90 visible: text !== ""

qml/Dash/Previews/PreviewRatingInput.qml+4−2

@@ -76,7 +76,8 @@ PreviewWidget {

76 verticalCenter: parent.verticalCenter

77 left: parent.left

78 }

79+ // TODO cimi: Yet another fix requiring Palette update.

79− color: Theme.palette.selected.backgroundText

80+ color: "grey" //Theme.palette.selected.backgroundText

80 opacity: .8

81 opacity: .8

81 text: widgetData["rating-label"] || i18n.tr("Rate this")

82 text: widgetData["rating-label"] || i18n.tr("Rate this")

82 }

83 }

@@ -121,7 +122,8 @@ PreviewWidget {

121 left: parent.left

122 left: parent.left

122 right: parent.right

123 right: parent.right

123 }

124 }

125+ // TODO cimi: Yet another fix requiring Palette update.

124− color: Theme.palette.selected.backgroundText

126+ color: "grey" //Theme.palette.selected.backgroundText

125 opacity: .8

127 opacity: .8

126 text: widgetData["review-label"] || i18n.tr("Add a review")

128 text: widgetData["review-label"] || i18n.tr("Add a review")

127 }

129 }

qml/Dash/ScopeDelegateMapper.qmldeleted−30

@@ -1,30 +0,0 @@

1−/*

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

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

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

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

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−import QtQuick 2.0

18−

19−QtObject {

20− property var scopeDelegateMapping: {"clickscope": "DashApps.qml"}

21− property string genericScope: "GenericScopeView.qml"

22−

23− function map(scopeId) {

24− var customScope = scopeDelegateMapping[scopeId]

25− if (customScope != undefined) {

26− return customScope

27− }

28− return genericScope

29− }

30−}

qml/graphics/phone_background.jpg

Binary file not shown.

qml/graphics/tablet_background.jpg

Binary file not shown.

run+15−1

@@ -68,8 +68,22 @@ if $MOUSE_TOUCH; then

68 QML_PHONE_SHELL_ARGS="$QML_PHONE_SHELL_ARGS -mousetouch"

69fi

70

71+control_c()

72+{

73+ /sbin/initctl stop unity8

74+ exit $?

75+}

76+

77+trap control_c INT

78+

71if $GDB; then

79if $GDB; then

72 gdb -ex run --args $QML_PHONE_SHELL_PATH $QML_PHONE_SHELL_ARGS $@

80 gdb -ex run --args $QML_PHONE_SHELL_PATH $QML_PHONE_SHELL_ARGS $@

73else

81else

82+ status=`/sbin/initctl status unity8`

83+ if [ "$status" != "unity8 stop/waiting" ]; then

84+ echo "Unity8 is already running, please stop it first"

85+ exit 1

86+ fi

74− $QML_PHONE_SHELL_PATH $QML_PHONE_SHELL_ARGS $@

87+ /sbin/initctl start unity8 BINARY="`readlink -f $QML_PHONE_SHELL_PATH` $QML_PHONE_SHELL_ARGS $@"

88+ tailf -n 0 ~/.cache/upstart/unity8.log

75fi

89fi

tests/autopilot/unity8/shell/emulators/dash.py+10−5

@@ -191,13 +191,18 @@ class DashApps(GenericScopeView):

191

192 """

193 category_element = self._get_category_element(category)

194− application_tiles = category_element.select_many('Card')

194+ application_cards = category_element.select_many('Card')

195− # TODO return them on the same order they are displayed.

195+

196− # --elopio - 2014-1-15

196+ # sort by y, x

197+ application_cards = sorted(

198+ application_cards,

199+ key=lambda card: (card.globalRect.y, card.globalRect.x))

200+

197 result = []

201 result = []

198− for card in application_tiles:

202+ for card in application_cards:

199 if card.objectName != 'cardToolCard':

203 if card.objectName != 'cardToolCard':

204+ card_header = card.select_single('CardHeader')

200− result.append(card)

205+ result.append(card_header.title)

201 return result

206 return result

202

207

203

208

tests/autopilot/unity8/shell/tests/test_emulators.py+3−11

@@ -166,7 +166,7 @@ class DashAppsEmulatorTestCase(DashBaseTestCase):

166 available_applications = [

167 'Title.2.0', 'Title.2.1', 'Title.2.2', 'Title.2.3', 'Title.2.4',

168 'Title.2.5', 'Title.2.6', 'Title.2.7', 'Title.2.8', 'Title.2.9',

169− 'Title.2.9', 'Title.2.10', 'Title.2.11']

169+ 'Title.2.10', 'Title.2.11', 'Title.2.12']

170

171 def setUp(self):

172 # Set up the fake scopes before launching unity.

@@ -183,21 +183,13 @@ class DashAppsEmulatorTestCase(DashBaseTestCase):

183 self.assertEqual(

184 'No category found with name unexisting category', str(exception))

185

186− def test_get_applications_should_return_list_with_names(self):

186+ def test_get_applications_should_return_correct_applications(self):

187 category = '2'

188 expected_apps_count = self._get_number_of_application_slots(category)

189 expected_applications = self.available_applications[

190 :expected_apps_count]

191−

192 applications = self.applications_scope.get_applications(category)

191 applications = self.applications_scope.get_applications(category)

193− applications_titles = []

194− for application in applications:

195− cardHeader = application.select_single('CardHeader')

196− applications_titles.append(cardHeader.title)

197−

198− self.assertThat(applications, HasLength(expected_apps_count))

199− for expected in expected_applications:

192+ self.assertEqual(expected_applications, applications)

200− self.assertThat(applications_titles, Contains(expected))

201

193

202 def _get_number_of_application_slots(self, category):

194 def _get_number_of_application_slots(self, category):

203 category_element = self.applications_scope._get_category_element(

195 category_element = self.applications_scope._get_category_element(

tests/autopilot/unity8/shell/tests/test_notifications.py+3−4

@@ -196,7 +196,7 @@ class InteractiveNotificationBase(NotificationsBase):

196 get_notification = lambda: notify_list.wait_select_single(

197 'Notification', objectName='notification1')

198 notification = get_notification()

199− self._assert_notification(notification, None, None, True, True, 1.0)

199+ self._assert_notification(notification, summary, body, True, True, 1.0)

200 initial_height = notification.height

201 self.touch.tap_object(notification.select_single(objectName="button1"))

202 self.assertThat(

@@ -403,7 +403,6 @@ class EphemeralNotificationsTests(NotificationsBase):

403

404 notification = lambda: notify_list.wait_select_single(

405 'Notification', objectName='notification1')

406−

407 self._assert_notification(

406 self._assert_notification(

408 notification(),

407 notification(),

409 summary,

408 summary,

@@ -579,7 +578,7 @@ class EphemeralNotificationsTests(NotificationsBase):

579 icon_path = self._get_icon_path('avatars/amanda.png')

578 icon_path = self._get_icon_path('avatars/amanda.png')

580 notification.update(summary, body, icon_path)

579 notification.update(summary, body, icon_path)

581 notification.show()

580 notification.show()

582− self._assert_notification(get_notification(), summary, body)

581+ self._assert_notification(get_notification(), summary, body, True, False, 1.0)

583

582

584 def test_update_notification_layout_change(self):

583 def test_update_notification_layout_change(self):

585 """Notification must allow updating its contents and layout while

584 """Notification must allow updating its contents and layout while

@@ -626,7 +625,7 @@ class EphemeralNotificationsTests(NotificationsBase):

626 notification.show()

625 notification.show()

627

626

628 self.assertThat(get_notification, Eventually(NotEquals(None)))

627 self.assertThat(get_notification, Eventually(NotEquals(None)))

629− self._assert_notification(get_notification(), summary, body, False)

628+ self._assert_notification(get_notification(), summary, body, False, False, 1.0)

630

629

631 def test_append_hint(self):

630 def test_append_hint(self):

632 """Notification has to accumulate body-text using append-hint."""

631 """Notification has to accumulate body-text using append-hint."""

tests/qmltests/CMakeLists.txt−1

@@ -11,7 +11,6 @@ set(qmltest_DEFAULT_IMPORT_PATHS

11set(qmltest_DEFAULT_TARGETS qmlunittests)

12set(qmltest_DEFAULT_NO_ADD_TEST FALSE)

13set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")

14−add_qml_test(Components AnimationControllerWithSignals)

15add_qml_test(Panel IndicatorItem)

14add_qml_test(Panel IndicatorItem)

16add_qml_test(utils/Unity/Test UnityTest)

15add_qml_test(utils/Unity/Test UnityTest)

17

16

tests/qmltests/Components/tst_AnimationControllerWithSignals.qmldeleted−142

@@ -1,142 +0,0 @@

1−/*

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

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

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

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

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−import QtQuick 2.0

18−import QtTest 1.0

19−import "../../../qml/Components"

20−

21−TestCase {

22− id: testCase

23− name: "AnimationControllerWithSignals"

24−

25− property real someNumber: 0.0

26−

27− NumberAnimation {

28− id: someNumberAnimation

29− target: testCase

30− properties: "someNumber"

31− from: 1.0

32− to: 100.0

33− }

34−

35− Component {

36− id: testSubjectComponent

37− AnimationControllerWithSignals {}

38− }

39−

40− Loader {

41− id: loader

42− asynchronous: false

43− }

44−

45− SignalSpy {

46− id: signalSpy

47− }

48−

49− function test_completeToEndWithSignal() {

50− loader.sourceComponent = testSubjectComponent;

51− var testSubject = loader.item;

52−

53− testSubject.animation = someNumberAnimation;

54− testSubject.progress = 0;

55−

56− signalSpy.signalName = "animationCompletedAtEnd";

57− signalSpy.target = testSubject;

58− signalSpy.clear();

59−

60− compare(testSubject.completing, false)

61− compare(testSubject.completed, true)

62−

63− testSubject.completeToEndWithSignal();

64− compare(testSubject.completing, true)

65− compare(testSubject.completed, true)

66− compare(signalSpy.count, 0);

67−

68− testSubject.progress = 0.5;

69− compare(testSubject.completing, true)

70− compare(testSubject.completed, false)

71− compare(signalSpy.count, 0);

72−

73− testSubject.progress = 1.0;

74− compare(testSubject.completing, false)

75− compare(testSubject.completed, true)

76− compare(signalSpy.count, 1);

77−

78− testSubject.animation = null

79− loader.sourceComponent = undefined;

80− }

81−

82− function test_completeToBeginningWithSignal() {

83− loader.sourceComponent = testSubjectComponent;

84− var testSubject = loader.item;

85−

86− testSubject.animation = someNumberAnimation;

87− testSubject.progress = 1;

88−

89− signalSpy.signalName = "animationCompletedAtBeginning";

90− signalSpy.target = testSubject;

91− signalSpy.clear();

92−

93− compare(testSubject.completing, false)

94− compare(testSubject.completed, true)

95−

96− testSubject.completeToBeginningWithSignal();

97− compare(testSubject.completing, true)

98− compare(testSubject.completed, true)

99− compare(signalSpy.count, 0);

100−

101− testSubject.progress = 0.5;

102− compare(testSubject.completing, true)

103− compare(testSubject.completed, false)

104− compare(signalSpy.count, 0);

105−

106− testSubject.progress = 0;

107− compare(testSubject.completing, false)

108− compare(testSubject.completed, true)

109− compare(signalSpy.count, 1);

110−

111− testSubject.animation = null

112− loader.sourceComponent = undefined;

113− }

114−

115− function test_settingProgressWithoutCallingCompleteWithSignal() {

116− loader.sourceComponent = testSubjectComponent;

117− var testSubject = loader.item;

118−

119− testSubject.animation = someNumberAnimation;

120− testSubject.progress = 0;

121−

122− signalSpy.signalName = "animationCompletedAtEnd";

123− signalSpy.target = testSubject;

124− signalSpy.clear();

125−

126− compare(testSubject.completing, false)

127− compare(testSubject.completed, true)

128−

129− testSubject.progress = 0.5;

130− compare(testSubject.completing, false)

131− compare(testSubject.completed, false)

132− compare(signalSpy.count, 0);

133−

134− testSubject.progress = 1;

135− compare(testSubject.completing, false)

136− compare(testSubject.completed, true)

137− compare(signalSpy.count, 0);

138−

139− testSubject.animation = null

140− loader.sourceComponent = undefined;

141− }

142−}

tests/qmltests/Components/tst_Carousel.qml+34−7

@@ -18,6 +18,7 @@ import QtQuick 2.0

18import QtTest 1.0

19import "../../../qml/Components/"

20import "../../../qml/Components/carousel.js" as Carousel

21+import Unity.Test 0.1 as UT

21

22

22Item {

23Item {

23 width: 700

24 width: 700

@@ -31,13 +32,17 @@ Item {

31 property int createdDelegates: 0

32 property int createdDelegates: 0

32 property int destroyedDelegates: 0

33 property int destroyedDelegates: 0

33

34

35+ itemComponent: BaseCarouselDelegate {

34− itemComponent: Rectangle {

36+ Rectangle {

37+ anchors.fill: parent

38+ border.color: "black"

35− color: "red"

39+ color: "red"

36− Component.onCompleted: carousel.createdDelegates++

40+ Component.onCompleted: carousel.createdDelegates++

37− Component.onDestruction: carousel.destroyedDelegates++

41+ Component.onDestruction: carousel.destroyedDelegates++

42+ }

38 }

43 }

39 }

44 }

40− TestCase {

45+ UT.UnityTestCase {

41 id: root

46 id: root

42 name: "Carousel"

47 name: "Carousel"

43 when: windowShown

48 when: windowShown

@@ -55,8 +60,11 @@ Item {

55 property real kGapEnd: kMiddleIndex * (1 - gapToEndPhase / gapToMiddlePhase)

60 property real kGapEnd: kMiddleIndex * (1 - gapToEndPhase / gapToMiddlePhase)

56 property real kXBeginningEnd: 1 / tileWidth + kMiddleIndex / gapToMiddlePhase

61 property real kXBeginningEnd: 1 / tileWidth + kMiddleIndex / gapToMiddlePhase

57

62

58− function test_onlyNeededItemsCreated() {

63+ // This test needs to run first since it tests a corner case condition

64+ // to where the carousel is just being created

65+ // That is why it has a 1 in the name

66+ function test_1onlyNeededItemsCreated() {

59− compare(carousel.createdDelegates, 10);

67+ tryCompare(carousel, "createdDelegates", 10);

60 compare(carousel.destroyedDelegates, 0);

68 compare(carousel.destroyedDelegates, 0);

61 }

69 }

62

70

@@ -216,5 +224,24 @@ Item {

216 data.maxTranslation)

224 data.maxTranslation)

217 compare(scale, data.result)

225 compare(scale, data.result)

218 }

226 }

227+

228+ function test_lastItemXPosition() {

229+ var carouselList = findChild(carousel, "listView");

230+ var stepAnimation = findInvisibleChild(carouselList, "stepAnimation");

231+ var stepDiff = 0;

232+ stepAnimation.onRunningChanged.connect(function() { if (stepAnimation.running) stepDiff = Math.abs(carouselList.contentX - stepAnimation.to); })

233+ var overshootOnce = false;

234+ while (!overshootOnce) {

235+ overshootOnce = carouselList.realContentX > carouselList.realContentWidth - carouselList.realWidth;

236+ mouseFlick(carousel, carousel.width - units.gu(1),

237+ carousel.height / 2,

238+ units.gu(2),

239+ carousel.height / 2);

240+ tryCompare(carouselList, "moving", false);

241+ }

242+ verify(stepDiff < 1);

243+ var x = carouselList.getXFromContinuousIndex(carousel.model - 1);

244+ verify(Math.abs(x - carouselList.contentX) < 1);

245+ }

219 }

246 }

220}

247}

tests/qmltests/Dash/qml/FakeScopeView.qmldeleted−45

@@ -1,45 +0,0 @@

1−/*

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

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

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

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

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−import QtQuick 2.0

18−import Unity 0.2

19−

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

21−

22−GenericScopeView {

23− id: fakeScopeView

24−

25− property alias backColor : back.color

26− property var categoryView: null

27−

28− onMovementStarted: {

29− if (shell != undefined && shell.scopeStatus != undefined) {

30− shell.scopeStatus[scope.id].movementStarted++;

31− }

32− }

33− onPositionedAtBeginning: {

34− if (shell != undefined && shell.scopeStatus != undefined) {

35− shell.scopeStatus[scope.id].positionedAtBeginning++;

36− }

37− }

38−

39− Rectangle {

40− id: back

41− anchors.fill: parent

42− color: "grey"

43− z: -1

44− }

45−}

tests/qmltests/Dash/qml/fake_generic_scopeView.qmldeleted−24

@@ -1,24 +0,0 @@

1−/*

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

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

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

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

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−import QtQuick 2.0

18−

19−FakeScopeView {

20− id: fake_generic_scopeView

21− objectName: "fake_generic_scopeView"

22−

23− backColor: "#D0D0D0"

24−}

tests/qmltests/Dash/qml/fake_scopeView1.qmldeleted−24

@@ -1,24 +0,0 @@

1−/*

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

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

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

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

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−import QtQuick 2.0

18−

19−FakeScopeView {

20− id: fake_scopeView1

21− objectName: "fake_scopeView1"

22−

23− backColor: "#90E090"

24−}

tests/qmltests/Dash/qml/fake_scopeView2.qmldeleted−24

@@ -1,24 +0,0 @@

1−/*

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

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

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

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

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−import QtQuick 2.0

18−

19−FakeScopeView {

20− id: fake_scopeView2

21− objectName: "fake_scopeView2"

22−

23− backColor: "#A0D0A0"

24−}

tests/qmltests/Dash/qml/fake_scopeView3.qmldeleted−24

@@ -1,24 +0,0 @@

1−/*

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

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

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

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

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−import QtQuick 2.0

18−

19−FakeScopeView {

20− id: fake_scopeView3

21− objectName: "fake_scopeView3"

22−

23− backColor: "#B0C0B0"

24−}

tests/qmltests/Dash/qml/fake_scopeView4.qmldeleted−24

@@ -1,24 +0,0 @@

1−/*

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

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

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

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

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−import QtQuick 2.0

18−

19−FakeScopeView {

20− id: fake_scopeView4

21− objectName: "fake_scopeView4"

22−

23− backColor: "#C0C0C0"

24−}

tests/qmltests/Dash/tst_Dash.qml−11

@@ -41,16 +41,6 @@ Item {

41 showScopeOnLoaded: "MockScope2"

42 }

43

44− ScopeDelegateMapper {

45− id: scopeDelegateMapper

46− scopeDelegateMapping: {

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

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

49− "clickscope": Qt.resolvedUrl("qml/fake_scopeView3.qml")

50− }

51− genericScope: Qt.resolvedUrl("qml/fake_generic_scopeView.qml")

52− }

53−

54 UT.UnityTestCase {

44 UT.UnityTestCase {

55 name: "Dash"

45 name: "Dash"

56 when: windowShown

46 when: windowShown

@@ -59,7 +49,6 @@ Item {

59

49

60 Component.onCompleted: {

50 Component.onCompleted: {

61 var dashContent = findChild(dash, "dashContent");

51 var dashContent = findChild(dash, "dashContent");

62− dashContent.scopeMapper = scopeDelegateMapper;

63 scopes = dashContent.scopes;

52 scopes = dashContent.scopes;

64 }

53 }

65

54

tests/qmltests/Dash/tst_DashContent.qml+27−51

@@ -35,13 +35,6 @@ Item {

35 property var panel: null

36 // BEGIN To reduce warnings

37

38− property var scopeStatus: {

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

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

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

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

43− }

44−

45 Scopes {

38 Scopes {

46 id: scopesModel

39 id: scopesModel

47 }

40 }

@@ -55,34 +48,9 @@ Item {

55 }

48 }

56 scopes : scopesModel

49 scopes : scopesModel

57

50

58− scopeMapper : scopeDelegateMapper

59 searchHistory: SearchHistoryModel {}

51 searchHistory: SearchHistoryModel {}

60 }

52 }

61

53

62− ScopeDelegateMapper {

63− id: scopeDelegateMapper

64− scopeDelegateMapping: {

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

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

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

68− }

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

70− }

71−

72− function clear_scope_status() {

73− scopeStatus["MockScope1"].movementStarted = 0;

74− scopeStatus["MockScope1"].positionedAtBeginning = 0;

75−

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

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

78−

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

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

81−

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

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

84− }

85−

86 SignalSpy {

54 SignalSpy {

87 id: scopeLoadedSpy

55 id: scopeLoadedSpy

88 target: dashContent

56 target: dashContent

@@ -97,7 +65,7 @@ Item {

97

65

98 UT.UnityTestCase {

66 UT.UnityTestCase {

99 name: "DashContent"

67 name: "DashContent"

100− when: scopesModel.loaded

68+ when: scopesModel.loaded && windowShown

101

69

102 function init() {

70 function init() {

103 scopesModel.clear();

71 scopesModel.clear();

@@ -108,7 +76,6 @@ Item {

108

76

109 function cleanup() {

77 function cleanup() {

110 movementStartedSpy.clear();

78 movementStartedSpy.clear();

111− clear_scope_status();

112 dashContent.visible = true;

79 dashContent.visible = true;

113

80

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

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

@@ -149,29 +116,38 @@ Item {

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

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

150 }

117 }

151

118

152− function test_movement_started_signal() {

119+ function test_show_header_on_list_movement() {

153− dashContent.setCurrentScopeAtIndex(3, true, false);

154−

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

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

156− verify(dashContentList != undefined)

121+ verify(dashContentList != undefined);

122+ var categoryListView = findChild(dashContentList, "categoryListView");

123+ verify(categoryListView != undefined);

124+

125+ waitForRendering(categoryListView);

157

126

158− dashContentList.movementStarted();

127+ categoryListView.contentY = units.gu(11);

128+ console.log("contentY", categoryListView.contentY);

159

129

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

130+ var startX = dashContentList.width/2;

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

131+ var startY = dashContentList.height/2;

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

132+ touchFlick(dashContentList, startX - units.gu(2), startY, startX, startY);

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

133+ tryCompare(categoryListView, "contentY", units.gu(11) - categoryListView.pageHeader.height);

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

165 }

134 }

166

135

167− function test_positioned_at_beginning_signal() {

136+ function test_set_current_scope_reset() {

137+ var dashContentList = findChild(dashContent, "dashContentList");

138+ verify(dashContentList != undefined);

139+ var categoryListView = findChild(dashContentList, "categoryListView");

140+ verify(categoryListView != undefined);

141+

142+ categoryListView.contentY = units.gu(10);

143+

144+ compare(dashContentList.currentItem.item.objectName, "MockScope1")

145+ compare(categoryListView.contentY, units.gu(10));

146+

168− dashContent.setCurrentScopeAtIndex(3, true, false);

147+ dashContent.setCurrentScopeAtIndex(0, false, true);

169

148

170− dashContent.positionedAtBeginning();

149+ compare(dashContentList.currentItem.item.objectName, "MockScope1")

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

150+ compare(categoryListView.contentY, 0);

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

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

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

175 }

151 }

176

152

177 // This tests that setting the current scope index will end up at the correct index even if

153 // This tests that setting the current scope index will end up at the correct index even if

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

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

64

65 UT.UnityTestCase {

66 name: "GenericScopeView"

67− when: scopes.loaded

67+ when: scopes.loaded && windowShown

68

69 function init() {

70 genericScopeView.scope = scopes.get(2)

tests/qmltests/Launcher/tst_Launcher.qml+1

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

66

67 UT.UnityTestCase {

68 id: revealer

69+ when: windowShown

69

70

70 function dragLauncherIntoView() {

71 function dragLauncherIntoView() {

71 var startX = launcher.dragAreaWidth/2;

72 var startX = launcher.dragAreaWidth/2;

tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+1

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

44

45 UT.UnityTestCase {

46 name: "MenuItemFactory"

47+ when: windowShown

47

48

48 property QtObject menuData: QtObject {

49 property QtObject menuData: QtObject {

49 property string label: "root"

50 property string label: "root"

tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml+1

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

39

40 UT.UnityTestCase {

41 name: "MessageMenuItemFactory"

42+ when: windowShown

42

43

43 property QtObject menuData: QtObject {

44 property QtObject menuData: QtObject {

44 property string label: "root"

45 property string label: "root"