From c841016783517a6173ab76cdb96a03180ae3c287 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 6 Dec 2017 12:26:20 +0000 Subject: [PATCH] Move and rename E2E test project for consistency --- Blazor.sln | 18 +++++++++--------- .../Infrastructure/AspNetServerFixture.cs | 2 +- .../Infrastructure/AspNetSiteTestBase.cs | 2 +- .../Infrastructure/BrowserFixture.cs | 2 +- .../Infrastructure/ServerFixture.cs | 2 +- .../Infrastructure/StaticServerFixture.cs | 2 +- .../Infrastructure/StaticSiteTestBase.cs | 2 +- .../Microsoft.Blazor.E2ETest.csproj | 2 +- .../Tests/HelloWorldTest.cs | 4 ++-- .../Tests/MonoSanityTest.cs | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) rename {e2e => test/Microsoft.Blazor.E2ETest}/Infrastructure/AspNetServerFixture.cs (94%) rename {e2e => test/Microsoft.Blazor.E2ETest}/Infrastructure/AspNetSiteTestBase.cs (95%) rename {e2e => test/Microsoft.Blazor.E2ETest}/Infrastructure/BrowserFixture.cs (92%) rename {e2e => test/Microsoft.Blazor.E2ETest}/Infrastructure/ServerFixture.cs (97%) rename {e2e => test/Microsoft.Blazor.E2ETest}/Infrastructure/StaticServerFixture.cs (95%) rename {e2e => test/Microsoft.Blazor.E2ETest}/Infrastructure/StaticSiteTestBase.cs (95%) rename e2e/Blazor.E2ETest.csproj => test/Microsoft.Blazor.E2ETest/Microsoft.Blazor.E2ETest.csproj (90%) rename {e2e => test/Microsoft.Blazor.E2ETest}/Tests/HelloWorldTest.cs (89%) rename {e2e => test/Microsoft.Blazor.E2ETest}/Tests/MonoSanityTest.cs (87%) diff --git a/Blazor.sln b/Blazor.sln index a2f844c0b0..f1caf90170 100644 --- a/Blazor.sln +++ b/Blazor.sln @@ -26,8 +26,6 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "HelloWorld", "samples\Hello SlnRelativePath = "samples\HelloWorld\" EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazor.E2ETest", "e2e\Blazor.E2ETest.csproj", "{A1A3AEB6-A832-477E-8D91-A672CFE53801}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "runtime", "runtime", "{B867E038-B3CE-43E3-9292-61568C46CDEB}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "mono", "mono", "{7B5CAAB1-A3EB-44F7-87E3-A13ED89FC17D}" @@ -39,11 +37,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.Mono", "ru EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoSanity", "samples\MonoSanity\MonoSanity.csproj", "{7C53BB6B-5906-4753-B507-C9FCC2F7E5B7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Blazor.Server", "runtime\Microsoft.Blazor.Server\Microsoft.Blazor.Server.csproj", "{5A694793-3257-4D37-BB74-4A41B3894685}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.Server", "runtime\Microsoft.Blazor.Server\Microsoft.Blazor.Server.csproj", "{5A694793-3257-4D37-BB74-4A41B3894685}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Blazor.Mono.Test", "test\Microsoft.Blazor.Mono.Test\Microsoft.Blazor.Mono.Test.csproj", "{118484D3-3993-45CE-97C1-6F28A517529B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.Mono.Test", "test\Microsoft.Blazor.Mono.Test\Microsoft.Blazor.Mono.Test.csproj", "{118484D3-3993-45CE-97C1-6F28A517529B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.E2ETest", "test\Microsoft.Blazor.E2ETest\Microsoft.Blazor.E2ETest.csproj", "{5BC2A10D-B6CA-43AE-B73C-2A41AE1039F9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -55,10 +55,6 @@ Global {4C7EE25B-E9C7-4CA3-8357-77ADF9AAD20A}.Debug|Any CPU.Build.0 = Debug|Any CPU {4C7EE25B-E9C7-4CA3-8357-77ADF9AAD20A}.Release|Any CPU.ActiveCfg = Debug|Any CPU {4C7EE25B-E9C7-4CA3-8357-77ADF9AAD20A}.Release|Any CPU.Build.0 = Debug|Any CPU - {A1A3AEB6-A832-477E-8D91-A672CFE53801}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1A3AEB6-A832-477E-8D91-A672CFE53801}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1A3AEB6-A832-477E-8D91-A672CFE53801}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1A3AEB6-A832-477E-8D91-A672CFE53801}.Release|Any CPU.Build.0 = Release|Any CPU {39FEC72D-AF52-47A3-B63D-7BF0E4335248}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {39FEC72D-AF52-47A3-B63D-7BF0E4335248}.Debug|Any CPU.Build.0 = Debug|Any CPU {39FEC72D-AF52-47A3-B63D-7BF0E4335248}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -75,18 +71,22 @@ Global {118484D3-3993-45CE-97C1-6F28A517529B}.Debug|Any CPU.Build.0 = Debug|Any CPU {118484D3-3993-45CE-97C1-6F28A517529B}.Release|Any CPU.ActiveCfg = Release|Any CPU {118484D3-3993-45CE-97C1-6F28A517529B}.Release|Any CPU.Build.0 = Release|Any CPU + {5BC2A10D-B6CA-43AE-B73C-2A41AE1039F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5BC2A10D-B6CA-43AE-B73C-2A41AE1039F9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5BC2A10D-B6CA-43AE-B73C-2A41AE1039F9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5BC2A10D-B6CA-43AE-B73C-2A41AE1039F9}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {4C7EE25B-E9C7-4CA3-8357-77ADF9AAD20A} = {F5FDD4E5-6A52-4A86-BE5E-5E42CB1DC8DA} - {A1A3AEB6-A832-477E-8D91-A672CFE53801} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E} {7B5CAAB1-A3EB-44F7-87E3-A13ED89FC17D} = {B867E038-B3CE-43E3-9292-61568C46CDEB} {39FEC72D-AF52-47A3-B63D-7BF0E4335248} = {B867E038-B3CE-43E3-9292-61568C46CDEB} {7C53BB6B-5906-4753-B507-C9FCC2F7E5B7} = {F5FDD4E5-6A52-4A86-BE5E-5E42CB1DC8DA} {5A694793-3257-4D37-BB74-4A41B3894685} = {B867E038-B3CE-43E3-9292-61568C46CDEB} {118484D3-3993-45CE-97C1-6F28A517529B} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E} + {5BC2A10D-B6CA-43AE-B73C-2A41AE1039F9} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {504DA352-6788-4DC0-8705-82167E72A4D3} diff --git a/e2e/Infrastructure/AspNetServerFixture.cs b/test/Microsoft.Blazor.E2ETest/Infrastructure/AspNetServerFixture.cs similarity index 94% rename from e2e/Infrastructure/AspNetServerFixture.cs rename to test/Microsoft.Blazor.E2ETest/Infrastructure/AspNetServerFixture.cs index 6797baa849..bed8a7e6ac 100644 --- a/e2e/Infrastructure/AspNetServerFixture.cs +++ b/test/Microsoft.Blazor.E2ETest/Infrastructure/AspNetServerFixture.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Hosting; using System; using System.IO; -namespace Blazor.E2ETest.Infrastructure +namespace Microsoft.Blazor.E2ETest.Infrastructure { public class AspNetServerFixture : ServerFixture { diff --git a/e2e/Infrastructure/AspNetSiteTestBase.cs b/test/Microsoft.Blazor.E2ETest/Infrastructure/AspNetSiteTestBase.cs similarity index 95% rename from e2e/Infrastructure/AspNetSiteTestBase.cs rename to test/Microsoft.Blazor.E2ETest/Infrastructure/AspNetSiteTestBase.cs index 74aef3b2bb..7251b4b913 100644 --- a/e2e/Infrastructure/AspNetSiteTestBase.cs +++ b/test/Microsoft.Blazor.E2ETest/Infrastructure/AspNetSiteTestBase.cs @@ -5,7 +5,7 @@ using OpenQA.Selenium; using System; using Xunit; -namespace Blazor.E2ETest.Infrastructure +namespace Microsoft.Blazor.E2ETest.Infrastructure { public class AspNetSiteTestBase : IClassFixture, IClassFixture diff --git a/e2e/Infrastructure/BrowserFixture.cs b/test/Microsoft.Blazor.E2ETest/Infrastructure/BrowserFixture.cs similarity index 92% rename from e2e/Infrastructure/BrowserFixture.cs rename to test/Microsoft.Blazor.E2ETest/Infrastructure/BrowserFixture.cs index 2067721cfd..d742b72c73 100644 --- a/e2e/Infrastructure/BrowserFixture.cs +++ b/test/Microsoft.Blazor.E2ETest/Infrastructure/BrowserFixture.cs @@ -6,7 +6,7 @@ using OpenQA.Selenium.Chrome; using OpenQA.Selenium.Remote; using System; -namespace Blazor.E2ETest.Infrastructure +namespace Microsoft.Blazor.E2ETest.Infrastructure { public class BrowserFixture : IDisposable { diff --git a/e2e/Infrastructure/ServerFixture.cs b/test/Microsoft.Blazor.E2ETest/Infrastructure/ServerFixture.cs similarity index 97% rename from e2e/Infrastructure/ServerFixture.cs rename to test/Microsoft.Blazor.E2ETest/Infrastructure/ServerFixture.cs index 976d4b2f88..a51535ce19 100644 --- a/e2e/Infrastructure/ServerFixture.cs +++ b/test/Microsoft.Blazor.E2ETest/Infrastructure/ServerFixture.cs @@ -8,7 +8,7 @@ using System.IO; using System.Linq; using System.Threading; -namespace Blazor.E2ETest.Infrastructure +namespace Microsoft.Blazor.E2ETest.Infrastructure { public abstract class ServerFixture : IDisposable { diff --git a/e2e/Infrastructure/StaticServerFixture.cs b/test/Microsoft.Blazor.E2ETest/Infrastructure/StaticServerFixture.cs similarity index 95% rename from e2e/Infrastructure/StaticServerFixture.cs rename to test/Microsoft.Blazor.E2ETest/Infrastructure/StaticServerFixture.cs index 0432bb4a40..3c5a925576 100644 --- a/e2e/Infrastructure/StaticServerFixture.cs +++ b/test/Microsoft.Blazor.E2ETest/Infrastructure/StaticServerFixture.cs @@ -5,7 +5,7 @@ using System.IO; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -namespace Blazor.E2ETest.Infrastructure +namespace Microsoft.Blazor.E2ETest.Infrastructure { public class StaticServerFixture : ServerFixture { diff --git a/e2e/Infrastructure/StaticSiteTestBase.cs b/test/Microsoft.Blazor.E2ETest/Infrastructure/StaticSiteTestBase.cs similarity index 95% rename from e2e/Infrastructure/StaticSiteTestBase.cs rename to test/Microsoft.Blazor.E2ETest/Infrastructure/StaticSiteTestBase.cs index f5f019d5dc..f006556cac 100644 --- a/e2e/Infrastructure/StaticSiteTestBase.cs +++ b/test/Microsoft.Blazor.E2ETest/Infrastructure/StaticSiteTestBase.cs @@ -6,7 +6,7 @@ using System; using System.IO; using Xunit; -namespace Blazor.E2ETest.Infrastructure +namespace Microsoft.Blazor.E2ETest.Infrastructure { public class StaticSiteTestBase : IClassFixture, IClassFixture diff --git a/e2e/Blazor.E2ETest.csproj b/test/Microsoft.Blazor.E2ETest/Microsoft.Blazor.E2ETest.csproj similarity index 90% rename from e2e/Blazor.E2ETest.csproj rename to test/Microsoft.Blazor.E2ETest/Microsoft.Blazor.E2ETest.csproj index 846c134a70..aad742e4c1 100644 --- a/e2e/Blazor.E2ETest.csproj +++ b/test/Microsoft.Blazor.E2ETest/Microsoft.Blazor.E2ETest.csproj @@ -16,7 +16,7 @@ - + diff --git a/e2e/Tests/HelloWorldTest.cs b/test/Microsoft.Blazor.E2ETest/Tests/HelloWorldTest.cs similarity index 89% rename from e2e/Tests/HelloWorldTest.cs rename to test/Microsoft.Blazor.E2ETest/Tests/HelloWorldTest.cs index 5342ac398f..422cbbf57e 100644 --- a/e2e/Tests/HelloWorldTest.cs +++ b/test/Microsoft.Blazor.E2ETest/Tests/HelloWorldTest.cs @@ -1,11 +1,11 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Blazor.E2ETest.Infrastructure; +using Microsoft.Blazor.E2ETest.Infrastructure; using OpenQA.Selenium; using Xunit; -namespace Blazor.E2ETest.Tests +namespace Microsoft.Blazor.E2ETest.Tests { public class HelloWorldTest : StaticSiteTestBase { diff --git a/e2e/Tests/MonoSanityTest.cs b/test/Microsoft.Blazor.E2ETest/Tests/MonoSanityTest.cs similarity index 87% rename from e2e/Tests/MonoSanityTest.cs rename to test/Microsoft.Blazor.E2ETest/Tests/MonoSanityTest.cs index 9658cd2a0f..11d7cbd3e1 100644 --- a/e2e/Tests/MonoSanityTest.cs +++ b/test/Microsoft.Blazor.E2ETest/Tests/MonoSanityTest.cs @@ -1,10 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Blazor.E2ETest.Infrastructure; +using Microsoft.Blazor.E2ETest.Infrastructure; using Xunit; -namespace Blazor.E2ETest.Tests +namespace Microsoft.Blazor.E2ETest.Tests { public class MonoSanityTest : AspNetSiteTestBase {