Add Pet tests, Test refactorings, ContentType refactored to Support enums

mihaj · mihaj · commit ae07b64aab02 · 2020-11-01T12:15:02.000+01:00
diff --git a/src/QAToolKit.Source.Swagger.Test/Fixtures/PetApi/Get/FindPetsByStatusResponses.cs b/src/QAToolKit.Source.Swagger.Test/Fixtures/PetApi/Get/FindPetsByStatusResponses.cs
@@ -4,7 +4,7 @@
 
 namespace QAToolKit.Source.Swagger.Test.Fixtures.PetApi.Get
 {
-    public static class PetsFindByStatusResponses
+    public static class FindPetsByStatusResponses
     {
         public static List<Response> Get(bool exampleValues)
         {
diff --git a/src/QAToolKit.Source.Swagger.Test/Fixtures/PetApi/Get/FindPetsByTagsResponses.cs b/src/QAToolKit.Source.Swagger.Test/Fixtures/PetApi/Get/FindPetsByTagsResponses.cs
@@ -4,7 +4,7 @@
 
 namespace QAToolKit.Source.Swagger.Test.Fixtures.PetApi.Get
 {
-    public static class PetsFindByTagsResponses
+    public static class FindPetsByTagsResponses
     {
         public static List<Response> Get(bool exampleValues)
         {
diff --git a/src/QAToolKit.Source.Swagger.Test/Fixtures/PetApi/Get/GetPetByIdResponse.cs b/src/QAToolKit.Source.Swagger.Test/Fixtures/PetApi/Get/GetPetByIdResponse.cs
@@ -4,7 +4,7 @@
 
 namespace QAToolKit.Source.Swagger.Test.Fixtures.PetApi.Get
 {
-    public static class PetsGetByIdResponse
+    public static class GetPetByIdResponse
     {
         public static List<Response> Get(bool exampleValues)
         {
diff --git a/src/QAToolKit.Source.Swagger.Test/Fixtures/PetApi/PetResponse405.cs b/src/QAToolKit.Source.Swagger.Test/Fixtures/PetApi/PetResponse405.cs
@@ -0,0 +1,18 @@
+﻿using QAToolKit.Core.Models;
+using System.Net;
+
+namespace QAToolKit.Source.Swagger.Test.Fixtures.PetApi
+{
+    public static class PetResponse405
+    {
+        public static Response Get()
+        {
+            return new Response()
+            {
+                StatusCode = HttpStatusCode.MethodNotAllowed,
+                Type = ResponseType.Empty,
+                Properties = null
+            };
+        }
+    }
+}
diff --git a/src/QAToolKit.Source.Swagger.Test/Fixtures/PetApi/Post/AddNewPetBody.cs b/src/QAToolKit.Source.Swagger.Test/Fixtures/PetApi/Post/AddNewPetBody.cs
@@ -0,0 +1,39 @@
+﻿using QAToolKit.Core.Models;
+using QAToolKit.Source.Swagger.Test.Fixtures.PetApi.Get.Helpers;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace QAToolKit.Source.Swagger.Test.Fixtures.PetApi.Post
+{
+    public static class AddNewPetBody
+    {
+        public static List<RequestBody> Get(bool exampleValues)
+        {
+            if (exampleValues)
+            {
+                return new List<RequestBody>()
+                {
+                    new RequestBody() {
+                        ContentType = ContentType.ToEnum(ContentType.Json),
+                        Name = "Pet",
+                        Required = true,
+                        Properties = PetObjectWithExampleValues.GetProperties()
+                    }
+                };
+            }
+            else
+            {
+                return new List<RequestBody>()
+                {
+                    new RequestBody() {
+                        ContentType = ContentType.ToEnum(ContentType.Json),
+                        Name = "Pet",
+                        Required = true,
+                        Properties = PetObjectWithoutExampleValues.GetProperties()
+                    }
+                };
+            }
+        }
+    }
+}
diff --git a/src/QAToolKit.Source.Swagger.Test/Fixtures/PetApi/Post/AddNewPetResponse.cs b/src/QAToolKit.Source.Swagger.Test/Fixtures/PetApi/Post/AddNewPetResponse.cs
@@ -0,0 +1,20 @@
+﻿using QAToolKit.Core.Models;
+using QAToolKit.Source.Swagger.Test.Fixtures.PetApi.Get.Helpers;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace QAToolKit.Source.Swagger.Test.Fixtures.PetApi.Post
+{
+    public static class AddNewPetResponse
+    {
+        public static List<Response> Get(bool exampleValues)
+        {
+            return new List<Response>()
+            {
+                PetResponse200.Get(exampleValues),
+                PetResponse405.Get()
+            };
+        }
+    }
+}
diff --git a/src/QAToolKit.Source.Swagger.Test/HttpGetTests/PetApi/SwaggerProcessorFindByTagsTests.cs b/src/QAToolKit.Source.Swagger.Test/HttpGetTests/PetApi/SwaggerProcessorFindByTagsTests.cs
@@ -12,7 +12,7 @@
 using Xunit;
 using Xunit.Abstractions;
 
-namespace QAToolKit.Source.Swagger.Test.HttpGetTests
+namespace QAToolKit.Source.Swagger.Test.HttpGetTests.PetApi
 {
     public class SwaggerProcessorFindByTagsTests
     {
@@ -62,7 +62,7 @@ public async Task PetsSwaggerGetByPetByIdWithExcampleValuesTest_Successfull()
             Assert.Empty(requests.FirstOrDefault().RequestBodies);
             Assert.Equal(2, requests.FirstOrDefault().Responses.Count);
 
-            var expectedPetsResponse = PetsFindByTagsResponses.Get(true).ToExpectedObject();
+            var expectedPetsResponse = FindPetsByTagsResponses.Get(true).ToExpectedObject();
             expectedPetsResponse.ShouldEqual(requests.FirstOrDefault().Responses);
 
             Assert.Equal("Finds Pets by tags", requests.FirstOrDefault().Summary);
@@ -109,7 +109,7 @@ public async Task PetsSwaggerGetByPetByIdWithoutExcampleValuesTest_Successfull()
             Assert.Empty(requests.FirstOrDefault().RequestBodies);
             Assert.Equal(2, requests.FirstOrDefault().Responses.Count);
 
-            var expectedPetsResponse = PetsFindByTagsResponses.Get(false).ToExpectedObject();
+            var expectedPetsResponse = FindPetsByTagsResponses.Get(false).ToExpectedObject();
             expectedPetsResponse.ShouldEqual(requests.FirstOrDefault().Responses);
 
             Assert.Equal("Finds Pets by tags", requests.FirstOrDefault().Summary);
diff --git a/src/QAToolKit.Source.Swagger.Test/HttpGetTests/PetApi/SwaggerProcessorGetPetByIdTests.cs b/src/QAToolKit.Source.Swagger.Test/HttpGetTests/PetApi/SwaggerProcessorGetPetByIdTests.cs
@@ -12,17 +12,17 @@
 using Xunit;
 using Xunit.Abstractions;
 
-namespace QAToolKit.Source.Swagger.Test.HttpGetTests
+namespace QAToolKit.Source.Swagger.Test.HttpGetTests.PetApi
 {
-    public class SwaggerProcessorGetPetsByIdTests
+    public class SwaggerProcessorGetPetByIdTests
     {
-        private readonly ILogger<SwaggerProcessorGetPetsByIdTests> _logger;
+        private readonly ILogger<SwaggerProcessorGetPetByIdTests> _logger;
 
-        public SwaggerProcessorGetPetsByIdTests(ITestOutputHelper testOutputHelper)
+        public SwaggerProcessorGetPetByIdTests(ITestOutputHelper testOutputHelper)
         {
             var loggerFactory = new LoggerFactory();
             loggerFactory.AddProvider(new XunitLoggerProvider(testOutputHelper));
-            _logger = loggerFactory.CreateLogger<SwaggerProcessorGetPetsByIdTests>();
+            _logger = loggerFactory.CreateLogger<SwaggerProcessorGetPetByIdTests>();
         }
 
         [Fact]
@@ -62,7 +62,7 @@ public async Task PetsSwaggerGetPetByIdWithExampleValuesTest_Successfull()
             Assert.Empty(requests.FirstOrDefault().RequestBodies);
             Assert.Equal(3, requests.FirstOrDefault().Responses.Count);
 
-            var expectedPetsResponse = PetsGetByIdResponse.Get(true).ToExpectedObject();
+            var expectedPetsResponse = GetPetByIdResponse.Get(true).ToExpectedObject();
             expectedPetsResponse.ShouldEqual(requests.FirstOrDefault().Responses);
 
             Assert.Equal("Find pet by ID", requests.FirstOrDefault().Summary);
@@ -108,7 +108,7 @@ public async Task PetsSwaggerGetPetByIdWithoutExampleValuesTest_Successfull()
             Assert.Empty(requests.FirstOrDefault().RequestBodies);
             Assert.Equal(3, requests.FirstOrDefault().Responses.Count);
 
-            var expectedPetsResponse = PetsGetByIdResponse.Get(false).ToExpectedObject();
+            var expectedPetsResponse = GetPetByIdResponse.Get(false).ToExpectedObject();
             expectedPetsResponse.ShouldEqual(requests.FirstOrDefault().Responses);
 
             Assert.Equal("Find pet by ID", requests.FirstOrDefault().Summary);
diff --git a/src/QAToolKit.Source.Swagger.Test/HttpGetTests/PetApi/SwaggerProcessorGetPetsByStatus.cs b/src/QAToolKit.Source.Swagger.Test/HttpGetTests/PetApi/SwaggerProcessorGetPetsByStatus.cs
@@ -12,7 +12,7 @@
 using Xunit;
 using Xunit.Abstractions;
 
-namespace QAToolKit.Source.Swagger.Test.HttpGetTests
+namespace QAToolKit.Source.Swagger.Test.HttpGetTests.PetApi
 {
     public class SwaggerProcessorGetPetsByStatus
     {
@@ -62,7 +62,7 @@ public async Task PetsSwaggerGetPetsByStatuesWithExampleValuesTest_Successfull()
             Assert.Empty(requests.FirstOrDefault().RequestBodies);
             Assert.Equal(2, requests.FirstOrDefault().Responses.Count);
 
-            var expectedPetsResponse = PetsFindByStatusResponses.Get(true).ToExpectedObject();
+            var expectedPetsResponse = FindPetsByStatusResponses.Get(true).ToExpectedObject();
             expectedPetsResponse.ShouldEqual(requests.FirstOrDefault().Responses);
 
             Assert.Equal("Finds Pets by status", requests.FirstOrDefault().Summary);
@@ -109,7 +109,7 @@ public async Task PetsSwaggerGetPetsByStatuesWithoutExampleValuesTest_Successful
             Assert.Empty(requests.FirstOrDefault().RequestBodies);
             Assert.Equal(2, requests.FirstOrDefault().Responses.Count);
 
-            var expectedPetsResponse = PetsFindByStatusResponses.Get(false).ToExpectedObject();
+            var expectedPetsResponse = FindPetsByStatusResponses.Get(false).ToExpectedObject();
             expectedPetsResponse.ShouldEqual(requests.FirstOrDefault().Responses);
 
             Assert.Equal("Finds Pets by status", requests.FirstOrDefault().Summary);
diff --git a/src/QAToolKit.Source.Swagger.Test/HttpGetTests/PetApi/SwaggerProcessorPetApiTests.cs b/src/QAToolKit.Source.Swagger.Test/HttpGetTests/PetApi/SwaggerProcessorPetApiTests.cs
@@ -7,7 +7,7 @@
 using Xunit;
 using Xunit.Abstractions;
 
-namespace QAToolKit.Source.Swagger.Test.HttpGetTests
+namespace QAToolKit.Source.Swagger.Test.HttpGetTests.PetApi
 {
     public class SwaggerProcessorPetApiTests
     {
diff --git a/src/QAToolKit.Source.Swagger.Test/HttpPostTests/PetApi/SwaggerProcessorAddNewPetTests.cs b/src/QAToolKit.Source.Swagger.Test/HttpPostTests/PetApi/SwaggerProcessorAddNewPetTests.cs
@@ -0,0 +1,118 @@
+﻿using ExpectedObjects;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using QAToolKit.Core.Models;
+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.HttpGetTests.PetApi
+{
+    public class SwaggerProcessorAddNewPetTests
+    {
+        private readonly ILogger<SwaggerProcessorAddNewPetTests> _logger;
+
+        public SwaggerProcessorAddNewPetTests(ITestOutputHelper testOutputHelper)
+        {
+            var loggerFactory = new LoggerFactory();
+            loggerFactory.AddProvider(new XunitLoggerProvider(testOutputHelper));
+            _logger = loggerFactory.CreateLogger<SwaggerProcessorAddNewPetTests>();
+        }
+
+        [Fact]
+        public async Task AddNewPetWithoutExampleValuesTest_Successfull()
+        {
+            var fileSource = new SwaggerFileSource(options =>
+            {
+                options.AddBaseUrl(new Uri("https://petstore3.swagger.io/"));
+                options.AddRequestFilters(new RequestFilter()
+                {
+                    EndpointNameWhitelist = new string[] { "addPet" }
+                });
+            });
+
+            var requests = await fileSource.Load(new List<FileInfo>() {
+                new FileInfo("Assets/swagger-pets-test.json")
+            });
+
+            _logger.LogInformation(JsonConvert.SerializeObject(requests, Formatting.Indented));
+
+            Assert.NotNull(requests);
+            Assert.Equal(1, requests.Count);
+
+            Assert.Empty(requests.FirstOrDefault().AuthenticationTypes);
+            Assert.Equal("https://petstore3.swagger.io/api/v3", requests.FirstOrDefault().BasePath);
+            Assert.Equal("Add a new pet to the store", requests.FirstOrDefault().Description);
+            Assert.Equal(HttpMethod.Post, requests.FirstOrDefault().Method);
+            Assert.Equal("addPet", requests.FirstOrDefault().OperationId);
+            Assert.Empty(requests.FirstOrDefault().Parameters);
+            Assert.Equal("/pet", requests.FirstOrDefault().Path);
+            Assert.Equal(2, requests.FirstOrDefault().Responses.Count);
+
+            var expectedPetsBody = AddNewPetBody.Get(false).ToExpectedObject();
+            expectedPetsBody.ShouldEqual(requests.FirstOrDefault().RequestBodies);
+
+            var expectedPetsResponse = AddNewPetResponse.Get(false).ToExpectedObject();
+            expectedPetsResponse.ShouldEqual(requests.FirstOrDefault().Responses);
+
+            Assert.Equal("Add a new pet to the store", requests.FirstOrDefault().Summary);
+            Assert.Collection(requests.FirstOrDefault().Tags, item =>
+            {
+                item = "pet";
+            });
+            Assert.Empty(requests.FirstOrDefault().TestTypes);
+        }
+
+        [Fact]
+        public async Task AddNewPetWithExampleValuesTest_Successfull()
+        {
+            var fileSource = new SwaggerFileSource(options =>
+            {
+                options.AddBaseUrl(new Uri("https://petstore3.swagger.io/"));
+                options.AddRequestFilters(new RequestFilter()
+                {
+                    EndpointNameWhitelist = new string[] { "addPet" }
+                });
+                options.UseSwaggerExampleValues = true;
+            });
+
+            var requests = await fileSource.Load(new List<FileInfo>() {
+                new FileInfo("Assets/swagger-pets-test.json")
+            });
+
+            _logger.LogInformation(JsonConvert.SerializeObject(requests, Formatting.Indented));
+
+            Assert.NotNull(requests);
+            Assert.Equal(1, requests.Count);
+
+            Assert.Empty(requests.FirstOrDefault().AuthenticationTypes);
+            Assert.Equal("https://petstore3.swagger.io/api/v3", requests.FirstOrDefault().BasePath);
+            Assert.Equal("Add a new pet to the store", requests.FirstOrDefault().Description);
+            Assert.Equal(HttpMethod.Post, requests.FirstOrDefault().Method);
+            Assert.Equal("addPet", requests.FirstOrDefault().OperationId);
+            Assert.Empty(requests.FirstOrDefault().Parameters);
+            Assert.Equal("/pet", requests.FirstOrDefault().Path);
+            Assert.Equal(2, requests.FirstOrDefault().Responses.Count);
+
+            var expectedPetsBody = AddNewPetBody.Get(true).ToExpectedObject();
+            expectedPetsBody.ShouldEqual(requests.FirstOrDefault().RequestBodies);
+
+            var expectedPetsResponse = AddNewPetResponse.Get(true).ToExpectedObject();
+            expectedPetsResponse.ShouldEqual(requests.FirstOrDefault().Responses);
+
+            Assert.Equal("Add a new pet to the store", requests.FirstOrDefault().Summary);
+            Assert.Collection(requests.FirstOrDefault().Tags, item =>
+            {
+                item = "pet";
+            });
+            Assert.Empty(requests.FirstOrDefault().TestTypes);
+        }
+    }
+}
diff --git a/src/QAToolKit.Source.Swagger.Test/QAToolKit.Source.Swagger.Test.csproj b/src/QAToolKit.Source.Swagger.Test/QAToolKit.Source.Swagger.Test.csproj
@@ -34,8 +34,8 @@
 
   <ItemGroup>
     <Folder Include="Fixtures\PetApi\Delete\" />
+    <Folder Include="Fixtures\PetApi\Post\Helpers\" />
     <Folder Include="Fixtures\PetApi\Put\" />
-    <Folder Include="Fixtures\PetApi\Post\" />
   </ItemGroup>
 
 </Project>
diff --git a/src/QAToolKit.Source.Swagger/SwaggerProcessor.cs b/src/QAToolKit.Source.Swagger/SwaggerProcessor.cs

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace QAToolKit.Source.Swagger.Test.Fixtures.PetApi.Get`
`6`	`6`	`{`
`7`		`- public static class PetsFindByStatusResponses`
	`7`	`+ public static class FindPetsByStatusResponses`
`8`	`8`	`{`
`9`	`9`	`public static List<Response> Get(bool exampleValues)`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace QAToolKit.Source.Swagger.Test.Fixtures.PetApi.Get`
`6`	`6`	`{`
`7`		`- public static class PetsFindByTagsResponses`
	`7`	`+ public static class FindPetsByTagsResponses`
`8`	`8`	`{`
`9`	`9`	`public static List<Response> Get(bool exampleValues)`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace QAToolKit.Source.Swagger.Test.Fixtures.PetApi.Get`
`6`	`6`	`{`
`7`		`- public static class PetsGetByIdResponse`
	`7`	`+ public static class GetPetByIdResponse`
`8`	`8`	`{`
`9`	`9`	`public static List<Response> Get(bool exampleValues)`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using Xunit;`
`8`	`8`	`using Xunit.Abstractions;`
`9`	`9`
`10`		`-namespace QAToolKit.Source.Swagger.Test.HttpGetTests`
	`10`	`+namespace QAToolKit.Source.Swagger.Test.HttpGetTests.PetApi`
`11`	`11`	`{`
`12`	`12`	`public class SwaggerProcessorPetApiTests`
`13`	`13`	`{`