From 2bc0c32f07bf45e8d2ee3dbbf17aef243205f1b6 Mon Sep 17 00:00:00 2001 From: Erik Pique Date: Tue, 11 Dec 2018 11:32:46 +0100 Subject: [PATCH] update test --- .gitignore | 1 + docker-compose-tests.override.yml | 14 +++++++------- src/Services/Basket/Basket.API/Dockerfile | 7 +++++++ src/Services/Catalog/Catalog.API/Dockerfile | 7 +++++++ src/Services/Location/Locations.API/Dockerfile | 4 ++++ src/Services/Marketing/Marketing.API/Dockerfile | 4 ++++ .../Marketing.FunctionalTests/CampaignScenarios.cs | 2 +- .../UserLocationRoleScenarios.cs | 4 ++-- src/Services/Ordering/Ordering.API/Dockerfile | 7 +++++++ 9 files changed, 40 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 3c690a758..8eed66fcf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ *.userosscache *.sln.docstates .vscode/ +tests-results/*.xml # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs diff --git a/docker-compose-tests.override.yml b/docker-compose-tests.override.yml index 8705e703f..bd70d7bc9 100644 --- a/docker-compose-tests.override.yml +++ b/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} diff --git a/src/Services/Basket/Basket.API/Dockerfile b/src/Services/Basket/Basket.API/Dockerfile index 71f85bb59..d6b2f5a02 100644 --- a/src/Services/Basket/Basket.API/Dockerfile +++ b/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 diff --git a/src/Services/Catalog/Catalog.API/Dockerfile b/src/Services/Catalog/Catalog.API/Dockerfile index 1b0d05e57..37e272186 100644 --- a/src/Services/Catalog/Catalog.API/Dockerfile +++ b/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 diff --git a/src/Services/Location/Locations.API/Dockerfile b/src/Services/Location/Locations.API/Dockerfile index ef9bbbc81..ad92837e0 100644 --- a/src/Services/Location/Locations.API/Dockerfile +++ b/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 diff --git a/src/Services/Marketing/Marketing.API/Dockerfile b/src/Services/Marketing/Marketing.API/Dockerfile index d047becea..980cf6dcb 100644 --- a/src/Services/Marketing/Marketing.API/Dockerfile +++ b/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 diff --git a/src/Services/Marketing/Marketing.FunctionalTests/CampaignScenarios.cs b/src/Services/Marketing/Marketing.FunctionalTests/CampaignScenarios.cs index 7085e27b5..04bb9e2c0 100644 --- a/src/Services/Marketing/Marketing.FunctionalTests/CampaignScenarios.cs +++ b/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() diff --git a/src/Services/Marketing/Marketing.FunctionalTests/UserLocationRoleScenarios.cs b/src/Services/Marketing/Marketing.FunctionalTests/UserLocationRoleScenarios.cs index fa734bbdf..7314f0bd9 100644 --- a/src/Services/Marketing/Marketing.FunctionalTests/UserLocationRoleScenarios.cs +++ b/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()) { diff --git a/src/Services/Ordering/Ordering.API/Dockerfile b/src/Services/Ordering/Ordering.API/Dockerfile index 759278bc4..859842b91 100644 --- a/src/Services/Ordering/Ordering.API/Dockerfile +++ b/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