* Extracted common superclass for GetAssetStreamHandler and CachedGetAssetStreamHandler

* Added some more tests

2 files changed, 74 insertions, 5 deletions

diff --git a/OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs b/OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs
new file mode 100644
index 0000000..aa97f62
--- /dev/null
+++ b/OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs
@@ -0,0 +1,72 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using NUnit.Framework;

+using OpenSim.Data;

+using OpenSim.Framework.Servers.HttpServer;

+using OpenSim.Tests.Common;

+

+namespace OpenSim.Framework.Servers.Tests

+{

+    [TestFixture]

+    public class CachedGetAssetStreamHandlerTests

+    {

+        private const string ASSETS_PATH = "/assets";

+

+        [Test]

+        public void TestConstructor()

+        {

+            TestHelper.InMethod();

+

+            CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null);

+        }

+

+        [Test]

+        public void TestGetParams()

+        {

+            TestHelper.InMethod();

+

+            CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null);

+            BaseRequestHandlerTestHelper.BaseTestGetParams(handler, ASSETS_PATH);

+        }

+

+        [Test]

+        public void TestSplitParams()

+        {

+            TestHelper.InMethod();

+

+            CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null);

+            BaseRequestHandlerTestHelper.BaseTestSplitParams(handler, ASSETS_PATH);

+        }

+

+        [Test]

+        public void TestHandleNoParams()

+        {

+            TestHelper.InMethod();

+

+            CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null);

+

+            BaseRequestHandlerTestHelper.BaseTestHandleNoParams(handler, ASSETS_PATH);

+        }

+

+        [Test]

+        public void TestHandleMalformedGuid()

+        {

+            TestHelper.InMethod();

+

+            CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null);

+

+            BaseRequestHandlerTestHelper.BaseTestHandleMalformedGuid(handler, ASSETS_PATH);

+        }

+

+        //[Test]

+        //public void TestHandleFetchMissingAsset()

+        //{

+

+        //    byte[] emptyResult = new byte[] { };

+        //    CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null);

+

+        //    Assert.AreEqual(new string[] { }, handler.Handle("/assets/badGuid", null, null, null), "Failed on bad guid.");

+        //}

+    }

+}

diff --git a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
index 157a883..091a944 100644
--- a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
+++ b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
@@ -11,7 +11,6 @@ namespace OpenSim.Framework.Servers.Tests
     [TestFixture]
     public class GetAssetStreamHandlerTests
     {
-        private static byte[] EmptyByteArray = new byte[] {};
         private const string ASSETS_PATH = "/assets";
 
         [Test]
@@ -47,8 +46,7 @@ namespace OpenSim.Framework.Servers.Tests
 
             GetAssetStreamHandler handler = new GetAssetStreamHandler(null);
 
-            Assert.AreEqual(EmptyByteArray, handler.Handle(ASSETS_PATH, null, null, null), "Failed on empty params.");
-            Assert.AreEqual(EmptyByteArray, handler.Handle(ASSETS_PATH + "/", null, null, null), "Failed on single slash.");
+            BaseRequestHandlerTestHelper.BaseTestHandleNoParams(handler, ASSETS_PATH);
         }
 
         [Test]
@@ -58,13 +56,12 @@ namespace OpenSim.Framework.Servers.Tests
 
             GetAssetStreamHandler handler = new GetAssetStreamHandler(null);
 
-            Assert.AreEqual(EmptyByteArray, handler.Handle(ASSETS_PATH + "/badGuid", null, null, null), "Failed on bad guid.");
+            BaseRequestHandlerTestHelper.BaseTestHandleMalformedGuid(handler, ASSETS_PATH);
         }
 
         //[Test]
         //public void TestHandleFetchMissingAsset()
         //{
-
         //    byte[] emptyResult = new byte[] { };
         //    GetAssetStreamHandler handler = new GetAssetStreamHandler(null);