Add basic XInventoryServicesTests.TestAddItem() regression test.
							parent
							
								
									08f0274b5a
								
							
						
					
					
						commit
						f8adf4de2f
					
				|  | @ -132,6 +132,11 @@ | |||
|   </exec> | ||||
|   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" />  | ||||
| 
 | ||||
|   <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.services.inventoryservice.tests"> | ||||
|     <arg value="./bin/OpenSim.Services.InventoryService.Tests.dll" /> | ||||
|   </exec> | ||||
|   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" />  | ||||
| 
 | ||||
|   <delete dir="%temp%"/> | ||||
| </target> | ||||
| 
 | ||||
|  | @ -235,6 +240,11 @@ | |||
|     <arg value="-xml=test-results/OpenSim.Capabilities.Handlers.Tests.dll-Results.xml" /> | ||||
|   </exec> | ||||
| 
 | ||||
|  <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.services.inventoryservice.tests"> | ||||
|     <arg value="./bin/OpenSim.Services.InventoryService.Tests.dll" /> | ||||
|     <arg value="-xml=test-results/OpenSim.Services.InventoryService.Tests.dll-Results.xml" /> | ||||
|   </exec> | ||||
| 
 | ||||
|  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" />  | ||||
|  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" />  | ||||
|  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" />  | ||||
|  | @ -245,6 +255,7 @@ | |||
|  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" />  | ||||
|  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" />  | ||||
|  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" />  | ||||
|  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" />  | ||||
| </target> | ||||
| 
 | ||||
