OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Re-enable save oar test by loading asset data plugins from test mock class 

* Actually spit out the exception caught by the plugin loader - not much point having plugins throw exceptions if we are just going to ignore them
0.6.6-post-fixes
Justin Clarke Casey 2009-05-18 17:46:14 +00:00
parent a885556063
commit ad7214620f
4 changed files with 206 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

189
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
View File

@ -67,134 +67,131 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
/// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet). /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet).
/// </summary> /// </summary>
//[Test] //[Test]
// public void TestSaveIarV0p1() public void TestSaveIarV0p1()
// { {
// TestHelper.InMethod(); TestHelper.InMethod();
// //log4net.Config.XmlConfigurator.Configure(); //log4net.Config.XmlConfigurator.Configure();
// InventoryArchiverModule archiverModule = new InventoryArchiverModule(); InventoryArchiverModule archiverModule = new InventoryArchiverModule();
// Scene scene = SceneSetupHelpers.SetupScene(false); Scene scene = SceneSetupHelpers.SetupScene(false);
// SceneSetupHelpers.SetupSceneModules(scene, archiverModule); SceneSetupHelpers.SetupSceneModules(scene, archiverModule);
// CommunicationsManager cm = scene.CommsManager; CommunicationsManager cm = scene.CommsManager;
// // Create user // Create user
// string userFirstName = "Jock"; string userFirstName = "Jock";
// string userLastName = "Stirrup"; string userLastName = "Stirrup";
// UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020"); UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
// cm.UserAdminService.AddUser(userFirstName, userLastName, string.Empty, string.Empty, 1000, 1000, userId); cm.UserAdminService.AddUser(userFirstName, userLastName, string.Empty, string.Empty, 1000, 1000, userId);
// CachedUserInfo userInfo = cm.UserProfileCacheService.GetUserDetails(userId); CachedUserInfo userInfo = cm.UserProfileCacheService.GetUserDetails(userId);
// userInfo.FetchInventory(); userInfo.FetchInventory();
// // Create asset // Create asset
// SceneObjectGroup object1; SceneObjectGroup object1;
// SceneObjectPart part1; SceneObjectPart part1;
// { {
// string partName = "My Little Dog Object"; string partName = "My Little Dog Object";
// UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040"); UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040");
// PrimitiveBaseShape shape = PrimitiveBaseShape.CreateSphere(); PrimitiveBaseShape shape = PrimitiveBaseShape.CreateSphere();
// Vector3 groupPosition = new Vector3(10, 20, 30); Vector3 groupPosition = new Vector3(10, 20, 30);
// Quaternion rotationOffset = new Quaternion(20, 30, 40, 50); Quaternion rotationOffset = new Quaternion(20, 30, 40, 50);
// Vector3 offsetPosition = new Vector3(5, 10, 15); Vector3 offsetPosition = new Vector3(5, 10, 15);
// part1 part1
// = new SceneObjectPart( = new SceneObjectPart(
// ownerId, shape, groupPosition, rotationOffset, offsetPosition); ownerId, shape, groupPosition, rotationOffset, offsetPosition);
// part1.Name = partName; part1.Name = partName;
// object1 = new SceneObjectGroup(part1); object1 = new SceneObjectGroup(part1);
// scene.AddNewSceneObject(object1, false); scene.AddNewSceneObject(object1, false);
// } }
// UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060"); UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
// AssetBase asset1 = new AssetBase(); AssetBase asset1 = new AssetBase();
// asset1.FullID = asset1Id; asset1.FullID = asset1Id;
// asset1.Data = Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(object1)); asset1.Data = Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(object1));
// scene.AssetService.Store(asset1); scene.AssetService.Store(asset1);
// // Create item // Create item
// UUID item1Id = UUID.Parse("00000000-0000-0000-0000-000000000080"); UUID item1Id = UUID.Parse("00000000-0000-0000-0000-000000000080");
// InventoryItemBase item1 = new InventoryItemBase(); InventoryItemBase item1 = new InventoryItemBase();
// item1.Name = "My Little Dog"; item1.Name = "My Little Dog";
// item1.AssetID = asset1.FullID; item1.AssetID = asset1.FullID;
// item1.ID = item1Id; item1.ID = item1Id;
// item1.Folder = userInfo.RootFolder.FindFolderByPath("Objects").ID; item1.Folder = userInfo.RootFolder.FindFolderByPath("Objects").ID;
// scene.AddInventoryItem(userId, item1); scene.AddInventoryItem(userId, item1);
// MemoryStream archiveWriteStream = new MemoryStream(); MemoryStream archiveWriteStream = new MemoryStream();
// archiverModule.OnInventoryArchiveSaved += SaveCompleted; archiverModule.OnInventoryArchiveSaved += SaveCompleted;
// lock (this) lock (this)
// { {
// archiverModule.ArchiveInventory(userFirstName, userLastName, "Objects", archiveWriteStream); archiverModule.ArchiveInventory(userFirstName, userLastName, "Objects", archiveWriteStream);
// //AssetServerBase assetServer = (AssetServerBase)scene.CommsManager.AssetCache.AssetServer; //AssetServerBase assetServer = (AssetServerBase)scene.CommsManager.AssetCache.AssetServer;
// //while (assetServer.HasWaitingRequests()) //while (assetServer.HasWaitingRequests())
// // assetServer.ProcessNextRequest(); // assetServer.ProcessNextRequest();
// Monitor.Wait(this, 60000); Monitor.Wait(this, 60000);
// } }
// byte[] archive = archiveWriteStream.ToArray(); byte[] archive = archiveWriteStream.ToArray();
// MemoryStream archiveReadStream = new MemoryStream(archive); MemoryStream archiveReadStream = new MemoryStream(archive);
// TarArchiveReader tar = new TarArchiveReader(archiveReadStream); TarArchiveReader tar = new TarArchiveReader(archiveReadStream);
// InventoryFolderImpl objectsFolder = userInfo.RootFolder.FindFolderByPath("Objects"); InventoryFolderImpl objectsFolder = userInfo.RootFolder.FindFolderByPath("Objects");
// //bool gotControlFile = false; //bool gotControlFile = false;
// bool gotObject1File = false; bool gotObject1File = false;
// //bool gotObject2File = false; //bool gotObject2File = false;
// string expectedObject1FilePath = string.Format( string expectedObject1FilePath = string.Format(
// "{0}{1}/{2}_{3}.xml", "{0}{1}/{2}_{3}.xml",
// ArchiveConstants.INVENTORY_PATH, ArchiveConstants.INVENTORY_PATH,
// string.Format( string.Format(
// "Objects{0}{1}", ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR, objectsFolder.ID), "Objects{0}{1}", ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR, objectsFolder.ID),
// item1.Name, item1.Name,
// item1Id); item1Id);
///*
// string expectedObject2FileName = string.Format( // string expectedObject2FileName = string.Format(
// "{0}_{1:000}-{2:000}-{3:000}__{4}.xml", // "{0}_{1:000}-{2:000}-{3:000}__{4}.xml",
// part2.Name, // part2.Name,
// Math.Round(part2.GroupPosition.X), Math.Round(part2.GroupPosition.Y), Math.Round(part2.GroupPosition.Z), // Math.Round(part2.GroupPosition.X), Math.Round(part2.GroupPosition.Y), Math.Round(part2.GroupPosition.Z),
// part2.UUID); // part2.UUID);
// */
// string filePath; string filePath;
// TarArchiveReader.TarEntryType tarEntryType; TarArchiveReader.TarEntryType tarEntryType;
// while (tar.ReadEntry(out filePath, out tarEntryType) != null) while (tar.ReadEntry(out filePath, out tarEntryType) != null)
// { {
//Console.WriteLine("Got {0}", filePath); //Console.WriteLine("Got {0}", filePath);
// /*
// if (ArchiveConstants.CONTROL_FILE_PATH == filePath) // if (ArchiveConstants.CONTROL_FILE_PATH == filePath)
// { // {
// gotControlFile = true; // gotControlFile = true;
// } // }
// */
// if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH) && filePath.EndsWith(".xml")) if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH) && filePath.EndsWith(".xml"))
{
string fileName = filePath.Remove(0, "Objects/".Length);
if (fileName.StartsWith(part1.Name))
{
Assert.That(filePath, Is.EqualTo(expectedObject1FilePath));
gotObject1File = true;
}
// else if (fileName.StartsWith(part2.Name))
// { // {
// //string fileName = filePath.Remove(0, "Objects/".Length); // Assert.That(fileName, Is.EqualTo(expectedObject2FileName));
// gotObject2File = true;
// //if (fileName.StartsWith(part1.Name))
// //{
// Assert.That(filePath, Is.EqualTo(expectedObject1FilePath));
// gotObject1File = true;
// //}
// //else if (fileName.StartsWith(part2.Name))
// //{
// // Assert.That(fileName, Is.EqualTo(expectedObject2FileName));
// // gotObject2File = true;
// //}
// }
// } // }
}
}
// //Assert.That(gotControlFile, Is.True, "No control file in archive"); // Assert.That(gotControlFile, Is.True, "No control file in archive");
// Assert.That(gotObject1File, Is.True, "No item1 file in archive"); Assert.That(gotObject1File, Is.True, "No item1 file in archive");
// //Assert.That(gotObject2File, Is.True, "No object2 file in archive"); // Assert.That(gotObject2File, Is.True, "No object2 file in archive");
// // TODO: Test presence of more files and contents of files. // TODO: Test presence of more files and contents of files.
// } }
/// <summary> /// <summary>
/// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where

