aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-05-29 16:27:43 +0000
committerJustin Clarke Casey2009-05-29 16:27:43 +0000
commit9021bb231c6db0d1dba767e4886bf562b91f03c5 (patch)
tree21aa5f4567749b78dfe499e522d8dcdd06a9008d
parent* Add xml2 load test (diff)
downloadopensim-SC-9021bb231c6db0d1dba767e4886bf562b91f03c5.zip
opensim-SC-9021bb231c6db0d1dba767e4886bf562b91f03c5.tar.gz
opensim-SC-9021bb231c6db0d1dba767e4886bf562b91f03c5.tar.bz2
opensim-SC-9021bb231c6db0d1dba767e4886bf562b91f03c5.tar.xz
* minor: move common serialization test code into fixture setup
-rw-r--r--OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs23
1 files changed, 17 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
index 3d8fb44..ad9d301 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
@@ -119,18 +119,22 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
119 <OtherParts /> 119 <OtherParts />
120 </SceneObjectGroup>"; 120 </SceneObjectGroup>";
121 121
122 protected SerialiserModule m_serialiserModule;
123
124 [TestFixtureSetUp]
125 public void Init()
126 {
127 m_serialiserModule = new SerialiserModule();
128 SceneSetupHelpers.SetupSceneModules(SceneSetupHelpers.SetupScene(false), m_serialiserModule);
129 }
130
122 [Test] 131 [Test]
123 public void TestLoadXml2() 132 public void TestLoadXml2()
124 { 133 {
125 TestHelper.InMethod(); 134 TestHelper.InMethod();
126 //log4net.Config.XmlConfigurator.Configure(); 135 //log4net.Config.XmlConfigurator.Configure();
127 136
128 SerialiserModule serialiserModule = new SerialiserModule(); 137 SceneObjectGroup so = m_serialiserModule.DeserializeGroupFromXml2(xml2);
129
130 Scene scene = SceneSetupHelpers.SetupScene(false);
131 SceneSetupHelpers.SetupSceneModules(scene, serialiserModule);
132
133 SceneObjectGroup so = serialiserModule.DeserializeGroupFromXml2(xml2);
134 SceneObjectPart rootPart = so.RootPart; 138 SceneObjectPart rootPart = so.RootPart;
135 139
136 Assert.That(rootPart.UUID, Is.EqualTo(new UUID("9be68fdd-f740-4a0f-9675-dfbbb536b946"))); 140 Assert.That(rootPart.UUID, Is.EqualTo(new UUID("9be68fdd-f740-4a0f-9675-dfbbb536b946")));
@@ -139,5 +143,12 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
139 143
140 // TODO: Check other properties 144 // TODO: Check other properties
141 } 145 }
146
147 //[Test]
148 public void TestSaveXml2()
149 {
150 TestHelper.InMethod();
151 //log4net.Config.XmlConfigurator.Configure();
152 }
142 } 153 }
143} \ No newline at end of file 154} \ No newline at end of file