Update test cases for DataMember attribute

Author: justinyoo

src/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core/Extensions/PropertyInfoExtensions.cs

@@ -1,5 +1,6 @@
 using System.Reflection;
 using System.Runtime.Serialization;
+
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
@@ -39,7 +40,7 @@ public static bool HasDataMemberAttribute(this PropertyInfo element)
         /// </summary>
         /// <param name="element"><see cref="PropertyInfo"/> instance.</param>
         /// <param name="namingStrategy"><see cref="NamingStrategy"/> instance.</param>
-        /// <returns>Returns the name from <see cref="JsonPropertyAttribute"/> or <see cref="DataMemberAttribute"/> instance.</returns>
+        /// <returns>Returns the name from <see cref="JsonPropertyAttribute"/> or <see cref="DataMemberAttribute"/> instance. If both <see cref="JsonPropertyAttribute"/> and <see cref="DataMemberAttribute"/> are declared, <see cref="JsonPropertyAttribute"/> takes precedence.</returns>
         public static string GetJsonPropertyName(this PropertyInfo element, NamingStrategy namingStrategy = null)
         {
             if (namingStrategy.IsNullOrDefault())

test-integration/Microsoft.Azure.WebJobs.Extensions.OpenApi.Document.Tests/Get_ApplicationJson_JsonProperty_Tests.cs

@@ -67,11 +67,9 @@ public void Given_OpenApiDocument_Then_It_Should_Return_ComponentSchema(string @
         }
 
         [DataTestMethod]
-        [DataRow("jsonPropertyObjectModel", "object", "memBer1", "string", null)]
+        [DataRow("jsonPropertyObjectModel", "object", "Member1", "string", null)]
         [DataRow("jsonPropertyObjectModel", "object", "MEMBER2", "integer", "int32")]
-        [DataRow("jsonPropertyObjectModel", "object", "MeMBer3", "string", "date-time")]
-        [DataRow("jsonPropertyObjectModel", "object", "member4", "boolean", null)]
-        [DataRow("jsonPropertyObjectModel", "object", "MembeR5", "number", "double")]
+        [DataRow("jsonPropertyObjectModel", "object", "mEmbER3", "string", "date-time")]
         public void Given_OpenApiDocument_Then_It_Should_Return_ComponentSchemaProperty(string @ref, string refType, string propertyName, string propertyType, string propertyFormat)
         {
             var properties = this._doc["components"]["schemas"][@ref]["properties"];

test-integration/Microsoft.Azure.WebJobs.Extensions.OpenApi.TestApp/Models/JsonPropertyObjectModel.cs

@@ -1,25 +1,20 @@
-using Newtonsoft.Json;
 using System;
 using System.Runtime.Serialization;
 
+using Newtonsoft.Json;
+
 namespace Microsoft.Azure.WebJobs.Extensions.OpenApi.TestApp.Models
 {
     public class JsonPropertyObjectModel
     {
-        [DataMember(Name = "memBer1")]
+        [JsonProperty("Member1")]
         public string DataMemberValue1 { get; set; }
 
         [DataMember(Name = "MEMBER2")]
         public int DataMemberValue2 { get; set; }
 
         [DataMember(Name = "MeMBer3")]
+        [JsonProperty("mEmbER3")]
         public DateTime DataMemberValue3 { get; set; }
-
-        [DataMember(Name = "member4")]
-        public bool DataMemberValue4 { get; set; }
-
-        [DataMember(Name = "MembeR5")]
-        public double DataMemberValue5 { get; set; }
-
     }
 }

test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests.Fakes/FakeModel.cs

@@ -17,7 +17,7 @@ public class FakeModel
         /// <summary>
         /// Gets or sets the value 2.
         /// </summary>
-        [JsonProperty("anotherFakeProperty", Required = Required.Always)]
+        [JsonProperty("anotherJsonFakeProperty", Required = Required.Always)]
         public string FakeProperty2 { get; set; }
 
         [JsonProperty(Required = Required.Default)]
@@ -27,7 +27,11 @@ public class FakeModel
         public string FakePropertyNoAnnotation { get; set; }
 
         [DataMember(Name = "anotherDataMemberFakeProperty")]
-        public string DataMemberFakeProperty { get; set; } 
+        public string FakeProperty3 { get; set; }
+
+        [DataMember(Name = "dataMemberFakeProperty")]
+        [JsonProperty("jsonFakeProperty")]
+        public string FakeProperty4 { get; set; }
 
         public object FakeObject { get; set; }
 

test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Extensions/PropertyInfoExtensionsTests.cs

@@ -32,7 +32,7 @@ public void Given_Property_When_GetJsonPropertyName_Invoked_Then_It_Should_Retur
         public void Given_Property_When_GetJsonPropertyName_Invoked_Then_It_Should_Return_JsonPropertyName()
         {
             var name = "FakeProperty2";
-            var jsonPropertyName = "anotherFakeProperty";
+            var jsonPropertyName = "anotherJsonFakeProperty";
             var property = typeof(FakeModel).GetProperty(name, BindingFlags.Public | BindingFlags.Instance);
             var namingStrategy = new DefaultNamingStrategy();
 
@@ -42,16 +42,33 @@ public void Given_Property_When_GetJsonPropertyName_Invoked_Then_It_Should_Retur
         }
 
         [TestMethod]
-        public void Given_Property_When_GetDataMemberName_Invoked_Then_It_Should_Return_DataMemberName()
+        public void Given_Property_When_GetJsonPropertyName_Invoked_Then_It_Should_Return_DataMemberName()
         {
-            var name = "DataMemberFakeProperty";
-            var jsonPropertyName = "anotherDataMemberFakeProperty";
+            var name = "FakeProperty3";
+            var dataMemberPropertyName = "anotherDataMemberFakeProperty";
+
+            var property = typeof(FakeModel).GetProperty(name, BindingFlags.Public | BindingFlags.Instance);
+            var namingStrategy = new DefaultNamingStrategy();
+
+            var result = PropertyInfoExtensions.GetJsonPropertyName(property, namingStrategy);
+
+            result.Should().Be(dataMemberPropertyName);
+        }
+
+        [TestMethod]
+        public void Given_BothProperties_When_GetJsonPropertyName_Invoked_Then_It_Should_Return_JsonPropertyName()
+        {
+            var name = "FakeProperty4";
+            var jsonPropertyName = "jsonFakeProperty";
+            var dataMemberPropertyName = "dataMemberFakeProperty";
+
             var property = typeof(FakeModel).GetProperty(name, BindingFlags.Public | BindingFlags.Instance);
             var namingStrategy = new DefaultNamingStrategy();
 
             var result = PropertyInfoExtensions.GetJsonPropertyName(property, namingStrategy);
 
             result.Should().Be(jsonPropertyName);
+            result.Should().NotBe(dataMemberPropertyName);
         }
 
         [TestMethod]