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

diff --git a/source/tests/xestiaab_common.h b/source/tests/xestiaab_common.h
index 203278f..6dbfb9f 100644
--- a/source/tests/xestiaab_common.h
+++ b/source/tests/xestiaab_common.h
@@ -249,30 +249,25 @@ 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";
-
-	ASSERT_EQ("A:\\path\\example\\lets\\have\\some\\fun", EscapeStringData(&EscapeStringData, false));
-
-
-}
-
-TEST(CommonFunctions, GetEscapeString){
+	EscapeStringData = "A:\\path\\example\\lets\\have\\some\\fun";
+	EscapeString(&EscapeStringData, false);
+	ASSERT_EQ("A:\\\\path\\\\example\\\\lets\\\\have\\\\some\\\\fun", EscapeStringData.ToStdString());
 
 }