Skip to content

Commit 3adb63a

Browse files
mvelosopmvelosop
committed
Run unit and integration tests from VS
1 parent 4b48468 commit 3adb63a

6 files changed

Lines changed: 31 additions & 30 deletions

src/Get-DockerfileSolutionProjects.ps1 renamed to src/Create-DockerfileSolutionRestore.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ param (
22
[string]$solution = "eShopOnContainers-ServicesAndWebApps.sln"
33
)
44

5-
$outfile = "DockerfileSolutionProjects.txt"
5+
$outfile = "DockerfileSolutionRestore.txt"
66

77
Write-Output "COPY ""$solution"" ""$solution""" > $outfile
88

src/DockerfileSolutionProjects.txt renamed to src/DockerfileSolutionRestore.txt

File renamed without changes.

‎src/docker-compose-tests.override.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ services:
44
rabbitmq-test:
55
ports:
66
- "15672:15672"
7-
- "5672:5672"
7+
- "5672:5672"
88

99
basket-data-test:
1010
ports:
@@ -27,15 +27,15 @@ services:
2727
- ASPNETCORE_URLS=http://0.0.0.0:80
2828
- SpaClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5104
2929
- XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105/xamarincallback
30-
- ConnectionString=${ESHOP_AZURE_IDENTITY_DB:-Server=sql-data-test;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word}
30+
- ConnectionString=${ESHOP_AZURE_IDENTITY_DB:-Server=sql-data-test;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word}
3131
- MvcClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5100
3232
- LocationApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5109
3333
- MarketingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5110
3434
- BasketApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103
3535
- OrderingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102
3636
- MobileShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5120
3737
- WebShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5121
38-
- UseCustomizationData=True
38+
- UseCustomizationData=True
3939
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
4040
- OrchestratorType=${ORCHESTRATOR_TYPE}
4141
ports:
@@ -179,7 +179,7 @@ services:
179179
- dotnet
180180
- test
181181
- --logger
182-
- trx;LogFileName=/tests/ordering-unit-test-results.xml
182+
- trx;LogFileName=/tests/ordering-unit-test-results.xml
183183

184184
marketing-api-test:
185185
environment:

‎src/docker-compose-tests.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
version: '3.4'
22

33
services:
4-
rabbitmq-test:
5-
image: rabbitmq:3-management-alpine
6-
7-
basket-data-test:
8-
image: redis:alpine
9-
104
sql-data-test:
115
image: microsoft/mssql-server-linux:2017-latest
126

137
nosql-data-test:
148
image: mongo
159

10+
basket-data-test:
11+
image: redis:alpine
12+
13+
rabbitmq-test:
14+
image: rabbitmq:3-management-alpine
15+
1616
identity-api-test:
1717
image: ${REGISTRY:-eshop}/identity-api-test:${TAG:-latest}
1818
build:
@@ -31,7 +31,7 @@ services:
3131
- basket-data-test
3232
- identity-api-test
3333
- rabbitmq-test
34-
volumes:
34+
volumes:
3535
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
3636

3737
basket-api-unit-test:
@@ -44,7 +44,7 @@ services:
4444
- basket-data-test
4545
- identity-api-test
4646
- rabbitmq-test
47-
volumes:
47+
volumes:
4848
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
4949

5050
catalog-api-test:
@@ -56,7 +56,7 @@ services:
5656
depends_on:
5757
- sql-data-test
5858
- rabbitmq-test
59-
volumes:
59+
volumes:
6060
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
6161

6262
catalog-api-unit-test:
@@ -68,7 +68,7 @@ services:
6868
depends_on:
6969
- sql-data-test
7070
- rabbitmq-test
71-
volumes:
71+
volumes:
7272
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
7373

7474
ordering-api-test:
@@ -80,7 +80,7 @@ services:
8080
depends_on:
8181
- sql-data-test
8282
- rabbitmq-test
83-
volumes:
83+
volumes:
8484
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
8585

8686
ordering-api-unit-test:
@@ -92,8 +92,8 @@ services:
9292
depends_on:
9393
- sql-data-test
9494
- rabbitmq-test
95-
volumes:
96-
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
95+
volumes:
96+
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
9797

9898
marketing-api-test:
9999
image: ${REGISTRY:-eshop}/marketing-api-test:${TAG:-latest}
@@ -106,7 +106,7 @@ services:
106106
- nosql-data-test
107107
- identity-api-test
108108
- rabbitmq-test
109-
volumes:
109+
volumes:
110110
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
111111

