diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs | 37 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs | 49 |
2 files changed, 72 insertions, 14 deletions
diff --git a/OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs b/OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs index dbb877d..b3cccfd 100644 --- a/OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs +++ b/OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs | |||
@@ -4,7 +4,10 @@ using System.Text; | |||
4 | using NUnit.Framework; | 4 | using NUnit.Framework; |
5 | using OpenSim.Data; | 5 | using OpenSim.Data; |
6 | using OpenSim.Framework.Servers.HttpServer; | 6 | using OpenSim.Framework.Servers.HttpServer; |
7 | using OpenSim.Services.Interfaces; | ||
7 | using OpenSim.Tests.Common; | 8 | using OpenSim.Tests.Common; |
9 | using OpenSim.Tests.Common.Mock; | ||
10 | using OpenSim.Tests.Common.Setup; | ||
8 | 11 | ||
9 | namespace OpenSim.Framework.Servers.Tests | 12 | namespace OpenSim.Framework.Servers.Tests |
10 | { | 13 | { |
@@ -59,14 +62,34 @@ namespace OpenSim.Framework.Servers.Tests | |||
59 | BaseRequestHandlerTestHelper.BaseTestHandleMalformedGuid(handler, ASSETS_PATH); | 62 | BaseRequestHandlerTestHelper.BaseTestHandleMalformedGuid(handler, ASSETS_PATH); |
60 | } | 63 | } |
61 | 64 | ||
62 | //[Test] | 65 | [Test] |
63 | //public void TestHandleFetchMissingAsset() | 66 | public void TestHandleFetchMissingAsset() |
64 | //{ | 67 | { |
68 | IAssetCache assetCache = new TestAssetCache(); | ||
69 | CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(assetCache); | ||
70 | |||
71 | GetAssetStreamHandlerTestHelpers.BaseFetchMissingAsset(handler); | ||
72 | } | ||
73 | |||
74 | [Test] | ||
75 | public void TestHandleFetchExistingAssetData() | ||
76 | { | ||
77 | CachedGetAssetStreamHandler handler; | ||
78 | OSHttpResponse response; | ||
79 | AssetBase asset = CreateTestEnvironment(out handler, out response); | ||
80 | |||
81 | GetAssetStreamHandlerTestHelpers.BaseFetchExistingAssetDataTest(asset, handler, response); | ||
82 | } | ||
65 | 83 | ||
66 | // byte[] emptyResult = new byte[] { }; | 84 | private static AssetBase CreateTestEnvironment(out CachedGetAssetStreamHandler handler, out OSHttpResponse response) |
67 | // CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null); | 85 | { |
86 | AssetBase asset = GetAssetStreamHandlerTestHelpers.CreateCommonTestResources(out response); | ||
87 | |||
88 | IAssetCache assetDataPlugin = new TestAssetCache(); | ||
89 | handler = new CachedGetAssetStreamHandler(assetDataPlugin); | ||
68 | 90 | ||
69 | // Assert.AreEqual(new string[] { }, handler.Handle("/assets/badGuid", null, null, null), "Failed on bad guid."); | 91 | assetDataPlugin.AddAsset(asset); |
70 | //} | 92 | return asset; |
93 | } | ||
71 | } | 94 | } |
72 | } | 95 | } |
diff --git a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs index 091a944..51dd79d 100644 --- a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs +++ b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs | |||
@@ -1,10 +1,14 @@ | |||
1 | using System; | 1 | using System; |
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Net; | ||
3 | using System.Text; | 4 | using System.Text; |
5 | using HttpServer; | ||
4 | using NUnit.Framework; | 6 | using NUnit.Framework; |
5 | using OpenSim.Data; | 7 | using OpenSim.Data; |
6 | using OpenSim.Framework.Servers.HttpServer; | 8 | using OpenSim.Framework.Servers.HttpServer; |
7 | using OpenSim.Tests.Common; | 9 | using OpenSim.Tests.Common; |
10 | using OpenSim.Tests.Common.Mock; | ||
11 | using OpenSim.Tests.Common.Setup; | ||
8 | 12 | ||
9 | namespace OpenSim.Framework.Servers.Tests | 13 | namespace OpenSim.Framework.Servers.Tests |
10 | { | 14 | { |
@@ -59,13 +63,44 @@ namespace OpenSim.Framework.Servers.Tests | |||
59 | BaseRequestHandlerTestHelper.BaseTestHandleMalformedGuid(handler, ASSETS_PATH); | 63 | BaseRequestHandlerTestHelper.BaseTestHandleMalformedGuid(handler, ASSETS_PATH); |
60 | } | 64 | } |
61 | 65 | ||
62 | //[Test] | 66 | [Test] |
63 | //public void TestHandleFetchMissingAsset() | 67 | public void TestHandleFetchMissingAsset() |
64 | //{ | 68 | { |
65 | // byte[] emptyResult = new byte[] { }; | 69 | IAssetDataPlugin assetDataPlugin = new TestAssetDataPlugin(); |
66 | // GetAssetStreamHandler handler = new GetAssetStreamHandler(null); | 70 | GetAssetStreamHandler handler = new GetAssetStreamHandler(assetDataPlugin); |
71 | |||
72 | GetAssetStreamHandlerTestHelpers.BaseFetchMissingAsset(handler); | ||
73 | } | ||
74 | |||
75 | [Test] | ||
76 | public void TestHandleFetchExistingAssetData() | ||
77 | { | ||
78 | GetAssetStreamHandler handler; | ||
79 | OSHttpResponse response; | ||
80 | AssetBase asset = CreateTestEnvironment(out handler, out response); | ||
81 | |||
82 | GetAssetStreamHandlerTestHelpers.BaseFetchExistingAssetDataTest(asset, handler, response); | ||
83 | } | ||
67 | 84 | ||
68 | // Assert.AreEqual(new string[] { }, handler.Handle("/assets/badGuid", null, null, null), "Failed on bad guid."); | 85 | [Test] |
69 | //} | 86 | public void TestHandleFetchExistingAssetXml() |
87 | { | ||
88 | GetAssetStreamHandler handler; | ||
89 | OSHttpResponse response; | ||
90 | AssetBase asset = CreateTestEnvironment(out handler, out response); | ||
91 | |||
92 | GetAssetStreamHandlerTestHelpers.BaseFetchExistingAssetXmlTest(asset, handler, response); | ||
93 | } | ||
94 | |||
95 | private static AssetBase CreateTestEnvironment(out GetAssetStreamHandler handler, out OSHttpResponse response) | ||
96 | { | ||
97 | AssetBase asset = GetAssetStreamHandlerTestHelpers.CreateCommonTestResources(out response); | ||
98 | |||
99 | IAssetDataPlugin assetDataPlugin = new TestAssetDataPlugin(); | ||
100 | handler = new GetAssetStreamHandler(assetDataPlugin); | ||
101 | |||
102 | assetDataPlugin.CreateAsset(asset); | ||
103 | return asset; | ||
104 | } | ||
70 | } | 105 | } |
71 | } | 106 | } |