on xenial help sign in
Remove unnecessary setDay function from the UserMetrics mock
commit834dfb5f87b1b5c5c14553babc944a6f4a806898 authorTomás Tormo <tomas.tormo@gmail.com> dateThu 27 Oct 2016, 11:20 (10 years ago) parent1a57522
2 files changed+4−17
tests/mocks/libusermetrics/UserMetrics.cpp+4−15 tests/mocks/libusermetrics/UserMetrics.h−2
tests/mocks/libusermetrics/UserMetrics.cpp+4−15
@@ -80,7 +80,6 @@ public:
8080 ColorTheme m_secondColor;
8181 QVariantListModel m_secondMonth;
8282 int m_currentDay;
83− bool m_currentDayChanged;
8483 QString m_username;
8584 FakeDataMap::const_iterator m_dataIndex;
8685 UserMetricsDataPtr m_newData;
@@ -225,7 +224,7 @@ int UserMetricsData::length() const
225224}
226225
227226UserMetricsPrivate::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)
229228{
230229 m_fakeData.insert("", UserMetricsDataPtr(new UserMetricsData(this)));
231230}
@@ -368,20 +367,21 @@ void UserMetricsPrivate::loadUserMetricsData()
368367 m_firstMonth.setVariantList(m_newData->firstMonth());
369368 m_secondColor = m_newData->secondColor();
370369 m_secondMonth.setVariantList(m_newData->secondMonth());
370+ m_currentDay = m_newData->length();
371371}
372372
373373void UserMetricsPrivate::finishSetFakeData()
374374{
375375 bool oldLabelEmpty = m_label.isEmpty();
376376 bool newLabelEmpty = m_newData->label().isEmpty();
377+ bool currentDayChanged = m_currentDay != m_newData->length();
377378
378379 loadUserMetricsData();
379380
380381 q_ptr->labelChanged(m_label);
381− if (m_currentDayChanged)
382+ if (currentDayChanged)
382383 {
383384 q_ptr->currentDayChanged(m_currentDay);
384− m_currentDayChanged = false;
385385 }
386386
387387 if (oldLabelEmpty && !newLabelEmpty)
@@ -468,14 +468,6 @@ int UserMetrics::currentDay() const
468468 return d_ptr->m_currentDay;
469469}
470470
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−
479471void UserMetrics::nextDataSourceSlot()
480472{
481473 d_ptr->nextFakeData();
@@ -488,9 +480,6 @@ void UserMetrics::readyForDataChangeSlot()
488480
489481void UserMetrics::reset()
490482{
491− d_ptr->m_currentDay = -1;
492− d_ptr->m_currentDayChanged = false;
493−
494483 d_ptr->findAndSetUsername("");
495484 d_ptr->loadUserMetricsData();
496485}
tests/mocks/libusermetrics/UserMetrics.h−2
@@ -57,8 +57,6 @@ public:
5757
5858 int currentDay() const;
5959
60− Q_INVOKABLE void setDay(int day);
61−
6260 ColorTheme * secondColor() const;
6361
6462 QAbstractItemModel *secondMonth() const;