X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiaab_common.h;h=3f8b803eeae81e5fe0d56bfdac52eb7fa074dd08;hb=a776c519f9846a8d0f2b1b9241e10b3101ad7296;hp=203278fc1177dbe3e25abe0764e9ba208e0cb8ea;hpb=f8a1d6049c84aae54744e8535b0e53b0877d1fe7;p=xestiaab%2F.git

diff --git a/source/tests/xestiaab_common.h b/source/tests/xestiaab_common.h
index 203278f..3f8b803 100644
--- a/source/tests/xestiaab_common.h
+++ b/source/tests/xestiaab_common.h
@@ -22,6 +22,7 @@
 #include "../common/mime.h"
 #include "../common/svrblist.h"
 #include "../common/textprocessing.h"
+
 TEST(CommonFunctions, GetUserDir){
 	
 	// Run the unit tests depending on the operating system being used.
@@ -249,49 +250,93 @@ TEST(CommonFunctions, EscapeString){
 
 	// Test the escape string function.
 
-	EscapeStringData = "\"Example\"";
-
-	ASSERT_EQ("\\\"Example\\\"", EscapeStringData(&EscapeStringData, false));
+	wxString EscapeStringData = "Example";
+	EscapeString(&EscapeStringData, false);
+	ASSERT_EQ("Example", EscapeStringData.ToStdString());
 
 	EscapeStringData = "Here we go, an \"example\" of escaping string.";
-
-	ASSERT_EQ("Here we go\\, an \\\"example\\\" of escaping string.", EscapeStringData(&EscapeStringData, false));
+	EscapeString(&EscapeStringData, false);
+	ASSERT_EQ("Here we go\\, an \"example\" of escaping string.", EscapeStringData.ToStdString());
 
 	EscapeStringData = "Lets put some \nnew \nlines \nin \nhere.";
-
-	ASSERT_EQ("Lets put some \\nnew \\nlines \\nin \\nhere.", EscapeStringData(&EscapeStringData, false));
+	EscapeString(&EscapeStringData, false);
+	ASSERT_EQ("Lets put some \\nnew \\nlines \\nin \\nhere.", EscapeStringData.ToStdString());
 
 	EscapeStringData = "Lets put some \r\nnew \r\nlines \r\nin \r\nhere.";
+	EscapeString(&EscapeStringData, false);
+	ASSERT_EQ("Lets put some \\nnew \\nlines \\nin \\nhere.", EscapeStringData.ToStdString());
 
-	ASSERT_EQ("Lets put some \\nnew \\nlines \\nin \\nhere.", EscapeStringData(&EscapeStringData, false));
-
-	EscapeStringData = "A:\path\example\lets\have\some\fun";
+	EscapeStringData = "A:\\path\\example\\lets\\have\\some\\fun";
+	EscapeString(&EscapeStringData, false);
+	ASSERT_EQ("A:\\\\path\\\\example\\\\lets\\\\have\\\\some\\\\fun", EscapeStringData.ToStdString());
 
-	ASSERT_EQ("A:\\path\\example\\lets\\have\\some\\fun", EscapeStringData(&EscapeStringData, false));
+}
 
+TEST(CommonFunctions, CaptureString){
 
-}
+	// Test the capture string function.
+	
+	wxString CaptureStringData = "Example";
+	CaptureString(&CaptureStringData, false);
+	ASSERT_EQ("Example", CaptureStringData.ToStdString());
 
-TEST(CommonFunctions, GetEscapeString){
+	CaptureStringData = "Here we go\\, an \"example\" of escaping string.";
+	CaptureString(&CaptureStringData, false);
+	ASSERT_EQ("Here we go, an \"example\" of escaping string.", CaptureStringData.ToStdString());
 
-}
+	CaptureStringData = "Lets put some \\nnew \\nlines \\nin \\nhere.";
+	CaptureString(&CaptureStringData, false);
+	ASSERT_EQ("Lets put some \nnew \nlines \nin \nhere.", CaptureStringData.ToStdString());
 
-TEST(CommonFunctions, CaptureString){
+	CaptureStringData = "A:\\\\path\\\\example\\\\lets\\\\have\\\\some\\\\fun";
+	CaptureString(&CaptureStringData, false);
+	ASSERT_EQ("A:\\path\\example\\lets\\have\\some\\fun", CaptureStringData.ToStdString());
 
 }
 
 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.
+
+	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());
 
-TEST(CommonFunctions, DeleteMapDataProcess){
+	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.
+
 }
\ No newline at end of file