X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiaab_common.h;h=ae9bbf53e75967141c3b3f981c8e2ac72e35703a;hb=56eff3f03cf38a27161b3279318c474e0421111c;hp=76384bb319007545893c6dd0f08cb115c85e445d;hpb=298d2bd787b9b695d017ba16c7357bb5c05b43f7;p=xestiaab%2F.git

diff --git a/source/tests/xestiaab_common.h b/source/tests/xestiaab_common.h
index 76384bb..ae9bbf5 100644
--- 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);
@@ -318,12 +326,70 @@ TEST(CommonFunctions, ResetUnusedString){
 
 TEST(CommonFunctions, ConvertToHTML){
 
-}
+	// Tests for converting data for inserting into a HTML
+	// formatted document.
+
+	wxString ConvertToHTMLData = "The test line where < is probably better than >!";
+	ConvertToHTML(&ConvertToHTMLData);
+	ASSERT_EQ("The test line where &lt; is probably better than &gt;!", ConvertToHTMLData.ToStdString());
+
+	ConvertToHTMLData = "More testing &<>\n";
+	ConvertToHTML(&ConvertToHTMLData);
+	ASSERT_EQ("More testing &amp;&lt;&gt;<br>", ConvertToHTMLData.ToStdString());
 
-TEST(CommonFunctions, DeleteMapDataProcess){
+	ConvertToHTMLData = "This is the first line.\nThis is the second line.\nThis is the third line.";
+	ConvertToHTML(&ConvertToHTMLData);
+	ASSERT_EQ("This is the first line.<br>This is the second line.<br>This is the third line.", ConvertToHTMLData.ToStdString());
 
 }
 
 TEST(CommonFunctions, MapDataExists){
 
+	// Tests for checking that map data exists.
+
+	std::map<int,int> MapExample;
+	int ItemIndex = 0;
+
+	MapExample.insert(std::make_pair(0,1));
+	MapExample.insert(std::make_pair(1,1));
+	MapExample.insert(std::make_pair(2,1));
+	MapExample.insert(std::make_pair(5,1));
+	MapExample.insert(std::make_pair(500,1));
+	MapExample.insert(std::make_pair(2415,1));
+
+	ASSERT_EQ(true, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 1;
+	ASSERT_EQ(true, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 2;
+	ASSERT_EQ(true, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 3;
+	ASSERT_EQ(false, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 5;
+	ASSERT_EQ(true, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 6;
+	ASSERT_EQ(false, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 499;
+	ASSERT_EQ(false, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 500;
+	ASSERT_EQ(true, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 501;
+	ASSERT_EQ(false, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 2414;
+	ASSERT_EQ(false, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 2415;
+	ASSERT_EQ(true, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 2416;
+	ASSERT_EQ(false, MapDataExists(&ItemIndex, &MapExample));
+
 }
\ No newline at end of file