112112
payment-api-test:
@@ -126,5 +126,5 @@ services:
126126
depends_on:
127127
- nosql-data-test
128128
- rabbitmq-test
129-
volumes:
129+
volumes:
130130
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests

‎src/docker-compose.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ services:
2121
image: ${REGISTRY:-eshop}/identity.api:${PLATFORM:-linux}-${TAG:-latest}
2222
build:
2323
context: .
24-
dockerfile: Services/Identity/Identity.API/Dockerfile
24+
dockerfile: Services/Identity/Identity.API/Dockerfile
2525
depends_on:
2626
- sqldata
2727

2828
basket-api:
2929
image: ${REGISTRY:-eshop}/basket.api:${PLATFORM:-linux}-${TAG:-latest}
3030
build:
3131
context: .
32-
dockerfile: Services/Basket/Basket.API/Dockerfile
32+
dockerfile: Services/Basket/Basket.API/Dockerfile
3333
depends_on:
3434
- basketdata
3535
- identity-api
@@ -48,7 +48,7 @@ services:
4848
image: ${REGISTRY:-eshop}/ordering.api:${PLATFORM:-linux}-${TAG:-latest}
4949
build:
5050
context: .
51-
dockerfile: Services/Ordering/Ordering.API/Dockerfile
51+
dockerfile: Services/Ordering/Ordering.API/Dockerfile
5252
depends_on:
5353
- sqldata
5454
- rabbitmq
@@ -57,7 +57,7 @@ services:
5757
image: ${REGISTRY:-eshop}/ordering.backgroundtasks:${PLATFORM:-linux}-${TAG:-latest}
5858
build:
5959
context: .
60-
dockerfile: Services/Ordering/Ordering.BackgroundTasks/Dockerfile
60+
dockerfile: Services/Ordering/Ordering.BackgroundTasks/Dockerfile
6161
depends_on:
6262
- sqldata
6363
- rabbitmq
@@ -66,7 +66,7 @@ services:
6666
image: ${REGISTRY:-eshop}/marketing.api:${PLATFORM:-linux}-${TAG:-latest}
6767
build:
6868
context: .
69-
dockerfile: Services/Marketing/Marketing.API/Dockerfile
69+
dockerfile: Services/Marketing/Marketing.API/Dockerfile
7070
depends_on:
7171
- sqldata
7272
- nosqldata
@@ -79,7 +79,7 @@ services:
7979
context: .
8080
dockerfile: Services/Payment/Payment.API/Dockerfile
8181
depends_on:
82-
- rabbitmq
82+
- rabbitmq
8383

8484
locations-api:
8585
image: ${REGISTRY:-eshop}/locations.api:${PLATFORM:-linux}-${TAG:-latest}
@@ -96,7 +96,7 @@ services:
9696
context: .
9797
dockerfile: Services/Webhooks/Webhooks.API/Dockerfile
9898
depends_on:
99-
- sqldata
99+
- sqldata
100100

101101
mobileshoppingapigw:
102102
image: envoyproxy/envoy:v1.11.1
@@ -159,7 +159,7 @@ services:
159159
image: ${REGISTRY:-eshop}/webspa:${PLATFORM:-linux}-${TAG:-latest}
160160
build:
161161
context: .
162-
dockerfile: Web/WebSPA/Dockerfile
162+
dockerfile: Web/WebSPA/Dockerfile
163163
args:
164164
NODE_IMAGE: ${NODE_IMAGE:-node:8.11}
165165
# depends_on:
@@ -171,7 +171,7 @@ services:
171171
image: ${REGISTRY:-eshop}/webmvc:${PLATFORM:-linux}-${TAG:-latest}
172172
build:
173173
context: .
174-
dockerfile: Web/WebMVC/Dockerfile
174+
dockerfile: Web/WebMVC/Dockerfile
175175
depends_on:
176176
- webshoppingagg
177177
- webshoppingapigw
@@ -183,7 +183,7 @@ services:
183183
context: .
184184
dockerfile: Web/WebhookClient/Dockerfile
185185
depends_on:
186-
- webhooks-api
186+
- webhooks-api
187187

188188
webshoppingapigw:
189189
image: envoyproxy/envoy:v1.11.1

‎src/run-test-infrastructure.ps1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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

0 commit comments

Comments
 (0)