202
OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
View File

@ -74,129 +74,129 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
} }
} }
///// <summary> /// <summary>
///// Test saving a V0.2 OpenSim Region Archive. /// Test saving a V0.2 OpenSim Region Archive.
///// </summary> /// </summary>
//[Test] [Test]
//public void TestSaveOarV0p2() public void TestSaveOarV0p2()
//{ {
// TestHelper.InMethod(); TestHelper.InMethod();
// //log4net.Config.XmlConfigurator.Configure(); log4net.Config.XmlConfigurator.Configure();
// ArchiverModule archiverModule = new ArchiverModule(); ArchiverModule archiverModule = new ArchiverModule();
// SerialiserModule serialiserModule = new SerialiserModule(); SerialiserModule serialiserModule = new SerialiserModule();
// TerrainModule terrainModule = new TerrainModule(); TerrainModule terrainModule = new TerrainModule();
// Scene scene = SceneSetupHelpers.SetupScene(false); Scene scene = SceneSetupHelpers.SetupScene(false);
// SceneSetupHelpers.SetupSceneModules(scene, archiverModule, serialiserModule, terrainModule); SceneSetupHelpers.SetupSceneModules(scene, archiverModule, serialiserModule, terrainModule);
// SceneObjectPart part1; SceneObjectPart part1;
// // Create and add prim 1 // Create and add prim 1
// { {
// string partName = "My Little Pony"; string partName = "My Little Pony";
// UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000015"); UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000015");
// PrimitiveBaseShape shape = PrimitiveBaseShape.CreateSphere(); PrimitiveBaseShape shape = PrimitiveBaseShape.CreateSphere();
// Vector3 groupPosition = new Vector3(10, 20, 30); Vector3 groupPosition = new Vector3(10, 20, 30);
// Quaternion rotationOffset = new Quaternion(20, 30, 40, 50); Quaternion rotationOffset = new Quaternion(20, 30, 40, 50);
// Vector3 offsetPosition = new Vector3(5, 10, 15); Vector3 offsetPosition = new Vector3(5, 10, 15);
// part1 part1
// = new SceneObjectPart( = new SceneObjectPart(
// ownerId, shape, groupPosition, rotationOffset, offsetPosition); ownerId, shape, groupPosition, rotationOffset, offsetPosition);
// part1.Name = partName; part1.Name = partName;
// scene.AddNewSceneObject(new SceneObjectGroup(part1), false); scene.AddNewSceneObject(new SceneObjectGroup(part1), false);
// } }
// SceneObjectPart part2; SceneObjectPart part2;
// // Create and add prim 2 // Create and add prim 2
// { {
// string partName = "Action Man"; string partName = "Action Man";
// UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000016"); UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000016");
// PrimitiveBaseShape shape = PrimitiveBaseShape.CreateCylinder(); PrimitiveBaseShape shape = PrimitiveBaseShape.CreateCylinder();
// Vector3 groupPosition = new Vector3(90, 80, 70); Vector3 groupPosition = new Vector3(90, 80, 70);
// Quaternion rotationOffset = new Quaternion(60, 70, 80, 90); Quaternion rotationOffset = new Quaternion(60, 70, 80, 90);
// Vector3 offsetPosition = new Vector3(20, 25, 30); Vector3 offsetPosition = new Vector3(20, 25, 30);
// part2 part2
// = new SceneObjectPart( = new SceneObjectPart(
// ownerId, shape, groupPosition, rotationOffset, offsetPosition); ownerId, shape, groupPosition, rotationOffset, offsetPosition);
// part2.Name = partName; part2.Name = partName;
// scene.AddNewSceneObject(new SceneObjectGroup(part2), false); scene.AddNewSceneObject(new SceneObjectGroup(part2), false);
// } }
// MemoryStream archiveWriteStream = new MemoryStream(); MemoryStream archiveWriteStream = new MemoryStream();
// scene.EventManager.OnOarFileSaved += SaveCompleted; scene.EventManager.OnOarFileSaved += SaveCompleted;
// Guid requestId = new Guid("00000000-0000-0000-0000-808080808080"); Guid requestId = new Guid("00000000-0000-0000-0000-808080808080");
// lock (this) lock (this)
// { {
// archiverModule.ArchiveRegion(archiveWriteStream, requestId); archiverModule.ArchiveRegion(archiveWriteStream, requestId);
// //AssetServerBase assetServer = (AssetServerBase)scene.CommsManager.AssetCache.AssetServer; //AssetServerBase assetServer = (AssetServerBase)scene.CommsManager.AssetCache.AssetServer;
// //while (assetServer.HasWaitingRequests()) //while (assetServer.HasWaitingRequests())
// // assetServer.ProcessNextRequest(); // assetServer.ProcessNextRequest();
// Monitor.Wait(this, 60000); Monitor.Wait(this, 60000);
// } }
// Assert.That(m_lastRequestId, Is.EqualTo(requestId)); Assert.That(m_lastRequestId, Is.EqualTo(requestId));
// byte[] archive = archiveWriteStream.ToArray(); byte[] archive = archiveWriteStream.ToArray();
// MemoryStream archiveReadStream = new MemoryStream(archive); MemoryStream archiveReadStream = new MemoryStream(archive);
// TarArchiveReader tar = new TarArchiveReader(archiveReadStream); TarArchiveReader tar = new TarArchiveReader(archiveReadStream);
// bool gotControlFile = false; bool gotControlFile = false;
// bool gotObject1File = false; bool gotObject1File = false;
// bool gotObject2File = false; bool gotObject2File = false;
// string expectedObject1FileName = string.Format( string expectedObject1FileName = string.Format(
// "{0}_{1:000}-{2:000}-{3:000}__{4}.xml", "{0}_{1:000}-{2:000}-{3:000}__{4}.xml",
// part1.Name, part1.Name,
// Math.Round(part1.GroupPosition.X), Math.Round(part1.GroupPosition.Y), Math.Round(part1.GroupPosition.Z), Math.Round(part1.GroupPosition.X), Math.Round(part1.GroupPosition.Y), Math.Round(part1.GroupPosition.Z),
// part1.UUID); part1.UUID);
// string expectedObject2FileName = string.Format( string expectedObject2FileName = string.Format(
// "{0}_{1:000}-{2:000}-{3:000}__{4}.xml", "{0}_{1:000}-{2:000}-{3:000}__{4}.xml",
// part2.Name, part2.Name,
// Math.Round(part2.GroupPosition.X), Math.Round(part2.GroupPosition.Y), Math.Round(part2.GroupPosition.Z), Math.Round(part2.GroupPosition.X), Math.Round(part2.GroupPosition.Y), Math.Round(part2.GroupPosition.Z),
// part2.UUID); part2.UUID);
// string filePath; string filePath;
// TarArchiveReader.TarEntryType tarEntryType; TarArchiveReader.TarEntryType tarEntryType;
// while (tar.ReadEntry(out filePath, out tarEntryType) != null) while (tar.ReadEntry(out filePath, out tarEntryType) != null)
// { {
// if (ArchiveConstants.CONTROL_FILE_PATH == filePath) if (ArchiveConstants.CONTROL_FILE_PATH == filePath)
// { {
// gotControlFile = true; gotControlFile = true;
// } }
// else if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH)) else if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH))
// { {
// string fileName = filePath.Remove(0, ArchiveConstants.OBJECTS_PATH.Length); string fileName = filePath.Remove(0, ArchiveConstants.OBJECTS_PATH.Length);
// if (fileName.StartsWith(part1.Name)) if (fileName.StartsWith(part1.Name))
// { {
// Assert.That(fileName, Is.EqualTo(expectedObject1FileName)); Assert.That(fileName, Is.EqualTo(expectedObject1FileName));
// gotObject1File = true; gotObject1File = true;
// } }
// else if (fileName.StartsWith(part2.Name)) else if (fileName.StartsWith(part2.Name))
// { {
// Assert.That(fileName, Is.EqualTo(expectedObject2FileName)); Assert.That(fileName, Is.EqualTo(expectedObject2FileName));
// gotObject2File = true; gotObject2File = true;
// } }
// } }
// } }
// Assert.That(gotControlFile, Is.True, "No control file in archive"); Assert.That(gotControlFile, Is.True, "No control file in archive");
// Assert.That(gotObject1File, Is.True, "No object1 file in archive"); Assert.That(gotObject1File, Is.True, "No object1 file in archive");
// Assert.That(gotObject2File, Is.True, "No object2 file in archive"); Assert.That(gotObject2File, Is.True, "No object2 file in archive");
// // TODO: Test presence of more files and contents of files. // TODO: Test presence of more files and contents of files.
// // Temporary // Temporary
// Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod()); Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod());
//} }
/// <summary> /// <summary>
/// Test loading a V0.2 OpenSim Region Archive. /// Test loading a V0.2 OpenSim Region Archive.

