aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDahlia Trimble2008-09-06 01:22:39 +0000
committerDahlia Trimble2008-09-06 01:22:39 +0000
commit5446bdff0911a458ad5299aa918efd52555f8210 (patch)
tree661711f82d0083e49f291c06f7322d1aca1aa171
parent* refactor: Make SOG itself responsible for checking whether it's already bee... (diff)
downloadopensim-SC_OLD-5446bdff0911a458ad5299aa918efd52555f8210.zip
opensim-SC_OLD-5446bdff0911a458ad5299aa918efd52555f8210.tar.gz
opensim-SC_OLD-5446bdff0911a458ad5299aa918efd52555f8210.tar.bz2
opensim-SC_OLD-5446bdff0911a458ad5299aa918efd52555f8210.tar.xz
Revert changes to TestStringsWithEscapedQuotesAndComments() so it will work in Bamboo instead of windows
-rw-r--r--OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs30
1 files changed, 21 insertions, 9 deletions
diff --git a/OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs b/OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs
index 3b2a499..310418c 100644
--- a/OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs
+++ b/OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs
@@ -349,15 +349,27 @@ default
349 } 349 }
350} 350}
351"; 351";
352 string expected = 352
353 "\n public void default_event_touch_start(LSL_Types.LSLInteger num_detected)" + 353 string expected = @"
354 "\n {" + 354 public void default_event_touch_start(LSL_Types.LSLInteger num_detected)
355 "\n LSL_Types.LSLString s1 = new LSL_Types.LSLString(\"this is a string.\");" + 355 {
356 "\n LSL_Types.LSLString s2 = new LSL_Types.LSLString(\"this is a string \") + new LSL_Types.LSLString(\"with an escaped \\\" inside it.\");" + 356 LSL_Types.LSLString s1 = new LSL_Types.LSLString(""this is a string."");
357 "\n s1 = s2 + new LSL_Types.LSLString(\" and this \") + new LSL_Types.LSLString(\"is a string with // comments.\");" + 357 LSL_Types.LSLString s2 = new LSL_Types.LSLString(""this is a string "") + new LSL_Types.LSLString(""with an escaped \"" inside it."");
358 "\n LSL_Types.LSLString onemore = new LSL_Types.LSLString(\"[^@]\");" + 358 s1 = s2 + new LSL_Types.LSLString("" and this "") + new LSL_Types.LSLString(""is a string with // comments."");
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.\");" + 359 LSL_Types.LSLString onemore = new LSL_Types.LSLString(""[\^@]"");
360 "\n }\n"; 360 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."");
361 }
362";
363
364 //string expected =
365 // "\n public void default_event_touch_start(LSL_Types.LSLInteger num_detected)" +
366 // "\n {" +
367 // "\n LSL_Types.LSLString s1 = new LSL_Types.LSLString(\"this is a string.\");" +
368 // "\n LSL_Types.LSLString s2 = new LSL_Types.LSLString(\"this is a string \") + new LSL_Types.LSLString(\"with an escaped \\\" inside it.\");" +
369 // "\n s1 = s2 + new LSL_Types.LSLString(\" and this \") + new LSL_Types.LSLString(\"is a string with // comments.\");" +
370 // "\n LSL_Types.LSLString onemore = new LSL_Types.LSLString(\"[\\^@]\");" +
371 // "\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.\");" +
372 // "\n }\n";
361 373
362 CSCodeGenerator cg = new CSCodeGenerator(); 374 CSCodeGenerator cg = new CSCodeGenerator();
363 string output = cg.Convert(input); 375 string output = cg.Convert(input);