b85001f · unity8 · git.iko.soy

qml/Dash/Previews/Preview.qml+1

compare with xenial

unifiedsplit

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

65

66 delegate: ListView {

67 id: column

68+ objectName: "previewListRow" + index

68 anchors { top: parent.top; bottom: parent.bottom }

69 anchors { top: parent.top; bottom: parent.bottom }

69 width: row.columnWidth

70 width: row.columnWidth

70 spacing: row.spacing

71 spacing: row.spacing

tests/mocks/Unity/fake_previewwidgetmodel.cpp+10

@@ -53,6 +53,16 @@ void PreviewWidgetModel::populateWidgets()

53 PreviewData* preview_data = new PreviewData(QString("widget-%1").arg(i), QString("text"), attributes);

54 m_previewWidgets.append(QSharedPointer<PreviewData>(preview_data));

55 }

56+

57+ QVariantMap attributes;

58+ QVariantMap buttonData;

59+ buttonData["label"] = "Button";

60+ QVariantList buttons;

61+ buttons << buttonData << buttonData << buttonData;

62+ attributes["actions"] = QVariant::fromValue(buttons);

63+ PreviewData* preview_data = new PreviewData(QString("widget-21"), QString("actions"), attributes);

64+ m_previewWidgets.append(QSharedPointer<PreviewData>(preview_data));

65+

56 endResetModel();

66 endResetModel();

57

67

58}

68}

tests/qmltests/Dash/Previews/tst_Preview.qml+31

@@ -54,6 +54,11 @@ Rectangle {

54 name: "Preview"

55 when: windowShown

56

57+ function init() {

58+ var widget = findChild(preview, "previewListRow0");

59+ widget.positionViewAtBeginning();

60+ }

61+

57 function test_triggered() {

62 function test_triggered() {

58 waitForRendering(preview);

63 waitForRendering(preview);

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

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

@@ -102,5 +107,31 @@ Rectangle {

102 return bottomLeft.y <= preview.height

107 return bottomLeft.y <= preview.height

103 }, true);

108 }, true);

104 }

109 }

110+

111+ function test_comboEnsureVisible() {

112+ waitForRendering(preview);

113+

114+ // Scroll down

115+ var previewListRow0 = findChild(preview, "previewListRow0");

116+ touchFlick(preview, preview.width / 2, units.gu(20), preview.width / 2, units.gu(1));

117+ tryCompare(previewListRow0, "atYEnd", true);

118+ tryCompare(previewListRow0, "moving", false);

119+

120+ // Click on the combo

121+ var widget = findChild(preview, "widget-21");

122+ var initialWidgetHeight = widget.height;

123+ var moreLessButton = findChild(widget, "moreLessButton");

124+ mouseClick(moreLessButton);

125+

126+ // Make sure the combo is growing

127+ tryCompareFunction(function () { return widget.height > 2 * initialWidgetHeight; }, true);

128+

129+ // Wait for the combo to stop growing

130+ tryCompareFunction(function () { var currentWidgetHeight = widget.height; wait(200); return currentWidgetHeight === widget.height;}, true);

131+

132+ // Make sure the combo bottom is on the viewport

133+ var bottomLeft = preview.mapFromItem(widget, 0, widget.height);

134+ verify(bottomLeft.y <= preview.height);

135+ }

105 }

136 }

106}

137}

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

@@ -380,8 +380,8 @@ Item {

380

381 tryCompare(testCase.subPageLoader, "open", false);

382

383+ tryCompareFunction(function() { return findChild(category, "delegate1") != null; }, true);

383 var tile = findChild(category, "delegate1");

384 var tile = findChild(category, "delegate1");

384− verify(tile, "Could not find delegate");

385

386 mouseClick(tile);

387 tryCompare(testCase.subPageLoader, "open", true);