Skip to content

Commit

Permalink
Remove some comments, change return value of bad request test cases t…
Browse files Browse the repository at this point in the history 
…o 500
  • Loading branch information
@mirsking
mirsking committed Aug 8, 2016
1 parent 0f8a921 commit 764ef0d
Showing 1 changed file with 19 additions and 21 deletions.
40 changes: 19 additions & 21 deletions test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/TrippinInMemoryE2ETest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,9 @@ public void TestCountCollectionOfStructuralProperty()
{
TestGetPayloadIs("People('russellwhyte')/Emails/$count", "2");
TestGetPayloadIs("People('russellwhyte')/AddressInfo/$count", "1");
TestGetPayloadIs("People('russellwhyte')/Features/$count", "2");
}

/// <summary>
/// TODO t-pewang, this case cannot pass, since my navigation property doesn't auto expand
/// </summary>
[Fact]
public void TestAutoExpandedNavigationProperty()
{
Expand All @@ -107,9 +105,9 @@ public void TestAutoExpandedNavigationProperty()
[InlineData("/People('willieashmore')/MiddleName/$value", 204)]
// Collection of primitive property with empty value
[InlineData("/People('willieashmore')/Emails", 200)]
//// Collection of primitive property $value with null value, should throw exception
//// TODO should be bad request 400 as this is not allowed, 404 is returned by WebApi Route Match method
//[InlineData("/People('willieashmore')/Emails/$value", 404)]
// Collection of primitive property $value with null value, should throw exception
// TODO should be bad request 400 as this is not allowed, 404 is returned by WebApi Route Match method. 500 is returned actually.
[InlineData("/People('willieashmore')/Emails/$value", 500)]
// Collection of primitive property with null collection
[InlineData("/People('clydeguess')/Emails", 200)]
// single complex property with null value
Expand All @@ -120,9 +118,9 @@ public void TestAutoExpandedNavigationProperty()
[InlineData("/People('clydeguess')/HomeAddress/Address", 204)]
// collection of complex property with empty collection value
[InlineData("/People('willieashmore')/AddressInfo", 200)]
//// collection of complex property's propery and collection of complex property has null value
//// TODO should be bad request 400 as this is not allowed, 404 is returned by WebApi Route Match method
//[InlineData("/People(5)/AddressInfo/Address", 404)]
// collection of complex property's propery and collection of complex property has null value
// TODO should be bad request 400 as this is not allowed, 404 is returned by WebApi Route Match method. 500 is returned actually.
[InlineData("/People(5)/AddressInfo/Address", 500)]
// Collection of complex property with null collection
[InlineData("/People('clydeguess')/AddressInfo", 200)]
// single navigation property with null value
Expand All @@ -135,9 +133,9 @@ public void TestAutoExpandedNavigationProperty()
[InlineData("/People('willieashmore')/Friends", 200)]
// collection of navigation property with null collection value
[InlineData("/People('clydeguess')/Trips", 200)]
//// collection of navigation property's property and navigation property has null value
//// TODO should be bad request 400 as this is not allowed, 404 is returned by WebApi Route Match method
//[InlineData("/People('willieashmore')/Friends/MiddleName", 404)]
// collection of navigation property's property and navigation property has null value
// TODO should be bad request 400 as this is not allowed, 404 is returned by WebApi Route Match method. 500 is returned actually.
[InlineData("/People('willieashmore')/Friends/MiddleName", 500)]
public void QueryPropertyWithNullValueStatusCode(string url, int expectedCode)
{
TestGetStatusCodeIs(url, expectedCode);
Expand All @@ -150,27 +148,27 @@ public void QueryPropertyWithNullValueStatusCode(string url, int expectedCode)
[InlineData("/People('NoneExist')/MiddleName/$value", 404)]
// Collection of primitive property
[InlineData("/People('NoneExist')/Emails", 404)]
//// Collection of primitive property $value
//// TODO should be bad request 400 as this is not allowed, 404 is returned by WebApi Route Match method
//[InlineData("/People('NoneExist')/Emails/$value", 404)]
// Collection of primitive property $value
// TODO should be bad request 400 as this is not allowed, 404 is returned by WebApi Route Match method. 500 is returned actually.
[InlineData("/People('NoneExist')/Emails/$value", 500)]
// single complex property
[InlineData("/People('NoneExist')/HomeAddress", 404)]
// single complex property's property
[InlineData("/People('NoneExist')/HomeAddress/Address", 404)]
// collection of complex property
[InlineData("/People('NoneExist')/AddressInfo", 404)]
//// collection of complex property's propery
//// TODO should be bad request 400 as this is not allowed?? 404 is returned by WebApi Route Match method
//[InlineData("/People('NoneExist')/Locations/Address", 404)]
// collection of complex property's propery
// TODO should be bad request 400 as this is not allowed, 404 is returned by WebApi Route Match method. 500 is returned actually.
[InlineData("/People('NoneExist')/Locations/Address", 500)]
// single navigation property
[InlineData("/People('NoneExist')/BestFriend", 404)]
// single navigation property's propery
[InlineData("/People('NoneExist')/BestFriend/MiddleName", 404)]
// collection of navigation property
[InlineData("/People('NoneExist')/Friends", 404)]
//// collection of navigation property's property
//// TODO should be bad request 400 as this is not allowed, 404 is returned by WebApi Route Match method
//[InlineData("/People('NoneExist')/Friends/MiddleName", 404)]
// collection of navigation property's property
// TODO should be bad request 400 as this is not allowed, 404 is returned by WebApi Route Match method. 500 is returned actually.
[InlineData("/People('NoneExist')/Friends/MiddleName", 500)]
public void QueryPropertyWithNonExistEntity(string url, int expectedCode)
{
TestGetStatusCodeIs(url, expectedCode);
Expand Down

0 comments on commit 764ef0d

Please sign in to comment.