Add GenerateExpandQueryStringInternal nullCheck tests (#2797)

Author: KenitoInc

src/Microsoft.AspNet.OData.Shared/Query/ExpandQueryBuilder.cs

@@ -30,11 +30,6 @@ public virtual string GenerateExpandQueryParameter(object value, IEdmModel model
                 throw Error.ArgumentNull(nameof(value));
             }
 
-            if (model == null)
-            {
-                throw Error.ArgumentNull(nameof(model));
-            }
-
             return GenerateExpandQueryStringInternal(value, model, false);
         }
 

test/E2ETest/Microsoft.Test.E2E.AspNet.OData/BulkOperation/BulkOperationController.cs

@@ -265,6 +265,14 @@ public ITestActionResult Post([FromBody] Employee employee)
             return Created(employee);
         }
 
+        [ODataRoute("UnTypedEmployees")]
+        [HttpPost]
+        [EnableQuery]
+        public ITestActionResult PostUnTypedEmployees([FromBody] string emp)
+        {
+            return Ok(emp);
+        }
+
         [ODataRoute("Employees({key})/Friends")]
         [HttpPatch]
         public ITestActionResult PatchFriends(int key, [FromBody] DeltaSet<Friend> friendColl)

test/E2ETest/Microsoft.Test.E2E.AspNet.OData/BulkOperation/BulkOperationTest.cs

@@ -1466,7 +1466,30 @@ public async Task PostEmployee_WithFullMetadata()
             }
         }
 
-#endregion
+        [Fact]
+        public async Task PostUntypedEmployeeAsString()
+        {
+            //Arrange
+
+            string requestUri = this.BaseAddress + "/convention/UntypedEmployees";
+
+            var content = @"{
+                    'value': 'OData'
+                     }";
+
+            var requestForPost = new HttpRequestMessage(new HttpMethod("POST"), requestUri);
+
+            StringContent stringContent = new StringContent(content: content, encoding: Encoding.UTF8, mediaType: "application/json");
+            requestForPost.Content = stringContent;
+
+            //Act & Assert
+            using (HttpResponseMessage response = await this.Client.SendAsync(requestForPost))
+            {
+                Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            }
+        }
+
+        #endregion
 
         #region Full Metadata
 

test/UnitTest/Microsoft.AspNet.OData.Test.Shared/Query/ExpandQueryBuilderTest.cs

@@ -96,6 +96,52 @@ public void MultipleUnevenLevelsExpand()
             Assert.Equal(expected, actual);
         }
 
+        [Fact]
+        public void NoNavigationPropertyReturnsEmptyString()
+        {
+            Employee employee = new Employee()
+            {
+                ID = 1,
+                Name= "Employee 1"
+            };
+
+            string expected = "";
+            string actual = expandQueryBuilder.GenerateExpandQueryParameter(employee, null);
+
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void NullEdmModelReturnsEmptyString()
+        {
+            Employee employee = new Employee()
+            {
+                ID = 1,
+                Friends = new List<Friend> { new Friend() { Id = 1001, Orders = new List<Order> { new Order { Id = 10001 } } }, new Friend() { Id = 1002, Orders = new List<Order> { new Order { Id = 10002, OrderLines = new List<OrderLine> { new OrderLine { Id = 222 } } }, new Order { Id = 10003 } } } },
+                NewFriends = new List<NewFriend> { new NewFriend() { Id = 1001, NewOrders = new List<NewOrder> { new NewOrder { Id = 10001 } } } }
+            };
+
+            string expected = "";
+            string actual = expandQueryBuilder.GenerateExpandQueryParameter(employee, null);
+
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void UnknownEdmTypeReturnsEmptyString()
+        {
+            NonEdmType nonEdmType = new NonEdmType()
+            {
+                Id = 1,
+                Name = "Unknown Type"
+            };
+
+            string expected = "";
+            string actual = expandQueryBuilder.GenerateExpandQueryParameter(nonEdmType, model);
+
+            Assert.Equal(expected, actual);
+        }
+
         private class Employee
         {
             [Key]
@@ -147,5 +193,12 @@ private class NewOrder
             public int Quantity { get; set; }
             public ODataIdContainer Container { get; set; }
         }
+
+        private class NonEdmType
+        {
+            [Key]
+            public int Id { get; set; }
+            public string Name { get; set; }
+        }
     }
 }