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

Run unit and integration tests from VS

dotnet3-migration/reorganize-folders
Miguel Veloso 5 years ago
parent
4b48468d6a
commit
3adb63aba5
6 changed files with 31 additions and 30 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      src/Create-DockerfileSolutionRestore.ps1
  2. +0
    -0
      src/DockerfileSolutionRestore.txt
  3. +4
    -4
      src/docker-compose-tests.override.yml
  4. +15
    -15
      src/docker-compose-tests.yml
  5. +10
    -10
      src/docker-compose.yml
  6. +1
    -0
      src/run-test-infrastructure.ps1

src/Get-DockerfileSolutionProjects.ps1 → src/Create-DockerfileSolutionRestore.ps1 View File

@ -2,7 +2,7 @@ param (
[string]$solution = "eShopOnContainers-ServicesAndWebApps.sln" [string]$solution = "eShopOnContainers-ServicesAndWebApps.sln"
) )
$outfile = "DockerfileSolutionProjects.txt"
$outfile = "DockerfileSolutionRestore.txt"
Write-Output "COPY ""$solution"" ""$solution""" > $outfile Write-Output "COPY ""$solution"" ""$solution""" > $outfile

src/DockerfileSolutionProjects.txt → src/DockerfileSolutionRestore.txt View File


+ 4
- 4
src/docker-compose-tests.override.yml View File

@ -4,7 +4,7 @@ services:
rabbitmq-test: rabbitmq-test:
ports: ports:
- "15672:15672" - "15672:15672"
- "5672:5672"
- "5672:5672"
basket-data-test: basket-data-test:
ports: ports:
@ -27,7 +27,7 @@ services:
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
- SpaClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5104 - SpaClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5104
- XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105/xamarincallback - XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105/xamarincallback
- ConnectionString=${ESHOP_AZURE_IDENTITY_DB:-Server=sql-data-test;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word}
- ConnectionString=${ESHOP_AZURE_IDENTITY_DB:-Server=sql-data-test;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word}
- MvcClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5100 - MvcClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5100
- LocationApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5109 - LocationApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5109
- MarketingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5110 - MarketingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5110
@ -35,7 +35,7 @@ services:
- OrderingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102 - OrderingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102
- MobileShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5120 - MobileShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5120
- WebShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5121 - WebShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5121
- UseCustomizationData=True
- UseCustomizationData=True
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY} - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
- OrchestratorType=${ORCHESTRATOR_TYPE} - OrchestratorType=${ORCHESTRATOR_TYPE}
ports: ports:
@ -179,7 +179,7 @@ services:
- dotnet - dotnet
- test - test
- --logger - --logger
- trx;LogFileName=/tests/ordering-unit-test-results.xml
- trx;LogFileName=/tests/ordering-unit-test-results.xml
marketing-api-test: marketing-api-test:
environment: environment:


+ 15
- 15
src/docker-compose-tests.yml View File

@ -1,18 +1,18 @@
version: '3.4' version: '3.4'
services: services:
rabbitmq-test:
image: rabbitmq:3-management-alpine
basket-data-test:
image: redis:alpine
sql-data-test: sql-data-test:
image: microsoft/mssql-server-linux:2017-latest image: microsoft/mssql-server-linux:2017-latest
nosql-data-test: nosql-data-test:
image: mongo image: mongo
basket-data-test:
image: redis:alpine
rabbitmq-test:
image: rabbitmq:3-management-alpine
identity-api-test: identity-api-test:
image: ${REGISTRY:-eshop}/identity-api-test:${TAG:-latest} image: ${REGISTRY:-eshop}/identity-api-test:${TAG:-latest}
build: build:
@ -31,7 +31,7 @@ services:
- basket-data-test - basket-data-test
- identity-api-test - identity-api-test
- rabbitmq-test - rabbitmq-test
volumes:
volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
basket-api-unit-test: basket-api-unit-test:
@ -44,7 +44,7 @@ services:
- basket-data-test - basket-data-test
- identity-api-test - identity-api-test
- rabbitmq-test - rabbitmq-test
volumes:
volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
catalog-api-test: catalog-api-test:
@ -56,7 +56,7 @@ services:
depends_on: depends_on:
- sql-data-test - sql-data-test
- rabbitmq-test - rabbitmq-test
volumes:
volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
catalog-api-unit-test: catalog-api-unit-test:
@ -68,7 +68,7 @@ services:
depends_on: depends_on:
- sql-data-test - sql-data-test
- rabbitmq-test - rabbitmq-test
volumes:
volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
ordering-api-test: ordering-api-test:
@ -80,7 +80,7 @@ services:
depends_on: depends_on:
- sql-data-test - sql-data-test
- rabbitmq-test - rabbitmq-test
volumes:
volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
ordering-api-unit-test: ordering-api-unit-test:
@ -92,8 +92,8 @@ services:
depends_on: depends_on:
- sql-data-test - sql-data-test
- rabbitmq-test - rabbitmq-test
volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
marketing-api-test: marketing-api-test:
image: ${REGISTRY:-eshop}/marketing-api-test:${TAG:-latest} image: ${REGISTRY:-eshop}/marketing-api-test:${TAG:-latest}
@ -106,7 +106,7 @@ services:
- nosql-data-test - nosql-data-test
- identity-api-test - identity-api-test
- rabbitmq-test - rabbitmq-test
volumes:
volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
payment-api-test: payment-api-test:
@ -126,5 +126,5 @@ services:
depends_on: depends_on:
- nosql-data-test - nosql-data-test
- rabbitmq-test - rabbitmq-test
volumes:
volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests

