Fixed spacing between include files and first test.

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

diff --git a/source/tests/xestiaab_common.h b/source/tests/xestiaab_common.h
index 203278f..f373df0 100644 (file)
--- 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,34 +250,47 @@ 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());
 
 }