Porting test cases from domaindrivendev#2723 for #3 credits @dougclutter

Havunen · Feb 18, 2024 · ff74036 · ff74036
1 parent 4e4bf2c
commit ff74036
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 3 deletions.
diff --git a/...otSwashbuckle.AspNetCore.SwaggerGen/SwaggerGenerator/ApiParameterDescriptionExtensions.cs b/...otSwashbuckle.AspNetCore.SwaggerGen/SwaggerGenerator/ApiParameterDescriptionExtensions.cs
@@ -44,9 +44,7 @@ public static PropertyInfo PropertyInfo(this ApiParameterDescription apiParamete
         {
             var modelMetadata = apiParameter.ModelMetadata;
 
-            return (modelMetadata?.ContainerType != null)
-                ? modelMetadata.ContainerType.GetProperty(modelMetadata.PropertyName)
-                : null;
+            return modelMetadata?.ContainerType?.GetProperty(modelMetadata.PropertyName);
         }
 
         public static IEnumerable<object> CustomAttributes(this ApiParameterDescription apiParameter)

diff --git a/test/DotSwashbuckle.AspNetCore.SwaggerGen.Test/DotSwashbuckle.AspNetCore.SwaggerGen.Test.xml b/test/DotSwashbuckle.AspNetCore.SwaggerGen.Test/DotSwashbuckle.AspNetCore.SwaggerGen.Test.xml
diff --git a/.../DotSwashbuckle.AspNetCore.SwaggerGen.Test/SchemaGenerator/CustomJsonSerializerContext.cs b/.../DotSwashbuckle.AspNetCore.SwaggerGen.Test/SchemaGenerator/CustomJsonSerializerContext.cs
@@ -0,0 +1,10 @@
+using System.Text.Json.Serialization;
+using DotSwashbuckle.AspNetCore.TestSupport;
+
+namespace Swashbuckle.AspNetCore.SwaggerGen.Test.SchemaGenerator;
+
+[JsonSerializable(typeof(IntEnum))]
+[JsonSerializable(typeof(LongEnum))]
+public partial class CustomJsonSerializerContext : JsonSerializerContext
+{
+}
diff --git a/...shbuckle.AspNetCore.SwaggerGen.Test/SchemaGenerator/JsonSerializerSchemaGeneratorTests.cs b/...shbuckle.AspNetCore.SwaggerGen.Test/SchemaGenerator/JsonSerializerSchemaGeneratorTests.cs
@@ -16,6 +16,7 @@
 using DotSwashbuckle.AspNetCore.TestSupport;
 using Microsoft.OpenApi.Any;
 using DotSwashbuckle.AspNetCore.TestSupport.Fixtures;
+using Swashbuckle.AspNetCore.SwaggerGen.Test.SchemaGenerator;
 
 namespace DotSwashbuckle.AspNetCore.SwaggerGen.Test
 {
@@ -777,6 +778,34 @@ public void GenerateSchema_HonorsSerializerOption_PropertyNamingPolicy()
             Assert.Equal(expectedDefaultAsJson, propertySchema.Default.ToJson());
         }
 
+        [Theory]
+        [InlineData(typeof(IntEnum), "integer", "int32", false, "2", "4", "8")]
+        [InlineData(typeof(LongEnum), "integer", "int64", false, "2", "4", "8")]
+        [InlineData(typeof(IntEnum?), "integer", "int32", true, "2", "4", "8")]
+        [InlineData(typeof(LongEnum?), "integer", "int64", true, "2", "4", "8")]
+        public void GenerateSchema_GeneratesReferencedEnumSchema_IfEnumOrNullableEnumType_WorksWithJsonSerializerContext(
+            Type type,
+            string expectedSchemaType,
+            string expectedFormat,
+            bool expectedNullable,
+            params string[] expectedEnumAsJson
+        )
+        {
+            var schemaRepository = new SchemaRepository();
+
+            var referenceSchema = Subject(
+                configureSerializer: c => { c.TypeInfoResolver = CustomJsonSerializerContext.Default; }
+            ).GenerateSchema(type, schemaRepository);
+
+            Assert.NotNull(referenceSchema.Reference);
+            var schema = schemaRepository.Schemas[referenceSchema.Reference.Id];
+            Assert.Equal(expectedSchemaType, schema.Type);
+            Assert.Equal(expectedFormat, schema.Format);
+            Assert.NotNull(schema.Enum);
+            Assert.Equal(expectedEnumAsJson, schema.Enum.Select(openApiAny => openApiAny.ToJson()));
+            Assert.Equal(expectedNullable, schema.Nullable);
+        }
+
         [Fact]
         public void GenerateSchema_HonorsSerializerAttribute_StringEnumConverter()
         {