Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb47664' into 'master'
[lipstick] Add localized version about setting stub. Contributes to JB#47664

See merge request mer-core/lipstick!128
  • Loading branch information
rainemak committed Oct 23, 2019
2 parents a504031 + 65ba819 commit ec1fe74
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions tests/stubs/aboutsettings_stub.h
Expand Up @@ -28,6 +28,7 @@ static const auto Imei = QStringLiteral("imei");
static const auto Serial = QStringLiteral("serial");
static const auto LocalizedOperatingSystemName = QStringLiteral("localizedOperatingSystemName");
static const auto OperatingSystemName = QStringLiteral("operatingSystemName");
static const auto LocalizedSoftwareVersion = QStringLiteral("localizedSoftwareVersion");
static const auto BaseOperatingSystemName = QStringLiteral("baseOperatingSystemName");
static const auto SoftwareVersion = QStringLiteral("softwareVersion");
static const auto SoftwareVersionId = QStringLiteral("softwareVersionId");
Expand All @@ -41,6 +42,7 @@ class AboutSettingsStub : public StubBase
virtual void AboutSettingsConstructor(QObject *parent);
virtual void AboutSettingsDestructor();
virtual QString operatingSystemName() const;
virtual QString localizedSoftwareVersion() const;

virtual qlonglong totalDiskSpace() const;
virtual qlonglong availableDiskSpace() const;
Expand Down Expand Up @@ -77,6 +79,12 @@ QString AboutSettingsStub::operatingSystemName() const
return stubReturnValue<QString>(OperatingSystemName);
}

QString AboutSettingsStub::localizedSoftwareVersion() const
{
stubMethodEntered(LocalizedSoftwareVersion);
return stubReturnValue<QString>(LocalizedSoftwareVersion);
}

qlonglong AboutSettingsStub::totalDiskSpace() const
{
stubMethodEntered(TotalDiskSpace);
Expand Down Expand Up @@ -178,6 +186,11 @@ QString AboutSettings::operatingSystemName() const
return gAboutSettingsStub->operatingSystemName();
}

QString AboutSettings::localizedSoftwareVersion() const
{
return gAboutSettingsStub->localizedSoftwareVersion();
}

qlonglong AboutSettings::totalDiskSpace() const
{
return gAboutSettingsStub->totalDiskSpace();
Expand Down

0 comments on commit ec1fe74

Please sign in to comment.