X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiaab_common.h;h=d55063ca30fed20fb42376c3597b596b18f8a417;hb=20bddb3e6b688c9bfe0e63559bcb33e2a95e7013;hp=f373df09defd8599ced732038d6e9654b535515e;hpb=65e83a58c7d3e09a83f77eb897df3b73f1bae4f8;p=xestiaab%2F.git

diff --git a/source/tests/xestiaab_common.h b/source/tests/xestiaab_common.h
index f373df0..d55063c 100644
--- a/source/tests/xestiaab_common.h
+++ b/source/tests/xestiaab_common.h
@@ -296,16 +296,92 @@ TEST(CommonFunctions, CaptureString){
 
 TEST(CommonFunctions, ResetUnusedString){
 
+	// Tests for resetting an unused string.
+
+	wxString ResetUnusedStringData = "Random string with a \\\\\\\\serverpath\\\\location";
+	ResetUnusedString(&ResetUnusedStringData);
+	ASSERT_EQ("Random string with a \\\\serverpath\\location", ResetUnusedStringData.ToStdString());	
+
+	ResetUnusedStringData = "Some text \\nwith new \\nlines!";
+	ResetUnusedString(&ResetUnusedStringData);
+	ASSERT_EQ("Some text \nwith new \nlines!", ResetUnusedStringData.ToStdString());
+
+	ResetUnusedStringData = "Some text \\nwith new \\nlines!";
+	ResetUnusedString(&ResetUnusedStringData);
+	ASSERT_EQ("Some text \nwith new \nlines!", ResetUnusedStringData.ToStdString());
+	
+	ResetUnusedStringData = "And now the list of characters: \\\\ \\n \\; \\,";
+	ResetUnusedString(&ResetUnusedStringData);
+	ASSERT_EQ("And now the list of characters: \\ \n ; ,", ResetUnusedStringData.ToStdString());
+
 }
 
 TEST(CommonFunctions, ConvertToHTML){
 
-}
+	// Tests for converting data for inserting into a HTML
+	// formatted document.
 
-TEST(CommonFunctions, DeleteMapDataProcess){
+	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());
+
+	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