834dfb5 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Remove unnecessary setDay function from the UserMetrics mock

834dfb5Tomás Tormo10 years ago

tests/mocks/libusermetrics/UserMetrics.cpp+4−15

compare with xenial

unifiedsplit

@@ -80,7 +80,6 @@ public:

80 ColorTheme m_secondColor;

81 QVariantListModel m_secondMonth;

82 int m_currentDay;

83− bool m_currentDayChanged;

84 QString m_username;

83 QString m_username;

85 FakeDataMap::const_iterator m_dataIndex;

84 FakeDataMap::const_iterator m_dataIndex;

86 UserMetricsDataPtr m_newData;

85 UserMetricsDataPtr m_newData;

@@ -225,7 +224,7 @@ int UserMetricsData::length() const

225}

224}

226

225

227UserMetricsPrivate::UserMetricsPrivate(UserMetrics *parent) :

226UserMetricsPrivate::UserMetricsPrivate(UserMetrics *parent) :

228− q_ptr(parent), m_firstColor(this), m_secondColor(this), m_currentDay(0), m_currentDayChanged(false)

227+ q_ptr(parent), m_firstColor(this), m_secondColor(this), m_currentDay(0)

229{

228{

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

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

231}

230}

@@ -368,20 +367,21 @@ void UserMetricsPrivate::loadUserMetricsData()

368 m_firstMonth.setVariantList(m_newData->firstMonth());

367 m_firstMonth.setVariantList(m_newData->firstMonth());

369 m_secondColor = m_newData->secondColor();

368 m_secondColor = m_newData->secondColor();

370 m_secondMonth.setVariantList(m_newData->secondMonth());

369 m_secondMonth.setVariantList(m_newData->secondMonth());

370+ m_currentDay = m_newData->length();

371}

372

373void UserMetricsPrivate::finishSetFakeData()

374{

375 bool oldLabelEmpty = m_label.isEmpty();

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

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

377

378

378 loadUserMetricsData();

379 loadUserMetricsData();

379

380

380 q_ptr->labelChanged(m_label);

381 q_ptr->labelChanged(m_label);

381− if (m_currentDayChanged)

382+ if (currentDayChanged)

382 {

383 {

383 q_ptr->currentDayChanged(m_currentDay);

384 q_ptr->currentDayChanged(m_currentDay);

384− m_currentDayChanged = false;

385 }

386

387 if (oldLabelEmpty && !newLabelEmpty)

@@ -468,14 +468,6 @@ int UserMetrics::currentDay() const

468 return d_ptr->m_currentDay;

469}

470

471−void UserMetrics::setDay(int day)

472−{

473− if(day != d_ptr->m_currentDay){

474− d_ptr->m_currentDay = day;

475− d_ptr->m_currentDayChanged = true;

476− }

477−}

478−

479void UserMetrics::nextDataSourceSlot()

471void UserMetrics::nextDataSourceSlot()

480{

472{

481 d_ptr->nextFakeData();

473 d_ptr->nextFakeData();

@@ -488,9 +480,6 @@ void UserMetrics::readyForDataChangeSlot()

488

480

489void UserMetrics::reset()

481void UserMetrics::reset()

490{

482{

491− d_ptr->m_currentDay = -1;

492− d_ptr->m_currentDayChanged = false;

493−

494 d_ptr->findAndSetUsername("");

483 d_ptr->findAndSetUsername("");

495 d_ptr->loadUserMetricsData();

484 d_ptr->loadUserMetricsData();

496}

485}

tests/mocks/libusermetrics/UserMetrics.h−2

@@ -57,8 +57,6 @@ public:

58 int currentDay() const;

60− Q_INVOKABLE void setDay(int day);

61−

62 ColorTheme * secondColor() const;

60 ColorTheme * secondColor() const;

64 QAbstractItemModel *secondMonth() const;

62 QAbstractItemModel *secondMonth() const;