Refactoring

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>

Author: AenBleidd

clientsetup/win/boinccas.h

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
-#pragma once 
+#pragma once
 
 class BOINCCABase
 {

clientsetup/win/stdafx.h

@@ -16,7 +16,7 @@
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#pragma once 
+#pragma once
 
 // Modify the following defines if you have to target a platform prior to the ones specified below.
 // Refer to MSDN for the latest info on corresponding values for different platforms.

tests/unit-tests/boinccas/test_boinccas_CAAnnounceUpgrade.cpp

@@ -18,7 +18,7 @@
 #include "boinccas_helper.h"
 #include "registry_helper.h"
 
-namespace test_boinccas_CAAnnounceUpgrade {
+namespace test_boinccas {
     class test_boinccas_CAAnnounceUpgrade : public test_boinccas_TestBase {
     protected:
         test_boinccas_CAAnnounceUpgrade() :

tests/unit-tests/boinccas/test_boinccas_CACleanupOldBinaries.cpp

@@ -17,7 +17,7 @@
 
 #include "boinccas_helper.h"
 
-namespace test_boinccas_CACleanupOldBinaries {
+namespace test_boinccas {
     class test_boinccas_CACleanupOldBinaries : public test_boinccas_TestBase {
     protected:
         test_boinccas_CACleanupOldBinaries() :

tests/unit-tests/boinccas/test_boinccas_CACreateAcctMgrLoginFile.cpp

@@ -17,8 +17,14 @@
 
 #include "boinccas_helper.h"
 
-namespace test_boinccas_CACreateAcctMgrLoginFile {
-    class test_boinccas_CACreateAcctMgrLoginFile : public test_boinccas_TestBase {
+namespace test_boinccas {
+    struct AccountData {
+        std::string login;
+        std::string passwordHash;
+    };
+
+    class test_boinccas_CACreateAcctMgrLoginFile :
+        public test_boinccas_TestBase {
     protected:
         test_boinccas_CACreateAcctMgrLoginFile() :
             test_boinccas_TestBase("CreateAcctMgrLoginFile") {
@@ -36,41 +42,38 @@ namespace test_boinccas_CACreateAcctMgrLoginFile {
             ofs.close();
         }
 
-        std::filesystem::path testDir;
-    };
-
-    struct AccountData {
-        std::string login;
-        std::string passwordHash;
-    };
+        std::pair<bool, AccountData> parseAccountXml(
+            const std::string& filename)
+        {
+            AccountData result;
 
-    std::pair<bool, AccountData> parseAccountXml(const std::string& filename)
-    {
-        AccountData result;
+            tinyxml2::XMLDocument doc;
+            const auto err = doc.LoadFile(filename.c_str());
+            if (err != tinyxml2::XML_SUCCESS) {
+                return { false, result };
+            }
 
-        tinyxml2::XMLDocument doc;
-        const auto err = doc.LoadFile(filename.c_str());
-        if (err != tinyxml2::XML_SUCCESS) {
-            return { false, result };
-        }
+            auto* root = doc.FirstChildElement("acct_mgr_login");
+            if (!root) {
+                return { false, result };
+            }
 
-        auto* root = doc.FirstChildElement("acct_mgr_login");
-        if (!root) {
-            return { false, result };
-        }
+            const auto* const loginElem = root->FirstChildElement("login");
+            if (loginElem && loginElem->GetText()) {
+                result.login = loginElem->GetText();
+            }
 
-        const auto* const loginElem = root->FirstChildElement("login");
-        if (loginElem && loginElem->GetText()) {
-            result.login = loginElem->GetText();
-        }
+            const auto* const hashElem =
+                root->FirstChildElement("password_hash");
+            if (hashElem && hashElem->GetText()) {
+                result.passwordHash = hashElem->GetText();
+            }
 
-        const auto* const hashElem = root->FirstChildElement("password_hash");
-        if (hashElem && hashElem->GetText()) {
-            result.passwordHash = hashElem->GetText();
+            return { true, result };
         }
 
-        return { true, result };
-    }
+        std::filesystem::path testDir;
+    };
 
 #ifdef BOINCCAS_TEST
     TEST_F(test_boinccas_CACreateAcctMgrLoginFile,

tests/unit-tests/boinccas/test_boinccas_CACreateBOINCAccounts.cpp

@@ -18,7 +18,7 @@
 #include "boinccas_helper.h"
 #include "user_group_helper.h"
 
-namespace test_boinccas_CACreateBOINCAccounts {
+namespace test_boinccas {
     constexpr auto masterAccountName = "boinc_master";
     constexpr auto projectAccountName = "boinc_project";
     constexpr auto masterAccountPassword = "qwerty123456!@#$%^";

tests/unit-tests/boinccas/test_boinccas_CACreateBOINCGroups.cpp

@@ -20,7 +20,7 @@
 
 #include <Lm.h>
 
-namespace test_boinccas_CACreateBOINCGroups {
+namespace test_boinccas {
     constexpr auto masterAccountName = "boinc_master";
     constexpr auto projectAccountName = "boinc_project";
     constexpr auto masterAccountPassword = "qwerty123456!@#$%^";

tests/unit-tests/boinccas/test_boinccas_CACreateClientAuthFile.cpp

@@ -17,54 +17,56 @@
 
 #include "boinccas_helper.h"
 
-namespace test_boinccas_CACreateClientAuthFile {
-    class test_boinccas_CACreateClientAuthFile :
-        public test_boinccas_TestBase {
-    protected:
-        test_boinccas_CACreateClientAuthFile() :
-            test_boinccas_TestBase("CreateClientAuthFile") {
-        }
-    };
-
+namespace test_boinccas {
     struct AccountData {
         std::string username;
         std::string password;
     };
 
-    std::pair<bool, AccountData> parseAccountXml(const std::string& filename)
-    {
-        AccountData result;
-
-        tinyxml2::XMLDocument doc;
-        const auto err = doc.LoadFile(filename.c_str());
-        if (err != tinyxml2::XML_SUCCESS) {
-            return { false, result };
-        }
-
-        const auto* root = doc.FirstChildElement("client_authorization");
-        if (!root) {
-            return { false, result };
-        }
-
-        const auto* project = root->FirstChildElement("boinc_project");
-        if (!project) {
-            return { false, result };
-        }
-
-        const auto* const usernameElem =
-            project->FirstChildElement("username");
-        if (usernameElem && usernameElem->GetText()) {
-            result.username = usernameElem->GetText();
+    class test_boinccas_CACreateClientAuthFile :
+        public test_boinccas_TestBase {
+    protected:
+        test_boinccas_CACreateClientAuthFile() :
+            test_boinccas_TestBase("CreateClientAuthFile") {
         }
 
-        const auto* const passwordElem =
-            project->FirstChildElement("password");
-        if (passwordElem && passwordElem->GetText()) {
-            result.password = passwordElem->GetText();
+        std::pair<bool, AccountData> parseAccountXml(
+            const std::string& filename)
+        {
+            AccountData result;
+
+            tinyxml2::XMLDocument doc;
+            const auto err = doc.LoadFile(filename.c_str());
+            if (err != tinyxml2::XML_SUCCESS) {
+                return { false, result };
+            }
+
+            const auto* root = doc.FirstChildElement("client_authorization");
+            if (!root) {
+                return { false, result };
+            }
+
+            const auto* project = root->FirstChildElement("boinc_project");
+            if (!project) {
+                return { false, result };
+            }
+
+            const auto* const usernameElem =
+                project->FirstChildElement("username");
+            if (usernameElem && usernameElem->GetText()) {
+                result.username = usernameElem->GetText();
+            }
+
+            const auto* const passwordElem =
+                project->FirstChildElement("password");
+            if (passwordElem && passwordElem->GetText()) {
+                result.password = passwordElem->GetText();
+            }
+
+            return { true, result };
         }
 
-        return { true, result };
-    }
+    };
 
 #ifdef BOINCCAS_TEST
     TEST_F(test_boinccas_CACreateClientAuthFile,

tests/unit-tests/boinccas/test_boinccas_CACreateProjectInitFile.cpp

@@ -18,7 +18,7 @@
 #include "boinccas_helper.h"
 #include "project_init.h"
 
-namespace test_boinccas_CACreateProjectInitFile {
+namespace test_boinccas {
     class test_boinccas_CACreateProjectInitFile :
         public test_boinccas_TestBase {
     protected:

tests/unit-tests/boinccas/test_boinccas_CADeleteBOINCAccounts.cpp

@@ -19,7 +19,7 @@
 #include "registry_helper.h"
 #include "user_group_helper.h"
 
-namespace test_boinccas_CADeleteBOINCAccounts {
+namespace test_boinccas {
     class test_boinccas_CADeleteBOINCAccounts : public test_boinccas_TestBase {
     protected:
         test_boinccas_CADeleteBOINCAccounts() :