git.iko.soy/unity8
on xenial help sign in
Some test refinements
e246ecdDaniel d'Andrada
tests/mocks/Unity/Application/ApplicationManager.cpp+1
compare with xenial
unifiedsplit
@@ -372,6 +372,7 @@ void ApplicationManager::buildListOfAvailableApplications()
372 application->setName("Gallery");
372 application->setName("Gallery");
373 application->setScreenshotId("gallery");
373 application->setScreenshotId("gallery");
374 application->setIconId("gallery");
374 application->setIconId("gallery");
375+ application->setFullscreen(true);
375 m_availableApplications.append(application);
376 m_availableApplications.append(application);
376
377
377 application = new ApplicationInfo(this);
378 application = new ApplicationInfo(this);
tests/mocks/Unity/Application/MirSurfaceItem.cpp+2−2
@@ -233,8 +233,8 @@ void MirSurfaceItem::createQmlContentItem()
233 m_qmlItem = qobject_cast<QQuickItem*>(m_qmlContentComponent->create());
233 m_qmlItem = qobject_cast<QQuickItem*>(m_qmlContentComponent->create());
234 m_qmlItem->setParentItem(this);
234 m_qmlItem->setParentItem(this);
235
235
236− setImplicitWidth(m_qmlItem->width());
236+ setImplicitWidth(m_qmlItem->implicitWidth());
237− setImplicitHeight(m_qmlItem->height());
237+ setImplicitHeight(m_qmlItem->implicitHeight());
238
238
239 {
239 {
240 QQmlProperty screenshotSource(m_qmlItem, "screenshotSource");
240 QQmlProperty screenshotSource(m_qmlItem, "screenshotSource");
tests/mocks/Unity/Application/MirSurfaceItem.qml+6−3
@@ -19,10 +19,12 @@ import QtQuick 2.0
19Rectangle {
19Rectangle {
20 objectName: "fakeSurfaceQML"
20 objectName: "fakeSurfaceQML"
21 id: root
21 id: root
22− color: "yellow"
22+ color: "pink"
23
23
24+ anchors.fill: parent
25+
24− width: units.gu(40)
26+ implicitWidth: units.gu(40)
25− height: units.gu(70)
27+ implicitHeight: units.gu(70)
26
28
27 property alias screenshotSource: screenshotImage.source
29 property alias screenshotSource: screenshotImage.source
28
30
@@ -34,6 +36,7 @@ Rectangle {
34 Image {
36 Image {
35 id: screenshotImage
37 id: screenshotImage
36 anchors.fill: parent
38 anchors.fill: parent
39+ fillMode: Image.Stretch
37 }
40 }
38
41
39 Text {
42 Text {
tests/qmltests/Stages/tst_PhoneStage.qml+1−4
@@ -26,14 +26,11 @@ Item {
26 width: units.gu(70)
26 width: units.gu(70)
27 height: units.gu(70)
27 height: units.gu(70)
28
28
29− Rectangle {
30−
31− }
32−
33 PhoneStage {
29 PhoneStage {
34 id: phoneStage
30 id: phoneStage
35 anchors { fill: parent; rightMargin: units.gu(30) }
31 anchors { fill: parent; rightMargin: units.gu(30) }
36 dragAreaWidth: units.gu(2)
32 dragAreaWidth: units.gu(2)
33+ maximizedAppTopMargin: units.gu(3) + units.dp(2)
37 }
34 }
38
35
39 Binding {
36 Binding {