cleanup

Author: mihaj

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

@@ -18,8 +18,10 @@ public void BombardierOutputOptionsTrueTest_Successful()
         [Fact]
         public void BombardierOutputOptionsFalseTest_Successful()
         {
-            var options = new BombardierOutputOptions();
-            options.ObfuscateAuthenticationHeader = false;
+            var options = new BombardierOutputOptions
+            {
+                ObfuscateAuthenticationHeader = false
+            };
 
             Assert.False(options.ObfuscateAuthenticationHeader);
         }

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

@@ -42,6 +42,8 @@ public async Task GenerateBombardierTestWithOptionsVariation1Test_Successfull()
 
             var bombardierTests = await bombardierTestsGenerator.Generate(httpRequest);
 
+            _logger.LogInformation(JsonConvert.SerializeObject(bombardierTests, Formatting.Indented));
+
             Assert.NotNull(bombardierTests);
             Assert.Single(bombardierTests);
             Assert.Contains(" -m GET https://petstore3.swagger.io/api/v3/pet/10 -c 1 --http2 --timeout=30s --duration=1s", bombardierTests.FirstOrDefault().Command);

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

@@ -47,6 +47,8 @@ public async Task BombardierGetTestWithOptionsTest_Successfull()
             });
             var bombardierResults = await bombardierTestsRunner.Run();
 
+            _logger.LogInformation(JsonConvert.SerializeObject(bombardierResults, Formatting.Indented));
+
             Assert.NotNull(bombardierResults);
             Assert.Single(bombardierResults);
             Assert.True(bombardierResults.FirstOrDefault().Counter1xx == 0);
@@ -100,6 +102,8 @@ public async Task BombardierPostTestWithOptionsTest_Successfull()
             });
             var bombardierResults = await bombardierTestsRunner.Run();
 
+            _logger.LogInformation(JsonConvert.SerializeObject(bombardierResults, Formatting.Indented));
+
             Assert.NotNull(bombardierResults);
             Assert.Single(bombardierResults);
             Assert.True(bombardierResults.FirstOrDefault().Counter1xx == 0);

src/QAToolKit.Engine.Bombardier/BombardierGeneratorOptions.cs

@@ -75,10 +75,7 @@ public class BombardierGeneratorOptions
         /// <returns></returns>
         public BombardierGeneratorOptions AddReplacementValues(ReplacementValue[] replacementValues)
         {
-            if (replacementValues == null)
-                throw new ArgumentException(nameof(replacementValues));
-
-            ReplacementValues = replacementValues;
+            ReplacementValues = replacementValues ?? throw new ArgumentException(nameof(replacementValues));
             return this;
         }
 

src/QAToolKit.Engine.Bombardier/BombardierTestsGenerator.cs

@@ -56,7 +56,7 @@ public async Task<IEnumerable<BombardierTest>> Generate(IList<HttpRequest> restR
             {
                 scriptBuilder.AppendLine($"{bombardierFullPath} " +
                     $"-m {request.Method.ToString().ToUpper()} {HttpUrlHelper.GenerateUrlParameters(request, _bombardierGeneratorOptions)}" +
-                    $"{BombardierSwitchGeneratorHelper.GenerateConcurrentSwitch(request, _bombardierGeneratorOptions)}" +
+                    $"{BombardierSwitchGeneratorHelper.GenerateConcurrentSwitch(_bombardierGeneratorOptions)}" +
                     $"{AuthorizationHeaderHelper.GenerateAuthHeader(request, _bombardierGeneratorOptions)}" +
                     $"{ContentTypeHeaderHelper.GenerateContentTypeHeader(request, _bombardierGeneratorOptions.BombardierBodyContentType)}" +
                     $"{BombardierSwitchGeneratorHelper.GenerateBodySwitch(request, _bombardierGeneratorOptions)}" +

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

@@ -86,10 +86,9 @@ internal static object GenerateHttpProtocolSwitch(BombardierGeneratorOptions bom
         /// <summary>
         /// Generate concurrent users bombardier switch
         /// </summary>
-        /// <param name="request"></param>
         /// <param name="bombardierGeneratorOptions"></param>
         /// <returns></returns>
-        internal static object GenerateConcurrentSwitch(HttpRequest request, BombardierGeneratorOptions bombardierGeneratorOptions)
+        internal static object GenerateConcurrentSwitch(BombardierGeneratorOptions bombardierGeneratorOptions)
         {
             return $" -c {bombardierGeneratorOptions.BombardierConcurrentUsers}";
         }

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

@@ -24,7 +24,7 @@ internal static string GenerateContentTypeHeader(HttpRequest request, ContentTyp
             }
             else
             {
-                var contentType = request.RequestBodies.FirstOrDefault(content => content.ContentType == ContentType.Enumeration.Json);
+                var contentType = request.RequestBodies.FirstOrDefault(content => content.ContentType == useContentType);
 
                 if (contentType != null)
                 {

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

@@ -33,7 +33,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-		<PackageReference Include="QAToolKit.Core" Version="0.1.7" />
+		<PackageReference Include="QAToolKit.Core" Version="0.2.0" />
 		<PackageReference Include="System.Text.Encodings.Web" Version="4.7.1" />
 	</ItemGroup>