544dec4 · unity8 · git.iko.soy

Greeter/GreeterContent.qml+1

compare with xenial

unifiedsplit

@@ -124,6 +124,7 @@ MouseArea {

124

125 function updateUsername(uid) {

126 greeterContentLoader.infographicModel.username = greeterContentLoader.model.data(uid, LightDM.UserRoles.NameRole)

127+ greeterContentLoader.infographicModel.readyForDataChangeSlot();

127 }

128 }

128

129

129 anchors {

130 anchors {

debian/control+1

@@ -13,6 +13,7 @@ Build-Depends: cmake,

13 libpulse-dev,

14 libqt5v8-5-private-dev,

15 libunity-core-6.0-dev (<< 7.80),

16+ libusermetricsoutput1-dev,

16 libxcb1-dev,

17 libxcb1-dev,

17 pkg-config,

18 pkg-config,

18 python3,

19 python3,

plugins/LightDM/CMakeLists.txt+4−1

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

1# Dependencies

2+include(FindPkgConfig)

3+pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)

2# TODO: Once we split out a separate greeter process, uncomment these lines

4# TODO: Once we split out a separate greeter process, uncomment these lines

3−#include(FindPkgConfig)

4#pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-2)

5#pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-2)

5

6

6include_directories(

7include_directories(

@@ -8,6 +9,7 @@ include_directories(

8 ${CMAKE_CURRENT_BINARY_DIR}

9 ${CMAKE_CURRENT_BINARY_DIR}

9 ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM

10 ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM

10 #${LIBLIGHTDM_INCLUDE_DIRS}

11 #${LIBLIGHTDM_INCLUDE_DIRS}

12+ ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}

11)

13)

12

14

13set(QMLPLUGIN_SRC

15set(QMLPLUGIN_SRC

@@ -25,6 +27,7 @@ target_link_libraries(LightDM-qml

25 MockLightDM-demo

27 MockLightDM-demo

26# TODO: Once we split out a separate greeter process, uncomment these lines

28# TODO: Once we split out a separate greeter process, uncomment these lines

27# ${LIBLIGHTDM_LDFLAGS}

29# ${LIBLIGHTDM_LDFLAGS}

30+ ${LIBUSERMETRICSOUTPUT_LDFLAGS}

28 )

31 )

29

32

30qt5_use_modules(LightDM-qml Gui Qml)

33qt5_use_modules(LightDM-qml Gui Qml)

plugins/LightDM/InfographicModel.hdeleted−27

@@ -1,27 +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− * Authors: Pete Woods <pete.woods@canonical.com>

17− */

18−

19−#ifndef INFOGRAPHICMODEL_H

20−#define INFOGRAPHICMODEL_H

21−

22−#include <QLightDM/InfographicModel>

23−

24−typedef QLightDM::InfographicModel InfographicModel;

25−typedef QLightDM::InfographicColorTheme InfographicColorTheme;

26−

27−#endif

plugins/LightDM/plugin.cpp+5−4

@@ -20,8 +20,9 @@

20#include "plugin.h"

21#include "Greeter.h"

22#include "UsersModel.h"

23+#include <libusermetricsoutput/ColorTheme.h>

24+#include <libusermetricsoutput/UserMetrics.h>

23#include <QLightDM/UsersModel>

25#include <QLightDM/UsersModel>

24−#include "InfographicModel.h"

25

26

26#include <QtCore/QAbstractItemModel>

27#include <QtCore/QAbstractItemModel>

27#include <QtQml>

28#include <QtQml>

@@ -44,17 +45,17 @@ static QObject *infographic_provider(QQmlEngine *engine, QJSEngine *scriptEngine

44{

45{

45 Q_UNUSED(engine)

46 Q_UNUSED(engine)

46 Q_UNUSED(scriptEngine)

47 Q_UNUSED(scriptEngine)

47− return InfographicModel::getInstance();

48+ return UserMetricsOutput::UserMetrics::getInstance();

48}

49}

49

50

50void LightDMPlugin::registerTypes(const char *uri)

51void LightDMPlugin::registerTypes(const char *uri)

51{

52{

52 qmlRegisterType<QAbstractItemModel>();

53 qmlRegisterType<QAbstractItemModel>();

53− qmlRegisterType<InfographicColorTheme>();

54+ qmlRegisterType<UserMetricsOutput::ColorTheme>();

54

55

55 Q_ASSERT(uri == QLatin1String("LightDM"));

56 Q_ASSERT(uri == QLatin1String("LightDM"));

56 qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);

57 qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);

57 qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);

58 qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);

58 qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", "Type is not instantiable");

59 qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", "Type is not instantiable");

59− qmlRegisterSingletonType<InfographicModel>(uri, 0, 1, "Infographic", infographic_provider);

60+ qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);

60}

61}

plugins/ListViewWithPageHeader/listviewwithpageheader.cpp+3

@@ -342,6 +342,9 @@ void ListViewWithPageHeader::positionAtBeginning()

342

343void ListViewWithPageHeader::showHeader()

