From 2ad61d9057b7cace802836effd6da38ec1de697b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ram=C3=B3n=20Tom=C3=A1s?= Date: Tue, 24 Oct 2017 18:05:50 +0200 Subject: [PATCH 1/7] Created new load test scenarios --- .../Middlewares/ByPassAuthMiddleware.cs | 1 + .../Middlewares/ByPassAuthMiddleware.cs | 1 + .../Middlewares/ByPassAuthMiddleware.cs | 1 + .../LoadTest/Basket.API/Checkout.webtest | 10 +- test/Services/LoadTest/Basket.loadtest | 467 +++++++++++++++++ test/Services/LoadTest/Campaigns.loadtest | 467 +++++++++++++++++ test/Services/LoadTest/Catalog.loadtest | 471 ++++++++++++++++++ test/Services/LoadTest/LoadTest.csproj | 21 +- .../Location.API/GetUserLocation.webtest | 10 +- test/Services/LoadTest/Locations.loadtest | 468 +++++++++++++++++ test/Services/LoadTest/OrderProducts.loadtest | 468 +++++++++++++++++ .../LoadTest/WebMVC/CreateNewOrder.webtest | 4 +- test/Services/LoadTest/app.config | 2 +- 13 files changed, 2384 insertions(+), 7 deletions(-) create mode 100644 test/Services/LoadTest/Basket.loadtest create mode 100644 test/Services/LoadTest/Campaigns.loadtest create mode 100644 test/Services/LoadTest/Catalog.loadtest create mode 100644 test/Services/LoadTest/Locations.loadtest create mode 100644 test/Services/LoadTest/OrderProducts.loadtest diff --git a/src/Services/Location/Locations.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs b/src/Services/Location/Locations.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs index 6814383b6..ae21d10cc 100644 --- a/src/Services/Location/Locations.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs +++ b/src/Services/Location/Locations.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs @@ -64,6 +64,7 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure.Midd new Claim("nonce", Guid.NewGuid().ToString()), new Claim("ttp://schemas.microsoft.com/identity/claims/identityprovider", "ByPassAuthMiddleware"), new Claim("nonce", Guid.NewGuid().ToString()), + new Claim("sub", "1234"), new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname","User"), new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname","Microsoft")} , "ByPassAuth"); diff --git a/src/Services/Marketing/Marketing.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs b/src/Services/Marketing/Marketing.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs index 8830e3b90..ed7eaf594 100644 --- a/src/Services/Marketing/Marketing.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs +++ b/src/Services/Marketing/Marketing.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs @@ -64,6 +64,7 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.Midd new Claim("nonce", Guid.NewGuid().ToString()), new Claim("ttp://schemas.microsoft.com/identity/claims/identityprovider", "ByPassAuthMiddleware"), new Claim("nonce", Guid.NewGuid().ToString()), + new Claim("sub", "1234"), new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname","User"), new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname","Microsoft")} , "ByPassAuth"); diff --git a/src/Services/Ordering/Ordering.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs b/src/Services/Ordering/Ordering.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs index 426381448..4c4207502 100644 --- a/src/Services/Ordering/Ordering.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs +++ b/src/Services/Ordering/Ordering.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs @@ -64,6 +64,7 @@ namespace Ordering.API.Infrastructure.Middlewares new Claim("nonce", Guid.NewGuid().ToString()), new Claim("ttp://schemas.microsoft.com/identity/claims/identityprovider", "ByPassAuthMiddleware"), new Claim("nonce", Guid.NewGuid().ToString()), + new Claim("sub", "1234"), new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname","User"), new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname","Microsoft")} , "ByPassAuth"); diff --git a/test/Services/LoadTest/Basket.API/Checkout.webtest b/test/Services/LoadTest/Basket.API/Checkout.webtest index ef7523bc3..95f43ec73 100644 --- a/test/Services/LoadTest/Basket.API/Checkout.webtest +++ b/test/Services/LoadTest/Basket.API/Checkout.webtest @@ -4,7 +4,7 @@
-
+
ewAiAEMAaQB0AHkAIgA6ACIAYwBpAHQAeQAiACwAIgBTAHQAcgBlAGUAdAAiADoAIgBzAHQAcgBlAGUAdAAiACwAIgBTAHQAYQB0AGUAIgA6ACIAcwB0AGEAdABlACIALAAiAEMAbwB1AG4AdAByAHkAIgA6ACIAYwBvAHUAdAByAHkAIgAsACIAWgBpAHAAQwBvAGQAZQAiADoAIgB6AGkAcABjAG8AZABlACIALAAiAEMAYQByAGQATgB1AG0AYgBlAHIAIgA6ACIAQwBhAHIAZABOAHUAbQBiAGUAcgAiACwAIgBDAGEAcgBkAEgAbwBsAGQAZQByAE4AYQBtAGUAIgA6ACIAQwBhAHIAZABIAG8AbABkAGUAcgBOAGEAbQBlACIALAAiAEMAYQByAGQARQB4AHAAaQByAGEAdABpAG8AbgAiADoAIgAyADAAMQA3AC0AMAA2AC0AMwAwAFQAMQAyADoAMgA1ADoAMwAxAC4AOAA3ADQANwAyADIANwBaACIALAAiAEMAYQByAGQAUwBlAGMAdQByAGkAdAB5AE4AdQBtAGIAZQByACIAOgAiADEAMgAzADQAIgAsACIAQwBhAHIAZABUAHkAcABlAEkAZAAiADoAMQAsACIAQgB1AHkAZQByACIAOgAiAEIAdQB5AGUAcgAiACwAIgBSAGUAcQB1AGUAcwB0AEkAZAAiADoAIgBlAGIAOAAwADAAMwA2ADQALQBiADQAZQAxAC0ANAA2AGUAYgAtADkAMgAzADUALQBlADgAYwA0ADcANAA3AGQAYQAyAGQANAAiAH0A @@ -31,4 +31,12 @@ + + + + + + + + \ No newline at end of file diff --git a/test/Services/LoadTest/Basket.loadtest b/test/Services/LoadTest/Basket.loadtest new file mode 100644 index 000000000..03dce8647 --- /dev/null +++ b/test/Services/LoadTest/Basket.loadtest @@ -0,0 +1,467 @@ + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + +
+
+
+
+
+ + + + + + +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Services/LoadTest/Campaigns.loadtest b/test/Services/LoadTest/Campaigns.loadtest new file mode 100644 index 000000000..ac91e6979 --- /dev/null +++ b/test/Services/LoadTest/Campaigns.loadtest @@ -0,0 +1,467 @@ + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + +
+
+
+
+
+ + + + + + +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Services/LoadTest/Catalog.loadtest b/test/Services/LoadTest/Catalog.loadtest new file mode 100644 index 000000000..938fba855 --- /dev/null +++ b/test/Services/LoadTest/Catalog.loadtest @@ -0,0 +1,471 @@ + + + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + +
+
+
+
+
+ + + + + + +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Services/LoadTest/LoadTest.csproj b/test/Services/LoadTest/LoadTest.csproj index b10e8bbfe..47f3ac5ec 100644 --- a/test/Services/LoadTest/LoadTest.csproj +++ b/test/Services/LoadTest/LoadTest.csproj @@ -54,7 +54,9 @@ - + + Designer + Always @@ -91,6 +93,21 @@ Always + + Always + + + Always + + + Always + + + Always + + + Always + Always @@ -138,7 +155,7 @@ PreserveNewest - + diff --git a/test/Services/LoadTest/Location.API/GetUserLocation.webtest b/test/Services/LoadTest/Location.API/GetUserLocation.webtest index 8b9f2bf76..403c0ae1a 100644 --- a/test/Services/LoadTest/Location.API/GetUserLocation.webtest +++ b/test/Services/LoadTest/Location.API/GetUserLocation.webtest @@ -1,7 +1,7 @@  - +
@@ -28,4 +28,12 @@ + + + + + + + + \ No newline at end of file diff --git a/test/Services/LoadTest/Locations.loadtest b/test/Services/LoadTest/Locations.loadtest new file mode 100644 index 000000000..af36d698c --- /dev/null +++ b/test/Services/LoadTest/Locations.loadtest @@ -0,0 +1,468 @@ + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + +
+
+
+
+
+ + + + + + +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Services/LoadTest/OrderProducts.loadtest b/test/Services/LoadTest/OrderProducts.loadtest new file mode 100644 index 000000000..63e0f88f3 --- /dev/null +++ b/test/Services/LoadTest/OrderProducts.loadtest @@ -0,0 +1,468 @@ + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + +
+
+
+
+
+ + + + + + +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Services/LoadTest/WebMVC/CreateNewOrder.webtest b/test/Services/LoadTest/WebMVC/CreateNewOrder.webtest index bfa715cbb..e83777734 100644 --- a/test/Services/LoadTest/WebMVC/CreateNewOrder.webtest +++ b/test/Services/LoadTest/WebMVC/CreateNewOrder.webtest @@ -14,7 +14,7 @@ - + @@ -157,7 +157,7 @@ - + diff --git a/test/Services/LoadTest/app.config b/test/Services/LoadTest/app.config index 5e1a9dbc8..b7037fc22 100644 --- a/test/Services/LoadTest/app.config +++ b/test/Services/LoadTest/app.config @@ -13,6 +13,6 @@ - + \ No newline at end of file From 66de8cd43c6fdb1a2cfef0f518ae5780f230c067 Mon Sep 17 00:00:00 2001 From: Kyle Baley Date: Tue, 24 Oct 2017 22:11:41 -0500 Subject: [PATCH 2/7] Update project list in mac build script --- cli-mac/build-bits.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cli-mac/build-bits.sh b/cli-mac/build-bits.sh index a7712b831..8b4917144 100755 --- a/cli-mac/build-bits.sh +++ b/cli-mac/build-bits.sh @@ -3,12 +3,15 @@ # List of microservices here needs to be updated to include all the new microservices (Marketing, etc.) projectList=( - "../src/Services/Catalog/Catalog.API" - "../src/Services/Basket/Basket.API" - "../src/Services/Ordering/Ordering.API" - "../src/Services/Identity/Identity.API" "../src/Web/WebMVC" "../src/Web/WebSPA" + "../src/Services/Identity/Identity.API" + "../src/Services/Catalog/Catalog.API" + "../src/Services/Ordering/Ordering.API" + "../src/Services/Basket/Basket.API" + "../src/Services/Location/Locations.API" + "../src/Services/Marketing/Marketing.API" + "../src/Services/Payment/Payment.API" "../src/Web/WebStatus" ) From 954717b65dc55d5043d32dec4feb6ef716f2be00 Mon Sep 17 00:00:00 2001 From: David Britch Date: Wed, 25 Oct 2017 15:47:35 +0100 Subject: [PATCH 3/7] Removed unneeded reference. --- .../eShopOnContainers.Droid/eShopOnContainers.Droid.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj index 8ccb42d53..46eefe5c2 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj @@ -161,7 +161,6 @@ ..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\monoandroid\System.Net.Http.Primitives.dll True - From 03e61fae9debcd4679f8479b2422781faa22587b Mon Sep 17 00:00:00 2001 From: David Britch Date: Wed, 25 Oct 2017 16:31:25 +0100 Subject: [PATCH 4/7] Added a Style to define the margin on Entry controls on the SettingsView. Fixes #387 --- .../Views/SettingsView.xaml | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml index dffc8c746..9314fb9fb 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml @@ -65,6 +65,20 @@ Value="True" /> + + + +