Merge branch 'master' into vehicles

1 files changed, 0 insertions, 80 deletions

diff --git a/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs b/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs
deleted file mode 100644
index 04a73e4..0000000
--- a/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs
+++ /dev/null
@@ -1,80 +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 NUnit.Framework;
-using OpenSim.Framework;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Server.Handlers.Asset;
-using OpenSim.Services.Interfaces;
-using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
-using OpenSim.Tests.Common.Setup;
-
-namespace OpenSim.Server.Handlers.Tests.Asset
-{
-    [TestFixture]
-    public class AssetServerGetHandlerTests
-    {
-        private const string ASSETS_PATH = "/assets";
-
-        [Test]
-        public void TestConstructor()
-        {
-            TestHelper.InMethod();
-
-            new AssetServerGetHandler(null);
-        }
-
-        [Test]
-        public void TestGetParams()
-        {
-            TestHelper.InMethod();
-
-            AssetServerGetHandler handler = new AssetServerGetHandler(null);
-            BaseRequestHandlerTestHelper.BaseTestGetParams(handler, ASSETS_PATH);
-        }
-
-        [Test]
-        public void TestSplitParams()
-        {
-            TestHelper.InMethod();
-
-            AssetServerGetHandler handler = new AssetServerGetHandler(null);
-            BaseRequestHandlerTestHelper.BaseTestSplitParams(handler, ASSETS_PATH);
-        }
-
-        // TODO: unused
-        // private static AssetBase CreateTestEnvironment(out AssetServerGetHandler handler, out OSHttpResponse response)
-        // {
-        //     AssetBase asset = GetAssetStreamHandlerTestHelpers.CreateCommonTestResources(out response);
-        //     IAssetService assetDataPlugin = new TestAssetService();
-        //     handler = new AssetServerGetHandler(assetDataPlugin);
-        //     assetDataPlugin.Store(asset);
-        //     return asset;
-        // }
-    }
-}