Modify tests to use different settings for each microsevice

dsrodenas · dsrodenas · commit 1420562b3482 · 2017-04-07T16:12:58.000+02:00
diff --git a/test/Services/FunctionalTests/FunctionalTests.csproj b/test/Services/FunctionalTests/FunctionalTests.csproj
@@ -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>
diff --git a/test/Services/FunctionalTests/Services/Catalog/CatalogScenariosBase.cs b/test/Services/FunctionalTests/Services/Catalog/CatalogScenariosBase.cs
@@ -14,7 +14,7 @@ public class CatalogScenariosBase
         public TestServer CreateServer()
         {
             var webHostBuilder = new WebHostBuilder();
-            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory());
+            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory() + "\\Services\\Catalog");
             webHostBuilder.UseStartup<Startup>();
 
             return new TestServer(webHostBuilder);
diff --git a/test/Services/FunctionalTests/Services/Catalog/settings.json b/test/Services/FunctionalTests/Services/Catalog/settings.json
@@ -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"
+}
diff --git a/test/Services/FunctionalTests/Services/Ordering/OrderingScenariosBase.cs b/test/Services/FunctionalTests/Services/Ordering/OrderingScenariosBase.cs
@@ -12,7 +12,7 @@ public class OrderingScenariosBase
         public TestServer CreateServer()
         {
             var webHostBuilder = new WebHostBuilder();
-            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory());
+            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory() + "\\Services\\Ordering");
             webHostBuilder.UseStartup<OrderingTestsStartup>();
 
             return new TestServer(webHostBuilder);
diff --git a/test/Services/FunctionalTests/Services/Ordering/settings.json b/test/Services/FunctionalTests/Services/Ordering/settings.json
diff --git a/test/Services/IntegrationTests/IntegrationTests.csproj b/test/Services/IntegrationTests/IntegrationTests.csproj
@@ -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>
diff --git a/test/Services/IntegrationTests/Services/Catalog/CatalogScenarioBase.cs b/test/Services/IntegrationTests/Services/Catalog/CatalogScenarioBase.cs
@@ -12,7 +12,7 @@ public class CatalogScenarioBase
         public TestServer CreateServer()
         {
             var webHostBuilder = new WebHostBuilder();
-            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory());
+            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory() + "\\Services\\Catalog");
             webHostBuilder.UseStartup<Startup>();
 
             return new TestServer(webHostBuilder);
diff --git a/test/Services/IntegrationTests/Services/Catalog/settings.json b/test/Services/IntegrationTests/Services/Catalog/settings.json
@@ -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"
+}
diff --git a/test/Services/IntegrationTests/Services/Ordering/OrderingScenarioBase.cs b/test/Services/IntegrationTests/Services/Ordering/OrderingScenarioBase.cs
@@ -10,7 +10,7 @@ public class OrderingScenarioBase
         public TestServer CreateServer()
         {
             var webHostBuilder = new WebHostBuilder();            
-            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory());
+            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory() + "\\Services\\Ordering");
             webHostBuilder.UseStartup<OrderingTestsStartup>();
 
             return new TestServer(webHostBuilder);
diff --git a/test/Services/IntegrationTests/Services/Ordering/settings.json b/test/Services/IntegrationTests/Services/Ordering/settings.json

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public class CatalogScenariosBase`
`14`	`14`	`public TestServer CreateServer()`
`15`	`15`	`{`
`16`	`16`	`var webHostBuilder = new WebHostBuilder();`
`17`		`- webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory());`
	`17`	`+ webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory() + "\\Services\\Catalog");`
`18`	`18`	`webHostBuilder.UseStartup<Startup>();`
`19`	`19`
`20`	`20`	`return new TestServer(webHostBuilder);`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class OrderingScenariosBase`
`12`	`12`	`public TestServer CreateServer()`
`13`	`13`	`{`
`14`	`14`	`var webHostBuilder = new WebHostBuilder();`
`15`		`- webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory());`
	`15`	`+ webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory() + "\\Services\\Ordering");`
`16`	`16`	`webHostBuilder.UseStartup<OrderingTestsStartup>();`
`17`	`17`
`18`	`18`	`return new TestServer(webHostBuilder);`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class CatalogScenarioBase`
`12`	`12`	`public TestServer CreateServer()`
`13`	`13`	`{`
`14`	`14`	`var webHostBuilder = new WebHostBuilder();`
`15`		`- webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory());`
	`15`	`+ webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory() + "\\Services\\Catalog");`
`16`	`16`	`webHostBuilder.UseStartup<Startup>();`
`17`	`17`
`18`	`18`	`return new TestServer(webHostBuilder);`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public class OrderingScenarioBase`
`10`	`10`	`public TestServer CreateServer()`
`11`	`11`	`{`
`12`	`12`	`var webHostBuilder = new WebHostBuilder();`
`13`		`- webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory());`
	`13`	`+ webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory() + "\\Services\\Ordering");`
`14`	`14`	`webHostBuilder.UseStartup<OrderingTestsStartup>();`
`15`	`15`
`16`	`16`	`return new TestServer(webHostBuilder);`