diff options
author | Justin Clarke Casey | 2009-06-05 17:03:44 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-06-05 17:03:44 +0000 |
commit | 87097f24848e9763ca7e3513b681a7b95fe5183f (patch) | |
tree | 75841e585cebfa670caa488496a1dfe28057024e /OpenSim/Tests/Common/Setup | |
parent | * Fix problem where known missing assets would stop save oar ever completing (diff) | |
download | opensim-SC_OLD-87097f24848e9763ca7e3513b681a7b95fe5183f.zip opensim-SC_OLD-87097f24848e9763ca7e3513b681a7b95fe5183f.tar.gz opensim-SC_OLD-87097f24848e9763ca7e3513b681a7b95fe5183f.tar.bz2 opensim-SC_OLD-87097f24848e9763ca7e3513b681a7b95fe5183f.tar.xz |
* Fix unit tests so that they correctly handle 404 missing asset response
* I didn't think there were tests in this area - my bad
Diffstat (limited to 'OpenSim/Tests/Common/Setup')
-rw-r--r-- | OpenSim/Tests/Common/Setup/GetAssetStreamHandlerTestHelpers.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Tests/Common/Setup/GetAssetStreamHandlerTestHelpers.cs b/OpenSim/Tests/Common/Setup/GetAssetStreamHandlerTestHelpers.cs index 138b690..d338f00 100644 --- a/OpenSim/Tests/Common/Setup/GetAssetStreamHandlerTestHelpers.cs +++ b/OpenSim/Tests/Common/Setup/GetAssetStreamHandlerTestHelpers.cs | |||
@@ -80,8 +80,7 @@ namespace OpenSim.Tests.Common.Setup | |||
80 | 80 | ||
81 | public static void BaseFetchExistingAssetMetaDataTest(AssetBase asset, BaseGetAssetStreamHandler handler, OSHttpResponse response) | 81 | public static void BaseFetchExistingAssetMetaDataTest(AssetBase asset, BaseGetAssetStreamHandler handler, OSHttpResponse response) |
82 | { | 82 | { |
83 | XmlSerializer xs = | 83 | XmlSerializer xs = new XmlSerializer(typeof(AssetMetadata)); |
84 | new XmlSerializer(typeof(AssetMetadata)); | ||
85 | 84 | ||
86 | byte[] expected = ServerUtils.SerializeResult(xs, asset.Metadata); | 85 | byte[] expected = ServerUtils.SerializeResult(xs, asset.Metadata); |
87 | 86 | ||
@@ -112,9 +111,12 @@ namespace OpenSim.Tests.Common.Setup | |||
112 | return asset; | 111 | return asset; |
113 | } | 112 | } |
114 | 113 | ||
115 | public static void BaseFetchMissingAsset(BaseGetAssetStreamHandler handler) | 114 | public static void BaseFetchMissingAsset(BaseGetAssetStreamHandler handler, OSHttpResponse response) |
116 | { | 115 | { |
117 | Assert.AreEqual(BaseRequestHandlerTestHelper.EmptyByteArray, handler.Handle("/assets/" + Guid.NewGuid(), null, null, null), "Failed on bad guid."); | 116 | Assert.AreEqual( |
117 | BaseRequestHandlerTestHelper.EmptyByteArray, | ||
118 | handler.Handle("/assets/" + Guid.NewGuid(), null, null, response), "Failed on bad guid."); | ||
119 | Assert.AreEqual((int)HttpStatusCode.NotFound, response.StatusCode, "Response code wrong in BaseFetchMissingAsset"); | ||
118 | } | 120 | } |
119 | } | 121 | } |
120 | } | 122 | } |