344{

345+ if (!m_headerItem)

346+ return;

347+

345 auto to = qMax(-minYExtent(), contentY() - m_headerItem->height() + m_headerItemShownHeight);

348 auto to = qMax(-minYExtent(), contentY() - m_headerItem->height() + m_headerItemShownHeight);

346 if (to != contentY()) {

349 if (to != contentY()) {

347 m_headerShowAnimation->setTo(to);

350 m_headerShowAnimation->setTo(to);

plugins/Utils/qlimitproxymodelqml.cpp+4−4

@@ -39,11 +39,11 @@ QHash<int, QByteArray> QLimitProxyModelQML::roleNames() const

39void

40QLimitProxyModelQML::setModel(QAbstractItemModel *itemModel)

41{

42− if (sourceModel() != NULL) {

43− sourceModel()->disconnect(this);

44− }

45−

46 if (itemModel != sourceModel()) {

42 if (itemModel != sourceModel()) {

43+ if (sourceModel() != NULL) {

44+ sourceModel()->disconnect(this);

45+ }

46+

47 setSourceModel(itemModel);

48

49 if (sourceModel() != NULL) {

run+3−3

@@ -41,17 +41,17 @@ done

41

42if $FAKE; then

43 export QML2_IMPORT_PATH=$PWD/builddir/tests/mocks:$PWD/builddir/plugins

44− export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/single

44+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single

45fi

46

47if $PINLOCK; then

48 export QML2_IMPORT_PATH=$PWD/builddir/tests/mocks:$PWD/builddir/plugins

49− export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/single-pin

49+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-pin

50fi

51

52if $KEYLOCK; then

53 export QML2_IMPORT_PATH=$PWD/builddir/tests/mocks:$PWD/builddir/plugins

54− export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/single-passphrase

54+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-passphrase

55fi

56

57# Force icon theme if running on the desktop, otherwise gnome theme (if running

tests/autopilot/unity8/tests/__init__.py+2−2

@@ -39,7 +39,7 @@ class ShellTestCase(AutopilotTestCase):

39 self.launch_test_local(geometry)

40

41 def launch_test_local(self, geometry):

42− os.environ['LD_LIBRARY_PATH'] = "../../builddir/tests/mocks/LightDM/" + self.lightdm_mock

42+ os.environ['LD_LIBRARY_PATH'] = "../../../unity_build/build/lib:../../builddir/tests/mocks/libusermetrics:../../builddir/tests/mocks/LightDM/" + self.lightdm_mock

43 if geometry != "0x0":

44 self.app = self.launch_test_application(

45 "../../builddir/unity8", "-geometry", geometry, "-frameless", app_type='qt')

@@ -48,7 +48,7 @@ class ShellTestCase(AutopilotTestCase):

48 "../../builddir/unity8", "-fullscreen", app_type='qt')

49

50 def launch_test_installed(self, geometry):

51− os.environ['LD_LIBRARY_PATH'] = "/usr/share/unity8/plugins/mocks/LightDM/" + self.lightdm_mock

51+ os.environ['LD_LIBRARY_PATH'] = "/usr/share/unity8/plugins/mocks/libusermetrics:/usr/share/unity8/plugins/mocks/LightDM/" + self.lightdm_mock

52 if model() == 'Desktop' and geometry != "0x0":

53 self.app = self.launch_test_application(

54 "unity8", "-geometry", geometry, "-frameless", app_type='qt')

tests/mocks/CMakeLists.txt+1

@@ -1,3 +1,4 @@

1+add_subdirectory(libusermetrics)

1add_subdirectory(LightDM)

2add_subdirectory(LightDM)

2add_subdirectory(Ubuntu)

3add_subdirectory(Ubuntu)

3add_subdirectory(Unity)

4add_subdirectory(Unity)

tests/mocks/LightDM/CMakeLists.txt+3

@@ -13,6 +13,7 @@ add_subdirectory(single-passphrase)

13include_directories(

14 ${CMAKE_CURRENT_SOURCE_DIR}

15 ${CMAKE_CURRENT_BINARY_DIR}

16+ ${CMAKE_SOURCE_DIR}/tests/mocks/libusermetrics

16)

17)

17

18

18set(QMLPLUGIN_SRC

19set(QMLPLUGIN_SRC

@@ -34,6 +35,8 @@ add_dependencies(MockLightDM-qml MockLightDM-full)

34target_link_libraries(MockLightDM-qml

35target_link_libraries(MockLightDM-qml

35 -L${CMAKE_CURRENT_BINARY_DIR}/full

36 -L${CMAKE_CURRENT_BINARY_DIR}/full

36 -llightdm-qt5-2

37 -llightdm-qt5-2

38+ -L${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics

39+ -lusermetricsoutput

37 )

40 )

38

41

39qt5_use_modules(MockLightDM-qml Gui Qml)

42qt5_use_modules(MockLightDM-qml Gui Qml)

tests/mocks/LightDM/InfographicModel.cppdeleted−416

@@ -1,416 +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− * Author: Pete Woods <pete.woods@canonical.com>

17− */

18−

19−#include "InfographicModelPrivate.h"

20−#include "InfographicModel.h"

21−

22−#include <QtCore/QDir>

23−#include <QtCore/QString>

24−#include <QtGui/QIcon>

25−#include <QMultiMap>

26−

27−using namespace QLightDM;

28−

29−namespace QLightDM

30−{

31−

32−class InfographicColorThemePrivate: QObject

33−{

34−public:

35− explicit InfographicColorThemePrivate(InfographicColorTheme *parent = 0);

36−

37− InfographicColorThemePrivate(const QColor &start, const QColor &main,

38− const QColor &end, InfographicColorTheme *parent = 0);

39−

40− ~InfographicColorThemePrivate();

41−

42− InfographicColorTheme * const q_ptr;

43−

44− QColor m_start;

45−

46− QColor m_main;

47−

48− QColor m_end;

49−

50−protected:

51− int calculateLength();

52−

53−private:

54− Q_DECLARE_PUBLIC(InfographicColorTheme)

55−};

56−

57−class InfographicDataPrivate: QObject

58−{

59−public:

60− explicit InfographicDataPrivate(InfographicData *parent);

61−

62− InfographicDataPrivate(const QString &label,

63− const InfographicColorTheme &firstColor,

64− const QVariantList &firstMonth,

65− const InfographicColorTheme &secondColor,

66− const QVariantList &secondMonth, InfographicData *parent);

67−

68− ~InfographicDataPrivate();

69−

70− InfographicData * const q_ptr;

71− QString m_label;

72− InfographicColorTheme m_firstColor;

73− QVariantList m_firstMonth;

74− InfographicColorTheme m_secondColor;

75− QVariantList m_secondMonth;

76− int m_length;

77−

78−protected:

79− int calculateLength();

80−

81−private:

82− Q_DECLARE_PUBLIC(InfographicData)

83−};

84−

85−}

86−

87−InfographicColorThemePrivate::InfographicColorThemePrivate(

88− InfographicColorTheme *parent) :

89− q_ptr(parent)

90−{

91−}

92−

93−InfographicColorThemePrivate::InfographicColorThemePrivate(const QColor &start,

94− const QColor &main, const QColor &end, InfographicColorTheme *parent) :

95− q_ptr(parent), m_start(start), m_main(main), m_end(end)

96−{

97−}

98−

99−InfographicColorThemePrivate::~InfographicColorThemePrivate()

100−{

101−}

102−

103−InfographicColorTheme::InfographicColorTheme(QObject *parent) :

104− QObject(parent), d_ptr(new InfographicColorThemePrivate(this))

105−{

106−}

107−

108−InfographicColorTheme::InfographicColorTheme(QColor &first, QColor &main,

109− QColor &end, QObject *parent) :

110− QObject(parent), d_ptr(

111− new InfographicColorThemePrivate(first, main, end, this))

112−{

113−

114−}

115−

116−InfographicColorTheme & InfographicColorTheme::operator=(

117− const InfographicColorTheme & other)

118−{

119− if (d_ptr->m_start != other.d_ptr->m_start)

120− {

121− d_ptr->m_start = other.d_ptr->m_start;

122− startChanged(d_ptr->m_start);

123− }

124− if (d_ptr->m_main != other.d_ptr->m_main)

125− {

126− d_ptr->m_main = other.d_ptr->m_main;

127− mainChanged(d_ptr->m_main);

128− }

129−

130− if (d_ptr->m_end != other.d_ptr->m_end)

131− {

132− d_ptr->m_end = other.d_ptr->m_end;

133− endChanged(d_ptr->m_end);

134− }

135−

136− return *this;

137−}

138−

139−InfographicColorTheme::~InfographicColorTheme()

140−{

141− delete d_ptr;

142−}

143−

144−QColor InfographicColorTheme::start() const

145−{

146− return d_ptr->m_start;

147−}

148−

149−QColor InfographicColorTheme::main() const

150−{

151− return d_ptr->m_main;

152−}

153−

154−QColor InfographicColorTheme::end() const

155−{

156− return d_ptr->m_end;

157−}

158−

159−InfographicDataPrivate::InfographicDataPrivate(InfographicData *parent) :

160− q_ptr(parent), m_firstColor(this), m_secondColor(this)

161−{

162− m_length = calculateLength();

163−}

164−

165−InfographicDataPrivate::InfographicDataPrivate(const QString &label,

166− const InfographicColorTheme &firstColor, const QVariantList &firstMonth,

167− const InfographicColorTheme &secondColor,

168− const QVariantList &secondMonth, InfographicData *parent) :

169− q_ptr(parent), m_label(label), m_firstColor(this), m_firstMonth(

170− firstMonth), m_secondColor(this), m_secondMonth(secondMonth)

171−{

172− m_length = calculateLength();

173− m_firstColor = firstColor;

174− m_secondColor = secondColor;

175−}

176−

177−InfographicDataPrivate::~InfographicDataPrivate()

178−{

179−}

180−

181−int InfographicDataPrivate::calculateLength()

182−{

183− int day(m_firstMonth.size());

184− auto it = m_firstMonth.end(), end = m_firstMonth.begin();

185− while (it != end)

186− {

187− --it;

188− --day;

189− if (!it->isNull())

190− {

191− return day;

192− }

193− }

194−

195− return -1;

196−}

197−

198−InfographicData::InfographicData(QObject *parent) :

199− QObject(parent), d_ptr(new InfographicDataPrivate(this))

200−{

201−}

202−

203−InfographicData::InfographicData(const QString &label,

204− const InfographicColorTheme &firstColor, const QVariantList &firstMonth,

205− const InfographicColorTheme &secondColor,

206− const QVariantList &secondMonth, QObject* parent) :

207− QObject(parent), d_ptr(

208− new InfographicDataPrivate(label, firstColor, firstMonth,

209− secondColor, secondMonth, this))

210−{

211−}

212−

213−InfographicData::~InfographicData()

214−{

215− delete d_ptr;

216−}

217−

218−const QString & InfographicData::label() const

219−{

220− return d_ptr->m_label;

221−}

222−

223−const InfographicColorTheme & InfographicData::firstColor() const

224−{

225− return d_ptr->m_firstColor;

226−}

227−

228−const QVariantList & InfographicData::firstMonth() const

229−{

230− return d_ptr->m_firstMonth;

231−}

232−

233−const InfographicColorTheme & InfographicData::secondColor() const

234−{

235− return d_ptr->m_secondColor;

236−}

237−

238−const QVariantList & InfographicData::secondMonth() const

239−{

240− return d_ptr->m_secondMonth;

241−}

242−

243−int InfographicData::length() const

244−{

245− return d_ptr->m_length;

246−}

247−

248−InfographicModelPrivate::InfographicModelPrivate(InfographicModel *parent) :

249− q_ptr(parent), m_currentDay(0)

250−{

251− m_fakeData.insert("", InfographicDataPtr(new InfographicData(this)));

252−}

253−

254−InfographicModelPrivate::~InfographicModelPrivate()

255−{

256−}

257−

258−void InfographicModelPrivate::setUsername(const QString &username)

259−{

260− if(m_username == username) {

261− return;

262− }

263−

264− m_username = username;

265−

266− m_dataIndex = m_fakeData.constFind(m_username);

267− if (m_dataIndex == m_fakeData.end())

268− {

269− m_dataIndex = m_fakeData.constFind("");

270− }

271−

272− loadFakeData();

273−

274− q_ptr->usernameChanged(m_username);

275−}

276−

277−void InfographicModelPrivate::loadFakeData()

278−{

279− m_newData = *m_dataIndex;

280−

281− bool oldLabelEmpty = m_label.isEmpty();

282− bool newLabelEmpty = m_newData->label().isEmpty();

283−

284− if (oldLabelEmpty && !newLabelEmpty)

285− {

286− q_ptr->dataAboutToAppear();

287− finishSetFakeData();

288− } else if (!oldLabelEmpty && newLabelEmpty)

289− {

290− q_ptr->dataAboutToDisappear();

291− } else if (!oldLabelEmpty && !newLabelEmpty)

292− {

293− q_ptr->dataAboutToChange();

294− }

295− // we emit no signal if the data has stayed empty

296−}

297−

298−void InfographicModelPrivate::finishSetFakeData()

299−{

300− bool oldLabelEmpty = m_label.isEmpty();

301− bool newLabelEmpty = m_newData->label().isEmpty();

302−

303− m_label = m_newData->label();

304− m_firstColor = m_newData->firstColor();

305− m_firstMonth.setVariantList(m_newData->firstMonth());

306− m_secondColor = m_newData->secondColor();

307− m_secondMonth.setVariantList(m_newData->secondMonth());

308−

309− bool currentDayChanged = m_currentDay != m_newData->length();

310− m_currentDay = m_newData->length();

311−

312− q_ptr->labelChanged(m_label);

313− if (currentDayChanged)

314− {

315− q_ptr->currentDayChanged(m_currentDay);

316− }

317−

318− if (oldLabelEmpty && !newLabelEmpty)

319− {

320− q_ptr->dataAppeared();

321− } else if (!oldLabelEmpty && newLabelEmpty)

322− {

323− q_ptr->dataDisappeared();

324− } else if (!oldLabelEmpty && !newLabelEmpty)

325− {

326− q_ptr->dataChanged();

327− }

328− // we emit no signal if the data has stayed empty

329−}

330−

331−void InfographicModelPrivate::nextFakeData()

332−{

333− ++m_dataIndex;

334− if (m_dataIndex == m_fakeData.end() || m_dataIndex.key() != m_username)

335− {

336− m_dataIndex = m_fakeData.constFind(m_username);

337− }

338−

339− loadFakeData();

340−}

341−

342−InfographicModel::InfographicModel(QObject *parent) :

343− QObject(parent), d_ptr(new InfographicModelPrivate(this))

344−{

345− d_ptr->generateFakeData();

346− setUsername("");

347−

348− connect(this, SIGNAL(nextDataSource()), this, SLOT(nextDataSourceSlot()),

349− Qt::QueuedConnection);

350− connect(this, SIGNAL(readyForDataChange()), this,

351− SLOT(readyForDataChangeSlot()), Qt::QueuedConnection);

352−}

353−

354−InfographicModel::~InfographicModel()

355−{

356− delete d_ptr;

357−}

358−

359−QString InfographicModel::label() const

360−{

361− return d_ptr->m_label;

362−}

363−

364−QString InfographicModel::username() const

365−{

366− return d_ptr->m_username;

367−}

368−

369−void InfographicModel::setUsername(const QString &username)

370−{

371− d_ptr->setUsername(username);

372−}

373−

374−InfographicColorTheme * InfographicModel::firstColor() const

375−{

376− return &d_ptr->m_firstColor;

377−}

378−

379−InfographicColorTheme * InfographicModel::secondColor() const

380−{

381− return &d_ptr->m_secondColor;

382−}

383−

384−QAbstractItemModel * InfographicModel::firstMonth() const

385−{

386− return &d_ptr->m_firstMonth;

387−}

388−

389−QAbstractItemModel * InfographicModel::secondMonth() const

390−{

391− return &d_ptr->m_secondMonth;

392−}

393−

394−int InfographicModel::currentDay() const

395−{

396− return d_ptr->m_currentDay;

397−}

398−

399−void InfographicModel::nextDataSourceSlot()

400−{

401− d_ptr->nextFakeData();

402−}

403−

404−void InfographicModel::readyForDataChangeSlot()

405−{

406− d_ptr->finishSetFakeData();

407−}

408−

409−/**

410− * Factory methods

411− */

412−

413−InfographicModel * InfographicModel::getInstance()

414−{

415− return new InfographicModel();

416−}

tests/mocks/LightDM/InfographicModelPrivate.hdeleted−99

@@ -1,99 +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− * Author: Pete Woods <pete.woods@canonical.com>

17− */

18−

19−#ifndef INFOGRAPHICMODEL_PRIVATE_H

20−#define INFOGRAPHICMODEL_PRIVATE_H

21−

22−#include <QtCore/QSharedPointer>

23−

24−#include "InfographicModel.h"

25−#include "plugins/Utils/qvariantlistmodel.h"

26−

27−namespace QLightDM

28−{

29−class InfographicDataPrivate;

30−

31−class Q_DECL_EXPORT InfographicData: public QObject

32−{

33−public:

34− explicit InfographicData(QObject *parent);

35−

36− InfographicData(const QString &label,

37− const InfographicColorTheme &firstColor,

38− const QVariantList &firstMonth,

39− const InfographicColorTheme &secondColor,

40− const QVariantList &secondMonth, QObject* parent);

41−

42− ~InfographicData();

43−

44−protected:

45− InfographicDataPrivate * const d_ptr;

46−

47−public:

48− const QString & label() const;

49− const InfographicColorTheme & firstColor() const;

50− const QVariantList & firstMonth() const;

51− const InfographicColorTheme & secondColor() const;

52− const QVariantList & secondMonth() const;

53− int length() const;

54−

55−private:

56− Q_DECLARE_PRIVATE(InfographicData)

57−};

58−

59−class InfographicModelPrivate: QObject

60−{

61−

62−public:

63− explicit InfographicModelPrivate(InfographicModel *parent);

64−

65− ~InfographicModelPrivate();

66−

67−public:

68− typedef QSharedPointer<InfographicData> InfographicDataPtr;

69− typedef QMultiMap<QString, InfographicDataPtr> FakeDataMap;

70−

71− InfographicModel * const q_ptr;

72− QString m_label;

73− InfographicColorTheme m_firstColor;

74− QVariantListModel m_firstMonth;

75− InfographicColorTheme m_secondColor;

76− QVariantListModel m_secondMonth;

77− int m_currentDay;

78− QString m_username;

79− FakeDataMap::const_iterator m_dataIndex;

80− InfographicDataPtr m_newData;

81− FakeDataMap m_fakeData;

82−

83− void setUsername(const QString &username);

84−

85−protected:

86− void nextFakeData();

87−

88− void generateFakeData();

89−

90− void loadFakeData();

91−

92− void finishSetFakeData();

93−

94−private:

95− Q_DECLARE_PUBLIC(InfographicModel)

96−};

97−}

98−

99−#endif // INFOGRAPHICMODEL_PRIVATE_H

tests/mocks/LightDM/demo/CMakeLists.txt+11−2

@@ -1,13 +1,22 @@

1+include(FindPkgConfig)

2+pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)

3+

1set(LibLightDM_SOURCES

4set(LibLightDM_SOURCES

2 ../Greeter.cpp

5 ../Greeter.cpp

3 ../UsersModel.cpp

6 ../UsersModel.cpp

4− ../InfographicModel.cpp

5 GreeterPrivate.cpp

7 GreeterPrivate.cpp

6 UsersModelPrivate.cpp

8 UsersModelPrivate.cpp

7− InfographicModelPrivate.cpp

8 ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp

9 ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp

9 )

10 )

10

11

11add_library(MockLightDM-demo STATIC ${LibLightDM_SOURCES})

12add_library(MockLightDM-demo STATIC ${LibLightDM_SOURCES})

12

13

14+include_directories(

15+ ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}

16+)

17+

18+target_link_libraries(MockLightDM-demo

19+ ${LIBUSERMETRICSOUTPUT_LDFLAGS}

20+ )

21+

13qt5_use_modules(MockLightDM-demo Gui)

22qt5_use_modules(MockLightDM-demo Gui)

tests/mocks/LightDM/demo/UsersModelPrivate.cpp+1−1

@@ -26,7 +26,7 @@ UsersModelPrivate::UsersModelPrivate(UsersModel* parent)

26{

27 entries =

28 {

29− { "guest", "Guest", 0, 0, false, false, 0, 0 },

29+ { "single", "Guest", 0, 0, false, false, 0, 0 },

30 };

31}

32

tests/mocks/LightDM/full/CMakeLists.txt−2

@@ -1,10 +1,8 @@

1set(LibLightDM_SOURCES

2 ../Greeter.cpp

3 ../UsersModel.cpp

4− ../InfographicModel.cpp

5 GreeterPrivate.cpp

4 GreeterPrivate.cpp

6 UsersModelPrivate.cpp

5 UsersModelPrivate.cpp

7− InfographicModelPrivate.cpp

8 ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp

6 ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp

9 )

7 )

10

8

tests/mocks/LightDM/single-passphrase/CMakeLists.txt−2

@@ -1,10 +1,8 @@

1set(LibLightDM_SOURCES

2 ../Greeter.cpp

3 ../UsersModel.cpp

4− ../InfographicModel.cpp

5 GreeterPrivate.cpp

4 GreeterPrivate.cpp

6 UsersModelPrivate.cpp

5 UsersModelPrivate.cpp

7− InfographicModelPrivate.cpp

8 ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp

6 ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp

9 )

7 )

10

8

tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cpp+1−1

@@ -26,7 +26,7 @@ UsersModelPrivate::UsersModelPrivate(UsersModel* parent)

26{

27 entries =

28 {

29− { "has-pin", "Has PIN", 0, 0, false, false, 0, 0 },

29+ { "single", "Has Passphrase", 0, 0, false, false, 0, 0 },

30 };

31}

32

tests/mocks/LightDM/single-pin/CMakeLists.txt−2

@@ -1,10 +1,8 @@

1set(LibLightDM_SOURCES

2 ../Greeter.cpp

3 ../UsersModel.cpp

4− ../InfographicModel.cpp

5 GreeterPrivate.cpp

4 GreeterPrivate.cpp

6 UsersModelPrivate.cpp

5 UsersModelPrivate.cpp

7− InfographicModelPrivate.cpp

8 ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp

6 ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp

9 )

7 )

10

8

tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp+1−1

@@ -26,7 +26,7 @@ UsersModelPrivate::UsersModelPrivate(UsersModel* parent)

26{

27 entries =

28 {

29− { "has-pin", "Has PIN", 0, 0, false, false, 0, 0 },

29+ { "single", "Has PIN", 0, 0, false, false, 0, 0 },

30 };

31}

32

tests/mocks/LightDM/single/CMakeLists.txt−2

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

1set(LibLightDM_SOURCES

2 ../Greeter.cpp

3− ../InfographicModel.cpp

4 ../UsersModel.cpp

3 ../UsersModel.cpp

5 GreeterPrivate.cpp

4 GreeterPrivate.cpp

6− InfographicModelPrivate.cpp

7 UsersModelPrivate.cpp

5 UsersModelPrivate.cpp

8 ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp

6 ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp

9 )

7 )

tests/mocks/LightDM/single/UsersModelPrivate.cpp+1−1

@@ -26,7 +26,7 @@ UsersModelPrivate::UsersModelPrivate(UsersModel* parent)

26{

27 entries =

28 {

29− { "one", "Only User", 0, 0, false, false, 0, 0 },

29+ { "single", "Single User", 0, 0, false, false, 0, 0 },

30 };

31}

32

tests/mocks/libusermetrics/CMakeLists.txtnew file+17

@@ -0,0 +1,17 @@

1+set(mock_SOURCES

2+ ColorTheme.cpp

3+ UserMetrics.cpp

4+ ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp

5+ )

6+

7+add_library(MockUserMetrics SHARED ${mock_SOURCES})

8+

9+qt5_use_modules(MockUserMetrics Gui)

10+

11+set_target_properties(MockUserMetrics PROPERTIES

12+ OUTPUT_NAME usermetricsoutput

13+ VERSION 1)

14+

15+install(TARGETS MockUserMetrics

16+ DESTINATION ${SHELL_APP_DIR}/plugins/mocks/libusermetrics

17+ )

tests/mocks/libusermetrics/ColorTheme.cppnew file+128

@@ -0,0 +1,128 @@

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+ * Author: Pete Woods <pete.woods@canonical.com>

17+ */

18+

19+#include "ColorTheme.h"

20+

21+#include <QtCore/QDir>

22+#include <QtCore/QString>

23+#include <QtGui/QIcon>

24+#include <QMultiMap>

25+

26+using namespace UserMetricsOutput;

27+

28+namespace UserMetricsOutput

29+{

30+

31+class ColorThemePrivate: QObject

32+{

33+public:

34+ explicit ColorThemePrivate(ColorTheme *parent = 0);

35+

36+ ColorThemePrivate(const QColor &start, const QColor &main,

37+ const QColor &end, ColorTheme *parent = 0);

38+

39+ ~ColorThemePrivate();

40+

41+ ColorTheme * const q_ptr;

42+

43+ QColor m_start;

44+

45+ QColor m_main;

46+

47+ QColor m_end;

48+

49+protected:

50+ int calculateLength();

51+

52+private:

53+ Q_DECLARE_PUBLIC(ColorTheme)

54+};

55+

56+}

57+

58+ColorThemePrivate::ColorThemePrivate(

59+ ColorTheme *parent) :

60+ q_ptr(parent)

61+{

62+}

63+

64+ColorThemePrivate::ColorThemePrivate(const QColor &start,

65+ const QColor &main, const QColor &end, ColorTheme *parent) :

66+ q_ptr(parent), m_start(start), m_main(main), m_end(end)

67+{

68+}

69+

70+ColorThemePrivate::~ColorThemePrivate()

71+{

72+}

73+

74+ColorTheme::ColorTheme(QObject *parent) :

75+ QObject(parent), d_ptr(new ColorThemePrivate(this))

76+{

77+}

78+

79+ColorTheme::ColorTheme(QColor &first, QColor &main,

80+ QColor &end, QObject *parent) :

81+ QObject(parent), d_ptr(

82+ new ColorThemePrivate(first, main, end, this))

83+{

84+

85+}

86+

87+ColorTheme & ColorTheme::operator=(

88+ const ColorTheme & other)

89+{

90+ if (d_ptr->m_start != other.d_ptr->m_start)

91+ {

92+ d_ptr->m_start = other.d_ptr->m_start;

93+ startChanged(d_ptr->m_start);

94+ }

95+ if (d_ptr->m_main != other.d_ptr->m_main)

96+ {

97+ d_ptr->m_main = other.d_ptr->m_main;

98+ mainChanged(d_ptr->m_main);

99+ }

100+

101+ if (d_ptr->m_end != other.d_ptr->m_end)

102+ {

103+ d_ptr->m_end = other.d_ptr->m_end;

104+ endChanged(d_ptr->m_end);

105+ }

106+

107+ return *this;

108+}

109+

110+ColorTheme::~ColorTheme()

111+{

112+ delete d_ptr;

113+}

114+

115+QColor ColorTheme::start() const

116+{

117+ return d_ptr->m_start;

118+}

119+

120+QColor ColorTheme::main() const

121+{

122+ return d_ptr->m_main;

123+}

124+

125+QColor ColorTheme::end() const

126+{

127+ return d_ptr->m_end;

128+}

tests/mocks/libusermetrics/ColorTheme.hnew file+68

@@ -0,0 +1,68 @@

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+ * Author: Pete Woods <pete.woods@canonical.com>

17+ */

18+

19+#ifndef UNITY_MOCK_COLORTHEME_H

20+#define UNITY_MOCK_COLORTHEME_H

21+

22+#include <QtGui/QColor>

23+

24+namespace UserMetricsOutput

25+{

26+class ColorThemePrivate;

27+

28+class Q_DECL_EXPORT ColorTheme: public QObject

29+{

30+Q_OBJECT

31+

32+Q_PROPERTY(QColor start READ start NOTIFY startChanged FINAL)

33+Q_PROPERTY(QColor main READ main NOTIFY mainChanged FINAL)

34+Q_PROPERTY(QColor end READ end NOTIFY endChanged FINAL)

35+

36+public:

37+ explicit ColorTheme(QObject *parent = 0);

38+

39+ explicit ColorTheme(QColor &first, QColor &main, QColor &end,

40+ QObject *parent = 0);

41+

42+ ColorTheme & operator=(const ColorTheme & other);

43+

44+ ~ColorTheme();

45+

46+ QColor start() const;

47+

48+ QColor main() const;

49+

50+ QColor end() const;

51+

52+Q_SIGNALS:

53+ void startChanged(const QColor &color);

54+

55+ void mainChanged(const QColor &color);

56+

57+ void endChanged(const QColor &color);

58+

59+protected:

60+ ColorThemePrivate * const d_ptr;

61+

62+ Q_DECLARE_PRIVATE(ColorTheme)

63+

64+};

65+

66+}

67+

68+#endif // UNITY_MOCK_COLORTHEME_H

tests/mocks/libusermetrics/UserMetrics.cppnew file+465

@@ -0,0 +1,465 @@

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+ * Author: Pete Woods <pete.woods@canonical.com>

17+ */

18+

19+#include "UserMetrics.h"

20+#include "plugins/Utils/qvariantlistmodel.h"

21+

22+#include <QtCore/QDir>

23+#include <QtCore/QString>

24+#include <QtGui/QIcon>

25+#include <QMultiMap>

26+

27+using namespace UserMetricsOutput;

28+

29+namespace UserMetricsOutput

30+{

31+class UserMetricsDataPrivate;

32+class UserMetricsPrivate;

33+

34+class Q_DECL_EXPORT UserMetricsData: public QObject

35+{

36+public:

37+ explicit UserMetricsData(QObject *parent);

38+

39+ UserMetricsData(const QString &label,

40+ const ColorTheme &firstColor,

41+ const QVariantList &firstMonth,

42+ const ColorTheme &secondColor,

43+ const QVariantList &secondMonth, QObject* parent);

44+

45+ ~UserMetricsData();

46+

47+protected:

48+ UserMetricsDataPrivate * const d_ptr;

49+

50+public:

51+ const QString & label() const;

52+ const ColorTheme & firstColor() const;

53+ const QVariantList & firstMonth() const;

54+ const ColorTheme & secondColor() const;

55+ const QVariantList & secondMonth() const;

56+ int length() const;

57+

58+private:

59+ Q_DECLARE_PRIVATE(UserMetricsData)

60+};

61+

62+class UserMetricsPrivate: QObject

63+{

64+public:

65+ explicit UserMetricsPrivate(UserMetrics *parent);

66+

67+ ~UserMetricsPrivate();

68+

69+public:

70+ typedef QSharedPointer<UserMetricsData> UserMetricsDataPtr;

71+ typedef QMultiMap<QString, UserMetricsDataPtr> FakeDataMap;

72+

73+ UserMetrics * const q_ptr;

74+ QString m_label;

75+ ColorTheme m_firstColor;

76+ QVariantListModel m_firstMonth;

77+ ColorTheme m_secondColor;

78+ QVariantListModel m_secondMonth;

79+ int m_currentDay;

80+ QString m_username;

81+ FakeDataMap::const_iterator m_dataIndex;

82+ UserMetricsDataPtr m_newData;

83+ FakeDataMap m_fakeData;

84+

85+ void setUsername(const QString &username);

86+

87+protected:

88+ void nextFakeData();

89+

90+ void generateFakeData();

91+

92+ void loadFakeData();

93+

94+ void finishSetFakeData();

95+

96+private:

97+ Q_DECLARE_PUBLIC(UserMetrics)

98+};

99+

100+class UserMetricsDataPrivate: QObject

101+{

102+public:

103+ explicit UserMetricsDataPrivate(UserMetricsData *parent);

104+

105+ UserMetricsDataPrivate(const QString &label,

106+ const ColorTheme &firstColor,

107+ const QVariantList &firstMonth,

108+ const ColorTheme &secondColor,

109+ const QVariantList &secondMonth, UserMetricsData *parent);

110+

111+ ~UserMetricsDataPrivate();

112+

113+ UserMetricsData * const q_ptr;

114+ QString m_label;

115+ ColorTheme m_firstColor;

116+ QVariantList m_firstMonth;

117+ ColorTheme m_secondColor;

118+ QVariantList m_secondMonth;

119+ int m_length;

120+

121+protected:

122+ int calculateLength();

123+

124+private:

125+ Q_DECLARE_PUBLIC(UserMetricsData)

126+};

127+

128+}

129+

130+UserMetricsDataPrivate::UserMetricsDataPrivate(UserMetricsData *parent) :

131+ q_ptr(parent), m_firstColor(this), m_secondColor(this)

132+{

133+ m_length = calculateLength();

134+}

135+

136+UserMetricsDataPrivate::UserMetricsDataPrivate(const QString &label,

137+ const ColorTheme &firstColor, const QVariantList &firstMonth,

138+ const ColorTheme &secondColor,

139+ const QVariantList &secondMonth, UserMetricsData *parent) :

140+ q_ptr(parent), m_label(label), m_firstColor(this), m_firstMonth(

141+ firstMonth), m_secondColor(this), m_secondMonth(secondMonth)

142+{

143+ m_length = calculateLength();

144+ m_firstColor = firstColor;

145+ m_secondColor = secondColor;

146+}

147+

148+UserMetricsDataPrivate::~UserMetricsDataPrivate()

149+{

150+}

151+

152+int UserMetricsDataPrivate::calculateLength()

153+{

154+ int day(m_firstMonth.size());

155+ auto it = m_firstMonth.end(), end = m_firstMonth.begin();

156+ while (it != end)

157+ {

158+ --it;

159+ --day;

160+ if (!it->isNull())

161+ {

162+ return day;

163+ }

164+ }

165+

166+ return -1;

167+}

168+

169+UserMetricsData::UserMetricsData(QObject *parent) :

170+ QObject(parent), d_ptr(new UserMetricsDataPrivate(this))

171+{

172+}

173+

174+UserMetricsData::UserMetricsData(const QString &label,

175+ const ColorTheme &firstColor, const QVariantList &firstMonth,

176+ const ColorTheme &secondColor,

177+ const QVariantList &secondMonth, QObject* parent) :

178+ QObject(parent), d_ptr(

179+ new UserMetricsDataPrivate(label, firstColor, firstMonth,

180+ secondColor, secondMonth, this))

181+{

182+}

183+

184+UserMetricsData::~UserMetricsData()

185+{

186+ delete d_ptr;

187+}

188+

189+const QString & UserMetricsData::label() const

190+{

191+ return d_ptr->m_label;

192+}

193+

194+const ColorTheme & UserMetricsData::firstColor() const

195+{

196+ return d_ptr->m_firstColor;

197+}

198+

199+const QVariantList & UserMetricsData::firstMonth() const

200+{

201+ return d_ptr->m_firstMonth;

202+}

203+

204+const ColorTheme & UserMetricsData::secondColor() const

205+{

206+ return d_ptr->m_secondColor;

207+}

208+

209+const QVariantList & UserMetricsData::secondMonth() const

210+{

211+ return d_ptr->m_secondMonth;

212+}

213+

214+int UserMetricsData::length() const

215+{

216+ return d_ptr->m_length;

217+}

218+

219+UserMetricsPrivate::UserMetricsPrivate(UserMetrics *parent) :

220+ q_ptr(parent), m_firstColor(this), m_secondColor(this)

221+{

222+ m_fakeData.insert("", UserMetricsDataPtr(new UserMetricsData(this)));

223+}

224+

225+UserMetricsPrivate::~UserMetricsPrivate()

226+{

227+}

228+

229+void UserMetricsPrivate::setUsername(const QString &username)

230+{

231+ if (m_username == username) {

232+ return;

233+ }

234+

235+ m_username = username;

236+

237+ m_dataIndex = m_fakeData.constFind(m_username);

238+ if (m_dataIndex == m_fakeData.end())

239+ {

240+ m_dataIndex = m_fakeData.constFind("");

241+ }

242+

243+ loadFakeData();

244+

245+ q_ptr->usernameChanged(m_username);

246+}

247+

248+void UserMetricsPrivate::generateFakeData()

249+{

250+ std::default_random_engine generator;

251+ std::normal_distribution<qreal> distribution(0.5, 0.2);

252+ auto rand = std::bind(distribution, generator);

253+

254+ QVector<QColor> colours;

255+ colours.push_back(QColor::fromRgbF(0.3, 0.27, 0.32));

256+ colours.push_back(QColor::fromRgbF(0.83, 0.49, 0.58));

257+ colours.push_back(QColor::fromRgbF(0.63, 0.51, 0.59));

258+

259+ colours.push_back(QColor::fromRgbF(0.28, 0.26, 0.4));

260+ colours.push_back(QColor::fromRgbF(0.47, 0.38, 0.56));

261+ colours.push_back(QColor::fromRgbF(0.69, 0.65, 0.78));

262+

263+ colours.push_back(QColor::fromRgbF(0.32, 0.21, 0.16));

264+ colours.push_back(QColor::fromRgbF(0.55, 0.45, 0.32));

265+ colours.push_back(QColor::fromRgbF(0.85, 0.74, 0.53));

266+

267+ colours.push_back(QColor::fromRgbF(0.25, 0.31, 0.19));

268+ colours.push_back(QColor::fromRgbF(0.63, 0.53, 0.3));

269+ colours.push_back(QColor::fromRgbF(0.89, 0.56, 0.31));

270+

271+ ColorTheme first(colours[0], colours[1], colours[2]);

272+ ColorTheme second(colours[3], colours[4], colours[5]);

273+ ColorTheme eighth(colours[6], colours[7], colours[8]);

274+ ColorTheme ninth(colours[9], colours[10], colours[11]);

275+

276+ {

277+ QVariantList firstMonth;

278+ while (firstMonth.size() < 17)

279+ firstMonth.push_back(QVariant(rand()));

280+ while (firstMonth.size() < 31)

281+ firstMonth.push_back(QVariant());

282+ QVariantList secondMonth;

283+ while (secondMonth.size() < 31)

284+ secondMonth.push_back(QVariant(rand()));

285+ QSharedPointer<UserMetricsData> data(

286+ new UserMetricsData("52km travelled", first, firstMonth,

287+ ninth, secondMonth, this));

288+ m_fakeData.insert("single", data);

289+ }

290+

291+ {

292+ QVariantList firstMonth;

293+ while (firstMonth.size() < 17)

294+ firstMonth.push_back(QVariant(rand()));

295+ while (firstMonth.size() < 31)

296+ firstMonth.push_back(QVariant());

297+ QVariantList secondMonth;

298+ while (secondMonth.size() < 31)

299+ secondMonth.push_back(QVariant(rand()));

300+ QSharedPointer<UserMetricsData> data(

301+ new UserMetricsData("33 messages today", second,

302+ firstMonth, eighth, secondMonth, this));

303+ m_fakeData.insert("single", data);

304+ }

305+

306+ {

307+ QVariantList firstMonth;

308+ while (firstMonth.size() < 17)

309+ firstMonth.push_back(QVariant(rand()));

310+ while (firstMonth.size() < 31)

311+ firstMonth.push_back(QVariant());

312+ QVariantList secondMonth;

313+ while (secondMonth.size() < 31)

314+ secondMonth.push_back(QVariant(rand()));

315+ QSharedPointer<UserMetricsData> data(

316+ new UserMetricsData("19 minutes talk time", eighth,

317+ firstMonth, second, secondMonth, this));

318+ m_fakeData.insert("single", data);

319+ // Also use same data for some tablet users

320+ m_fakeData.insert("has-password", data);

321+ m_fakeData.insert("no-password", data);

322+ m_fakeData.insert("empty-name", data);

323+ }

324+}

325+

326+void UserMetricsPrivate::loadFakeData()

327+{

328+ m_newData = *m_dataIndex;

329+

330+ bool oldLabelEmpty = m_label.isEmpty();

331+ bool newLabelEmpty = m_newData->label().isEmpty();

332+

333+ if (oldLabelEmpty && !newLabelEmpty)

334+ {

335+ q_ptr->dataAboutToAppear();

336+ finishSetFakeData();

337+ } else if (!oldLabelEmpty && newLabelEmpty)

338+ {

339+ q_ptr->dataAboutToDisappear();

340+ } else if (!oldLabelEmpty && !newLabelEmpty)

341+ {

342+ q_ptr->dataAboutToChange();

343+ }

344+ // we emit no signal if the data has stayed empty

345+}

346+

347+void UserMetricsPrivate::finishSetFakeData()

348+{

349+ bool oldLabelEmpty = m_label.isEmpty();

350+ bool newLabelEmpty = m_newData->label().isEmpty();

351+

352+ m_label = m_newData->label();

353+ m_firstColor = m_newData->firstColor();

354+ m_firstMonth.setVariantList(m_newData->firstMonth());

355+ m_secondColor = m_newData->secondColor();

356+ m_secondMonth.setVariantList(m_newData->secondMonth());

357+

358+ bool currentDayChanged = m_currentDay != m_newData->length();

359+ m_currentDay = m_newData->length();

360+

361+ q_ptr->labelChanged(m_label);

362+ if (currentDayChanged)

363+ {

364+ q_ptr->currentDayChanged(m_currentDay);

365+ }

366+

367+ if (oldLabelEmpty && !newLabelEmpty)

368+ {

369+ q_ptr->dataAppeared();

370+ } else if (!oldLabelEmpty && newLabelEmpty)

371+ {

372+ q_ptr->dataDisappeared();

373+ } else if (!oldLabelEmpty && !newLabelEmpty)

374+ {

375+ q_ptr->dataChanged();

376+ }

377+ // we emit no signal if the data has stayed empty

378+}

379+

380+void UserMetricsPrivate::nextFakeData()

381+{

382+ ++m_dataIndex;

383+ if (m_dataIndex == m_fakeData.end() || m_dataIndex.key() != m_username)

384+ {

385+ m_dataIndex = m_fakeData.constFind(m_username);

386+ }

387+

388+ loadFakeData();

389+}

390+

391+UserMetrics::UserMetrics(QObject *parent) :

392+ QObject(parent), d_ptr(new UserMetricsPrivate(this))

393+{

394+ d_ptr->generateFakeData();

395+ setUsername("");

396+

397+ connect(this, SIGNAL(nextDataSource()), this, SLOT(nextDataSourceSlot()),

398+ Qt::QueuedConnection);

399+ connect(this, SIGNAL(readyForDataChange()), this,

400+ SLOT(readyForDataChangeSlot()), Qt::QueuedConnection);

401+}

402+

403+UserMetrics::~UserMetrics()

404+{

405+ delete d_ptr;

406+}

407+

408+QString UserMetrics::label() const

409+{

410+ return d_ptr->m_label;

411+}

412+

413+QString UserMetrics::username() const

414+{

415+ return d_ptr->m_username;

416+}

417+

418+void UserMetrics::setUsername(const QString &username)

419+{

420+ d_ptr->setUsername(username);

421+}

422+

423+ColorTheme *UserMetrics::firstColor() const

424+{

425+ return &d_ptr->m_firstColor;

426+}

427+

428+ColorTheme *UserMetrics::secondColor() const

429+{

430+ return &d_ptr->m_secondColor;

431+}

432+

433+QAbstractItemModel *UserMetrics::firstMonth() const

434+{

435+ return &d_ptr->m_firstMonth;

436+}

437+

438+QAbstractItemModel *UserMetrics::secondMonth() const

439+{

440+ return &d_ptr->m_secondMonth;

441+}

442+

443+int UserMetrics::currentDay() const

444+{

445+ return d_ptr->m_currentDay;

446+}

447+

448+void UserMetrics::nextDataSourceSlot()

449+{

450+ d_ptr->nextFakeData();

451+}

452+

453+void UserMetrics::readyForDataChangeSlot()

454+{

455+ d_ptr->finishSetFakeData();

456+}

457+

458+/**

459+ * Factory methods

460+ */

461+

462+UserMetrics * UserMetrics::getInstance()

463+{

464+ return new UserMetrics();

465+}

tests/mocks/LightDM/InfographicModel.h → tests/mocks/libusermetrics/UserMetrics.hrenamed+22−60

@@ -16,74 +16,34 @@

16 * Author: Pete Woods <pete.woods@canonical.com>

17 */

18

19−#ifndef LIGHTDM_INFOGRAPHICMODEL_H

19+#ifndef UNITY_MOCK_USERMETRICS_H

20−#define LIGHTDM_INFOGRAPHICMODEL_H

20+#define UNITY_MOCK_USERMETRICS_H

21

22+#include "ColorTheme.h"

23+#include <QtCore/QAbstractListModel>

22#include <QtCore/QString>

24#include <QtCore/QString>

23−#include <QtGui/qcolor.h>

25+#include <QtGui/QColor>

24−#include <QAbstractListModel>

25

26

26−namespace QLightDM

27+namespace UserMetricsOutput

27{

28{

28−class InfographicColorThemePrivate;

29+class UserMetricsPrivate;

29

30

30−class Q_DECL_EXPORT InfographicColorTheme: public QObject

31+class Q_DECL_EXPORT UserMetrics: public QObject

31−{

32−Q_OBJECT

33−

34−Q_PROPERTY(QColor start READ start NOTIFY startChanged FINAL)

35−Q_PROPERTY(QColor main READ main NOTIFY mainChanged FINAL)

36−Q_PROPERTY(QColor end READ end NOTIFY endChanged FINAL)

37−

38−public:

39− explicit InfographicColorTheme(QObject *parent = 0);

40−

41− explicit InfographicColorTheme(QColor &first, QColor &main, QColor &end,

42− QObject *parent = 0);

43−

44− InfographicColorTheme & operator=(const InfographicColorTheme & other);

45−

46− ~InfographicColorTheme();

47−

48− QColor start() const;

49−

50− QColor main() const;

51−

52− QColor end() const;

53−

54−Q_SIGNALS:

55− void startChanged(const QColor &color);

56−

57− void mainChanged(const QColor &color);

58−

59− void endChanged(const QColor &color);

60−

61−protected:

62− InfographicColorThemePrivate * const d_ptr;

63−

64− Q_DECLARE_PRIVATE(InfographicColorTheme)

65−

66−};

67−

68−class InfographicModelPrivate;

69−

70−class Q_DECL_EXPORT InfographicModel: public QObject

71{

32{

72Q_OBJECT

33Q_OBJECT

73

34

74Q_PROPERTY(QString label READ label NOTIFY labelChanged FINAL)

35Q_PROPERTY(QString label READ label NOTIFY labelChanged FINAL)

75Q_PROPERTY(QString username READ username WRITE setUsername NOTIFY usernameChanged FINAL)

36Q_PROPERTY(QString username READ username WRITE setUsername NOTIFY usernameChanged FINAL)

76−Q_PROPERTY(QLightDM::InfographicColorTheme* firstColor READ firstColor NOTIFY firstColorChanged FINAL)

37+Q_PROPERTY(UserMetricsOutput::ColorTheme* firstColor READ firstColor NOTIFY firstColorChanged FINAL)

77−Q_PROPERTY(QLightDM::InfographicColorTheme* secondColor READ secondColor NOTIFY secondColorChanged FINAL)

38+Q_PROPERTY(UserMetricsOutput::ColorTheme* secondColor READ secondColor NOTIFY secondColorChanged FINAL)

78Q_PROPERTY(QAbstractItemModel *firstMonth READ firstMonth NOTIFY firstMonthChanged FINAL)

39Q_PROPERTY(QAbstractItemModel *firstMonth READ firstMonth NOTIFY firstMonthChanged FINAL)

79Q_PROPERTY(QAbstractItemModel *secondMonth READ secondMonth NOTIFY secondMonthChanged FINAL)

40Q_PROPERTY(QAbstractItemModel *secondMonth READ secondMonth NOTIFY secondMonthChanged FINAL)

80Q_PROPERTY(int currentDay READ currentDay NOTIFY currentDayChanged FINAL)

41Q_PROPERTY(int currentDay READ currentDay NOTIFY currentDayChanged FINAL)

81

42

82public:

43public:

83− static InfographicModel *getInstance();

44+ static UserMetrics *getInstance();

84

45

85− explicit InfographicModel(QObject *parent = 0);

46+ ~UserMetrics();

86− ~InfographicModel();

87

47

88 QString label() const;

48 QString label() const;

89

49

@@ -91,13 +51,13 @@ public:

91

51

92 void setUsername(const QString &username);

52 void setUsername(const QString &username);

93

53

94− InfographicColorTheme * firstColor() const;

54+ ColorTheme * firstColor() const;

95

55

96 QAbstractItemModel *firstMonth() const;

56 QAbstractItemModel *firstMonth() const;

97

57

98 int currentDay() const;

58 int currentDay() const;

99

59

100− InfographicColorTheme * secondColor() const;

60+ ColorTheme * secondColor() const;

101

61

102 QAbstractItemModel *secondMonth() const;

62 QAbstractItemModel *secondMonth() const;

103

63

@@ -106,13 +66,13 @@ Q_SIGNALS:

106

66

107 void usernameChanged(const QString &username);

67 void usernameChanged(const QString &username);

108

68

109− void firstColorChanged(InfographicColorTheme *color);

69+ void firstColorChanged(ColorTheme *color);

110

70

111 void firstMonthChanged(QAbstractItemModel *firstMonth);

71 void firstMonthChanged(QAbstractItemModel *firstMonth);

112

72

113 void currentDayChanged(int length);

73 void currentDayChanged(int length);

114

74

115− void secondColorChanged(InfographicColorTheme *color);

75+ void secondColorChanged(ColorTheme *color);

116

76

117 void secondMonthChanged(QAbstractItemModel *secondMonth);

77 void secondMonthChanged(QAbstractItemModel *secondMonth);

118

78

@@ -138,13 +98,15 @@ protected Q_SLOTS:

138 void readyForDataChangeSlot();

98 void readyForDataChangeSlot();

139

99

140protected:

100protected:

141− InfographicModelPrivate * const d_ptr;

101+ UserMetricsPrivate * const d_ptr;

102+

103+ explicit UserMetrics(QObject *parent = 0);

142

104

143− Q_DISABLE_COPY(InfographicModel)

105+ Q_DISABLE_COPY(UserMetrics)

144− Q_DECLARE_PRIVATE(InfographicModel)

106+ Q_DECLARE_PRIVATE(UserMetrics)

145

107

146};

108};

147

109

148}

110}

149

111

150−#endif // LIGHTDM_INFOGRAPHICMODEL_H

112+#endif // UNITY_MOCK_USERMETRICS_H

tests/mocks/libusermetrics/libusermetricsoutput/ColorTheme.hnew file+1

@@ -0,0 +1 @@

1+../ColorTheme.h

tests/mocks/libusermetrics/libusermetricsoutput/UserMetrics.hnew file+1

@@ -0,0 +1 @@

1+../UserMetrics.h

tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp+6

@@ -1299,6 +1299,12 @@ private Q_SLOTS:

1299 QCOMPARE(lvwph->m_headerItemShownHeight, 0.);

1300 }

1301

1302+ void testCrashShowHeaderWithNoHeader()

1303+ {

1304+ lvwph->setHeader(nullptr);

1305+ lvwph->showHeader();

1306+ }

1307+

1302private:

1308private:

1303 QQuickView *view;

1309 QQuickView *view;

1304 ListViewWithPageHeader *lvwph;

1310 ListViewWithPageHeader *lvwph;

tests/plugins/Utils/qlimitproxymodeltest.cpp+15

@@ -446,6 +446,7 @@ private Q_SLOTS:

446

447 ModelTest t1(&proxy);

448 }

