domaindrivendev#2378 nullable issue?

anoordover · Mar 30, 2022 · c11f3bc · c11f3bc
1 parent fcbec2c
commit c11f3bc
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/test/Swashbuckle.AspNetCore.Newtonsoft.Test/Fixtures/JsonConverterAnnotatedEnum.cs b/test/Swashbuckle.AspNetCore.Newtonsoft.Test/Fixtures/JsonConverterAnnotatedEnum.cs
@@ -12,4 +12,9 @@ public enum JsonConverterAnnotatedEnum
         [EnumMember(Value = "X-foo")]
         X = 8
     }
+
+    public class EnumHolder1
+    {
+        public int? AnnotatedEnum { get; set; }
+    }
 }
diff --git a/.../Swashbuckle.AspNetCore.Newtonsoft.Test/SchemaGenerator/NewtonsoftSchemaGeneratorTests.cs b/.../Swashbuckle.AspNetCore.Newtonsoft.Test/SchemaGenerator/NewtonsoftSchemaGeneratorTests.cs
@@ -694,6 +694,33 @@ public void GenerateSchema_HonorsSerializerAttribute_StringEnumConverter()
             Assert.Equal(new[] { "\"Value1\"", "\"Value2\"", "\"X-foo\"" }, schema.Enum.Select(openApiAny => openApiAny.ToJson()));
         }
 
+        [Fact]
+        public void GenerateSchema_NullableProperty_ShouldBeNullable()
+        {
+            var schemaRepository = new SchemaRepository();
+
+            var referenceSchema = Subject().GenerateSchema(typeof(EnumHolder1), schemaRepository);
+
+            //TODO: see https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/2378#issuecomment-1072977332
+            //Will this be a $ref in swagger.json?
+            //according to the comment a $ref cannot contain nullable: true
+            var schema = schemaRepository.Schemas[referenceSchema.Reference.Id];
+            var property = schema.Properties["AnnotatedEnum"];
+            Assert.True(property.Nullable);
+        }
+
+        [Fact]
+        public void GenerateSchema_QuestionmarkProperty_ShouldBeNullable()
+        {
+            var schemaRepository = new SchemaRepository();
+
+            var referenceSchema = Subject().GenerateSchema(typeof(EnumHolder1), schemaRepository);
+
+            var schema = schemaRepository.Schemas[referenceSchema.Reference.Id];
+            var property = schema.Properties["AnnotatedEnum"];
+            Assert.True(property.Nullable);
+        }
+
         [Fact]
         public void GenerateSchema_HonorsSerializerAttribute_JsonIgnore()
         {