58a11ae · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

fix tests

58a11aeMichael Zanetti11 years ago

qml/Shell.qml+1−1

compare with xenial

unifiedsplit

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

567 shadeBackground: !tutorial.running

568 superPressed: physicalKeysMapper.superPressed

569 superTabPressed: physicalKeysMapper.superTabPressed

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

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

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

572

573 onShowDashHome: showHome()

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

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

23GSettingsControllerQml::GSettingsControllerQml()

24 : m_usageMode("Staged")

25 , m_autohideLauncher(false)

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

26{

27{

27}

28}

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

102 }

103 }

103}

104}

104

105

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+

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

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

106}

120}

107

121

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

145 this, &GSettingsQml::lifecycleExemptAppidsChanged);

159 this, &GSettingsQml::lifecycleExemptAppidsChanged);

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

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

147 this, &GSettingsQml::autohideLauncherChanged);

161 this, &GSettingsQml::autohideLauncherChanged);

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

163+ this, &GSettingsQml::launcherWidthChanged);

148}

164}

149

165

150GSettingsSchemaQml * GSettingsQml::schema() const {

166GSettingsSchemaQml * GSettingsQml::schema() const {

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

217 }

233 }

218}

234}

219

235

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+

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

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

221{

246{

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

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

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

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

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

231 }

256 }

232}

257}

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

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

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

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

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

55public:

56public:

56 GSettingsQml(QObject *parent = nullptr);

57 GSettingsQml(QObject *parent = nullptr);

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

61 qint64 lockedOutTime() const;

62 qint64 lockedOutTime() const;

62 QStringList lifecycleExemptAppids() const;

63 QStringList lifecycleExemptAppids() const;

63 bool autohideLauncher() const;

64 bool autohideLauncher() const;

65+ int launcherWidth() const;

65 void setPictureUri(const QString &str);

67 void setPictureUri(const QString &str);

66 void setUsageMode(const QString &usageMode);

68 void setUsageMode(const QString &usageMode);

67 void setLockedOutTime(qint64 timestamp);

69 void setLockedOutTime(qint64 timestamp);

68 void setLifecycleExemptAppids(const QStringList &appIds);

70 void setLifecycleExemptAppids(const QStringList &appIds);

69 void setAutohideLauncher(bool autohideLauncher);

71 void setAutohideLauncher(bool autohideLauncher);

72+ void setLauncherWidth(int launcherWidth);

71Q_SIGNALS:

74Q_SIGNALS:

72 void schemaChanged();

75 void schemaChanged();

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

75 void lockedOutTimeChanged(qint64);

78 void lockedOutTimeChanged(qint64);

76 void lifecycleExemptAppidsChanged(const QStringList &);

79 void lifecycleExemptAppidsChanged(const QStringList &);

77 void autohideLauncherChanged(bool);

80 void autohideLauncherChanged(bool);

81+ void launcherWidthChanged(int launcherWidth);

79private:

83private:

80 GSettingsSchemaQml* m_schema;

84 GSettingsSchemaQml* m_schema;

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

105 bool autohideLauncher() const;

109 bool autohideLauncher() const;

106 Q_INVOKABLE void setAutohideLauncher(bool autohideLauncher);

110 Q_INVOKABLE void setAutohideLauncher(bool autohideLauncher);

107

111

112+ int launcherWidth() const;

113+ Q_INVOKABLE void setLauncherWidth(int launcherWidth);

114+

108Q_SIGNALS:

115Q_SIGNALS:

109 void pictureUriChanged(const QString&);

116 void pictureUriChanged(const QString&);

110 void usageModeChanged(const QString&);

117 void usageModeChanged(const QString&);

111 void lockedOutTimeChanged(qint64 timestamp);

118 void lockedOutTimeChanged(qint64 timestamp);

112 void lifecycleExemptAppidsChanged(const QStringList&);

119 void lifecycleExemptAppidsChanged(const QStringList&);

113 void autohideLauncherChanged(bool autohideLauncher);

120 void autohideLauncherChanged(bool autohideLauncher);

121+ void launcherWidthChanged(int launcherWidth);

114

122

115private:

123private:

116 GSettingsControllerQml();

124 GSettingsControllerQml();

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

120 qint64 m_lockedOutTime;

128 qint64 m_lockedOutTime;

121 QStringList m_lifecycleExemptAppids;

129 QStringList m_lifecycleExemptAppids;

122 bool m_autohideLauncher;

130 bool m_autohideLauncher;

131+ int m_launcherWidth;

123

132

124 static GSettingsControllerQml* s_controllerInstance;

133 static GSettingsControllerQml* s_controllerInstance;

125 QList<GSettingsQml *> m_registeredGSettings;

134 QList<GSettingsQml *> m_registeredGSettings;

tests/qmltests/tst_Shell.qml+2

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

904 function dragLauncherIntoView() {

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

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

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

908+ waitForRendering(launcher);

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

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

908

910

909 var touchStartX = 2;

911 var touchStartX = 2;