aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMike Mazur2008-09-07 08:00:41 +0000
committerMike Mazur2008-09-07 08:00:41 +0000
commitec13642e1a1eb3ee3348fabc9c3de054b627a920 (patch)
tree1feb58c085ea29677961ec251b30cefbd232c7ca
parent(Hopefully) fix making .zip and .tar.gz files with each build. (diff)
downloadopensim-SC-ec13642e1a1eb3ee3348fabc9c3de054b627a920.zip
opensim-SC-ec13642e1a1eb3ee3348fabc9c3de054b627a920.tar.gz
opensim-SC-ec13642e1a1eb3ee3348fabc9c3de054b627a920.tar.bz2
opensim-SC-ec13642e1a1eb3ee3348fabc9c3de054b627a920.tar.xz
Convert TestStringsWithEscapedQuotesAndComments to use concatenated expected string.
-rw-r--r--OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs29
1 files changed, 9 insertions, 20 deletions
diff --git a/OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs b/OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs
index 7522f39..4417819 100644
--- a/OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs
+++ b/OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs
@@ -349,26 +349,15 @@ default
349} 349}
350"; 350";
351 351
352 string expected = @" 352 string expected =
353 public void default_event_touch_start(LSL_Types.LSLInteger num_detected) 353 "\n public void default_event_touch_start(LSL_Types.LSLInteger num_detected)" +
354 { 354 "\n {" +
355 LSL_Types.LSLString s1 = new LSL_Types.LSLString(""this is a string.""); 355 "\n LSL_Types.LSLString s1 = new LSL_Types.LSLString(\"this is a string.\");" +
356 LSL_Types.LSLString s2 = new LSL_Types.LSLString(""this is a string "") + new LSL_Types.LSLString(""with an escaped \"" inside it.""); 356 "\n LSL_Types.LSLString s2 = new LSL_Types.LSLString(\"this is a string \") + new LSL_Types.LSLString(\"with an escaped \\\" inside it.\");" +
357 s1 = s2 + new LSL_Types.LSLString("" and this "") + new LSL_Types.LSLString(""is a string with // comments.""); 357 "\n s1 = s2 + new LSL_Types.LSLString(\" and this \") + new LSL_Types.LSLString(\"is a string with // comments.\");" +
358 LSL_Types.LSLString onemore = new LSL_Types.LSLString(""[\^@]""); 358 "\n LSL_Types.LSLString onemore = new LSL_Types.LSLString(\"[\\^@]\");" +
359 LSL_Types.LSLString multiline = new LSL_Types.LSLString(""Good evening Sir,\n my name is Steve.\n I come from a rough area.\n I used to be addicted to crack\n but now I am off it and trying to stay clean.\n That is why I am selling magazine subscriptions.""); 359 "\n LSL_Types.LSLString multiline = new LSL_Types.LSLString(\"Good evening Sir,\\n my name is Steve.\\n I come from a rough area.\\n I used to be addicted to crack\\n but now I am off it and trying to stay clean.\\n That is why I am selling magazine subscriptions.\");" +
360 } 360 "\n }\n";
361";
362
363 //string expected =
364 // "\n public void default_event_touch_start(LSL_Types.LSLInteger num_detected)" +
365 // "\n {" +
366 // "\n LSL_Types.LSLString s1 = new LSL_Types.LSLString(\"this is a string.\");" +
367 // "\n LSL_Types.LSLString s2 = new LSL_Types.LSLString(\"this is a string \") + new LSL_Types.LSLString(\"with an escaped \\\" inside it.\");" +
368 // "\n s1 = s2 + new LSL_Types.LSLString(\" and this \") + new LSL_Types.LSLString(\"is a string with // comments.\");" +
369 // "\n LSL_Types.LSLString onemore = new LSL_Types.LSLString(\"[\\^@]\");" +
370 // "\n LSL_Types.LSLString multiline = new LSL_Types.LSLString(\"Good evening Sir,\n my name is Steve.\n I come from a rough area.\n I used to be addicted to crack\n but now I am off it and trying to stay clean.\n That is why I am selling magazine subscriptions.\");" +
371 // "\n }\n";
372 361
373 CSCodeGenerator cg = new CSCodeGenerator(); 362 CSCodeGenerator cg = new CSCodeGenerator();
374 string output = cg.Convert(input); 363 string output = cg.Convert(input);