diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs index 33a630c..8273e32 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Framework.Tests | |||
55 | { | 55 | { |
56 | TestHelpers.InMethod(); | 56 | TestHelpers.InMethod(); |
57 | // log4net.Config.XmlConfigurator.Configure(); | 57 | // log4net.Config.XmlConfigurator.Configure(); |
58 | 58 | ||
59 | Scene scene = new SceneHelpers().SetupScene(); | 59 | Scene scene = new SceneHelpers().SetupScene(); |
60 | UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene); | 60 | UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene); |
61 | SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID); | 61 | SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID); |
@@ -78,7 +78,7 @@ namespace OpenSim.Region.Framework.Tests | |||
78 | { | 78 | { |
79 | TestHelpers.InMethod(); | 79 | TestHelpers.InMethod(); |
80 | // log4net.Config.XmlConfigurator.Configure(); | 80 | // log4net.Config.XmlConfigurator.Configure(); |
81 | 81 | ||
82 | Scene scene = new SceneHelpers().SetupScene(); | 82 | Scene scene = new SceneHelpers().SetupScene(); |
83 | UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene); | 83 | UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene); |
84 | SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID); | 84 | SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID); |
@@ -121,7 +121,7 @@ namespace OpenSim.Region.Framework.Tests | |||
121 | { | 121 | { |
122 | TestHelpers.InMethod(); | 122 | TestHelpers.InMethod(); |
123 | // log4net.Config.XmlConfigurator.Configure(); | 123 | // log4net.Config.XmlConfigurator.Configure(); |
124 | 124 | ||
125 | Scene scene = new SceneHelpers().SetupScene(); | 125 | Scene scene = new SceneHelpers().SetupScene(); |
126 | UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene); | 126 | UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene); |
127 | SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID); | 127 | SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID); |
@@ -130,18 +130,18 @@ namespace OpenSim.Region.Framework.Tests | |||
130 | = TaskInventoryHelpers.AddNotecard( | 130 | = TaskInventoryHelpers.AddNotecard( |
131 | scene.AssetService, sop1, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!"); | 131 | scene.AssetService, sop1, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!"); |
132 | 132 | ||
133 | InventoryFolderBase folder | 133 | InventoryFolderBase folder |
134 | = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, user1.PrincipalID, "Objects")[0]; | 134 | = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, user1.PrincipalID, "Objects")[0]; |
135 | 135 | ||
136 | // Perform test | 136 | // Perform test |
137 | string message; | 137 | string message; |
138 | scene.MoveTaskInventoryItem(user1.PrincipalID, folder.ID, sop1, sopItem1.ItemID, out message); | 138 | scene.MoveTaskInventoryItem(user1.PrincipalID, folder.ID, sop1, sopItem1.ItemID, out message); |
139 | 139 | ||
140 | InventoryItemBase ncUserItem | 140 | InventoryItemBase ncUserItem |
141 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, user1.PrincipalID, "Objects/ncItem"); | 141 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, user1.PrincipalID, "Objects/ncItem"); |
142 | Assert.That(ncUserItem, Is.Not.Null, "Objects/ncItem was not found"); | 142 | Assert.That(ncUserItem, Is.Not.Null, "Objects/ncItem was not found"); |
143 | } | 143 | } |
144 | 144 | ||
145 | /// <summary> | 145 | /// <summary> |
146 | /// Test MoveTaskInventoryItem from a part inventory to a user inventory where the item has no parent folder assigned. | 146 | /// Test MoveTaskInventoryItem from a part inventory to a user inventory where the item has no parent folder assigned. |
147 | /// </summary> | 147 | /// </summary> |
@@ -153,7 +153,7 @@ namespace OpenSim.Region.Framework.Tests | |||
153 | { | 153 | { |
154 | TestHelpers.InMethod(); | 154 | TestHelpers.InMethod(); |
155 | // log4net.Config.XmlConfigurator.Configure(); | 155 | // log4net.Config.XmlConfigurator.Configure(); |
156 | 156 | ||
157 | Scene scene = new SceneHelpers().SetupScene(); | 157 | Scene scene = new SceneHelpers().SetupScene(); |
158 | UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene); | 158 | UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene); |
159 | SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID); | 159 | SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID); |
@@ -162,11 +162,11 @@ namespace OpenSim.Region.Framework.Tests | |||
162 | TaskInventoryItem sopItem1 | 162 | TaskInventoryItem sopItem1 |
163 | = TaskInventoryHelpers.AddNotecard( | 163 | = TaskInventoryHelpers.AddNotecard( |
164 | scene.AssetService, sop1, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!"); | 164 | scene.AssetService, sop1, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!"); |
165 | 165 | ||
166 | // Perform test | 166 | // Perform test |
167 | string message; | 167 | string message; |
168 | scene.MoveTaskInventoryItem(user1.PrincipalID, UUID.Zero, sop1, sopItem1.ItemID, out message); | 168 | scene.MoveTaskInventoryItem(user1.PrincipalID, UUID.Zero, sop1, sopItem1.ItemID, out message); |
169 | 169 | ||
170 | InventoryItemBase ncUserItem | 170 | InventoryItemBase ncUserItem |
171 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, user1.PrincipalID, "Notecards/ncItem"); | 171 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, user1.PrincipalID, "Notecards/ncItem"); |
172 | Assert.That(ncUserItem, Is.Not.Null, "Notecards/ncItem was not found"); | 172 | Assert.That(ncUserItem, Is.Not.Null, "Notecards/ncItem was not found"); |