Unit testing code cleanup

[xestiaab/.git] / source / tests / xestiaab_common.h

diff --git a/source/tests/xestiaab_common.h b/source/tests/xestiaab_common.h
index d55063c..ae9bbf5 100644 (file)
--- a/source/tests/xestiaab_common.h
+++ b/source/tests/xestiaab_common.h
@@ -86,6 +86,10 @@ TEST(CommonFunctions, GetAccountDir){
        wxString AccountDirCheck2 = "";
        wxString AccountDirCheck3 = "";
        
+       wxString AccountDirInput1 = "Example1";
+       wxString AccountDirInput2 = "Example2";
+       wxString AccountDirInput3 = "Example3";
+       
        AccountDirCheck1.Append(wxString::FromUTF8(getenv("HOME")));
        AccountDirCheck1.Append(wxT("/.xestiaab/accounts/"));
        AccountDirCheck1.Append("Example1");
@@ -101,9 +105,9 @@ TEST(CommonFunctions, GetAccountDir){
        AccountDirCheck3.Append("Example3");
        AccountDirCheck3.Append(wxT("/"));
        
-       wxString AccountDir1 = GetAccountDir("Example1", false);
-       wxString AccountDir2 = GetAccountDir("Example2", false);
-       wxString AccountDir3 = GetAccountDir("Example3", false);
+       wxString AccountDir1 = GetAccountDir(AccountDirInput1, false);
+       wxString AccountDir2 = GetAccountDir(AccountDirInput2, false);
+       wxString AccountDir3 = GetAccountDir(AccountDirInput3, false);
 
        ASSERT_EQ(AccountDir1, AccountDirCheck1);
        ASSERT_EQ(AccountDir2, AccountDirCheck2);
@@ -129,6 +133,10 @@ TEST(CommonFunctions, GetAccountDirCertificate){
        wxString AccountDirCheck2 = "";
        wxString AccountDirCheck3 = "";
        
+       wxString AccountDirInput1 = "Example1";
+       wxString AccountDirInput2 = "Example2";
+       wxString AccountDirInput3 = "Example3";
+       
        AccountDirCheck1.Append(wxString::FromUTF8(getenv("HOME")));
        AccountDirCheck1.Append(wxT("/.xestiaab/accounts/"));
        AccountDirCheck1.Append("Example1");
@@ -144,9 +152,9 @@ TEST(CommonFunctions, GetAccountDirCertificate){
        AccountDirCheck3.Append("Example3");
        AccountDirCheck3.Append(wxT("/server.crt"));
        
-       wxString AccountDir1 = GetAccountDir("Example1", true);
-       wxString AccountDir2 = GetAccountDir("Example2", true);
-       wxString AccountDir3 = GetAccountDir("Example3", true);
+       wxString AccountDir1 = GetAccountDir(AccountDirInput1, true);
+       wxString AccountDir2 = GetAccountDir(AccountDirInput2, true);
+       wxString AccountDir3 = GetAccountDir(AccountDirInput3, true);
 
        ASSERT_EQ(AccountDir1, AccountDirCheck1);
        ASSERT_EQ(AccountDir2, AccountDirCheck2);