mo2/modorganizer-bsapacker
0
0
Fork 0
mirror of https://github.com/ModOrganizer2/modorganizer-bsapacker.git synced 2026-07-27 14:06:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24 from Holt59/iplugin-isactive-refactoring

Browse Source 
IPlugin::isActive refactoring
This commit is contained in:
Mikaël Capelle
2020-11-18 10:00:17 +01:00
committed by GitHub
parent 54ce48eb18 fdec1d2307
commit dbb7755a9c
5 changed files with 7 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BsaPacker.cpp
-5
View File
@@ -51,11 +51,6 @@ namespace BsaPacker
return MOBase::VersionInfo(1, 0, 4, MOBase::VersionInfo::RELEASE_FINAL);
}
bool Bsa_Packer::isActive() const
{
return this->m_SettingsService->GetPluginSetting(SettingsService::SETTING_ENABLED).toBool();
}
QList<MOBase::PluginSetting> Bsa_Packer::settings() const
{
return SettingsService::PluginSettings;
src/BsaPacker.h
-1
View File
@@ -23,7 +23,6 @@ namespace BsaPacker
[[nodiscard]] QString author() const override;
[[nodiscard]] QString description() const override;
[[nodiscard]] MOBase::VersionInfo version() const override;
[[nodiscard]] bool isActive() const override;
[[nodiscard]] QList<MOBase::PluginSetting> settings() const override;
// IPluginTool interface
src/SettingsService.cpp
-2
View File
@@ -2,7 +2,6 @@
namespace BsaPacker
{
const QString& SettingsService::SETTING_ENABLED = QStringLiteral("enabled");
const QString& SettingsService::SETTING_HIDE_LOOSE_ASSETS = QStringLiteral("hide_loose_assets");
const QString& SettingsService::SETTING_CREATE_PLUGINS = QStringLiteral("create_plugins");
const QString& SettingsService::SETTING_BLACKLISTED_FILES = QStringLiteral("blacklisted_files");
@@ -11,7 +10,6 @@ namespace BsaPacker
const QList<MOBase::PluginSetting>& SettingsService::PluginSettings = {
MOBase::PluginSetting(SettingsService::SETTING_HIDE_LOOSE_ASSETS, QObject::tr("After creating the archive, set loose assets to hidden."), false),
MOBase::PluginSetting(SettingsService::SETTING_CREATE_PLUGINS, QObject::tr("Create a dummy plugin to load the archive if one does not exist."), false),
MOBase::PluginSetting(SettingsService::SETTING_ENABLED, QObject::tr("Allow this plugin to run."), false),
MOBase::PluginSetting(SettingsService::SETTING_BLACKLISTED_FILES, QObject::tr("Specify a semi-colon seperated list of file extensions to ignore when packing."), ".txt;.hkx;.xml;.ini")
//MOBase::PluginSetting(SettingsService::SETTING_SPLIT_ARCHIVES, QObject::tr("Automatically create multiple archives if they exceed the size limit."), false);
};
tests/BsaPackerFacts.cpp
-29
View File
@@ -31,33 +31,4 @@ namespace BsaPackerTests
EXPECT_NO_THROW(result.init(naggyMockOrganizer));
}
TEST_F(BsaPackerFacts, IsActive_WhenPluginEnabled_ReturnsTrue)
{
// Arrange
Bsa_Packer sut;
ON_CALL(*naggyMockOrganizer, pluginSetting(Eq("BSA Packer"), Eq(QStringLiteral("enabled"))))
.WillByDefault(Return(true));
sut.init(naggyMockOrganizer);
// Act
auto result = sut.isActive();
// Assert
EXPECT_TRUE(result);
}
TEST_F(BsaPackerFacts, IsActive_WhenPluginDisabled_ReturnsFalse)
{
// Arrange
Bsa_Packer sut;
ON_CALL(*naggyMockOrganizer, pluginSetting(Eq("BSA Packer"), Eq("enabled")))
.WillByDefault(Return(false));
sut.init(naggyMockOrganizer);
// Act
auto result = sut.isActive();
// Assert
EXPECT_FALSE(result);
}
}
tests/MockOrganizer.h
+7 -1
View File
@@ -19,6 +19,8 @@ public:
MOCK_METHOD(void, modDataChanged, (IModInterface *mod), (override));
MOCK_METHOD(QVariant, pluginSetting, (const QString &pluginName, const QString &key), (const, override));
MOCK_METHOD(void, setPluginSetting, (const QString &pluginName, const QString &key, const QVariant &value), (override));
MOCK_METHOD(bool, isPluginEnabled, (const QString& pluginName), (const, override));
MOCK_METHOD(bool, isPluginEnabled, (IPlugin *plugin), (const, override));
MOCK_METHOD(QVariant, persistent, (const QString &pluginName, const QString &key, const QVariant &def), (const, override));
MOCK_METHOD(void, setPersistent, (const QString &pluginName, const QString &key, const QVariant &value, bool sync), (override));
MOCK_METHOD(QString, pluginDataPath, (), (const, override));
@@ -43,6 +45,10 @@ public:
MOCK_METHOD(bool, onProfileCreated, (const std::function<void(MOBase::IProfile*)>&), (override));
MOCK_METHOD(bool, onProfileRemoved, (const std::function<void(const QString&)>&), (override));
MOCK_METHOD(bool, onProfileRenamed, (const std::function<void(MOBase::IProfile*, QString const&, QString const&)>&), (override));
MOCK_METHOD(bool, onProfileChanged, (const std::function<void (MOBase::IProfile *,MOBase::IProfile *)> &), (override));
MOCK_METHOD(bool, onProfileChanged, (const std::function<void (MOBase::IProfile*, MOBase::IProfile*)> &), (override));
MOCK_METHOD(bool, onPluginSettingChanged, (const std::function<void (const QString &,const QString &,const QVariant &,const QVariant &)> &), (override));
MOCK_METHOD(bool, onPluginEnabled, (const std::function<void(const MOBase::IPlugin*)>&), (override));
MOCK_METHOD(bool, onPluginEnabled, (const QString&, const std::function<void()>&), (override));
MOCK_METHOD(bool, onPluginDisabled, (const std::function<void(const MOBase::IPlugin*)>&), (override));
MOCK_METHOD(bool, onPluginDisabled, (const QString&, const std::function<void()>&), (override));
};