diff --git a/MusicStore.sln b/MusicStore.sln index 6ad13b2f94..c9b3990935 100644 --- a/MusicStore.sln +++ b/MusicStore.sln @@ -1,10 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{44621553-AA7D-4893-8834-79582A7D8348}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7D749BDA-4638-4517-B66A-D40DEDEEB141}" ProjectSection(SolutionItems) = preProject global.json = global.json @@ -21,58 +19,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MusicStore", "src\MusicStor EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MusicStore.Test", "test\MusicStore.Test\MusicStore.Test.xproj", "{CA663205-77DE-4E55-B300-85594181B5A9}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mocks", "Mocks", "{D7CB3341-F932-4AC6-8F4E-EDC62F03C064}" - ProjectSection(SolutionItems) = preProject - shared\Mocks\Readme.md = shared\Mocks\Readme.md - shared\Mocks\StartupOpenIdConnectTesting.cs = shared\Mocks\StartupOpenIdConnectTesting.cs - shared\Mocks\StartupSocialTesting.cs = shared\Mocks\StartupSocialTesting.cs - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Facebook", "Facebook", "{B53E1D6D-4A18-4AA2-BE59-146D6B7F310D}" - ProjectSection(SolutionItems) = preProject - shared\Mocks\Facebook\FacebookMockBackChannelHttpHandler.cs = shared\Mocks\Facebook\FacebookMockBackChannelHttpHandler.cs - shared\Mocks\Facebook\TestFacebookEvents.cs = shared\Mocks\Facebook\TestFacebookEvents.cs - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{E839AEB0-7926-4FEE-B22C-11AF7EF5D4BF}" - ProjectSection(SolutionItems) = preProject - shared\MusicStoreConfig.cs = shared\MusicStoreConfig.cs - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{78715843-B625-414E-9074-56908C48EF28}" - ProjectSection(SolutionItems) = preProject - shared\Mocks\Common\CustomStateDataFormat.cs = shared\Mocks\Common\CustomStateDataFormat.cs - shared\Mocks\Common\Helpers.cs = shared\Mocks\Common\Helpers.cs - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Google", "Google", "{A6D34706-33E8-45D4-9E3D-8EB8C9EAD9B2}" - ProjectSection(SolutionItems) = preProject - shared\Mocks\Google\GoogleMockBackChannelHttpHandler.cs = shared\Mocks\Google\GoogleMockBackChannelHttpHandler.cs - shared\Mocks\Google\TestGoogleEvents.cs = shared\Mocks\Google\TestGoogleEvents.cs - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MicrosoftAccount", "MicrosoftAccount", "{86DDEB7E-F29D-41BD-9866-65EB01A8CFED}" - ProjectSection(SolutionItems) = preProject - shared\Mocks\MicrosoftAccount\MicrosoftAccountMockBackChannelHandler.cs = shared\Mocks\MicrosoftAccount\MicrosoftAccountMockBackChannelHandler.cs - shared\Mocks\MicrosoftAccount\TestMicrosoftAccountEvents.cs = shared\Mocks\MicrosoftAccount\TestMicrosoftAccountEvents.cs - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenIdConnect", "OpenIdConnect", "{B76F2C95-C066-4CAB-AA2B-287FA039C786}" - ProjectSection(SolutionItems) = preProject - shared\Mocks\OpenIdConnect\CustomStringDataFormat.cs = shared\Mocks\OpenIdConnect\CustomStringDataFormat.cs - shared\Mocks\OpenIdConnect\keys.json = shared\Mocks\OpenIdConnect\keys.json - shared\Mocks\OpenIdConnect\openid-configuration.json = shared\Mocks\OpenIdConnect\openid-configuration.json - shared\Mocks\OpenIdConnect\OpenIdConnectBackChannelHttpHandler.cs = shared\Mocks\OpenIdConnect\OpenIdConnectBackChannelHttpHandler.cs - shared\Mocks\OpenIdConnect\TestOpenIdConnectEvents.cs = shared\Mocks\OpenIdConnect\TestOpenIdConnectEvents.cs - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Twitter", "Twitter", "{6CA9AC03-039E-4993-8164-C27E418683C5}" - ProjectSection(SolutionItems) = preProject - shared\Mocks\Twitter\CustomTwitterStateDataFormat.cs = shared\Mocks\Twitter\CustomTwitterStateDataFormat.cs - shared\Mocks\Twitter\TestTwitterEvents.cs = shared\Mocks\Twitter\TestTwitterEvents.cs - shared\Mocks\Twitter\TwitterMockBackChannelHttpHandler.cs = shared\Mocks\Twitter\TwitterMockBackChannelHttpHandler.cs - EndProjectSection -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MusicStore.Standalone", "src\MusicStore.Standalone\MusicStore.Standalone.xproj", "{C4222506-9D5B-469D-90C1-196A3F27CB44}" EndProject Global @@ -137,13 +83,6 @@ Global {A319ACCE-060B-4385-9534-9F2202F6180E} = {363D2681-31A6-48C9-90BB-9ACFF4A41F06} {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0} = {B7B176B6-8D4D-4EF1-BBD2-DDA650C78FFF} {CA663205-77DE-4E55-B300-85594181B5A9} = {363D2681-31A6-48C9-90BB-9ACFF4A41F06} - {D7CB3341-F932-4AC6-8F4E-EDC62F03C064} = {E839AEB0-7926-4FEE-B22C-11AF7EF5D4BF} - {B53E1D6D-4A18-4AA2-BE59-146D6B7F310D} = {D7CB3341-F932-4AC6-8F4E-EDC62F03C064} - {78715843-B625-414E-9074-56908C48EF28} = {D7CB3341-F932-4AC6-8F4E-EDC62F03C064} - {A6D34706-33E8-45D4-9E3D-8EB8C9EAD9B2} = {D7CB3341-F932-4AC6-8F4E-EDC62F03C064} - {86DDEB7E-F29D-41BD-9866-65EB01A8CFED} = {D7CB3341-F932-4AC6-8F4E-EDC62F03C064} - {B76F2C95-C066-4CAB-AA2B-287FA039C786} = {D7CB3341-F932-4AC6-8F4E-EDC62F03C064} - {6CA9AC03-039E-4993-8164-C27E418683C5} = {D7CB3341-F932-4AC6-8F4E-EDC62F03C064} {C4222506-9D5B-469D-90C1-196A3F27CB44} = {B7B176B6-8D4D-4EF1-BBD2-DDA650C78FFF} EndGlobalSection EndGlobal diff --git a/src/MusicStore.Standalone/project.json b/src/MusicStore.Standalone/project.json index 8fc15e892d..dbff8e199d 100644 --- a/src/MusicStore.Standalone/project.json +++ b/src/MusicStore.Standalone/project.json @@ -12,17 +12,17 @@ "../MusicStore/obj" ], "include": [ - "../../shared/**/*.cs", "../MusicStore/**/*.cs" ] }, "copyToOutput": { "mappings": { - "Areas/": "../MusicStore/Areas/**/*.cshtml", - "Views/": "../MusicStore/Views/**/*.cshtml", - "wwwroot/": "../MusicStore/wwwroot/", - "web.config": "../MusicStore/web.config", - "config.json": "../MusicStore/config.json" + "Areas/": "../MusicStore/Areas/**/*.cshtml", + "Views/": "../MusicStore/Views/**/*.cshtml", + "wwwroot/": "../MusicStore/wwwroot/", + "web.config": "../MusicStore/web.config", + "config.json": "../MusicStore/config.json", + "ForTesting/": "../MusicStore/ForTesting/**/*.json" } }, "define": [ @@ -39,7 +39,8 @@ "Views/": "../MusicStore/Views/**/*.cshtml", "wwwroot/": "../MusicStore/wwwroot/", "web.config": "../MusicStore/web.config", - "config.json": "../MusicStore/config.json" + "config.json": "../MusicStore/config.json", + "ForTesting/": "../MusicStore/ForTesting/**/*.json" } }, "dependencies": { diff --git a/shared/Mocks/Common/CustomStateDataFormat.cs b/src/MusicStore/ForTesting/Mocks/Common/CustomStateDataFormat.cs similarity index 100% rename from shared/Mocks/Common/CustomStateDataFormat.cs rename to src/MusicStore/ForTesting/Mocks/Common/CustomStateDataFormat.cs diff --git a/shared/Mocks/Common/Helpers.cs b/src/MusicStore/ForTesting/Mocks/Common/Helpers.cs similarity index 100% rename from shared/Mocks/Common/Helpers.cs rename to src/MusicStore/ForTesting/Mocks/Common/Helpers.cs diff --git a/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs b/src/MusicStore/ForTesting/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs similarity index 100% rename from shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs rename to src/MusicStore/ForTesting/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs diff --git a/shared/Mocks/Facebook/TestFacebookEvents.cs b/src/MusicStore/ForTesting/Mocks/Facebook/TestFacebookEvents.cs similarity index 100% rename from shared/Mocks/Facebook/TestFacebookEvents.cs rename to src/MusicStore/ForTesting/Mocks/Facebook/TestFacebookEvents.cs diff --git a/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs b/src/MusicStore/ForTesting/Mocks/Google/GoogleMockBackChannelHttpHandler.cs similarity index 100% rename from shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs rename to src/MusicStore/ForTesting/Mocks/Google/GoogleMockBackChannelHttpHandler.cs diff --git a/shared/Mocks/Google/TestGoogleEvents.cs b/src/MusicStore/ForTesting/Mocks/Google/TestGoogleEvents.cs similarity index 100% rename from shared/Mocks/Google/TestGoogleEvents.cs rename to src/MusicStore/ForTesting/Mocks/Google/TestGoogleEvents.cs diff --git a/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs b/src/MusicStore/ForTesting/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs similarity index 100% rename from shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs rename to src/MusicStore/ForTesting/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs diff --git a/shared/Mocks/MicrosoftAccount/TestMicrosoftAccountEvents.cs b/src/MusicStore/ForTesting/Mocks/MicrosoftAccount/TestMicrosoftAccountEvents.cs similarity index 100% rename from shared/Mocks/MicrosoftAccount/TestMicrosoftAccountEvents.cs rename to src/MusicStore/ForTesting/Mocks/MicrosoftAccount/TestMicrosoftAccountEvents.cs diff --git a/shared/Mocks/OpenIdConnect/CustomStringDataFormat.cs b/src/MusicStore/ForTesting/Mocks/OpenIdConnect/CustomStringDataFormat.cs similarity index 100% rename from shared/Mocks/OpenIdConnect/CustomStringDataFormat.cs rename to src/MusicStore/ForTesting/Mocks/OpenIdConnect/CustomStringDataFormat.cs diff --git a/shared/Mocks/OpenIdConnect/OpenIdConnectBackChannelHttpHandler.cs b/src/MusicStore/ForTesting/Mocks/OpenIdConnect/OpenIdConnectBackChannelHttpHandler.cs similarity index 91% rename from shared/Mocks/OpenIdConnect/OpenIdConnectBackChannelHttpHandler.cs rename to src/MusicStore/ForTesting/Mocks/OpenIdConnect/OpenIdConnectBackChannelHttpHandler.cs index 2e824883f7..a8dd616713 100644 --- a/shared/Mocks/OpenIdConnect/OpenIdConnectBackChannelHttpHandler.cs +++ b/src/MusicStore/ForTesting/Mocks/OpenIdConnect/OpenIdConnectBackChannelHttpHandler.cs @@ -13,8 +13,7 @@ namespace MusicStore.Mocks.OpenIdConnect var response = new HttpResponseMessage(); var basePath = Path.GetFullPath(Path.Combine( - Directory.GetCurrentDirectory(), "..", "..", - "shared", "Mocks","OpenIdConnect")); + Directory.GetCurrentDirectory(), "ForTesting", "Mocks","OpenIdConnect")); if (request.RequestUri.AbsoluteUri == "https://login.windows.net/[tenantName].onmicrosoft.com/.well-known/openid-configuration") { diff --git a/shared/Mocks/OpenIdConnect/TestOpenIdConnectEvents.cs b/src/MusicStore/ForTesting/Mocks/OpenIdConnect/TestOpenIdConnectEvents.cs similarity index 100% rename from shared/Mocks/OpenIdConnect/TestOpenIdConnectEvents.cs rename to src/MusicStore/ForTesting/Mocks/OpenIdConnect/TestOpenIdConnectEvents.cs diff --git a/shared/Mocks/OpenIdConnect/keys.json b/src/MusicStore/ForTesting/Mocks/OpenIdConnect/keys.json similarity index 100% rename from shared/Mocks/OpenIdConnect/keys.json rename to src/MusicStore/ForTesting/Mocks/OpenIdConnect/keys.json diff --git a/shared/Mocks/OpenIdConnect/openid-configuration.json b/src/MusicStore/ForTesting/Mocks/OpenIdConnect/openid-configuration.json similarity index 100% rename from shared/Mocks/OpenIdConnect/openid-configuration.json rename to src/MusicStore/ForTesting/Mocks/OpenIdConnect/openid-configuration.json diff --git a/shared/Mocks/Readme.md b/src/MusicStore/ForTesting/Mocks/Readme.md similarity index 100% rename from shared/Mocks/Readme.md rename to src/MusicStore/ForTesting/Mocks/Readme.md diff --git a/shared/Mocks/StartupOpenIdConnectTesting.cs b/src/MusicStore/ForTesting/Mocks/StartupOpenIdConnectTesting.cs similarity index 100% rename from shared/Mocks/StartupOpenIdConnectTesting.cs rename to src/MusicStore/ForTesting/Mocks/StartupOpenIdConnectTesting.cs diff --git a/shared/Mocks/StartupSocialTesting.cs b/src/MusicStore/ForTesting/Mocks/StartupSocialTesting.cs similarity index 100% rename from shared/Mocks/StartupSocialTesting.cs rename to src/MusicStore/ForTesting/Mocks/StartupSocialTesting.cs diff --git a/shared/Mocks/Twitter/CustomTwitterStateDataFormat.cs b/src/MusicStore/ForTesting/Mocks/Twitter/CustomTwitterStateDataFormat.cs similarity index 100% rename from shared/Mocks/Twitter/CustomTwitterStateDataFormat.cs rename to src/MusicStore/ForTesting/Mocks/Twitter/CustomTwitterStateDataFormat.cs diff --git a/shared/Mocks/Twitter/TestTwitterEvents.cs b/src/MusicStore/ForTesting/Mocks/Twitter/TestTwitterEvents.cs similarity index 100% rename from shared/Mocks/Twitter/TestTwitterEvents.cs rename to src/MusicStore/ForTesting/Mocks/Twitter/TestTwitterEvents.cs diff --git a/shared/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs b/src/MusicStore/ForTesting/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs similarity index 100% rename from shared/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs rename to src/MusicStore/ForTesting/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs diff --git a/shared/MusicStoreConfig.cs b/src/MusicStore/ForTesting/MusicStoreConfig.cs similarity index 100% rename from shared/MusicStoreConfig.cs rename to src/MusicStore/ForTesting/MusicStoreConfig.cs diff --git a/src/MusicStore/ForTesting/Readme.md b/src/MusicStore/ForTesting/Readme.md new file mode 100644 index 0000000000..b8c7e75a34 --- /dev/null +++ b/src/MusicStore/ForTesting/Readme.md @@ -0,0 +1 @@ +The contents of this folder are used for end to end testing. \ No newline at end of file diff --git a/src/MusicStore/project.json b/src/MusicStore/project.json index eb9af19161..f239ad9c48 100644 --- a/src/MusicStore/project.json +++ b/src/MusicStore/project.json @@ -5,18 +5,14 @@ "description": "Music store application on ASP.NET 5", "version": "1.1.0-*", "buildOptions": { - "compile": { - "include": [ - "../../shared/**/*.cs" - ] - }, "copyToOutput": { "include": [ "Areas", "Views", "wwwroot", "config.json", - "web.config" + "web.config", + "ForTesting/**/*.json" ] }, "define": [ @@ -33,7 +29,8 @@ "Views", "wwwroot", "config.json", - "web.config" + "web.config", + "ForTesting/**/*.json" ] }, "dependencies": { diff --git a/test/E2ETests/MusicStoreConfig.cs b/test/E2ETests/MusicStoreConfig.cs new file mode 100644 index 0000000000..8090b19a22 --- /dev/null +++ b/test/E2ETests/MusicStoreConfig.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace E2ETests +{ + public class MusicStoreConfig + { + public const string ConnectionStringKey = "Data__DefaultConnection__ConnectionString"; + } +} diff --git a/test/E2ETests/NtlmAuthentationTest.cs b/test/E2ETests/NtlmAuthentationTest.cs index 3e25489f30..59939b6265 100644 --- a/test/E2ETests/NtlmAuthentationTest.cs +++ b/test/E2ETests/NtlmAuthentationTest.cs @@ -53,7 +53,7 @@ namespace E2ETests // Override the connection strings using environment based configuration deploymentParameters.EnvironmentVariables .Add(new KeyValuePair( - MusicStore.StoreConfig.ConnectionStringKey, + MusicStoreConfig.ConnectionStringKey, DbUtils.CreateConnectionString(musicStoreDbName))); using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, _logger)) diff --git a/test/E2ETests/OpenIdConnectTests.cs b/test/E2ETests/OpenIdConnectTests.cs index d7d9e92dc3..1972201419 100644 --- a/test/E2ETests/OpenIdConnectTests.cs +++ b/test/E2ETests/OpenIdConnectTests.cs @@ -79,7 +79,7 @@ namespace E2ETests // Override the connection strings using environment based configuration deploymentParameters.EnvironmentVariables .Add(new KeyValuePair( - MusicStore.StoreConfig.ConnectionStringKey, + MusicStoreConfig.ConnectionStringKey, DbUtils.CreateConnectionString(musicStoreDbName))); using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, _logger)) diff --git a/test/E2ETests/PublishAndRunTests.cs b/test/E2ETests/PublishAndRunTests.cs index a0a59db858..19c95a5732 100644 --- a/test/E2ETests/PublishAndRunTests.cs +++ b/test/E2ETests/PublishAndRunTests.cs @@ -159,7 +159,7 @@ namespace E2ETests // Override the connection strings using environment based configuration deploymentParameters.EnvironmentVariables .Add(new KeyValuePair( - MusicStore.StoreConfig.ConnectionStringKey, + MusicStoreConfig.ConnectionStringKey, DbUtils.CreateConnectionString(musicStoreDbName))); using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, _logger)) diff --git a/test/E2ETests/SmokeTests.cs b/test/E2ETests/SmokeTests.cs index c15ed8d26a..bbec457924 100644 --- a/test/E2ETests/SmokeTests.cs +++ b/test/E2ETests/SmokeTests.cs @@ -195,7 +195,7 @@ namespace E2ETests // Override the connection strings using environment based configuration deploymentParameters.EnvironmentVariables .Add(new KeyValuePair( - MusicStore.StoreConfig.ConnectionStringKey, + MusicStoreConfig.ConnectionStringKey, DbUtils.CreateConnectionString(musicStoreDbName))); using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, _logger)) diff --git a/test/E2ETests/project.json b/test/E2ETests/project.json index 2a9668d368..7218f320b4 100644 --- a/test/E2ETests/project.json +++ b/test/E2ETests/project.json @@ -1,11 +1,6 @@ { "buildOptions": { - "warningsAsErrors": true, - "compile": { - "include": [ - "../../shared/**/*.cs" - ] - } + "warningsAsErrors": true }, "dependencies": { "dotnet-test-xunit": "2.2.0-*",