Unit testing code cleanup

diff --git a/source/tests/xestiaab_carddav.cpp b/source/tests/xestiaab_carddav.cpp
index 02b1fa5..e205c9b 100644 (file)
--- a/source/tests/xestiaab_carddav.cpp
+++ b/source/tests/xestiaab_carddav.cpp
@@ -722,7 +722,7 @@ TEST(CardDAV, Use_Fake_To_Simulate_A_Connection_That_Fails_To_Delete_A_Server_Co
        FakeConnection.TestSessionCode = 22;
        FakeConnection.TestResultMessage = "You do not have permission to delete this resource.";
        
-       COServerResponse DeleteContactResult = FakeConnection.DeleteContact("testfile.vcf", "a23124sfadfdvxc1646541bsdfaf");
+       COServerResponse DeleteContactResult = FakeConnection.DeleteContact("testfile.vcf");
        
        EXPECT_EQ(COREQUEST_ERROR_SERVER, DeleteContactResult.RequestResult);
        EXPECT_EQ("", DeleteContactResult.EntityTag);
@@ -748,7 +748,7 @@ TEST(CardDAV, Use_Fake_To_Simulate_A_Connection_That_Fails_To_Delete_A_Server_Co
        FakeConnection.TestSessionCode = 22;
        FakeConnection.TestResultMessage = "The resource could not be found.";
        
-       COServerResponse DeleteContactResult = FakeConnection.DeleteContact("testfile.vcf", "a23124sfadfdvxc1646541bsdfaf");
+       COServerResponse DeleteContactResult = FakeConnection.DeleteContact("testfile.vcf");
        
        EXPECT_EQ(COREQUEST_ERROR_SERVER, DeleteContactResult.RequestResult);
        EXPECT_EQ("", DeleteContactResult.EntityTag);
@@ -774,7 +774,7 @@ TEST(CardDAV, Use_Fake_To_Simulate_A_Connection_That_Fails_To_Delete_A_Server_Co
        FakeConnection.TestSessionCode = 0;
        FakeConnection.TestResultMessage = "";
        
-       COServerResponse DeleteContactResult = FakeConnection.DeleteContact("testfile.vcf", "a23124sfadfdvxc1646541bsdfaf");
+       COServerResponse DeleteContactResult = FakeConnection.DeleteContact("testfile.vcf");
        
        EXPECT_EQ(COREQUEST_ERROR_NOTCONNECTED, DeleteContactResult.RequestResult);
        EXPECT_EQ("", DeleteContactResult.EntityTag);

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);

diff --git a/source/tests/xestiaab_contactsave.h b/source/tests/xestiaab_contactsave.h
index b3dde42..446571a 100644 (file)
--- a/source/tests/xestiaab_contactsave.h
+++ b/source/tests/xestiaab_contactsave.h
@@ -713,9 +713,6 @@ TEST(ContactSave, ContactSaveTests){
        ASSERT_EQ(CONTACTLOAD_OK, TestFile3.LoadFile("LoadCheck-Load4.vcf"));
        ASSERT_EQ(CONTACTSAVE_OK, TestFile3.SaveString(&SaveData));
        
-       std::cout << SaveData << std::endl;
-       std::cout << SaveDataCompare << std::endl;
-       
        ASSERT_EQ(SaveDataCompare, SaveData);
 
 }