diff options
author | Justin Clark-Casey (justincc) | 2012-08-29 02:01:43 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-08-29 02:01:43 +0100 |
commit | 7ea832d47c827ad9ef8eb0ce24702fbee585b1ee (patch) | |
tree | 9afe94690870999a66608b3b5cd51c4d068ec579 /OpenSim/Tests/Common/Mock | |
parent | Add experimental DynamicTextureModule.ReuseTextures flag, currently only conf... (diff) | |
download | opensim-SC_OLD-7ea832d47c827ad9ef8eb0ce24702fbee585b1ee.zip opensim-SC_OLD-7ea832d47c827ad9ef8eb0ce24702fbee585b1ee.tar.gz opensim-SC_OLD-7ea832d47c827ad9ef8eb0ce24702fbee585b1ee.tar.bz2 opensim-SC_OLD-7ea832d47c827ad9ef8eb0ce24702fbee585b1ee.tar.xz |
Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where folders with asset type of 'Folder' and 'Unknown' were accidentally treated as system folders.
This prevented more than one additional ordinary folder from being created in the base "My Inventory" user folder.
Added regression test for this case.
Switched tests to use XInventoryService with mostly implemented TestXInventoryDataPlugin rather than InventoryService
Disabled TestLoadIarV0_1SameNameCreator() since this has not been working for a very long time (ever since XInventoryService) started being used
since it doesnt' preserve creator data in the same way as InventoryService did and so effectively lost the OSPAs.
However, nobody noticed/complained about this issue and OSPAs have been superseded by HG like creator information via the --home save oar/iar switch.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs | 131 |
1 files changed, 131 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs new file mode 100644 index 0000000..bca5979 --- /dev/null +++ b/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs | |||
@@ -0,0 +1,131 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Linq; | ||
31 | using System.Reflection; | ||
32 | using log4net; | ||
33 | using OpenMetaverse; | ||
34 | using OpenSim.Framework; | ||
35 | using OpenSim.Data; | ||
36 | |||
37 | namespace OpenSim.Tests.Common.Mock | ||
38 | { | ||
39 | public class TestXInventoryDataPlugin : IXInventoryData | ||
40 | { | ||
41 | private Dictionary<UUID, XInventoryFolder> m_allFolders = new Dictionary<UUID, XInventoryFolder>(); | ||
42 | private Dictionary<UUID, XInventoryItem> m_allItems = new Dictionary<UUID, XInventoryItem>(); | ||
43 | |||
44 | public TestXInventoryDataPlugin(string conn, string realm) {} | ||
45 | |||
46 | public XInventoryItem[] GetItems(string[] fields, string[] vals) | ||
47 | { | ||
48 | List<XInventoryItem> origItems = Get<XInventoryItem>(fields, vals, m_allItems.Values.ToList()); | ||
49 | |||
50 | return origItems.Select(i => i.Clone()).ToArray(); | ||
51 | } | ||
52 | |||
53 | public XInventoryFolder[] GetFolders(string[] fields, string[] vals) | ||
54 | { | ||
55 | List<XInventoryFolder> origFolders | ||
56 | = Get<XInventoryFolder>(fields, vals, m_allFolders.Values.ToList()); | ||
57 | |||
58 | return origFolders.Select(f => f.Clone()).ToArray(); | ||
59 | } | ||
60 | |||
61 | private List<T> Get<T>(string[] fields, string[] vals, List<T> inputEntities) | ||
62 | { | ||
63 | List<T> entities = inputEntities; | ||
64 | |||
65 | for (int i = 0; i < fields.Length; i++) | ||
66 | { | ||
67 | entities | ||
68 | = entities.Where( | ||
69 | e => | ||
70 | { | ||
71 | FieldInfo fi = typeof(T).GetField(fields[i]); | ||
72 | if (fi == null) | ||
73 | throw new NotImplementedException(string.Format("No field {0} for val {1}", fields[i], vals[i])); | ||
74 | |||
75 | return fi.GetValue(e).ToString() == vals[i]; | ||
76 | } | ||
77 | ).ToList(); | ||
78 | } | ||
79 | |||
80 | return entities; | ||
81 | } | ||
82 | |||
83 | public bool StoreFolder(XInventoryFolder folder) | ||
84 | { | ||
85 | m_allFolders[folder.folderID] = folder.Clone(); | ||
86 | |||
87 | // Console.WriteLine("Added folder {0} {1}", folder.folderName, folder.folderID); | ||
88 | |||
89 | return true; | ||
90 | } | ||
91 | |||
92 | public bool StoreItem(XInventoryItem item) | ||
93 | { | ||
94 | m_allItems[item.inventoryID] = item.Clone(); | ||
95 | |||
96 | // Console.WriteLine("Added item {0} {1}, creator {2}, owner {3}", item.inventoryName, item.inventoryID, item.creatorID, item.avatarID); | ||
97 | |||
98 | return true; | ||
99 | } | ||
100 | |||
101 | public bool DeleteFolders(string field, string val) | ||
102 | { | ||
103 | return DeleteFolders(new string[] { field }, new string[] { val }); | ||
104 | } | ||
105 | |||
106 | public bool DeleteFolders(string[] fields, string[] vals) | ||
107 | { | ||
108 | XInventoryFolder[] foldersToDelete = GetFolders(fields, vals); | ||
109 | Array.ForEach(foldersToDelete, f => m_allFolders.Remove(f.folderID)); | ||
110 | |||
111 | return true; | ||
112 | } | ||
113 | |||
114 | public bool DeleteItems(string field, string val) | ||
115 | { | ||
116 | return DeleteItems(new string[] { field }, new string[] { val }); | ||
117 | } | ||
118 | |||
119 | public bool DeleteItems(string[] fields, string[] vals) | ||
120 | { | ||
121 | XInventoryItem[] itemsToDelete = GetItems(fields, vals); | ||
122 | Array.ForEach(itemsToDelete, i => m_allItems.Remove(i.inventoryID)); | ||
123 | |||
124 | return true; | ||
125 | } | ||
126 | |||
127 | public bool MoveItem(string id, string newParent) { throw new NotImplementedException(); } | ||
128 | public XInventoryItem[] GetActiveGestures(UUID principalID) { throw new NotImplementedException(); } | ||
129 | public int GetAssetPermissions(UUID principalID, UUID assetID) { throw new NotImplementedException(); } | ||
130 | } | ||
131 | } \ No newline at end of file | ||