From 4ba2b095a225753f606fba6f1e4d9e056a09448a Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Sat, 5 Dec 2015 09:49:28 +0000 Subject: [PATCH] Remove unnecessary Plugin() constructor --- src/backend/plugin/plugin.cpp | 7 ------ src/backend/plugin/plugin.h | 1 - src/tests/backend/plugin/test_plugin.h | 35 ++++++++------------------ 3 files changed, 10 insertions(+), 33 deletions(-) diff --git a/src/backend/plugin/plugin.cpp b/src/backend/plugin/plugin.cpp index 2aa32403..363dbab0 100644 --- a/src/backend/plugin/plugin.cpp +++ b/src/backend/plugin/plugin.cpp @@ -92,13 +92,6 @@ namespace loot { regex(regex7, regex::ECMAScript | regex::icase) }); - Plugin::Plugin() : - _isEmpty(true), - _loadsBsa(false), - isMaster(false), - crc(0), - numOverrideRecords(0) {} - Plugin::Plugin(const std::string& n) : PluginMetadata(n), _isEmpty(true), diff --git a/src/backend/plugin/plugin.h b/src/backend/plugin/plugin.h index b633dea2..30a85ac8 100644 --- a/src/backend/plugin/plugin.h +++ b/src/backend/plugin/plugin.h @@ -41,7 +41,6 @@ namespace loot { class Plugin : public PluginMetadata { public: - Plugin(); Plugin(const std::string& name); Plugin(Game& game, const std::string& name, const bool headerOnly); diff --git a/src/tests/backend/plugin/test_plugin.h b/src/tests/backend/plugin/test_plugin.h index 1c24854d..25e6567a 100644 --- a/src/tests/backend/plugin/test_plugin.h +++ b/src/tests/backend/plugin/test_plugin.h @@ -31,16 +31,7 @@ along with LOOT. If not, see class Plugin : public SkyrimTest {}; TEST_F(Plugin, ConstructorsAndDataAccess) { - loot::Plugin plugin; - EXPECT_EQ("", plugin.Name()); - EXPECT_TRUE(plugin.FormIDs().empty()); - EXPECT_TRUE(plugin.Masters().empty()); - EXPECT_FALSE(plugin.IsMaster()); - EXPECT_TRUE(plugin.IsEmpty()); - EXPECT_EQ("", plugin.Version()); - EXPECT_EQ(0, plugin.Crc()); - - plugin = loot::Plugin("Blank.esm"); + loot::Plugin plugin("Blank.esm"); EXPECT_EQ("Blank.esm", plugin.Name()); EXPECT_TRUE(plugin.FormIDs().empty()); EXPECT_TRUE(plugin.Masters().empty()); @@ -133,12 +124,8 @@ TEST_F(Plugin, IsActive) { } TEST_F(Plugin, EqualityOperator) { - loot::Plugin plugin1, plugin2; - EXPECT_TRUE(plugin1 == plugin2); - EXPECT_TRUE(plugin2 == plugin1); - - plugin1 = loot::Plugin("Blank.esm"); - plugin2 = loot::Plugin("blank.esm"); + loot::Plugin plugin1("Blank.esm"); + loot::Plugin plugin2("blank.esm"); EXPECT_TRUE(plugin1 == plugin2); EXPECT_TRUE(plugin2 == plugin1); @@ -169,12 +156,8 @@ TEST_F(Plugin, EqualityOperator) { } TEST_F(Plugin, InequalityOperator) { - loot::Plugin plugin1, plugin2; - EXPECT_FALSE(plugin1 != plugin2); - EXPECT_FALSE(plugin2 != plugin1); - - plugin1 = loot::Plugin("Blank.esm"); - plugin2 = loot::Plugin("blank.esm"); + loot::Plugin plugin1("Blank.esm"); + loot::Plugin plugin2("blank.esm"); EXPECT_FALSE(plugin1 != plugin2); EXPECT_FALSE(plugin2 != plugin1); @@ -209,7 +192,8 @@ TEST_F(Plugin, DoFormIDsOverlap) { game.SetGamePath(dataPath.parent_path()); ASSERT_NO_THROW(game.Init(false, localPath)); - loot::Plugin plugin1, plugin2; + loot::Plugin plugin1("Blank.esm"); + loot::Plugin plugin2("blank.esm"); EXPECT_FALSE(plugin1.DoFormIDsOverlap(plugin2)); EXPECT_FALSE(plugin2.DoFormIDsOverlap(plugin1)); @@ -234,7 +218,8 @@ TEST_F(Plugin, OverlapFormIDs) { game.SetGamePath(dataPath.parent_path()); ASSERT_NO_THROW(game.Init(false, localPath)); - loot::Plugin plugin1, plugin2; + loot::Plugin plugin1("Blank.esm"); + loot::Plugin plugin2("blank.esm"); EXPECT_TRUE(plugin1.OverlapFormIDs(plugin2).empty()); EXPECT_TRUE(plugin2.OverlapFormIDs(plugin1).empty()); @@ -269,7 +254,7 @@ TEST_F(Plugin, CheckInstallValidity) { game.SetGamePath(dataPath.parent_path()); ASSERT_NO_THROW(game.Init(false, localPath)); - loot::Plugin plugin; + loot::Plugin plugin("Blank.esm"); EXPECT_FALSE(plugin.CheckInstallValidity(game)); EXPECT_TRUE(plugin.Messages().empty());