Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 0 insertions, 135 deletions

diff --git a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
deleted file mode 100644
index be3f518..0000000
--- a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Text;
-using HttpServer;
-using NUnit.Framework;
-using OpenSim.Data;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
-using OpenSim.Tests.Common.Setup;
-
-namespace OpenSim.Framework.Servers.Tests
-{
-    [TestFixture]
-    public class GetAssetStreamHandlerTests
-    {
-        private const string ASSETS_PATH = "/assets";
-
-        [Test]
-        public void TestConstructor()
-        {
-            TestHelper.InMethod();
-
-            // GetAssetStreamHandler handler = 
-            new GetAssetStreamHandler(null);
-        }
-
-        [Test]
-        public void TestGetParams()
-        {
-            TestHelper.InMethod();
-
-            GetAssetStreamHandler handler = new GetAssetStreamHandler(null);
-            BaseRequestHandlerTestHelper.BaseTestGetParams(handler, ASSETS_PATH);
-        }
-
-        [Test]
-        public void TestSplitParams()
-        {
-            TestHelper.InMethod();
-
-            GetAssetStreamHandler handler = new GetAssetStreamHandler(null);
-            BaseRequestHandlerTestHelper.BaseTestSplitParams(handler, ASSETS_PATH);
-        }
-
-        [Test]
-        public void TestHandleNoParams()
-        {
-            TestHelper.InMethod();
-
-            GetAssetStreamHandler handler = new GetAssetStreamHandler(null);
-
-            BaseRequestHandlerTestHelper.BaseTestHandleNoParams(handler, ASSETS_PATH);
-        }
-
-        [Test]
-        public void TestHandleMalformedGuid()
-        {
-            TestHelper.InMethod();
-
-            GetAssetStreamHandler handler = new GetAssetStreamHandler(null);
-
-            BaseRequestHandlerTestHelper.BaseTestHandleMalformedGuid(handler, ASSETS_PATH);
-        }
-
-        [Test]
-        public void TestHandleFetchMissingAsset()
-        {
-            GetAssetStreamHandler handler;
-            OSHttpResponse response;
-            CreateTestEnvironment(out handler, out response);
-
-            GetAssetStreamHandlerTestHelpers.BaseFetchMissingAsset(handler, response);
-        }
-
-        [Test]
-        public void TestHandleFetchExistingAssetData()
-        {
-            GetAssetStreamHandler handler;
-            OSHttpResponse response;
-            AssetBase asset = CreateTestEnvironment(out handler, out response);
-
-            GetAssetStreamHandlerTestHelpers.BaseFetchExistingAssetDataTest(asset, handler, response);
-        }
-
-        [Test]
-        public void TestHandleFetchExistingAssetXml()
-        {
-            GetAssetStreamHandler handler;
-            OSHttpResponse response;
-            AssetBase asset = CreateTestEnvironment(out handler, out response);
-
-            GetAssetStreamHandlerTestHelpers.BaseFetchExistingAssetXmlTest(asset, handler, response);
-        }
-
-        private static AssetBase CreateTestEnvironment(out GetAssetStreamHandler handler, out OSHttpResponse response)
-        {
-            AssetBase asset = GetAssetStreamHandlerTestHelpers.CreateCommonTestResources(out response);
-
-            IAssetDataPlugin assetDataPlugin = new TestAssetDataPlugin();
-            handler = new GetAssetStreamHandler(assetDataPlugin);
-
-            assetDataPlugin.StoreAsset(asset);
-            return asset;
-        }
-    }
-}