7
OpenSim/Server/Base/ServerUtils.cs
View File

@ -31,11 +31,14 @@ using System.Reflection;
using System.Xml; using System.Xml;
using System.Xml.Serialization; using System.Xml.Serialization;
using System.Text; using System.Text;
using log4net;
namespace OpenSim.Server.Base namespace OpenSim.Server.Base
{ {
public static class ServerUtils public static class ServerUtils
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public static string SLAssetTypeToContentType(int assetType) public static string SLAssetTypeToContentType(int assetType)
{ {
switch (assetType) switch (assetType)
@ -114,6 +117,9 @@ namespace OpenSim.Server.Base
try try
{ {
//m_log.DebugFormat("[PLUGINS]: Loading plugins from {0}", System.IO.Directory.GetCurrentDirectory());
//m_log.DebugFormat("[PLUGINS]: Trying to load {0}", dllName);
Assembly pluginAssembly = Assembly.LoadFrom(dllName); Assembly pluginAssembly = Assembly.LoadFrom(dllName);
foreach (Type pluginType in pluginAssembly.GetTypes()) foreach (Type pluginType in pluginAssembly.GetTypes())
@ -141,6 +147,7 @@ namespace OpenSim.Server.Base
} }
catch (Exception e) catch (Exception e)
{ {
m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e);
return null; return null;
} }
} }

4
OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
View File

@ -131,11 +131,11 @@ namespace OpenSim.Tests.Common.Setup
config.AddConfig("AssetService"); config.AddConfig("AssetService");
config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector"); config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector");
config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService"); config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService");
config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Data.Null.dll"); config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
assetService.Initialise(config); assetService.Initialise(config);
assetService.AddRegion(testScene); assetService.AddRegion(testScene);
assetService.RegionLoaded(testScene); assetService.RegionLoaded(testScene);
//testScene.RegisterModuleInterface<IAssetService>((IAssetService)assetService); testScene.AddRegionModule(assetService.Name, assetService);
testScene.SetModuleInterfaces(); testScene.SetModuleInterfaces();