update test

.gitignore

@@ -7,6 +7,7 @@
 *.userosscache
 *.sln.docstates
 .vscode/
+tests-results/*.xml
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

docker-compose-tests.override.yml

@@ -46,7 +46,7 @@ services:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - ConnectionString=${ESHOP_AZURE_REDIS_BASKET_DB:-basket-data-test}
-      - identityUrl=http://identity-api
+      - identityUrl=http://identity-api-test
       - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq-test}
       - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
@@ -68,7 +68,7 @@ services:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - ConnectionString=${ESHOP_AZURE_REDIS_BASKET_DB:-basket-data-test}
-      - identityUrl=http://identity-api
+      - identityUrl=http://identity-api-test
       - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq-test}
       - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
@@ -138,7 +138,7 @@ services:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql-data-test;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
-      - identityUrl=http://identity-api
+      - identityUrl=http://identity-api-test
       - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq-test}
       - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
@@ -162,7 +162,7 @@ services:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql-data-test;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
-      - identityUrl=http://identity-api
+      - identityUrl=http://identity-api-test
       - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq-test}
       - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
@@ -179,7 +179,7 @@ services:
         - dotnet
         - test
         - --logger
-        - trx;LogFileName=/tests/ordering-unit-test-results.xml  
+        - trx;LogFileName=/tests/ordering-unit-test-results.xml
 
   marketing-api-test:
     environment:
@@ -191,7 +191,7 @@ services:
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq-test}
       - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
       - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
-      - identityUrl=http://identity-api
+      - identityUrl=http://identity-api-test
       - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
       - CampaignDetailFunctionUri=${ESHOP_AZUREFUNC_CAMPAIGN_DETAILS_URI}
       - PicBaseUrl=${ESHOP_AZURE_STORAGE_MARKETING_URL:-http://localhost:5110/api/v1/campaigns/[0]/pic/}
@@ -229,7 +229,7 @@ services:
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - ConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosql-data-test}
       - Database=LocationsDb
-      - identityUrl=http://identity-api
+      - identityUrl=http://identity-api-test
       - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq-test}
       - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}

src/Services/Basket/Basket.API/Dockerfile

@@ -5,6 +5,13 @@ EXPOSE 80
 FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /src
 COPY . .
+
+WORKDIR /src/src/Services/Basket/Basket.FunctionalTests
+RUN dotnet restore -nowarn:msb3202,nu1503
+
+WORKDIR /src/src/Services/Basket/Basket.UnitTests
+RUN dotnet restore -nowarn:msb3202,nu1503
+
 WORKDIR /src/src/Services/Basket/Basket.API
 RUN dotnet restore -nowarn:msb3202,nu1503
 RUN dotnet build --no-restore -c Release -o /app

src/Services/Catalog/Catalog.API/Dockerfile

@@ -5,6 +5,13 @@ EXPOSE 80
 FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /src
 COPY . .
+
+WORKDIR /src/src/Services/Catalog/Catalog.UnitTests
+RUN dotnet restore -nowarn:msb3202,nu1503
+
+WORKDIR /src/src/Services/Catalog/Catalog.FunctionalTests
+RUN dotnet restore -nowarn:msb3202,nu1503
+
 WORKDIR /src/src/Services/Catalog/Catalog.API
 RUN dotnet restore -nowarn:msb3202,nu1503
 RUN dotnet build --no-restore -c Release -o /app

src/Services/Location/Locations.API/Dockerfile

@@ -5,6 +5,10 @@ EXPOSE 80
 FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /src
 COPY . .
+
+WORKDIR /src/src/Services/Location/Locations.FunctionalTests
+RUN dotnet restore -nowarn:msb3202,nu1503
+
 WORKDIR /src/src/Services/Location/Locations.API
 RUN dotnet restore -nowarn:msb3202,nu1503
 RUN dotnet build --no-restore -c Release -o /app

src/Services/Marketing/Marketing.API/Dockerfile

@@ -5,6 +5,10 @@ EXPOSE 80
 FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /src
 COPY . .
+
+WORKDIR /src/src/Services/Marketing/Marketing.FunctionalTests
+RUN dotnet restore -nowarn:msb3202,nu1503
+
 WORKDIR /src/src/Services/Marketing/Marketing.API
 RUN dotnet restore -nowarn:msb3202,nu1503
 RUN dotnet build --no-restore -c Release -o /app

src/Services/Marketing/Marketing.FunctionalTests/CampaignScenarios.cs

@@ -27,7 +27,7 @@ namespace Marketing.FunctionalTests
         [Fact]
         public async Task Get_get_campaign_by_id_and_response_ok_status_code()
         {
-            var campaignId = 81;
+            var campaignId = 21;
             using (var server = CreateServer())
             {
                 var response = await server.CreateClient()

src/Services/Marketing/Marketing.FunctionalTests/UserLocationRoleScenarios.cs

@@ -28,7 +28,7 @@ namespace Marketing.FunctionalTests
         [Fact]
         public async Task Post_add_new_user_location_rule_and_response_ok_status_code()
         {
-            var campaignId = 81;
+            var campaignId = 21;
 
             using (var server = CreateServer())
             {
@@ -44,7 +44,7 @@ namespace Marketing.FunctionalTests
         [Fact]
         public async Task Delete_delete_user_location_role_and_response_not_content_status_code()
         {
-            var campaignId = 81;
+            var campaignId = 21;
 
             using (var server = CreateServer())
             {

src/Services/Ordering/Ordering.API/Dockerfile

@@ -5,6 +5,13 @@ EXPOSE 80
 FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /src
 COPY . .
+
+WORKDIR /src/src/Services/Ordering/Ordering.FunctionalTests
+RUN dotnet restore -nowarn:msb3202,nu1503
+
+WORKDIR /src/src/Services/Ordering/Ordering.UnitTests
+RUN dotnet restore -nowarn:msb3202,nu1503
+
 WORKDIR /src/src/Services/Ordering/Ordering.API
 RUN dotnet restore -nowarn:msb3202,nu1503
 RUN dotnet build --no-restore -c Release -o /app