diff options
author | John Hurliman | 2010-09-16 17:30:46 -0700 |
---|---|---|
committer | John Hurliman | 2010-09-16 17:30:46 -0700 |
commit | 860b2a502f797e5822c6705d4639f370f3ac5861 (patch) | |
tree | 5a74ddbd626142e27f6c3439ea267b8ea348ce9c /OpenSim/Data/Tests | |
parent | Add the modules include line back that i dropped by mistake (diff) | |
download | opensim-SC_OLD-860b2a502f797e5822c6705d4639f370f3ac5861.zip opensim-SC_OLD-860b2a502f797e5822c6705d4639f370f3ac5861.tar.gz opensim-SC_OLD-860b2a502f797e5822c6705d4639f370f3ac5861.tar.bz2 opensim-SC_OLD-860b2a502f797e5822c6705d4639f370f3ac5861.tar.xz |
Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/Tests/RegionTests.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs index a081462..23d498d 100644 --- a/OpenSim/Data/Tests/RegionTests.cs +++ b/OpenSim/Data/Tests/RegionTests.cs | |||
@@ -232,15 +232,15 @@ namespace OpenSim.Data.Tests | |||
232 | sog.AddPart(p2); | 232 | sog.AddPart(p2); |
233 | sog.AddPart(p3); | 233 | sog.AddPart(p3); |
234 | 234 | ||
235 | SceneObjectPart[] parts = sog.GetParts(); | 235 | SceneObjectPart[] parts = sog.Parts; |
236 | Assert.That(parts.Length,Is.EqualTo(4), "Assert.That(parts.Length,Is.EqualTo(4))"); | 236 | Assert.That(parts.Length,Is.EqualTo(4), "Assert.That(parts.Length,Is.EqualTo(4))"); |
237 | 237 | ||
238 | db.StoreObject(sog, newregion); | 238 | db.StoreObject(sog, newregion); |
239 | List<SceneObjectGroup> sogs = db.LoadObjects(newregion); | 239 | List<SceneObjectGroup> sogs = db.LoadObjects(newregion); |
240 | Assert.That(sogs.Count,Is.EqualTo(1), "Assert.That(sogs.Count,Is.EqualTo(1))"); | 240 | Assert.That(sogs.Count,Is.EqualTo(1), "Assert.That(sogs.Count,Is.EqualTo(1))"); |
241 | SceneObjectGroup newsog = sogs[0]; | 241 | SceneObjectGroup newsog = sogs[0]; |
242 | 242 | ||
243 | SceneObjectPart[] newparts = newsog.GetParts(); | 243 | SceneObjectPart[] newparts = newsog.Parts; |
244 | Assert.That(newparts.Length,Is.EqualTo(4), "Assert.That(newparts.Length,Is.EqualTo(4))"); | 244 | Assert.That(newparts.Length,Is.EqualTo(4), "Assert.That(newparts.Length,Is.EqualTo(4))"); |
245 | 245 | ||
246 | Assert.That(newsog.HasChildPrim(tmp0), "Assert.That(newsog.HasChildPrim(tmp0))"); | 246 | Assert.That(newsog.HasChildPrim(tmp0), "Assert.That(newsog.HasChildPrim(tmp0))"); |
@@ -560,7 +560,7 @@ namespace OpenSim.Data.Tests | |||
560 | } | 560 | } |
561 | 561 | ||
562 | SceneObjectGroup retsog = FindSOG("Test SOG", region4); | 562 | SceneObjectGroup retsog = FindSOG("Test SOG", region4); |
563 | SceneObjectPart[] parts = retsog.GetParts(); | 563 | SceneObjectPart[] parts = retsog.Parts; |
564 | for (int i=0;i<30;i++) | 564 | for (int i=0;i<30;i++) |
565 | { | 565 | { |
566 | SceneObjectPart cursop = mydic[parts[i].UUID]; | 566 | SceneObjectPart cursop = mydic[parts[i].UUID]; |
@@ -607,7 +607,7 @@ namespace OpenSim.Data.Tests | |||
607 | sog.AddPart(p2); | 607 | sog.AddPart(p2); |
608 | sog.AddPart(p3); | 608 | sog.AddPart(p3); |
609 | 609 | ||
610 | SceneObjectPart[] parts = sog.GetParts(); | 610 | SceneObjectPart[] parts = sog.Parts; |
611 | Assert.That(parts.Length, Is.EqualTo(4), "Assert.That(parts.Length,Is.EqualTo(4))"); | 611 | Assert.That(parts.Length, Is.EqualTo(4), "Assert.That(parts.Length,Is.EqualTo(4))"); |
612 | 612 | ||
613 | db.StoreObject(sog, newregion); | 613 | db.StoreObject(sog, newregion); |
@@ -615,7 +615,7 @@ namespace OpenSim.Data.Tests | |||
615 | Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count,Is.EqualTo(1))"); | 615 | Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count,Is.EqualTo(1))"); |
616 | SceneObjectGroup newsog = sogs[0]; | 616 | SceneObjectGroup newsog = sogs[0]; |
617 | 617 | ||
618 | SceneObjectPart[] newparts = newsog.GetParts(); | 618 | SceneObjectPart[] newparts = newsog.Parts; |
619 | Assert.That(newparts.Length, Is.EqualTo(4), "Assert.That(newparts.Length,Is.EqualTo(4))"); | 619 | Assert.That(newparts.Length, Is.EqualTo(4), "Assert.That(newparts.Length,Is.EqualTo(4))"); |
620 | 620 | ||
621 | Assert.That(newsog, Constraints.PropertyCompareConstraint(sog) | 621 | Assert.That(newsog, Constraints.PropertyCompareConstraint(sog) |
@@ -625,7 +625,7 @@ namespace OpenSim.Data.Tests | |||
625 | .IgnoreProperty(x=>x.RegionHandle) | 625 | .IgnoreProperty(x=>x.RegionHandle) |
626 | .IgnoreProperty(x=>x.RegionUUID) | 626 | .IgnoreProperty(x=>x.RegionUUID) |
627 | .IgnoreProperty(x=>x.Scene) | 627 | .IgnoreProperty(x=>x.Scene) |
628 | .IgnoreProperty(x=>x.Children) | 628 | .IgnoreProperty(x=>x.Parts) |
629 | .IgnoreProperty(x=>x.PassCollision) | 629 | .IgnoreProperty(x=>x.PassCollision) |
630 | .IgnoreProperty(x=>x.RootPart)); | 630 | .IgnoreProperty(x=>x.RootPart)); |
631 | } | 631 | } |