Merge branch 'develop' of https://github.com/qatoolkit/qatoolkit-engine-bombardier-net into develop

Author: mihaj

.github/workflows/dotnet-core.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        os: [ ubuntu-latest, windows-latest ]
 
     steps:
     - uses: actions/checkout@v2

Directory.Build.props

@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <Version>0.3.5</Version>
+    <Version>0.3.6</Version>
   </PropertyGroup>
 </Project>

src/QAToolKit.Engine.Bombardier.Test/BombardierTestAsserterTests.cs

@@ -50,15 +50,15 @@ public async Task BombardierGetTestWithOptionsTest_Successfull()
 
             var asserter = new BombardierTestAsserter(bombardierResults.FirstOrDefault());
             var assertResults = asserter
-                .NumberOf1xxResponses((x) => x == 0)
-                .NumberOf2xxResponses((x) => x >= 0)
-                .NumberOf3xxResponses((x) => x == 0)
-                .NumberOf4xxResponses((x) => x == 0)
-                .NumberOf5xxResponses((x) => x == 0)
-                .AverageLatency((x) => x >= 0)
+                .NumberOf1xxResponses(x => x == 0)
+                .NumberOf2xxResponses(x => x >= 0)
+                .NumberOf3xxResponses(x => x == 0)
+                .NumberOf4xxResponses(x => x == 0)
+                .NumberOf5xxResponses(x => x == 0)
+                .AverageLatency(x => x >= 0)
                 .AverageRequestsPerSecond((x) => x >= 0)
-                .MaximumLatency((x) => x >= 0)
-                .MaximumRequestsPerSecond((x) => x >= 0)
+                .MaximumLatency(x => x >= 0)
+                .MaximumRequestsPerSecond(x => x >= 0)
                 .AssertAll();
 
             foreach (var result in assertResults)
@@ -97,15 +97,15 @@ public async Task BombardierPostTestWithOptionsTest_Successfull()
 
             var asserter = new BombardierTestAsserter(bombardierResults.FirstOrDefault());
             var assertResults = asserter
-                .NumberOf1xxResponses((x) => x == 0)
-                .NumberOf2xxResponses((x) => x >= 0)
-                .NumberOf3xxResponses((x) => x == 0)
-                .NumberOf4xxResponses((x) => x == 0)
-                .NumberOf5xxResponses((x) => x == 0)
-                .AverageLatency((x) => x >= 0)
-                .AverageRequestsPerSecond((x) => x >= 0)
-                .MaximumLatency((x) => x >= 0)
-                .MaximumRequestsPerSecond((x) => x >= 0)
+                .NumberOf1xxResponses(x => x == 0)
+                .NumberOf2xxResponses(x => x >= 0)
+                .NumberOf3xxResponses(x => x == 0)
+                .NumberOf4xxResponses(x => x == 0)
+                .NumberOf5xxResponses(x => x == 0)
+                .AverageLatency(x => x >= 0)
+                .AverageRequestsPerSecond(x => x >= 0)
+                .MaximumLatency(x => x >= 0)
+                .MaximumRequestsPerSecond(x => x >= 0)
                 .AssertAll();
 
             foreach (var result in assertResults)
@@ -148,15 +148,15 @@ public async Task BombardierPostTestWithBodyAndOptionsTest_Successfull()
 
             var asserter = new BombardierTestAsserter(bombardierResults.FirstOrDefault());
             var assertResults = asserter
-                .NumberOf1xxResponses((x) => x == 0)
-                .NumberOf2xxResponses((x) => x >= 0)
-                .NumberOf3xxResponses((x) => x == 0)
-                .NumberOf4xxResponses((x) => x == 0)
-                .NumberOf5xxResponses((x) => x == 0)
-                .AverageLatency((x) => x >= 0)
-                .AverageRequestsPerSecond((x) => x >= 0)
-                .MaximumLatency((x) => x >= 0)
-                .MaximumRequestsPerSecond((x) => x >= 0)
+                .NumberOf1xxResponses(x => x == 0)
+                .NumberOf2xxResponses(x => x >= 0)
+                .NumberOf3xxResponses(x => x == 0)
+                .NumberOf4xxResponses(x => x == 0)
+                .NumberOf5xxResponses(x => x == 0)
+                .AverageLatency(x => x >= 0)
+                .AverageRequestsPerSecond(x => x >= 0)
+                .MaximumLatency(x => x >= 0)
+                .MaximumRequestsPerSecond(x => x >= 0)
                 .AssertAll();
 
             foreach (var result in assertResults)
@@ -176,15 +176,15 @@ public void BombardierAsserterNullResults_Successfull()
         {
             var asserter = new BombardierTestAsserter(new BombardierResult());
             var assertResults = asserter
-                .NumberOf1xxResponses((x) => x == 0)
-                .NumberOf2xxResponses((x) => x >= 0)
-                .NumberOf3xxResponses((x) => x == 0)
-                .NumberOf4xxResponses((x) => x == 0)
-                .NumberOf5xxResponses((x) => x == 0)
-                .AverageLatency((x) => x >= 0)
+                .NumberOf1xxResponses(x => x == 0)
+                .NumberOf2xxResponses(x => x >= 0)
+                .NumberOf3xxResponses(x => x == 0)
+                .NumberOf4xxResponses(x => x == 0)
+                .NumberOf5xxResponses(x => x == 0)
+                .AverageLatency(x => x >= 0)
                 .AverageRequestsPerSecond((x) => x >= 0)
-                .MaximumLatency((x) => x >= 0)
-                .MaximumRequestsPerSecond((x) => x >= 0)
+                .MaximumLatency(x => x >= 0)
+                .MaximumRequestsPerSecond(x => x >= 0)
                 .AssertAll();
 
             foreach (var result in assertResults)

src/QAToolKit.Engine.Bombardier/Helpers/AuthorizationHeaderHelper.cs

@@ -23,7 +23,7 @@ internal static string GenerateAuthHeader(HttpRequest request, BombardierGenerat
         {
             //Check if Swagger operation description contains certain auth tags
             string authHeader;
-            if (request.Description.Contains(AuthenticationType.Oauth2.Value()) || bombardierOptions.AccessTokens.Any())
+            if (request.Description.Contains(AuthenticationType.OAuth2.Value()) || bombardierOptions.AccessTokens.Any())
             {
                 if (request.Description.Contains(AuthenticationType.Customer.Value()) && !request.Description.Contains(AuthenticationType.Administrator.Value()))
                 {

src/QAToolKit.Engine.Bombardier/QAToolKit.Engine.Bombardier.csproj

@@ -38,7 +38,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-		<PackageReference Include="QAToolKit.Core" Version="0.3.0" />
+		<PackageReference Include="QAToolKit.Core" Version="0.3.3" />
 		<PackageReference Include="System.Text.Encodings.Web" Version="5.0.0" />
 	</ItemGroup>