From a9fc1e2c8d56262b344fdd1916914db7c942ff79 Mon Sep 17 00:00:00 2001
From: Miguel Veloso <mvelosop@gmail.com>
Date: Mon, 2 Dec 2019 20:27:01 +0000
Subject: [PATCH] Fix services test containers

---
 src/docker-compose-tests.override.yml | 20 ++++++++++----------
 src/docker-compose-tests.yml          | 18 +++++++++---------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/docker-compose-tests.override.yml b/src/docker-compose-tests.override.yml
index 35e8170da..6a2cf1991 100644
--- a/src/docker-compose-tests.override.yml
+++ b/src/docker-compose-tests.override.yml
@@ -41,7 +41,7 @@ services:
     ports:
       - "5105:80"
 
-  basket-api-test:
+  basket-api-functional-test:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
@@ -61,7 +61,7 @@ services:
         - dotnet
         - test
         - --logger
-        - trx;LogFileName=/tests/basket-test-results.xml
+        - trx;LogFileName=/tests/basket-functional-test-results.xml
 
   basket-api-unit-test:
     environment:
@@ -85,7 +85,7 @@ services:
         - --logger
         - trx;LogFileName=/tests/basket-unit-test-results.xml
 
-  catalog-api-test:
+  catalog-api-functional-test:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
@@ -107,7 +107,7 @@ services:
         - dotnet
         - test
         - --logger
-        - trx;LogFileName=/tests/catalog-test-results.xml
+        - trx;LogFileName=/tests/catalog-functional-test-results.xml
 
   catalog-api-unit-test:
     environment:
@@ -133,7 +133,7 @@ services:
         - --logger
         - trx;LogFileName=/tests/catalog-unit-test-results.xml
 
-  ordering-api-test:
+  ordering-api-functional-test:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
@@ -155,7 +155,7 @@ services:
         - dotnet
         - test
         - --logger
-        - trx;LogFileName=/tests/ordering-test-results.xml
+        - trx;LogFileName=/tests/ordering-functional-test-results.xml
 
   ordering-api-unit-test:
     environment:
@@ -181,7 +181,7 @@ services:
         - --logger
         - trx;LogFileName=/tests/ordering-unit-test-results.xml
 
-  marketing-api-test:
+  marketing-api-functional-test:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
@@ -208,7 +208,7 @@ services:
         - dotnet
         - test
         - --logger
-        - trx;LogFileName=/tests/marketing-test-results.xml
+        - trx;LogFileName=/tests/marketing-functional-test-results.xml
 
   payment-api-test:
     environment:
@@ -223,7 +223,7 @@ services:
     ports:
       - "5108:80"
 
-  locations-api-test:
+  locations-api-functional-test:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
@@ -244,4 +244,4 @@ services:
       - dotnet
       - test
       - --logger
-      - trx;LogFileName=/tests/locations-test-results.xml
\ No newline at end of file
+      - trx;LogFileName=/tests/locations-functional-test-results.xml
\ No newline at end of file
diff --git a/src/docker-compose-tests.yml b/src/docker-compose-tests.yml
index c4e14580d..75daf5a2f 100644
--- a/src/docker-compose-tests.yml
+++ b/src/docker-compose-tests.yml
@@ -21,7 +21,7 @@ services:
     depends_on:
       - sql-data-test
 
-  basket-api-test:
+  basket-api-functional-test:
     image: ${REGISTRY:-eshop}/basket-api-test:${TAG:-latest}
     build:
       context: .
@@ -35,7 +35,7 @@ services:
       - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
 
   basket-api-unit-test:
-    image: ${REGISTRY:-eshop}/basket-api-test:${TAG:-latest}
+    image: ${REGISTRY:-eshop}/basket-api-unit-test:${TAG:-latest}
     build:
       context: .
       dockerfile: Services/Basket/Basket.API/Dockerfile
@@ -47,8 +47,8 @@ services:
     volumes:
       - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
 
-  catalog-api-test:
-    image: ${REGISTRY:-eshop}/catalog-api-test:${TAG:-latest}
+  catalog-api-functional-test:
+    image: ${REGISTRY:-eshop}/catalog-api-functional-test:${TAG:-latest}
     build:
       context: .
       dockerfile: Services/Catalog/Catalog.API/Dockerfile
@@ -60,7 +60,7 @@ services:
       - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
 
   catalog-api-unit-test:
-    image: ${REGISTRY:-eshop}/catalog-api-test:${TAG:-latest}
+    image: ${REGISTRY:-eshop}/catalog-api-unit-test:${TAG:-latest}
     build:
       context: .
       dockerfile: Services/Catalog/Catalog.API/Dockerfile
@@ -71,7 +71,7 @@ services:
     volumes:
       - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
 
-  ordering-api-test:
+  ordering-api-functional-test:
     image: ${REGISTRY:-eshop}/ordering-api-test:${TAG:-latest}
     build:
       context: .
@@ -84,7 +84,7 @@ services:
       - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
 
   ordering-api-unit-test:
-    image: ${REGISTRY:-eshop}/ordering-api-test:${TAG:-latest}
+    image: ${REGISTRY:-eshop}/ordering-api-unit-test:${TAG:-latest}
     build:
       context: .
       dockerfile: Services/Ordering/Ordering.API/Dockerfile
@@ -95,7 +95,7 @@ services:
     volumes:
       - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
 
-  marketing-api-test:
+  marketing-api-functional-test:
     image: ${REGISTRY:-eshop}/marketing-api-test:${TAG:-latest}
     build:
       context: .
@@ -117,7 +117,7 @@ services:
     depends_on:
       - rabbitmq-test
 
-  locations-api-test:
+  locations-api-functional-test:
     image: ${REGISTRY:-eshop}/locations-api-test:${TAG:-latest}
     build:
       context: .