small bug fixes and test upgrade

Author: mihaj

Directory.Build.props

@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <Version>0.1.1</Version>
+    <Version>0.1.5</Version>
   </PropertyGroup>
 </Project>

src/QAToolKit.Source.Swagger.Test/Fixtures/BicycleApi/BicycleResponse400.cs

@@ -0,0 +1,57 @@
+using QAToolKit.Core.Models;
+using System.Collections.Generic;
+using System.Net;
+
+namespace QAToolKit.Source.Swagger.Test.Fixtures.BicycleApi
+{
+    public static class BicycleResponse400
+    {
+        public static Response Get()
+        {
+            return new Response()
+            {
+                StatusCode = HttpStatusCode.BadRequest,
+                Type = ResponseType.Object,
+                Properties = new List<Property>()
+                {
+                    new Property() {
+                        Name = "statusCode",
+                        Description = null,
+                        Format = "int32",
+                        Required = false,
+                        Properties = null,
+                        Type = "integer",
+                        Value = null
+                    },
+                    new Property() {
+                        Name = "statusDescription",
+                        Description = null,
+                        Format = null,
+                        Required = false,
+                        Properties = null,
+                        Type = "string",
+                        Value = null
+                    },
+                    new Property() {
+                        Name = "message",
+                        Description = null,
+                        Format = null,
+                        Required = false,
+                        Properties = null,
+                        Type = "string",
+                        Value = null
+                    },
+                    new Property() {
+                        Name = "errorCode",
+                        Description = null,
+                        Format = "int32",
+                        Required = false,
+                        Properties = null,
+                        Type = "integer",
+                        Value = null
+                    }
+                }
+            };
+        }
+    }
+}

src/QAToolKit.Source.Swagger.Test/Fixtures/BicycleApi/Get/GetBicycleByIdResponse.cs

@@ -0,0 +1,19 @@
+using QAToolKit.Core.Models;
+using QAToolKit.Source.Swagger.Test.Fixtures.BicycleApi.Get.Helpers;
+using QAToolKit.Source.Swagger.Test.Fixtures.PetApi.Get.Helpers;
+using System.Collections.Generic;
+
+namespace QAToolKit.Source.Swagger.Test.Fixtures.BicycleApi.Get
+{
+    public static class GetBicycleByIdResponse
+    {
+        public static List<Response> Get()
+        {
+            return new List<Response>()
+            {
+                BicyclesResponse200.Get(),
+                BicycleResponse400.Get()
+            };
+        }
+    }
+}

src/QAToolKit.Source.Swagger.Test/Fixtures/BicycleApi/Get/Helpers/BicycleObjectWithoutExampleValues.cs

@@ -0,0 +1,92 @@
+using QAToolKit.Core.Models;
+using System.Collections.Generic;
+
+namespace QAToolKit.Source.Swagger.Test.Fixtures.BicycleApi.Get.Helpers
+{
+    public static class BicycleObjectWithoutExampleValues
+    {
+        public static List<Property> GetProperties()
+        {
+            return new List<Property>()
+                    {
+                        new Property(){
+                            Name = "id",
+                            Description = "Bike Id",
+                            Format = "int32",
+                            Required = false,
+                            Properties = null,
+                            Type = "integer",
+                            Value = "1"
+                        },
+                        new Property(){
+                            Name = "name",
+                            Description = "Bike name",
+                            Format = null,
+                            Required = false,
+                            Properties = null,
+                            Type = "string",
+                            Value = "Foil"
+                        },
+                        new Property(){
+                            Name = "brand",
+                            Description = "Bicycle brand",
+                            Format = null,
+                            Required = false,
+                            Properties = null,
+                            Type = "string",
+                            Value = "Cannondale"
+                        },
+                        new Property(){
+                            Name = "BicycleType",
+                            Description = null,
+                            Format = "int32",
+                            Required = false,
+                            Properties = new List<Property>(){
+                                        new Property()
+                                        {
+                                            Name = null,
+                                            Description = null,
+                                            Format = null,
+                                            Required = false,
+                                            Properties = null,
+                                            Type = "string",
+                                            Value = "0"
+                                        },
+                                        new Property()
+                                        {
+                                            Name = null,
+                                            Description = null,
+                                            Format = null,
+                                            Required = false,
+                                            Properties = null,
+                                            Type = "string",
+                                            Value = "1"
+                                        },
+                                        new Property()
+                                        {
+                                            Name = null,
+                                            Description = null,
+                                            Format = null,
+                                            Required = false,
+                                            Properties = null,
+                                            Type = "string",
+                                            Value = "2"
+                                        },
+                                        new Property()
+                                        {
+                                            Name = null,
+                                            Description = null,
+                                            Format = null,
+                                            Required = false,
+                                            Properties = null,
+                                            Type = "string",
+                                            Value = "3"
+                                        }
+                                    },
+                            Type = "enum",
+                            Value = null
+                        }
+                    };
+        }
+    }
+}

