Fix after rebasing.

ModOrganizer2 · Jun 29, 2024 · e318999 · e318999
1 parent 1327bf1
commit e318999
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 24 deletions.
diff --git a/src/mobase/wrappers/basic_classes.cpp b/src/mobase/wrappers/basic_classes.cpp
@@ -5,9 +5,11 @@
 #include <format>
 
 #include <executableinfo.h>
+#include <extension.h>
 #include <filemapping.h>
 #include <guessedvalue.h>
 #include <idownloadmanager.h>
+#include <iextensionlist.h>
 #include <igamefeatures.h>
 #include <iinstallationmanager.h>
 #include <imodinterface.h>
@@ -517,6 +519,8 @@ namespace mo2::python {
                  py::return_value_policy::reference)
             .def("pluginList", &IOrganizer::pluginList,
                  py::return_value_policy::reference)
+            .def("extensionList", &IOrganizer::extensionList,
+                 py::return_value_policy::reference)
             .def("modList", &IOrganizer::modList, py::return_value_policy::reference)
             .def("gameFeatures", &IOrganizer::gameFeatures,
                  py::return_value_policy::reference)

diff --git a/src/mobase/wrappers/pyplugins.cpp b/src/mobase/wrappers/pyplugins.cpp
@@ -144,11 +144,6 @@ namespace mo2::python {
             .def("init", &IPlugin::init, "organizer"_a)
             .def("name", &IPlugin::name)
             .def("localizedName", &IPlugin::localizedName)
-            .def("master", &IPlugin::master)
-            .def("author", &IPlugin::author)
-            .def("description", &IPlugin::description)
-            .def("version", &IPlugin::version)
-            .def("requirements", &IPlugin::requirements)
             .def("settings", &IPlugin::settings)
             .def("enabledByDefault", &IPlugin::enabledByDefault);
 

diff --git a/src/mobase/wrappers/pyplugins.h b/src/mobase/wrappers/pyplugins.h
@@ -45,22 +45,6 @@ namespace mo2::python {
         {
             PYBIND11_OVERRIDE(QString, PluginBase, localizedName, );
         }
-        QString master() const override
-        {
-            PYBIND11_OVERRIDE(QString, PluginBase, master, );
-        }
-        QString author() const override
-        {
-            PYBIND11_OVERRIDE_PURE(QString, PluginBase, author, );
-        }
-        QString description() const override
-        {
-            PYBIND11_OVERRIDE_PURE(QString, PluginBase, description, );
-        }
-        VersionInfo version() const override
-        {
-            PYBIND11_OVERRIDE_PURE(VersionInfo, PluginBase, version, );
-        }
         QList<PluginSetting> settings() const override
         {
             PYBIND11_OVERRIDE_PURE(QList<PluginSetting>, PluginBase, settings, );

diff --git a/tests/mocks/MockOrganizer.h b/tests/mocks/MockOrganizer.h
@@ -34,6 +34,7 @@ class MockOrganizer : public IOrganizer {
 	MOCK_METHOD(std::shared_ptr<const IFileTree>, virtualFileTree, (), (const, override));
 	MOCK_METHOD(MOBase::IDownloadManager*, downloadManager, (), (const, override));
 	MOCK_METHOD(MOBase::IPluginList*, pluginList, (), (const, override));
+	MOCK_METHOD(MOBase::IExtensionList&, extensionList, (), (const, override));
 	MOCK_METHOD(MOBase::IModList*, modList, (), (const, override));
 	MOCK_METHOD(MOBase::IProfile*, profile, (), (const, override));
 	MOCK_METHOD(MOBase::IGameFeatures*, gameFeatures, (), (const, override));

diff --git a/tests/runner/test_iplugin.cpp b/tests/runner/test_iplugin.cpp
@@ -25,10 +25,7 @@ TEST(IPlugin, Basic)
     const IPlugin* plugin = qobject_cast<IPlugin*>(objects[0][0]);
     EXPECT_NE(plugin, nullptr);
 
-    EXPECT_EQ(plugin->author(), "The Author");
     EXPECT_EQ(plugin->name(), "The Name");
-    EXPECT_EQ(plugin->version(), VersionInfo(1, 3, 0));
-    EXPECT_EQ(plugin->description(), "The Description");
 
     // settings
     const auto settings = plugin->settings();