449+

449 void testModelChanged() {

450 void testModelChanged() {

450 QLimitProxyModelQML proxy;

451 QLimitProxyModelQML proxy;

451 MockListModel model, model2;

452 MockListModel model, model2;

@@ -464,6 +465,20 @@ private Q_SLOTS:

464 proxy.setModel(&model);

465 proxy.setModel(&model);

465 QCOMPARE(spyOnModelChanged.count(), 3);

466 QCOMPARE(spyOnModelChanged.count(), 3);

466 }

467 }

468+

469+ void setSameModelTwice() {

470+ QLimitProxyModelQML proxy;

471+ MockListModel model;

472+

473+ proxy.setModel(&model);

474+ proxy.setModel(&model);

475+

476+ QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));

477+

478+ model.insertRows(0, 5);

479+ QCOMPARE(proxy.rowCount(), 5);

480+ QCOMPARE(spyOnCountChanged.count(), 1);

481+ }

467};

482};

468

483

469QTEST_MAIN(QLimitProxyModelTest)

484QTEST_MAIN(QLimitProxyModelTest)

tests/qmltests/CMakeLists.txt+4−4

@@ -47,13 +47,13 @@ add_qml_test(Dash FilterGrids IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMA

47 ${CMAKE_BINARY_DIR}/tests/mocks)

48add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

49add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}

50− PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")

50+ PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")

51add_qml_test(Greeter Tablet IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}

52− ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")

52+ ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")

53add_qml_test(Greeter Phone IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}

54− ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")

54+ ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")

55add_qml_test(Greeter Infographics IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}

56− ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")

56+ ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")

57add_qml_test(Hud Hud)

58add_qml_test(Hud Result)

59add_qml_test(Launcher Launcher IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})