src/QAToolKit.Source.Swagger.Test/Fixtures/BicycleApi/Get/Helpers/BicyclesParameters.cs

@@ -0,0 +1,72 @@
+using QAToolKit.Core.Models;
+using System.Collections.Generic;
+
+namespace QAToolKit.Source.Swagger.Test.Fixtures.BicycleApi.Get.Helpers
+{
+    public static class BicyclesParameters
+    {
+        public static List<Parameter> Get(bool exampleValues)
+        {
+            if (exampleValues)
+            {
+                return new List<Parameter>()
+                {
+                    new Parameter() {
+                        Name = "bicycleType",
+                        Location = Location.Query,
+                        Nullable = false,
+                        Type = "integer",
+                        Required = false,
+                        Value = null
+                    },
+                    new Parameter() {
+                        Name = "api-version",
+                        Location = Location.Query,
+                        Nullable = false,
+                        Type = "string",
+                        Required = false,
+                        Value = "1"
+                    },
+                    new Parameter() {
+                        Name = "X-version",
+                        Location = Location.Header,
+                        Nullable = false,
+                        Type = "string",
+                        Required = false,
+                        Value = null
+                    }
+                };
+            }
+            else
+            {
+                return new List<Parameter>()
+                {
+                   new Parameter() {
+                        Name = "bicycleType",
+                        Location = Location.Query,
+                        Nullable = false,
+                        Type = "integer",
+                        Required = false,
+                        Value = null
+                    },
+                    new Parameter() {
+                        Name = "api-version",
+                        Location = Location.Query,
+                        Nullable = false,
+                        Type = "string",
+                        Required = false,
+                        Value = null
+                    },
+                    new Parameter() {
+                        Name = "X-version",
+                        Location = Location.Header,
+                        Nullable = false,
+                        Type = "string",
+                        Required = false,
+                        Value = null
+                    }
+                };
+            }
+        }
+    }
+}

src/QAToolKit.Source.Swagger.Test/Fixtures/BicycleApi/Get/Helpers/BicyclesResponse200.cs

@@ -0,0 +1,18 @@
+using QAToolKit.Core.Models;
+using System.Net;
+
+namespace QAToolKit.Source.Swagger.Test.Fixtures.BicycleApi.Get.Helpers
+{
+    public static class BicyclesResponse200
+    {
+        public static Response Get()
+        {
+            return new Response()
+            {
+                StatusCode = HttpStatusCode.OK,
+                Type = ResponseType.Objects,
+                Properties = BicycleObjectWithoutExampleValues.GetProperties()
+            };
+        }
+    }
+}

src/QAToolKit.Source.Swagger.Test/SwaggerTests/BicycleApi/Get/SwaggerProcessorGetBicycleByIdTests.cs

