diff --git a/src/BsaPacker.cpp b/src/BsaPacker.cpp index 77f3f13..c9d87d2 100644 --- a/src/BsaPacker.cpp +++ b/src/BsaPacker.cpp @@ -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 Bsa_Packer::settings() const { return SettingsService::PluginSettings; diff --git a/src/BsaPacker.h b/src/BsaPacker.h index ba8818a..a624586 100644 --- a/src/BsaPacker.h +++ b/src/BsaPacker.h @@ -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 settings() const override; // IPluginTool interface diff --git a/src/SettingsService.cpp b/src/SettingsService.cpp index a4d6d56..ed9dd0c 100644 --- a/src/SettingsService.cpp +++ b/src/SettingsService.cpp @@ -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& 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); }; diff --git a/tests/BsaPackerFacts.cpp b/tests/BsaPackerFacts.cpp index 2c64070..d3e8e59 100644 --- a/tests/BsaPackerFacts.cpp +++ b/tests/BsaPackerFacts.cpp @@ -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); - } } diff --git a/tests/MockOrganizer.h b/tests/MockOrganizer.h index e9f4942..dd80173 100644 --- a/tests/MockOrganizer.h +++ b/tests/MockOrganizer.h @@ -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&), (override)); MOCK_METHOD(bool, onProfileRemoved, (const std::function&), (override)); MOCK_METHOD(bool, onProfileRenamed, (const std::function&), (override)); - MOCK_METHOD(bool, onProfileChanged, (const std::function &), (override)); + MOCK_METHOD(bool, onProfileChanged, (const std::function &), (override)); MOCK_METHOD(bool, onPluginSettingChanged, (const std::function &), (override)); + MOCK_METHOD(bool, onPluginEnabled, (const std::function&), (override)); + MOCK_METHOD(bool, onPluginEnabled, (const QString&, const std::function&), (override)); + MOCK_METHOD(bool, onPluginDisabled, (const std::function&), (override)); + MOCK_METHOD(bool, onPluginDisabled, (const QString&, const std::function&), (override)); }; \ No newline at end of file