| <target name="doxygen"> | ||||
|  |  | |||
|  | @ -0,0 +1,87 @@ | |||
| /* | ||||
|  * 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 Nini.Config; | ||||
| using NUnit.Framework; | ||||
| using OpenMetaverse; | ||||
| using OpenSim.Framework; | ||||
| using OpenSim.Server.Base; | ||||
| using OpenSim.Services.Interfaces; | ||||
| using OpenSim.Tests.Common; | ||||
| 
 | ||||
| namespace OpenSim.Services.InventoryService.Tests | ||||
| { | ||||
|     /// <summary> | ||||
|     /// Tests for the XInventoryService | ||||
|     /// </summary> | ||||
|     /// <remarks> | ||||
|     /// TODO: Fill out more tests. | ||||
|     /// </remarks> | ||||
|     [TestFixture] | ||||
|     public class XInventoryServiceTests | ||||
|     { | ||||
|         /// <summary> | ||||
|         /// Tests add item operation. | ||||
|         /// </summary> | ||||
|         /// <remarks> | ||||
|         /// TODO: Test all operations. | ||||
|         /// </remarks> | ||||
|         [Test] | ||||
|         public void TestAddItem() | ||||
|         { | ||||
|             string creatorId = TestHelpers.ParseTail(0x1).ToString(); | ||||
|             UUID ownerId = TestHelpers.ParseTail(0x2); | ||||
|             UUID itemId = TestHelpers.ParseTail(0x10); | ||||
|             UUID assetId = TestHelpers.ParseTail(0x20); | ||||
|             string itemName = "item1";            | ||||
| 
 | ||||
|             IConfigSource config = new IniConfigSource();             | ||||
|             config.AddConfig("InventoryService"); | ||||
|             config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); | ||||
| 
 | ||||
|             IInventoryService xis  | ||||
|                 = ServerUtils.LoadPlugin<IInventoryService>( | ||||
|                     "OpenSim.Services.InventoryService.dll:XInventoryService", new Object[] { config }); | ||||
| 
 | ||||
|             InventoryItemBase itemToStore  | ||||
|                 = new InventoryItemBase(itemId, ownerId)  | ||||
|                     { CreatorId = creatorId.ToString(), AssetID = assetId, Name = itemName }; | ||||
| 
 | ||||
|             xis.AddItem(itemToStore); | ||||
| 
 | ||||
|             InventoryItemBase itemRetrieved = new InventoryItemBase(itemId); | ||||
|             itemRetrieved = xis.GetItem(itemRetrieved); | ||||
| 
 | ||||
|             Assert.That(itemRetrieved, Is.Not.Null); | ||||
|             Assert.That(itemRetrieved.CreatorId, Is.EqualTo(creatorId)); | ||||
|             Assert.That(itemRetrieved.Owner, Is.EqualTo(ownerId)); | ||||
|             Assert.That(itemRetrieved.AssetID, Is.EqualTo(assetId)); | ||||
|             Assert.That(itemRetrieved.Name, Is.EqualTo(itemName)); | ||||
|         } | ||||
|     } | ||||
| } | ||||
							
								
								
									
										46
									
								
								prebuild.xml
								
								
								
								
							
							
						
						
									
										46
									
								
								prebuild.xml
								
								
								
								
							|  | @ -1124,7 +1124,9 @@ | |||
|       <Reference name="log4net" path="../../../bin/"/> | ||||
| 
 | ||||
|       <Files> | ||||
|         <Match pattern="*.cs" recurse="true"/> | ||||
|         <Match pattern="*.cs" recurse="true"> | ||||
|           <Exclude name="Tests" pattern="Tests"/> | ||||
|         </Match> | ||||
|       </Files> | ||||
|     </Project> | ||||
|      | ||||
|  | @ -2719,6 +2721,48 @@ | |||
|       </Files> | ||||
|     </Project> | ||||
| 
 | ||||
|     <Project frameworkVersion="v3_5" name="OpenSim.Services.InventoryService.Tests" path="OpenSim/Services/InventoryService/Tests" type="Library"> | ||||
|       <Configuration name="Debug"> | ||||
|         <Options> | ||||
|           <OutputPath>../../../../bin/</OutputPath> | ||||
|         </Options> | ||||
|       </Configuration> | ||||
|       <Configuration name="Release"> | ||||
|         <Options> | ||||
|           <OutputPath>../../../../bin/</OutputPath> | ||||
|         </Options> | ||||
|       </Configuration> | ||||
| 
 | ||||
|       <ReferencePath>../../../../bin/</ReferencePath> | ||||
|       <Reference name="System"/> | ||||
|       <Reference name="System.Core"/> | ||||
|       <Reference name="System.Drawing"/> | ||||
|       <Reference name="System.Xml"/> | ||||
|       <Reference name="System.Web"/> | ||||
|       <Reference name="nunit.framework" path="../../../../bin/"/> | ||||
|       <Reference name="OpenMetaverse" path="../../../../bin/"/> | ||||
|       <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> | ||||
|       <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/> | ||||
|       <Reference name="OpenSim.Capabilities"/> | ||||
|       <Reference name="OpenSim.Capabilities.Handlers"/> | ||||
|       <Reference name="OpenSim.Framework"/> | ||||
|       <Reference name="OpenSim.Framework.Console"/> | ||||
|       <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||||
|       <Reference name="OpenSim.Region.Framework"/> | ||||
|       <Reference name="OpenSim.Server.Base"/> | ||||
|       <Reference name="OpenSim.Server.Handlers"/> | ||||
|       <Reference name="OpenSim.Services.Base"/> | ||||
|       <Reference name="OpenSim.Services.Interfaces"/> | ||||
|       <Reference name="OpenSim.Tests.Common"/> | ||||
|       <Reference name="Nini" path="../../../../bin/"/> | ||||
|       <Reference name="log4net" path="../../../../bin/"/> | ||||
| 
 | ||||
|       <Files> | ||||
|         <Match pattern="*.cs" recurse="true"> | ||||
|         </Match> | ||||
|       </Files> | ||||
|     </Project> | ||||
| 
 | ||||
| 
 | ||||
|     <Project frameworkVersion="v3_5" name="OpenSim.Capabilities.Handlers.Tests" path="OpenSim/Capabilities/Handlers" type="Library"> | ||||
|       <Configuration name="Debug"> | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Justin Clark-Casey (justincc)
						Justin Clark-Casey (justincc)