+ 10
- 10
src/docker-compose.yml View File

@ -21,7 +21,7 @@ services:
image: ${REGISTRY:-eshop}/identity.api:${PLATFORM:-linux}-${TAG:-latest} image: ${REGISTRY:-eshop}/identity.api:${PLATFORM:-linux}-${TAG:-latest}
build: build:
context: . context: .
dockerfile: Services/Identity/Identity.API/Dockerfile
dockerfile: Services/Identity/Identity.API/Dockerfile
depends_on: depends_on:
- sqldata - sqldata
@ -29,7 +29,7 @@ services:
image: ${REGISTRY:-eshop}/basket.api:${PLATFORM:-linux}-${TAG:-latest} image: ${REGISTRY:-eshop}/basket.api:${PLATFORM:-linux}-${TAG:-latest}
build: build:
context: . context: .
dockerfile: Services/Basket/Basket.API/Dockerfile
dockerfile: Services/Basket/Basket.API/Dockerfile
depends_on: depends_on:
- basketdata - basketdata
- identity-api - identity-api
@ -48,7 +48,7 @@ services:
image: ${REGISTRY:-eshop}/ordering.api:${PLATFORM:-linux}-${TAG:-latest} image: ${REGISTRY:-eshop}/ordering.api:${PLATFORM:-linux}-${TAG:-latest}
build: build:
context: . context: .
dockerfile: Services/Ordering/Ordering.API/Dockerfile
dockerfile: Services/Ordering/Ordering.API/Dockerfile
depends_on: depends_on:
- sqldata - sqldata
- rabbitmq - rabbitmq
@ -57,7 +57,7 @@ services:
image: ${REGISTRY:-eshop}/ordering.backgroundtasks:${PLATFORM:-linux}-${TAG:-latest} image: ${REGISTRY:-eshop}/ordering.backgroundtasks:${PLATFORM:-linux}-${TAG:-latest}
build: build:
context: . context: .
dockerfile: Services/Ordering/Ordering.BackgroundTasks/Dockerfile
dockerfile: Services/Ordering/Ordering.BackgroundTasks/Dockerfile
depends_on: depends_on:
- sqldata - sqldata
- rabbitmq - rabbitmq
@ -66,7 +66,7 @@ services:
image: ${REGISTRY:-eshop}/marketing.api:${PLATFORM:-linux}-${TAG:-latest} image: ${REGISTRY:-eshop}/marketing.api:${PLATFORM:-linux}-${TAG:-latest}
build: build:
context: . context: .
dockerfile: Services/Marketing/Marketing.API/Dockerfile
dockerfile: Services/Marketing/Marketing.API/Dockerfile
depends_on: depends_on:
- sqldata - sqldata
- nosqldata - nosqldata
@ -79,7 +79,7 @@ services:
context: . context: .
dockerfile: Services/Payment/Payment.API/Dockerfile dockerfile: Services/Payment/Payment.API/Dockerfile
depends_on: depends_on:
- rabbitmq
- rabbitmq
locations-api: locations-api:
image: ${REGISTRY:-eshop}/locations.api:${PLATFORM:-linux}-${TAG:-latest} image: ${REGISTRY:-eshop}/locations.api:${PLATFORM:-linux}-${TAG:-latest}
@ -96,7 +96,7 @@ services:
context: . context: .
dockerfile: Services/Webhooks/Webhooks.API/Dockerfile dockerfile: Services/Webhooks/Webhooks.API/Dockerfile
depends_on: depends_on:
- sqldata
- sqldata
mobileshoppingapigw: mobileshoppingapigw:
image: envoyproxy/envoy:v1.11.1 image: envoyproxy/envoy:v1.11.1
@ -159,7 +159,7 @@ services:
image: ${REGISTRY:-eshop}/webspa:${PLATFORM:-linux}-${TAG:-latest} image: ${REGISTRY:-eshop}/webspa:${PLATFORM:-linux}-${TAG:-latest}
build: build:
context: . context: .
dockerfile: Web/WebSPA/Dockerfile
dockerfile: Web/WebSPA/Dockerfile
args: args:
NODE_IMAGE: ${NODE_IMAGE:-node:8.11} NODE_IMAGE: ${NODE_IMAGE:-node:8.11}
# depends_on: # depends_on:
@ -171,7 +171,7 @@ services:
image: ${REGISTRY:-eshop}/webmvc:${PLATFORM:-linux}-${TAG:-latest} image: ${REGISTRY:-eshop}/webmvc:${PLATFORM:-linux}-${TAG:-latest}
build: build:
context: . context: .
dockerfile: Web/WebMVC/Dockerfile
dockerfile: Web/WebMVC/Dockerfile
depends_on: depends_on:
- webshoppingagg - webshoppingagg
- webshoppingapigw - webshoppingapigw
@ -183,7 +183,7 @@ services:
context: . context: .
dockerfile: Web/WebhookClient/Dockerfile dockerfile: Web/WebhookClient/Dockerfile
depends_on: depends_on:
- webhooks-api
- webhooks-api
webshoppingapigw: webshoppingapigw:
image: envoyproxy/envoy:v1.11.1 image: envoyproxy/envoy:v1.11.1


+ 1
- 0
src/run-test-infrastructure.ps1 View File

@ -0,0 +1 @@
docker-compose -f .\docker-compose-tests.yml -f .\docker-compose-tests.override.yml up sql-data-test nosql-data-test basket-data-test rabbitmq-test identity-api-test payment-api-test

Write Preview
Loading…
Cancel
Save