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

Added inventory tests to Robust.Tests.

fsassets
Diva Canto 2015-05-11 08:52:12 -07:00
parent 3c596e47c6
commit 3df472f10d
5 changed files with 166 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
View File

@ -406,9 +406,13 @@ namespace OpenSim.Services.Connectors
public bool AddItem(InventoryItemBase item)
{
if (item.Description == null)
item.Description = String.Empty;
if (item.CreatorData == null)
item.CreatorData = String.Empty;
Dictionary<string,object> ret = MakeRequest("ADDITEM",
if (item.CreatorId == null)
item.CreatorId = String.Empty;
Dictionary<string, object> ret = MakeRequest("ADDITEM",
new Dictionary<string,object> {
{ "AssetID", item.AssetID.ToString() },
{ "AssetType", item.AssetType.ToString() },

12
OpenSim/Services/InventoryService/XInventoryService.cs
View File

@ -261,7 +261,7 @@ namespace OpenSim.Services.InventoryService
private InventoryFolderBase GetSystemFolderForType(InventoryFolderBase rootFolder, AssetType type)
{
// m_log.DebugFormat("[XINVENTORY SERVICE]: Getting folder type {0} for user {1}", type, principalID);
//m_log.DebugFormat("[XINVENTORY SERVICE]: Getting folder type {0}", type);
if (type == AssetType.RootFolder)
return rootFolder;
@ -272,13 +272,13 @@ namespace OpenSim.Services.InventoryService
if (folders.Length == 0)
{
// m_log.WarnFormat("[XINVENTORY SERVICE]: Found no folder for type {0} for user {1}", type, principalID);
//m_log.WarnFormat("[XINVENTORY SERVICE]: Found no folder for type {0} ", type);
return null;
}
// m_log.DebugFormat(
// "[XINVENTORY SERVICE]: Found folder {0} {1} for type {2} for user {3}",
// folders[0].folderName, folders[0].folderID, type, principalID);
//m_log.DebugFormat(
// "[XINVENTORY SERVICE]: Found folder {0} {1} for type {2}",
// folders[0].folderName, folders[0].folderID, type);
return ConvertToOpenSim(folders[0]);
}

152
OpenSim/Tests/Robust/Clients/Inventory/InventoryClient.cs Normal file
View File

@ -0,0 +1,152 @@
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Text;
using System.Reflection;
using OpenMetaverse;
using NUnit.Framework;
using OpenSim.Framework;
using OpenSim.Services.Interfaces;
using OpenSim.Services.Connectors;
namespace Robust.Tests
{
[TestFixture]
public class InventoryClient
{
// private static readonly ILog m_log =
// LogManager.GetLogger(
// MethodBase.GetCurrentMethod().DeclaringType);
private UUID m_userID = new UUID("00000000-0000-0000-0000-333333333333");
private UUID m_rootFolderID;
private UUID m_notecardsFolder;
private UUID m_objectsFolder;
[Test]
public void Inventory_001_CreateInventory()
{
XInventoryServicesConnector m_Connector = new XInventoryServicesConnector(DemonServer.Address);
// Create an inventory that looks like this:
//
// /My Inventory
// <other system folders>
// /Objects
// Some Object
// /Notecards
// Notecard 1
// Notecard 2
// /Test Folder
// Link to notecard -> /Notecards/Notecard 2
// Link to Objects folder -> /Objects
Console.WriteLine("Starting inventory test");
bool success = m_Connector.CreateUserInventory(m_userID);
Assert.IsTrue(success, "Failed to create user inventory");
m_rootFolderID = m_Connector.GetRootFolder(m_userID).ID;
Assert.AreNotEqual(m_rootFolderID, UUID.Zero, "Root folder ID must not be UUID.Zero");
InventoryFolderBase of = m_Connector.GetFolderForType(m_userID, AssetType.Object);
Assert.IsNotNull(of, "Failed to retrieve Objects folder");
m_objectsFolder = of.ID;
Assert.AreNotEqual(m_objectsFolder, UUID.Zero, "Objects folder ID must not be UUID.Zero");
// Add an object
InventoryItemBase item = new InventoryItemBase(new UUID("b0000000-0000-0000-0000-00000000000b"), m_userID);
item.AssetID = UUID.Random();
item.AssetType = (int)AssetType.Object;
item.Folder = m_objectsFolder;
item.Name = "Some Object";
item.Description = string.Empty;
success = m_Connector.AddItem(item);
Assert.IsTrue(success, "Failed to add object to inventory");
InventoryFolderBase ncf = m_Connector.GetFolderForType(m_userID, AssetType.Notecard);
Assert.IsNotNull(of, "Failed to retrieve Notecards folder");
m_notecardsFolder = ncf.ID;
Assert.AreNotEqual(m_notecardsFolder, UUID.Zero, "Notecards folder ID must not be UUID.Zero");
m_notecardsFolder = ncf.ID;
// Add a notecard
item = new InventoryItemBase(new UUID("10000000-0000-0000-0000-000000000001"), m_userID);
item.AssetID = UUID.Random();
item.AssetType = (int)AssetType.Notecard;
item.Folder = m_notecardsFolder;
item.Name = "Test Notecard 1";
item.Description = string.Empty;
success = m_Connector.AddItem(item);
Assert.IsTrue(success, "Failed to add Notecard 1 to inventory");
// Add another notecard
item.ID = new UUID("20000000-0000-0000-0000-000000000002");
item.AssetID = new UUID("a0000000-0000-0000-0000-00000000000a");
item.Name = "Test Notecard 2";
item.Description = string.Empty;
success = m_Connector.AddItem(item);
Assert.IsTrue(success, "Failed to add Notecard 2 to inventory");
// Add a folder
InventoryFolderBase folder = new InventoryFolderBase(new UUID("f0000000-0000-0000-0000-00000000000f"), "Test Folder", m_userID, m_rootFolderID);
folder.Type = (int)AssetType.Folder;
success = m_Connector.AddFolder(folder);
Assert.IsTrue(success, "Failed to add Test Folder to inventory");
// Add a link to notecard 2 in Test Folder
item.AssetID = item.ID; // use item ID of notecard 2
item.ID = new UUID("40000000-0000-0000-0000-000000000004");
item.AssetType = (int)AssetType.Link;
item.Folder = folder.ID;
item.Name = "Link to notecard";
item.Description = string.Empty;
success = m_Connector.AddItem(item);
Assert.IsTrue(success, "Failed to add link to notecard to inventory");
// Add a link to the Objects folder in Test Folder
item.AssetID = m_Connector.GetFolderForType(m_userID, AssetType.Object).ID; // use item ID of Objects folder
item.ID = new UUID("50000000-0000-0000-0000-000000000005");
item.AssetType = (int)AssetType.LinkFolder;
item.Folder = folder.ID;
item.Name = "Link to Objects folder";
item.Description = string.Empty;
success = m_Connector.AddItem(item);
Assert.IsTrue(success, "Failed to add link to objects folder to inventory");
InventoryCollection coll = m_Connector.GetFolderContent(m_userID, m_rootFolderID);
Assert.IsNotNull(coll, "Failed to retrieve contents of root folder");
Assert.Greater(coll.Folders.Count, 0, "Root folder does not have any subfolders");
coll = m_Connector.GetFolderContent(m_userID, folder.ID);
Assert.IsNotNull(coll, "Failed to retrieve contents of Test Folder");
Assert.AreEqual(coll.Items.Count + coll.Folders.Count, 2, "Test Folder is expected to have exactly 2 things inside");
}
}
}

2
OpenSim/Tests/Robust/Server/DemonServer.cs
View File

@ -54,6 +54,8 @@ namespace Robust.Tests
Console.WriteLine("**** Starting demon Robust server ****");
m_demon = new Thread( () => Main(new string[] {"-inifile=Robust.Tests.ini"}));
m_demon.Start();
// Give some time for the server to instantiate all services
Thread.Sleep(3000);
Console.WriteLine("**** Setup Finished ****");
}

2
bin/Robust.Tests.ini
View File

@ -153,7 +153,7 @@
[InventoryService]
LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"
StorageProvider = "OpenSim.Tests.Common.dll"
StorageProvider = "OpenSim.Tests.Common.dll:TestXInventoryDataPlugin"
ConnectionString = ""
; Will calls to purge folders (empty trash) and immediately delete/update items or folders (not move to trash first) succeed?