From 3ff8eba3a7b1715277e3fcb5f69c52d770724403 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Wed, 26 Mar 2014 14:28:54 -0700 Subject: [PATCH] Rename test project as FunctionalTests. --- WebListener.sln | 24 +++++++++---------- .../AuthenticationTests.cs | 11 ++------- .../HttpsTests.cs | 9 ++----- .../OpaqueUpgradeTests.cs | 9 +++---- .../Properties/AssemblyInfo.cs | 4 ++-- .../RequestBodyTests.cs | 11 ++------- .../RequestHeaderTests.cs | 11 ++------- .../RequestTests.cs | 11 ++------- .../ResponseBodyTests.cs | 11 ++------- .../ResponseHeaderTests.cs | 14 +++-------- .../ResponseSendFileTests.cs | 8 ++----- .../ResponseTests.cs | 12 ++-------- .../ServerTests.cs | 11 ++------- .../Utilities.cs | 11 ++++----- .../project.json | 0 15 files changed, 43 insertions(+), 114 deletions(-) rename test/{Microsoft.AspNet.Server.WebListener.Test => Microsoft.AspNet.Server.WebListener.FunctionalTests}/AuthenticationTests.cs (91%) rename test/{Microsoft.AspNet.Server.WebListener.Test => Microsoft.AspNet.Server.WebListener.FunctionalTests}/HttpsTests.cs (94%) rename test/{Microsoft.AspNet.Server.WebListener.Test => Microsoft.AspNet.Server.WebListener.FunctionalTests}/OpaqueUpgradeTests.cs (97%) rename test/{Microsoft.AspNet.Server.WebListener.Test => Microsoft.AspNet.Server.WebListener.FunctionalTests}/Properties/AssemblyInfo.cs (94%) rename test/{Microsoft.AspNet.Server.WebListener.Test => Microsoft.AspNet.Server.WebListener.FunctionalTests}/RequestBodyTests.cs (92%) rename test/{Microsoft.AspNet.Server.WebListener.Test => Microsoft.AspNet.Server.WebListener.FunctionalTests}/RequestHeaderTests.cs (89%) rename test/{Microsoft.AspNet.Server.WebListener.Test => Microsoft.AspNet.Server.WebListener.FunctionalTests}/RequestTests.cs (93%) rename test/{Microsoft.AspNet.Server.WebListener.Test => Microsoft.AspNet.Server.WebListener.FunctionalTests}/ResponseBodyTests.cs (95%) rename test/{Microsoft.AspNet.Server.WebListener.Test => Microsoft.AspNet.Server.WebListener.FunctionalTests}/ResponseHeaderTests.cs (96%) rename test/{Microsoft.AspNet.Server.WebListener.Test => Microsoft.AspNet.Server.WebListener.FunctionalTests}/ResponseSendFileTests.cs (97%) rename test/{Microsoft.AspNet.Server.WebListener.Test => Microsoft.AspNet.Server.WebListener.FunctionalTests}/ResponseTests.cs (91%) rename test/{Microsoft.AspNet.Server.WebListener.Test => Microsoft.AspNet.Server.WebListener.FunctionalTests}/ServerTests.cs (95%) rename test/{Microsoft.AspNet.Server.WebListener.Test => Microsoft.AspNet.Server.WebListener.FunctionalTests}/Utilities.cs (88%) rename test/{Microsoft.AspNet.Server.WebListener.Test => Microsoft.AspNet.Server.WebListener.FunctionalTests}/project.json (100%) diff --git a/WebListener.sln b/WebListener.sln index 9f18ac98c5..1037bd9799 100644 --- a/WebListener.sln +++ b/WebListener.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30110.0 +VisualStudioVersion = 12.0.30203.2 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestClient", "samples\TestClient\TestClient.csproj", "{8B828433-B333-4C19-96AE-00BFFF9D8841}" EndProject @@ -21,14 +21,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld.net45", "samples EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SelfHostServer.net45", "samples\SelfHostServer\SelfHostServer.net45.csproj", "{96C67B2F-9913-4E8D-B2E8-969BE66B71B6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Server.WebListener.Test.net45", "test\Microsoft.AspNet.Server.WebListener.Test\Microsoft.AspNet.Server.WebListener.Test.net45.csproj", "{485DAC59-A1F1-4D47-98BF-B448C994E05B}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld.k10", "samples\HelloWorld\HelloWorld.k10.csproj", "{A1F2CA12-3F08-4DE2-B3D9-52DBE267936B}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Security.Windows.net45", "src\Microsoft.AspNet.Security.Windows\Microsoft.AspNet.Security.Windows.net45.csproj", "{8B4EF749-251D-4222-AD18-DE5A1E7D321A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Security.Windows.Test.net45", "test\Microsoft.AspNet.Security.Windows.Test\Microsoft.AspNet.Security.Windows.Test.net45.csproj", "{3EC418D5-C8FD-47AA-BFED-F524358EC3DD}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Server.WebListener.FunctionalTests.net45", "test\Microsoft.AspNet.Server.WebListener.FunctionalTests\Microsoft.AspNet.Server.WebListener.FunctionalTests.net45.csproj", "{E7841BDA-EEE0-42D8-8E09-48F021B1934E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -59,10 +59,6 @@ Global {96C67B2F-9913-4E8D-B2E8-969BE66B71B6}.Debug|Any CPU.Build.0 = Debug|Any CPU {96C67B2F-9913-4E8D-B2E8-969BE66B71B6}.Release|Any CPU.ActiveCfg = Release|Any CPU {96C67B2F-9913-4E8D-B2E8-969BE66B71B6}.Release|Any CPU.Build.0 = Release|Any CPU - {485DAC59-A1F1-4D47-98BF-B448C994E05B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {485DAC59-A1F1-4D47-98BF-B448C994E05B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {485DAC59-A1F1-4D47-98BF-B448C994E05B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {485DAC59-A1F1-4D47-98BF-B448C994E05B}.Release|Any CPU.Build.0 = Release|Any CPU {A1F2CA12-3F08-4DE2-B3D9-52DBE267936B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A1F2CA12-3F08-4DE2-B3D9-52DBE267936B}.Debug|Any CPU.Build.0 = Debug|Any CPU {A1F2CA12-3F08-4DE2-B3D9-52DBE267936B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -75,20 +71,24 @@ Global {3EC418D5-C8FD-47AA-BFED-F524358EC3DD}.Debug|Any CPU.Build.0 = Debug|Any CPU {3EC418D5-C8FD-47AA-BFED-F524358EC3DD}.Release|Any CPU.ActiveCfg = Release|Any CPU {3EC418D5-C8FD-47AA-BFED-F524358EC3DD}.Release|Any CPU.Build.0 = Release|Any CPU + {E7841BDA-EEE0-42D8-8E09-48F021B1934E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E7841BDA-EEE0-42D8-8E09-48F021B1934E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E7841BDA-EEE0-42D8-8E09-48F021B1934E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E7841BDA-EEE0-42D8-8E09-48F021B1934E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {485DAC59-A1F1-4D47-98BF-B448C994E05B} = {E183C826-1360-4DFF-9994-F33CED5C8525} - {3EC418D5-C8FD-47AA-BFED-F524358EC3DD} = {E183C826-1360-4DFF-9994-F33CED5C8525} {8B828433-B333-4C19-96AE-00BFFF9D8841} = {3A1E31E3-2794-4CA3-B8E2-253E96BDE514} - {BF335732-BB09-49A1-8676-F074047E7DB2} = {3A1E31E3-2794-4CA3-B8E2-253E96BDE514} - {96C67B2F-9913-4E8D-B2E8-969BE66B71B6} = {3A1E31E3-2794-4CA3-B8E2-253E96BDE514} - {A1F2CA12-3F08-4DE2-B3D9-52DBE267936B} = {3A1E31E3-2794-4CA3-B8E2-253E96BDE514} {6D9D3023-3ED7-4C95-80F0-347843ABD759} = {99D5E5F3-88F5-4CCF-8D8C-717C8925DF09} {253B9134-B6EB-4E59-8725-D983FD941A21} = {99D5E5F3-88F5-4CCF-8D8C-717C8925DF09} {00C6A882-1FE2-4769-901C-023D8DC175C4} = {99D5E5F3-88F5-4CCF-8D8C-717C8925DF09} + {BF335732-BB09-49A1-8676-F074047E7DB2} = {3A1E31E3-2794-4CA3-B8E2-253E96BDE514} + {96C67B2F-9913-4E8D-B2E8-969BE66B71B6} = {3A1E31E3-2794-4CA3-B8E2-253E96BDE514} + {A1F2CA12-3F08-4DE2-B3D9-52DBE267936B} = {3A1E31E3-2794-4CA3-B8E2-253E96BDE514} {8B4EF749-251D-4222-AD18-DE5A1E7D321A} = {99D5E5F3-88F5-4CCF-8D8C-717C8925DF09} + {3EC418D5-C8FD-47AA-BFED-F524358EC3DD} = {E183C826-1360-4DFF-9994-F33CED5C8525} + {E7841BDA-EEE0-42D8-8E09-48F021B1934E} = {E183C826-1360-4DFF-9994-F33CED5C8525} EndGlobalSection EndGlobal diff --git a/test/Microsoft.AspNet.Server.WebListener.Test/AuthenticationTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/AuthenticationTests.cs similarity index 91% rename from test/Microsoft.AspNet.Server.WebListener.Test/AuthenticationTests.cs rename to test/Microsoft.AspNet.Server.WebListener.FunctionalTests/AuthenticationTests.cs index 9f8887a5c8..893fc4c941 100644 --- a/test/Microsoft.AspNet.Server.WebListener.Test/AuthenticationTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/AuthenticationTests.cs @@ -1,11 +1,6 @@ -// ----------------------------------------------------------------------- -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -// ----------------------------------------------------------------------- +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; -using System.Collections.Generic; using System.Net; using System.Net.Http; using System.Threading.Tasks; @@ -13,10 +8,8 @@ using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.PipelineCore; using Xunit; -namespace Microsoft.AspNet.Server.WebListener.Test +namespace Microsoft.AspNet.Server.WebListener { - using AppFunc = Func; - public class AuthenticationTests { private const string Address = "http://localhost:8080/"; diff --git a/test/Microsoft.AspNet.Server.WebListener.Test/HttpsTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/HttpsTests.cs similarity index 94% rename from test/Microsoft.AspNet.Server.WebListener.Test/HttpsTests.cs rename to test/Microsoft.AspNet.Server.WebListener.FunctionalTests/HttpsTests.cs index d96effc06c..73b417ff4a 100644 --- a/test/Microsoft.AspNet.Server.WebListener.Test/HttpsTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/HttpsTests.cs @@ -1,10 +1,5 @@ -// ----------------------------------------------------------------------- -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -// ----------------------------------------------------------------------- +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -using System; using System.IO; using System.Net.Http; using System.Security.Cryptography.X509Certificates; @@ -15,7 +10,7 @@ using Microsoft.AspNet.HttpFeature; using Microsoft.AspNet.PipelineCore; using Xunit; -namespace Microsoft.AspNet.Server.WebListener.Test +namespace Microsoft.AspNet.Server.WebListener { public class HttpsTests { diff --git a/test/Microsoft.AspNet.Server.WebListener.Test/OpaqueUpgradeTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs similarity index 97% rename from test/Microsoft.AspNet.Server.WebListener.Test/OpaqueUpgradeTests.cs rename to test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs index e7ddf53495..45097046fa 100644 --- a/test/Microsoft.AspNet.Server.WebListener.Test/OpaqueUpgradeTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs @@ -1,8 +1,5 @@ -// ----------------------------------------------------------------------- -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -// ----------------------------------------------------------------------- +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. + /* TODO: Opaque using System; using System.Collections.Generic; @@ -15,7 +12,7 @@ using System.Threading.Tasks; using Xunit; using Xunit.Extensions; -namespace Microsoft.AspNet.Server.WebListener.Tests +namespace Microsoft.AspNet.Server.WebListener { using AppFunc = Func; using OpaqueUpgrade = Action, Func, Task>>; diff --git a/test/Microsoft.AspNet.Server.WebListener.Test/Properties/AssemblyInfo.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Properties/AssemblyInfo.cs similarity index 94% rename from test/Microsoft.AspNet.Server.WebListener.Test/Properties/AssemblyInfo.cs rename to test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Properties/AssemblyInfo.cs index c596cb6438..9b52afa8d6 100644 --- a/test/Microsoft.AspNet.Server.WebListener.Test/Properties/AssemblyInfo.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Properties/AssemblyInfo.cs @@ -11,11 +11,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("Microsoft.AspNet.Server.WebListener.Tests")] +[assembly: AssemblyTitle("Microsoft.AspNet.Server.WebListener.FunctionalTests")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Microsoft.AspNet.Server.WebListener.Tests")] +[assembly: AssemblyProduct("Microsoft.AspNet.Server.WebListener.FunctionalTests")] [assembly: AssemblyCopyright("Copyright © 2012")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/test/Microsoft.AspNet.Server.WebListener.Test/RequestBodyTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestBodyTests.cs similarity index 92% rename from test/Microsoft.AspNet.Server.WebListener.Test/RequestBodyTests.cs rename to test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestBodyTests.cs index 59df978897..81a90c6fcd 100644 --- a/test/Microsoft.AspNet.Server.WebListener.Test/RequestBodyTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestBodyTests.cs @@ -1,11 +1,6 @@ -// ----------------------------------------------------------------------- -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -// ----------------------------------------------------------------------- +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; -using System.Collections.Generic; using System.IO; using System.Net; using System.Net.Http; @@ -15,10 +10,8 @@ using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.PipelineCore; using Xunit; -namespace Microsoft.AspNet.Server.WebListener.Test +namespace Microsoft.AspNet.Server.WebListener { - using AppFunc = Func; - public class RequestBodyTests { private const string Address = "http://localhost:8080/"; diff --git a/test/Microsoft.AspNet.Server.WebListener.Test/RequestHeaderTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestHeaderTests.cs similarity index 89% rename from test/Microsoft.AspNet.Server.WebListener.Test/RequestHeaderTests.cs rename to test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestHeaderTests.cs index 3ebb24eaca..b400e8b375 100644 --- a/test/Microsoft.AspNet.Server.WebListener.Test/RequestHeaderTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestHeaderTests.cs @@ -1,11 +1,6 @@ -// ----------------------------------------------------------------------- -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -// ----------------------------------------------------------------------- +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; -using System.Collections.Generic; using System.Net.Http; using System.Net.Sockets; using System.Text; @@ -14,10 +9,8 @@ using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.PipelineCore; using Xunit; -namespace Microsoft.AspNet.Server.WebListener.Test +namespace Microsoft.AspNet.Server.WebListener { - using AppFunc = Func; - public class RequestHeaderTests { private const string Address = "http://localhost:8080/"; diff --git a/test/Microsoft.AspNet.Server.WebListener.Test/RequestTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestTests.cs similarity index 93% rename from test/Microsoft.AspNet.Server.WebListener.Test/RequestTests.cs rename to test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestTests.cs index dcfa78eab3..041665d0bb 100644 --- a/test/Microsoft.AspNet.Server.WebListener.Test/RequestTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestTests.cs @@ -1,23 +1,16 @@ -// ----------------------------------------------------------------------- -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -// ----------------------------------------------------------------------- +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; -using System.Collections.Generic; using System.IO; using System.Net.Http; using System.Text; -using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.FeatureModel; -using Microsoft.AspNet.Hosting.Server; using Microsoft.AspNet.HttpFeature; using Microsoft.AspNet.PipelineCore; using Xunit; -namespace Microsoft.AspNet.Server.WebListener.Test +namespace Microsoft.AspNet.Server.WebListener { using AppFunc = Func; diff --git a/test/Microsoft.AspNet.Server.WebListener.Test/ResponseBodyTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseBodyTests.cs similarity index 95% rename from test/Microsoft.AspNet.Server.WebListener.Test/ResponseBodyTests.cs rename to test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseBodyTests.cs index 0372b63a39..0bb29b774f 100644 --- a/test/Microsoft.AspNet.Server.WebListener.Test/ResponseBodyTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseBodyTests.cs @@ -1,8 +1,4 @@ -// ----------------------------------------------------------------------- -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -// ----------------------------------------------------------------------- +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; using System.Collections.Generic; @@ -12,14 +8,11 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.FeatureModel; -using Microsoft.AspNet.HttpFeature; using Microsoft.AspNet.PipelineCore; using Xunit; -namespace Microsoft.AspNet.Server.WebListener.Test +namespace Microsoft.AspNet.Server.WebListener { - using AppFunc = Func; - public class ResponseBodyTests { private const string Address = "http://localhost:8080/"; diff --git a/test/Microsoft.AspNet.Server.WebListener.Test/ResponseHeaderTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseHeaderTests.cs similarity index 96% rename from test/Microsoft.AspNet.Server.WebListener.Test/ResponseHeaderTests.cs rename to test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseHeaderTests.cs index 59ce482ed5..11eff9ff14 100644 --- a/test/Microsoft.AspNet.Server.WebListener.Test/ResponseHeaderTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseHeaderTests.cs @@ -1,13 +1,8 @@ -// ----------------------------------------------------------------------- -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -// ----------------------------------------------------------------------- +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; -using System.Collections.Generic; -using System.IO; using System.Linq; +using System.Net; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNet.FeatureModel; @@ -15,11 +10,8 @@ using Microsoft.AspNet.HttpFeature; using Microsoft.AspNet.PipelineCore; using Xunit; -namespace Microsoft.AspNet.Server.WebListener.Test +namespace Microsoft.AspNet.Server.WebListener { - using AppFunc = Func; - using System.Net; - public class ResponseHeaderTests { private const string Address = "http://localhost:8080/"; diff --git a/test/Microsoft.AspNet.Server.WebListener.Test/ResponseSendFileTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseSendFileTests.cs similarity index 97% rename from test/Microsoft.AspNet.Server.WebListener.Test/ResponseSendFileTests.cs rename to test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseSendFileTests.cs index 19d790fffa..4e0e4b1f27 100644 --- a/test/Microsoft.AspNet.Server.WebListener.Test/ResponseSendFileTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseSendFileTests.cs @@ -1,8 +1,4 @@ -// ----------------------------------------------------------------------- -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -// ----------------------------------------------------------------------- +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; using System.Collections.Generic; @@ -18,7 +14,7 @@ using Microsoft.AspNet.HttpFeature; using Microsoft.AspNet.PipelineCore; using Xunit; -namespace Microsoft.AspNet.Server.WebListener.Test +namespace Microsoft.AspNet.Server.WebListener { public class ResponseSendFileTests { diff --git a/test/Microsoft.AspNet.Server.WebListener.Test/ResponseTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseTests.cs similarity index 91% rename from test/Microsoft.AspNet.Server.WebListener.Test/ResponseTests.cs rename to test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseTests.cs index a9f33067aa..55d6a84562 100644 --- a/test/Microsoft.AspNet.Server.WebListener.Test/ResponseTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseTests.cs @@ -1,11 +1,6 @@ -// ----------------------------------------------------------------------- -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -// ----------------------------------------------------------------------- +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; -using System.Collections.Generic; using System.Net; using System.Net.Http; using System.Threading.Tasks; @@ -14,11 +9,8 @@ using Microsoft.AspNet.HttpFeature; using Microsoft.AspNet.PipelineCore; using Xunit; -namespace Microsoft.AspNet.Server.WebListener.Test +namespace Microsoft.AspNet.Server.WebListener { - using AppFunc = Func; - using Microsoft.AspNet.Hosting.Server; - public class ResponseTests { private const string Address = "http://localhost:8080/"; diff --git a/test/Microsoft.AspNet.Server.WebListener.Test/ServerTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ServerTests.cs similarity index 95% rename from test/Microsoft.AspNet.Server.WebListener.Test/ServerTests.cs rename to test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ServerTests.cs index c3632fa4c3..5b8b79d68f 100644 --- a/test/Microsoft.AspNet.Server.WebListener.Test/ServerTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ServerTests.cs @@ -1,8 +1,4 @@ -// ----------------------------------------------------------------------- -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -// ----------------------------------------------------------------------- +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; using System.Collections.Generic; @@ -17,11 +13,8 @@ using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.PipelineCore; using Xunit; -namespace Microsoft.AspNet.Server.WebListener.Test +namespace Microsoft.AspNet.Server.WebListener { - using AppFunc = Func; - using Microsoft.AspNet.Hosting.Server; - public class ServerTests { private const string Address = "http://localhost:8080/"; diff --git a/test/Microsoft.AspNet.Server.WebListener.Test/Utilities.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Utilities.cs similarity index 88% rename from test/Microsoft.AspNet.Server.WebListener.Test/Utilities.cs rename to test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Utilities.cs index eba2edfd9e..57dab56d0c 100644 --- a/test/Microsoft.AspNet.Server.WebListener.Test/Utilities.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Utilities.cs @@ -1,10 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.AspNet.Abstractions; -using Microsoft.AspNet.Hosting.Server; +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. -namespace Microsoft.AspNet.Server.WebListener.Test +using System; +using System.Threading.Tasks; + +namespace Microsoft.AspNet.Server.WebListener { using AppFunc = Func; diff --git a/test/Microsoft.AspNet.Server.WebListener.Test/project.json b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json similarity index 100% rename from test/Microsoft.AspNet.Server.WebListener.Test/project.json rename to test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json