diff options
author | Justin Clark-Casey (justincc) | 2009-08-14 20:07:13 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-08-14 20:07:13 +0100 |
commit | ff28ecee1b35ba24ec538d8ed018c764476c62b4 (patch) | |
tree | a7f3809e55cb096a9ce9e332142bc7d360d70ae9 /OpenSim | |
parent | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-ff28ecee1b35ba24ec538d8ed018c764476c62b4.zip opensim-SC-ff28ecee1b35ba24ec538d8ed018c764476c62b4.tar.gz opensim-SC-ff28ecee1b35ba24ec538d8ed018c764476c62b4.tar.bz2 opensim-SC-ff28ecee1b35ba24ec538d8ed018c764476c62b4.tar.xz |
Re-enable TestSaveIarV0_1()
Implement more parts of TestAssetService
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 2 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestAssetService.cs | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index 9784fcf..c66678f 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -74,7 +74,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
74 | /// <summary> | 74 | /// <summary> |
75 | /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet). | 75 | /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet). |
76 | /// </summary> | 76 | /// </summary> |
77 | //[Test] | 77 | [Test] |
78 | public void TestSaveIarV0_1() | 78 | public void TestSaveIarV0_1() |
79 | { | 79 | { |
80 | TestHelper.InMethod(); | 80 | TestHelper.InMethod(); |
diff --git a/OpenSim/Tests/Common/Mock/TestAssetService.cs b/OpenSim/Tests/Common/Mock/TestAssetService.cs index 5f1184b..81f123a 100644 --- a/OpenSim/Tests/Common/Mock/TestAssetService.cs +++ b/OpenSim/Tests/Common/Mock/TestAssetService.cs | |||
@@ -45,7 +45,13 @@ namespace OpenSim.Tests.Common.Mock | |||
45 | 45 | ||
46 | public AssetBase Get(string id) | 46 | public AssetBase Get(string id) |
47 | { | 47 | { |
48 | return Assets[ id ]; | 48 | AssetBase asset; |
49 | if (Assets.ContainsKey(id)) | ||
50 | asset = Assets[id]; | ||
51 | else | ||
52 | asset = null; | ||
53 | |||
54 | return asset; | ||
49 | } | 55 | } |
50 | 56 | ||
51 | public AssetMetadata GetMetadata(string id) | 57 | public AssetMetadata GetMetadata(string id) |
@@ -59,8 +65,10 @@ namespace OpenSim.Tests.Common.Mock | |||
59 | } | 65 | } |
60 | 66 | ||
61 | public bool Get(string id, object sender, AssetRetrieved handler) | 67 | public bool Get(string id, object sender, AssetRetrieved handler) |
62 | { | 68 | { |
63 | throw new NotImplementedException(); | 69 | handler(id, sender, Get(id)); |
70 | |||
71 | return true; | ||
64 | } | 72 | } |
65 | 73 | ||
66 | public string Store(AssetBase asset) | 74 | public string Store(AssetBase asset) |