diff --git a/docker-compose-tests.override.yml b/docker-compose-tests.override.yml
index b22402011..e335feeba 100644
--- a/docker-compose-tests.override.yml
+++ b/docker-compose-tests.override.yml
@@ -61,7 +61,29 @@ services:
- dotnet
- test
- --logger
- - trx;LogFileName=basket-test-results.xml
+ - trx;LogFileName=/tests/basket-test-results.xml
+
+ basket-api-unit-test:
+ environment:
+ - ASPNETCORE_ENVIRONMENT=Development
+ - ASPNETCORE_URLS=http://0.0.0.0:80
+ - ConnectionString=${ESHOP_AZURE_REDIS_BASKET_DB:-basket-data-test}
+ - identityUrl=http://identity-api
+ - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
+ - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq-test}
+ - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
+ - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
+ - AzureServiceBusEnabled=False
+ - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
+ - OrchestratorType=${ORCHESTRATOR_TYPE}
+ - UseLoadTest=${USE_LOADTEST:-False}
+ ports:
+ - "5113:80"
+ entrypoint:
+ - dotnet
+ - test
+ - --logger
+ - trx;LogFileName=/tests/basket-unit-test-results.xml
catalog-api-test:
environment:
@@ -85,7 +107,31 @@ services:
- dotnet
- test
- --logger
- - trx;LogFileName=catalog-test-results.xml
+ - trx;LogFileName=/tests/catalog-test-results.xml
+
+ catalog-api-unit-test:
+ environment:
+ - ASPNETCORE_ENVIRONMENT=Development
+ - ASPNETCORE_URLS=http://0.0.0.0:80
+ - ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sql-data-test;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word}
+ - PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG_URL:-http://localhost:5202/api/v1/c/catalog/items/[0]/pic/}
+ - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq-test}
+ - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
+ - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
+ - AzureStorageAccountName=${ESHOP_AZURE_STORAGE_CATALOG_NAME}
+ - AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_CATALOG_KEY}
+ - UseCustomizationData=True
+ - AzureServiceBusEnabled=False
+ - AzureStorageEnabled=False
+ - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
+ - OrchestratorType=${ORCHESTRATOR_TYPE}
+ ports:
+ - "5191:80"
+ entrypoint:
+ - dotnet
+ - test
+ - --logger
+ - trx;LogFileName=/tests/catalog-unit-test-results.xml
ordering-api-test:
environment:
@@ -109,7 +155,31 @@ services:
- dotnet
- test
- --logger
- - trx;LogFileName=ordering-test-results.xml
+ - trx;LogFileName=/tests/ordering-test-results.xml
+
+ ordering-api-unit-test:
+ environment:
+ - 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
+ - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
+ - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq-test}
+ - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
+ - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
+ - UseCustomizationData=True
+ - AzureServiceBusEnabled=False
+ - CheckUpdateTime=30000
+ - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
+ - OrchestratorType=${ORCHESTRATOR_TYPE}
+ - UseLoadTest=${USE_LOADTEST:-False}
+ ports:
+ - "5112:80"
+ entrypoint:
+ - dotnet
+ - test
+ - --logger
+ - trx;LogFileName=/tests/ordering-unit-test-results.xml
ordering-backgroundtasks-test:
environment:
@@ -155,7 +225,8 @@ services:
entrypoint:
- dotnet
- test
- - --logger:trx;LogFileName=marketing-test-results.xml
+ - --logger
+ - trx;LogFileName=/tests/marketing-test-results.xml
payment-api-test:
environment:
@@ -190,4 +261,5 @@ services:
entrypoint:
- dotnet
- test
- - --logger:trx;LogFileName=locations-test-results.xml
\ No newline at end of file
+ - --logger
+ - trx;LogFileName=/tests/locations-test-results.xml
\ No newline at end of file
diff --git a/docker-compose-tests.yml b/docker-compose-tests.yml
index aefea83e2..c636172cb 100644
--- a/docker-compose-tests.yml
+++ b/docker-compose-tests.yml
@@ -18,7 +18,6 @@ services:
build:
context: .
dockerfile: src/Services/Identity/Identity.API/Dockerfile
- target: functionaltest
depends_on:
- sql-data-test
@@ -35,6 +34,19 @@ services:
volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
+ basket-api-unit-test:
+ image: eshop/basket-api-test:${TAG:-latest}
+ build:
+ context: .
+ dockerfile: src/Services/Basket/Basket.API/Dockerfile
+ target: unittest
+ depends_on:
+ - basket-data-test
+ - identity-api-test
+ - rabbitmq-test
+ volumes:
+ - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
+
catalog-api-test:
image: eshop/catalog-api-test:${TAG:-latest}
build:
@@ -47,6 +59,18 @@ services:
volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
+ catalog-api-unit-test:
+ image: eshop/catalog-api-test:${TAG:-latest}
+ build:
+ context: .
+ dockerfile: src/Services/Catalog/Catalog.API/Dockerfile
+ target: unittest
+ depends_on:
+ - sql-data-test
+ - rabbitmq-test
+ volumes:
+ - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
+
ordering-api-test:
image: eshop/ordering-api-test:${TAG:-latest}
build:
@@ -59,6 +83,18 @@ services:
volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
+ ordering-api-unit-test:
+ image: eshop/ordering-api-test:${TAG:-latest}
+ build:
+ context: .
+ dockerfile: src/Services/Ordering/Ordering.API/Dockerfile
+ target: unittest
+ depends_on:
+ - sql-data-test
+ - rabbitmq-test
+ volumes:
+ - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
+
ordering-backgroundtasks-test:
image: eshop/ordering-backgroundtasks-test:${TAG:-latest}
build:
@@ -88,7 +124,6 @@ services:
build:
context: .
dockerfile: src/Services/Payment/Payment.API/Dockerfile
- target: functionaltest
depends_on:
- rabbitmq-test
diff --git a/src/Services/Basket/Basket.API/Dockerfile b/src/Services/Basket/Basket.API/Dockerfile
index 8db634288..71f85bb59 100644
--- a/src/Services/Basket/Basket.API/Dockerfile
+++ b/src/Services/Basket/Basket.API/Dockerfile
@@ -12,9 +12,8 @@ RUN dotnet build --no-restore -c Release -o /app
FROM build as functionaltest
WORKDIR /src/src/Services/Basket/Basket.FunctionalTests
-FROM build as test
+FROM build as unittest
WORKDIR /src/src/Services/Basket/Basket.UnitTests
-RUN dotnet test --logger trx;LogFileName=basket.api.unit-test-results.xml
FROM build AS publish
RUN dotnet publish --no-restore -c Release -o /app
diff --git a/src/Services/Catalog/Catalog.API/Dockerfile b/src/Services/Catalog/Catalog.API/Dockerfile
index fba7ebe78..1b0d05e57 100644
--- a/src/Services/Catalog/Catalog.API/Dockerfile
+++ b/src/Services/Catalog/Catalog.API/Dockerfile
@@ -9,13 +9,12 @@ WORKDIR /src/src/Services/Catalog/Catalog.API
RUN dotnet restore -nowarn:msb3202,nu1503
RUN dotnet build --no-restore -c Release -o /app
+FROM build as unittest
+WORKDIR /src/src/Services/Catalog/Catalog.UnitTests
+
FROM build as functionaltest
WORKDIR /src/src/Services/Catalog/Catalog.FunctionalTests
-FROM build as test
-WORKDIR /src/src/Services/Catalog/Catalog.UnitTests
-RUN dotnet test --logger trx;LogFileName=/catalog.api.unit-test-results.xml
-
FROM build AS publish
RUN dotnet publish --no-restore -c Release -o /app
diff --git a/src/Services/Ordering/Ordering.API/Dockerfile b/src/Services/Ordering/Ordering.API/Dockerfile
index c80a8c2ab..759278bc4 100644
--- a/src/Services/Ordering/Ordering.API/Dockerfile
+++ b/src/Services/Ordering/Ordering.API/Dockerfile
@@ -12,9 +12,8 @@ RUN dotnet build --no-restore -c Release -o /app
FROM build as functionaltest
WORKDIR /src/src/Services/Ordering/Ordering.FunctionalTests
-FROM build as test
+FROM build as unittest
WORKDIR /src/src/Services/Ordering/Ordering.UnitTests
-RUN dotnet test --logger trx;LogFileName=/ordering.api.unit-test-results.xml
FROM build AS publish
RUN dotnet publish --no-restore -c Release -o /app
diff --git a/tests-results/basket-test-results.xml b/tests-results/basket-test-results.xml
new file mode 100644
index 000000000..e13cb7118
--- /dev/null
+++ b/tests-results/basket-test-results.xml
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [xUnit.net 00:00:03.2739919] Basket.FunctionalTests.RedisBasketRepositoryTests.UpdateBasket_return_and_add_basket [FAIL]
+
+
+ [xUnit.net 00:00:03.3153598] Basket.FunctionalTests.RedisBasketRepositoryTests.Delete_Basket_return_null [FAIL]
+
+
+
+
\ No newline at end of file
diff --git a/tests-results/basket-unit-test-results.xml b/tests-results/basket-unit-test-results.xml
new file mode 100644
index 000000000..53a30def1
--- /dev/null
+++ b/tests-results/basket-unit-test-results.xml
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [xUnit.net 00:00:03.2180801] Basket.FunctionalTests.RedisBasketRepositoryTests.UpdateBasket_return_and_add_basket [FAIL]
+
+
+ [xUnit.net 00:00:03.2591737] Basket.FunctionalTests.RedisBasketRepositoryTests.Delete_Basket_return_null [FAIL]
+
+
+
+
\ No newline at end of file
diff --git a/tests-results/catalog-test-results.xml b/tests-results/catalog-test-results.xml
new file mode 100644
index 000000000..2556db540
--- /dev/null
+++ b/tests-results/catalog-test-results.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tests-results/catalog-unit-test-results.xml b/tests-results/catalog-unit-test-results.xml
new file mode 100644
index 000000000..de5ff2337
--- /dev/null
+++ b/tests-results/catalog-unit-test-results.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tests-results/locations-test-results.xml b/tests-results/locations-test-results.xml
new file mode 100644
index 000000000..b799d1a50
--- /dev/null
+++ b/tests-results/locations-test-results.xml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tests-results/marketing-test-results.xml b/tests-results/marketing-test-results.xml
new file mode 100644
index 000000000..5545febcc
--- /dev/null
+++ b/tests-results/marketing-test-results.xml
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tests-results/test-results.xml b/tests-results/ordering-test-results.xml
similarity index 59%
rename from tests-results/test-results.xml
rename to tests-results/ordering-test-results.xml
index c005f5529..d6291e668 100644
--- a/tests-results/test-results.xml
+++ b/tests-results/ordering-test-results.xml
@@ -1,32 +1,32 @@
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
+
-
+
-
+
-
-
-
+
+
+
@@ -35,7 +35,7 @@
\ No newline at end of file
diff --git a/tests-results/ordering-unit-test-results.xml b/tests-results/ordering-unit-test-results.xml
new file mode 100644
index 000000000..9809a3e23
--- /dev/null
+++ b/tests-results/ordering-unit-test-results.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file