Run unit and integration tests from VS

src/Create-DockerfileSolutionRestore.ps1

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

src/docker-compose-tests.override.yml

@@ -4,7 +4,7 @@ services:
   rabbitmq-test:
     ports:
       - "15672:15672"
-      - "5672:5672" 
+      - "5672:5672"
 
   basket-data-test:
     ports:
@@ -27,7 +27,7 @@ services:
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - SpaClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5104
       - 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
       - LocationApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5109
       - MarketingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5110
@@ -35,7 +35,7 @@ services:
       - OrderingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102
       - MobileShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5120
       - WebShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5121
-      - UseCustomizationData=True  
+      - UseCustomizationData=True
       - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
       - OrchestratorType=${ORCHESTRATOR_TYPE}
     ports:
@@ -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:

src/docker-compose-tests.yml

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

src/docker-compose.yml

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

src/run-test-infrastructure.ps1

@@ -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