@@ -0,0 +1,76 @@
+using ExpectedObjects;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using QAToolKit.Core.Models;
+using QAToolKit.Source.Swagger.Test.Fixtures.BicycleApi.Get;
+using QAToolKit.Source.Swagger.Test.Fixtures.BicycleApi.Get.Helpers;
+using QAToolKit.Source.Swagger.Test.Fixtures.PetApi.Get;
+using QAToolKit.Source.Swagger.Test.Fixtures.PetApi.Post;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace QAToolKit.Source.Swagger.Test.SwaggerTests.BicycleApi.Get
+{
+    public class SwaggerProcessorGetBicycleByIdTests
+    {
+        private readonly ILogger<SwaggerProcessorGetBicycleByIdTests> _logger;
+
+        public SwaggerProcessorGetBicycleByIdTests(ITestOutputHelper testOutputHelper)
+        {
+            var loggerFactory = new LoggerFactory();
+            loggerFactory.AddProvider(new XunitLoggerProvider(testOutputHelper));
+            _logger = loggerFactory.CreateLogger<SwaggerProcessorGetBicycleByIdTests>();
+        }
+
+        [Fact]
+        public async Task PetsSwaggerGetPetByIdWithExampleValuesTest_Successfull()
+        {
+            var urlSource = new SwaggerUrlSource(options =>
+            {
+                options.AddBaseUrl(new Uri("https://qatoolkitapi.azurewebsites.net/"));
+                options.AddRequestFilters(new RequestFilter()
+                {
+                    EndpointNameWhitelist = new string[] { "GetAllBikes" }
+                });
+                options.UseSwaggerExampleValues = true;
+            });
+
+            var requests = await urlSource.Load(new Uri[] {
+                new Uri("https://qatoolkitapi.azurewebsites.net/swagger/v1/swagger.json")
+            });
+
+            _logger.LogInformation(JsonConvert.SerializeObject(requests, Formatting.Indented));
+
+            Assert.NotNull(requests);
+            Assert.Equal(1, requests.Count);
+            Assert.Empty(requests.FirstOrDefault().AuthenticationTypes);
+            Assert.Equal("https://qatoolkitapi.azurewebsites.net/", requests.FirstOrDefault().BasePath);
+            Assert.Equal("Get all bikes", requests.FirstOrDefault().Description);
+            Assert.Equal(HttpMethod.Get, requests.FirstOrDefault().Method);
+            Assert.Equal("GetAllBikes", requests.FirstOrDefault().OperationId);
+            Assert.Equal(3, requests.FirstOrDefault().Parameters.Count);
+            Assert.Equal("/api/bicycles", requests.FirstOrDefault().Path);
+            Assert.Empty(requests.FirstOrDefault().RequestBodies);
+            Assert.Equal(2, requests.FirstOrDefault().Responses.Count);
+
+            var getBikesParameters = BicyclesParameters.Get(true).ToExpectedObject();
+            getBikesParameters.ShouldEqual(requests.FirstOrDefault().Parameters);
+
+            var expectedPetsResponse = GetBicycleByIdResponse.Get().ToExpectedObject();
+            expectedPetsResponse.ShouldEqual(requests.FirstOrDefault().Responses);
+
+            Assert.Equal("Get all bikes by filter", requests.FirstOrDefault().Summary);
+            Assert.Collection(requests.FirstOrDefault().Tags, item =>
+            {
+                item = "Public";
+            });
+            Assert.Empty(requests.FirstOrDefault().TestTypes);
+        }
+    }
+}

src/QAToolKit.Source.Swagger/QAToolKit.Source.Swagger.csproj

@@ -37,7 +37,7 @@
 		<PackageReference Include="Microsoft.OpenApi" Version="1.2.3" />
 		<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.2.3" />
 		<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-		<PackageReference Include="QAToolKit.Core" Version="0.1.5" />
+		<PackageReference Include="QAToolKit.Core" Version="0.1.6" />
 	</ItemGroup>
 
 </Project>

src/QAToolKit.Source.Swagger/SwaggerOptions.cs

@@ -37,7 +37,7 @@ public class SwaggerOptions
         /// <summary>
         /// Use Swagger example values that come with Swagger file
         /// </summary>
-        internal bool UseSwaggerExampleValues { get; set; } = false;
+        public bool UseSwaggerExampleValues { get; set; } = false;
 
         /// <summary>
         /// Add basic authentication