58a11ae · unity8 · git.iko.soy

git.iko.soy/unity8

fix tests

commit58a11ae51ff4c291e533692606b088afc6a8156e authorMichael Zanetti <michael.zanetti@canonical.com> dateFri 8 Jan 2016, 12:28 (11 years ago) parenta62fe1b

4 files changed+44−1

compare with xenial

unifiedsplit

qml/Shell.qml+1−1 tests/mocks/GSettings.1.0/fake_gsettings.cpp+32 tests/mocks/GSettings.1.0/fake_gsettings.h+9 tests/qmltests/tst_Shell.qml+2

qml/Shell.qml+1−1

@@ -567,7 +567,7 @@ Item {

567567 shadeBackground: !tutorial.running

568568 superPressed: physicalKeysMapper.superPressed

569569 superTabPressed: physicalKeysMapper.superTabPressed

570− panelWidth: units.gu(launcherSettings.launcherWidth)

570+ panelWidth: units.gu(settings.launcherWidth)

571571 lockedVisible: shell.usageScenario == "desktop" && !settings.autohideLauncher

572572

573573 onShowDashHome: showHome()

tests/mocks/GSettings.1.0/fake_gsettings.cpp+32

@@ -23,6 +23,7 @@ GSettingsControllerQml* GSettingsControllerQml::s_controllerInstance = 0;

2323GSettingsControllerQml::GSettingsControllerQml()

2424 : m_usageMode("Staged")

2525 , m_autohideLauncher(false)

26+ , m_launcherWidth(qgetenv("GRID_UNIT_PX").isEmpty() ? 8 : qgetenv("GRID_UNIT_PX").toInt() * 8)

2627{

2728}

2829

@@ -102,6 +103,19 @@ void GSettingsControllerQml::setAutohideLauncher(bool autohideLauncher)

102103 }

103104}

104105

106+int GSettingsControllerQml::launcherWidth() const

107+{

108+ return m_launcherWidth;

109+}

110+

111+void GSettingsControllerQml::setLauncherWidth(int launcherWidth)

112+{

113+ if (m_launcherWidth != launcherWidth) {

114+ m_launcherWidth = launcherWidth;

115+ Q_EMIT launcherWidthChanged(launcherWidth);

116+ }

117+}

118+

105119GSettingsSchemaQml::GSettingsSchemaQml(QObject *parent): QObject(parent) {

106120}

107121

@@ -145,6 +159,8 @@ GSettingsQml::GSettingsQml(QObject *parent)

145159 this, &GSettingsQml::lifecycleExemptAppidsChanged);

146160 connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::autohideLauncherChanged,

147161 this, &GSettingsQml::autohideLauncherChanged);

162+ connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::launcherWidthChanged,

163+ this, &GSettingsQml::launcherWidthChanged);

148164}

149165

150166GSettingsSchemaQml * GSettingsQml::schema() const {

@@ -217,6 +233,15 @@ bool GSettingsQml::autohideLauncher() const

217233 }

218234}

219235

236+int GSettingsQml::launcherWidth() const

237+{

238+ if (m_schema->id() == "com.canonical.Unity8") {

239+ return GSettingsControllerQml::instance()->launcherWidth();

240+ } else {

241+ return false;

242+ }

243+}

244+

220245void GSettingsQml::setLifecycleExemptAppids(const QStringList &appIds)

221246{

222247 if (m_schema->id() == "com.canonical.qtmir") {

@@ -230,3 +255,10 @@ void GSettingsQml::setAutohideLauncher(bool autohideLauncher)

230255 GSettingsControllerQml::instance()->setAutohideLauncher(autohideLauncher);

231256 }

232257}

258+

259+void GSettingsQml::setLauncherWidth(int launcherWidth)

260+{

261+ if (m_schema->id() == "com.canonical.Unity8") {

262+ GSettingsControllerQml::instance()->setLauncherWidth(launcherWidth);

263+ }

264+}

tests/mocks/GSettings.1.0/fake_gsettings.h+9

@@ -51,6 +51,7 @@ class GSettingsQml: public QObject

5151 Q_PROPERTY(qint64 lockedOutTime READ lockedOutTime WRITE setLockedOutTime NOTIFY lockedOutTimeChanged)

5252 Q_PROPERTY(QStringList lifecycleExemptAppids READ lifecycleExemptAppids WRITE setLifecycleExemptAppids NOTIFY lifecycleExemptAppidsChanged)

5353 Q_PROPERTY(bool autohideLauncher READ autohideLauncher WRITE setAutohideLauncher NOTIFY autohideLauncherChanged)

54+ Q_PROPERTY(int launcherWidth READ launcherWidth WRITE setLauncherWidth NOTIFY launcherWidthChanged)

5455

5556public:

5657 GSettingsQml(QObject *parent = nullptr);

@@ -61,12 +62,14 @@ public:

6162 qint64 lockedOutTime() const;

6263 QStringList lifecycleExemptAppids() const;

6364 bool autohideLauncher() const;

65+ int launcherWidth() const;

6466

6567 void setPictureUri(const QString &str);

6668 void setUsageMode(const QString &usageMode);

6769 void setLockedOutTime(qint64 timestamp);

6870 void setLifecycleExemptAppids(const QStringList &appIds);

6971 void setAutohideLauncher(bool autohideLauncher);

72+ void setLauncherWidth(int launcherWidth);

7073

7174Q_SIGNALS:

7275 void schemaChanged();

@@ -75,6 +78,7 @@ Q_SIGNALS:

7578 void lockedOutTimeChanged(qint64);

7679 void lifecycleExemptAppidsChanged(const QStringList &);

7780 void autohideLauncherChanged(bool);

81+ void launcherWidthChanged(int launcherWidth);

7882

7983private:

8084 GSettingsSchemaQml* m_schema;

@@ -105,12 +109,16 @@ public:

105109 bool autohideLauncher() const;

106110 Q_INVOKABLE void setAutohideLauncher(bool autohideLauncher);

107111

112+ int launcherWidth() const;

113+ Q_INVOKABLE void setLauncherWidth(int launcherWidth);

114+

108115Q_SIGNALS:

109116 void pictureUriChanged(const QString&);

110117 void usageModeChanged(const QString&);

111118 void lockedOutTimeChanged(qint64 timestamp);

112119 void lifecycleExemptAppidsChanged(const QStringList&);

113120 void autohideLauncherChanged(bool autohideLauncher);

121+ void launcherWidthChanged(int launcherWidth);

114122

115123private:

116124 GSettingsControllerQml();

@@ -120,6 +128,7 @@ private:

120128 qint64 m_lockedOutTime;

121129 QStringList m_lifecycleExemptAppids;

122130 bool m_autohideLauncher;

131+ int m_launcherWidth;

123132

124133 static GSettingsControllerQml* s_controllerInstance;

125134 QList<GSettingsQml *> m_registeredGSettings;

tests/qmltests/tst_Shell.qml+2

@@ -904,6 +904,8 @@ Rectangle {

904904 function dragLauncherIntoView() {

905905 var launcher = findChild(shell, "launcher");

906906 var launcherPanel = findChild(launcher, "launcherPanel");

907+ print("launcherPanel.x", launcherPanel.x, launcherPanel.width)

908+ waitForRendering(launcher);

907909 verify(launcherPanel.x = - launcherPanel.width);

908910

909911 var touchStartX = 2;