aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/Tests/BasicRegionTest.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/Tests/BasicRegionTest.cs')
-rw-r--r--OpenSim/Data/Tests/BasicRegionTest.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index 8373922..8474921 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -71,14 +71,7 @@ namespace OpenSim.Data.Tests
71 71
72 public void SuperInit() 72 public void SuperInit()
73 { 73 {
74 try 74 OpenSim.Tests.Common.TestLogging.LogToConsole();
75 {
76 XmlConfigurator.Configure();
77 }
78 catch (Exception)
79 {
80 // I don't care, just leave log4net off
81 }
82 75
83 region1 = UUID.Random(); 76 region1 = UUID.Random();
84 region3 = UUID.Random(); 77 region3 = UUID.Random();
@@ -536,6 +529,9 @@ namespace OpenSim.Data.Tests
536 [Test] 529 [Test]
537 public void T016_RandomSogWithSceneParts() 530 public void T016_RandomSogWithSceneParts()
538 { 531 {
532 PropertyScrambler<SceneObjectPart> scrambler =
533 new PropertyScrambler<SceneObjectPart>()
534 .DontScramble(x => x.UUID);
539 UUID tmpSog = UUID.Random(); 535 UUID tmpSog = UUID.Random();
540 UUID tmp1 = UUID.Random(); 536 UUID tmp1 = UUID.Random();
541 UUID tmp2 = UUID.Random(); 537 UUID tmp2 = UUID.Random();
@@ -547,14 +543,18 @@ namespace OpenSim.Data.Tests
547 p1.Shape = PrimitiveBaseShape.Default; 543 p1.Shape = PrimitiveBaseShape.Default;
548 p2.Shape = PrimitiveBaseShape.Default; 544 p2.Shape = PrimitiveBaseShape.Default;
549 p3.Shape = PrimitiveBaseShape.Default; 545 p3.Shape = PrimitiveBaseShape.Default;
550 ScrambleForTesting.Scramble(p1);
551 ScrambleForTesting.Scramble(p2);
552 ScrambleForTesting.Scramble(p3);
553 p1.UUID = tmp1; 546 p1.UUID = tmp1;
554 p2.UUID = tmp2; 547 p2.UUID = tmp2;
555 p3.UUID = tmp3; 548 p3.UUID = tmp3;
549 scrambler.Scramble(p1);
550 scrambler.Scramble(p2);
551 scrambler.Scramble(p3);
552
556 SceneObjectGroup sog = NewSOG("Sop 0", tmpSog, newregion); 553 SceneObjectGroup sog = NewSOG("Sop 0", tmpSog, newregion);
557 ScrambleForTesting.Scramble(sog); 554 PropertyScrambler<SceneObjectGroup> sogScrambler =
555 new PropertyScrambler<SceneObjectGroup>()
556 .DontScramble(x => x.UUID);
557 sogScrambler.Scramble(sog);
558 sog.UUID = tmpSog; 558 sog.UUID = tmpSog;
559 sog.AddPart(p1); 559 sog.AddPart(p1);
560 sog.AddPart(p2); 560 sog.AddPart(p2);