ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modify tests to use different settings for each microsevice

Browse Source
This commit is contained in:
dsanz 2017-04-07 16:12:58 +02:00
parent ccde4a09f4
commit 237c5424d8
10 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/Services/FunctionalTests/FunctionalTests.csproj
View File

@ -4,6 +4,16 @@
<TargetFramework>netcoreapp1.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<None Remove="Services\Catalog\settings.json" />
</ItemGroup>
<ItemGroup>
<Content Include="Services\Catalog\settings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
@ -23,7 +33,7 @@
<None Update="appsettings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="settings.json">
<None Update="Services\Ordering\settings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

2
test/Services/FunctionalTests/Services/Catalog/CatalogScenariosBase.cs
View File

@ -14,7 +14,7 @@ namespace FunctionalTests.Services.Catalog
public TestServer CreateServer()
{
var webHostBuilder = new WebHostBuilder();
webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory());
webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory() + "\\Services\\Catalog");
webHostBuilder.UseStartup<Startup>();
return new TestServer(webHostBuilder);

7
test/Services/FunctionalTests/Services/Catalog/settings.json Normal file
View File

@ -0,0 +1,7 @@
{
"ConnectionString": "Server=tcp:127.0.0.1,5433;Initial Catalog=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word",
"ExternalCatalogBaseUrl": "http://localhost:5101",
"IdentityUrl": "http://localhost:5105",
"isTest": "true",
"EventBusConnection": "localhost"
}

2
test/Services/FunctionalTests/Services/Ordering/OrderingScenariosBase.cs
View File

@ -12,7 +12,7 @@ namespace FunctionalTests.Services.Ordering
public TestServer CreateServer()
{
var webHostBuilder = new WebHostBuilder();
webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory());
webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory() + "\\Services\\Ordering");
webHostBuilder.UseStartup<OrderingTestsStartup>();
return new TestServer(webHostBuilder);

0
test/Services/FunctionalTests/settings.json → test/Services/FunctionalTests/Services/Ordering/settings.json
View File

11
test/Services/IntegrationTests/IntegrationTests.csproj
View File

@ -12,9 +12,16 @@
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
</PropertyGroup>
<ItemGroup>
<None Remove="Services\Catalog\settings.json" />
</ItemGroup>
<ItemGroup>
<!--<Content Include="settings.json;web.config">-->
<Content Include="settings.json">
<Content Include="Services\Catalog\settings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Services\Ordering\settings.json">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
</ItemGroup>
@ -35,7 +42,7 @@
</ItemGroup>
<ItemGroup>
<Content Update="settings.json">
<Content Update="Services\Ordering\settings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

2
test/Services/IntegrationTests/Services/Catalog/CatalogScenarioBase.cs
View File

@ -12,7 +12,7 @@ namespace IntegrationTests.Services.Catalog
public TestServer CreateServer()
{
var webHostBuilder = new WebHostBuilder();
webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory());
webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory() + "\\Services\\Catalog");
webHostBuilder.UseStartup<Startup>();
return new TestServer(webHostBuilder);

6
test/Services/IntegrationTests/Services/Catalog/settings.json Normal file
View File

@ -0,0 +1,6 @@
{
"ConnectionString": "Server=tcp:127.0.0.1,5433;Initial Catalog=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word",
"ExternalCatalogBaseUrl": "http://localhost:5101",
"IdentityUrl": "http://localhost:5105",
"isTest": "true"
}

2
test/Services/IntegrationTests/Services/Ordering/OrderingScenarioBase.cs
View File

@ -10,7 +10,7 @@
public TestServer CreateServer()
{
var webHostBuilder = new WebHostBuilder();
webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory());
webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory() + "\\Services\\Ordering");
webHostBuilder.UseStartup<OrderingTestsStartup>();
return new TestServer(webHostBuilder);

0
test/Services/IntegrationTests/settings.json → test/Services/IntegrationTests/Services/Ordering/settings.json
View File