Skip to content

Commit

Permalink
Port EdmDateAndTimeOfDayTests (#3048)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ElizabethOkerio
ElizabethOkerio authored Sep 23, 2024
1 parent 95233fc commit 0d7f2da
Show file tree
Hide file tree
Showing 6 changed files with 783 additions and 51 deletions.
8 changes: 4 additions & 4 deletions ...Common/Common/HttpClientRequestMessage.cs → ...on/Common/TestHttpClientRequestMessage.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------------
// <copyright file="HttpClientRequestMessage.cs" company=".NET Foundation">
// <copyright file="TestHttpClientRequestMessage.cs" company=".NET Foundation">
// Copyright (c) .NET Foundation and Contributors. All rights reserved.
// See License.txt in the project root for license information.
// </copyright>
Expand All @@ -11,15 +11,15 @@ namespace Microsoft.OData.Client.E2E.TestCommon.Common
/// An implementation of <see cref="IODataRequestMessageAsync"/> that uses an <see cref="HttpRequestMessage"/> under the covers.
/// In OData library, a message is an abstraction which consists of stream and header interfaces that hides the details of stream-reading/writing.
/// </summary>
public class HttpClientRequestMessage : IODataRequestMessageAsync, IServiceCollectionProvider, IDisposable, IAsyncDisposable
public class TestHttpClientRequestMessage : IODataRequestMessageAsync, IServiceCollectionProvider, IDisposable, IAsyncDisposable
{
private readonly HttpRequestMessage _request;
private readonly HttpClient _httpClient;
private HttpContent _content;
private Stream _stream;
private bool _disposed;

public HttpClientRequestMessage(Uri uri, HttpClient httpClient)
public TestHttpClientRequestMessage(Uri uri, HttpClient httpClient)
{
_httpClient = httpClient;
_stream = new MemoryStream();
Expand Down Expand Up @@ -101,7 +101,7 @@ public async Task<IODataResponseMessageAsync> GetResponseAsync()
throw new Exception($"Request to {_request.RequestUri} failed: {ex.Message}", ex);
}

return new HttpClientResponseMessage(response)
return new TestHttpClientResponseMessage(response)
{
ServiceProvider = ServiceProvider
};
Expand Down
6 changes: 3 additions & 3 deletions ...ommon/Common/HttpClientResponseMessage.cs → ...n/Common/TestHttpClientResponseMessage.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------------
// <copyright file="HttpClientResponseMessage.cs" company=".NET Foundation">
// <copyright file="TestHttpClientResponseMessage.cs" company=".NET Foundation">
// Copyright (c) .NET Foundation and Contributors. All rights reserved.
// See License.txt in the project root for license information.
// </copyright>
Expand All @@ -11,12 +11,12 @@ namespace Microsoft.OData.Client.E2E.TestCommon.Common
/// An implementation of <see cref="IODataResponseMessageAsync"/> that uses an <see cref="HttpResponseMessage"/> under the covers.
/// In ODataLibrary, a message is an abstraction which consists of stream and header interfaces that hides the details of stream-reading/writing.
/// </summary>
public class HttpClientResponseMessage : IODataResponseMessageAsync, IServiceCollectionProvider
public class TestHttpClientResponseMessage : IODataResponseMessageAsync, IServiceCollectionProvider
{
private readonly HttpResponseMessage _response;
private bool _disposed;

public HttpClientResponseMessage(HttpResponseMessage response)
public TestHttpClientResponseMessage(HttpResponseMessage response)
{
_response = response;
}
Expand Down
40 changes: 20 additions & 20 deletions .../Tests/Client/Microsoft.OData.Client.E2E.Tests/ComplexTypeTests/Tests/ComplexTypeTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public async Task QueryingAnEntityWithADerivedComplexTypeProperty_ExecutesSucces

var requestUri = new Uri(_baseUri.AbsoluteUri + "People(1)", UriKind.Absolute);

var requestMessage = new TestCommon.Common.HttpClientRequestMessage(requestUri, base.Client)
var requestMessage = new TestHttpClientRequestMessage(requestUri, base.Client)
{
Method = "GET"
};
Expand Down Expand Up @@ -128,7 +128,7 @@ public async Task QueryingADerivedComplexTypeProperty_ExecutesSuccessfully(strin

Uri requestUri = new(_baseUri.AbsoluteUri + "People(1)/HomeAddress", UriKind.Absolute);

var requestMessage = new TestCommon.Common.HttpClientRequestMessage(requestUri, base.Client)
var requestMessage = new TestHttpClientRequestMessage(requestUri, base.Client)
{
Method = "GET"
};
Expand Down Expand Up @@ -163,7 +163,7 @@ public async Task QueryingAPropertyOfADerivedComplexTypeProperty_ExecutesSuccess

Uri requestUri = new(_baseUri.AbsoluteUri + "People(1)/HomeAddress/Microsoft.OData.Client.E2E.Tests.Common.Server.Default.HomeAddress/FamilyName", UriKind.Absolute);

var requestMessage = new TestCommon.Common.HttpClientRequestMessage(requestUri, base.Client)
var requestMessage = new TestHttpClientRequestMessage(requestUri, base.Client)
{
Method = "GET"
};
Expand Down Expand Up @@ -191,7 +191,7 @@ public async Task FilterByAPropertyOfADerivedComplexTypeProperty_ExecutesSuccess

Uri requestUri = new(_baseUri.AbsoluteUri + "People?$filter=HomeAddress/Microsoft.OData.Client.E2E.Tests.Common.Server.Default.HomeAddress/FamilyName eq 'Cats'", UriKind.Absolute);

var requestMessage = new TestCommon.Common.HttpClientRequestMessage(requestUri, base.Client)
var requestMessage = new TestHttpClientRequestMessage(requestUri, base.Client)
{
Method = "GET"
};
Expand Down Expand Up @@ -309,7 +309,7 @@ public async Task UpdatingADerivedComplexTypeProperty_UpdatesSuccessfully(string

var requestUrl = new Uri(_baseUri + "People(1)");

var requestMessage = new TestCommon.Common.HttpClientRequestMessage(requestUrl, base.Client)
var requestMessage = new TestHttpClientRequestMessage(requestUrl, base.Client)
{
Method = "PATCH"
};
Expand Down Expand Up @@ -426,7 +426,7 @@ public async Task InsertingAndDeletingAnEntityWithADerivedComplexTypeProperty_Wo

var requestUrl = new Uri(_baseUri + "People");

var requestMessage = new TestCommon.Common.HttpClientRequestMessage(requestUrl, base.Client)
var requestMessage = new TestHttpClientRequestMessage(requestUrl, base.Client)
{
Method = "POST"
};
Expand Down Expand Up @@ -456,7 +456,7 @@ public async Task InsertingAndDeletingAnEntityWithADerivedComplexTypeProperty_Wo

var deleteRequestUrl = new Uri(_baseUri + "People(101)");

var deleteRequestMessage = new TestCommon.Common.HttpClientRequestMessage(deleteRequestUrl, base.Client)
var deleteRequestMessage = new TestHttpClientRequestMessage(deleteRequestUrl, base.Client)
{
Method = "DELETE"
};
Expand All @@ -480,7 +480,7 @@ public async Task FunctionReturns_DerivedComplexType_Successfully(string mimeTyp

Uri requestUri = new(_baseUri.AbsoluteUri + "People(1)/Default.GetHomeAddress", UriKind.Absolute);

var requestMessage = new TestCommon.Common.HttpClientRequestMessage(requestUri, base.Client)
var requestMessage = new TestHttpClientRequestMessage(requestUri, base.Client)
{
Method = "GET"
};
Expand Down Expand Up @@ -510,7 +510,7 @@ public async Task FunctionReturns_DerivedComplexType_Successfully(string mimeTyp

requestUri = new Uri(_baseUri.AbsoluteUri + "People(3)/Default.GetHomeAddress", UriKind.Absolute);

requestMessage = new TestCommon.Common.HttpClientRequestMessage(requestUri, base.Client)
requestMessage = new TestHttpClientRequestMessage(requestUri, base.Client)
{
Method = "GET"
};
Expand Down Expand Up @@ -668,7 +668,7 @@ public async Task QueryingAnEntityWithAnOpenComplexTypeProperty_ExecutesSuccessf

Uri requestUri = new(_baseUri.AbsoluteUri + "Accounts(101)", UriKind.Absolute);

var requestMessage = new TestCommon.Common.HttpClientRequestMessage(requestUri, base.Client)
var requestMessage = new TestHttpClientRequestMessage(requestUri, base.Client)
{
Method = "GET"
};
Expand Down Expand Up @@ -730,7 +730,7 @@ public async Task QueryingAnOpenPropertyOfAnOpenComplexType_ExecutesSuccessfully

Uri requestUri = new(_baseUri.AbsoluteUri + "Accounts(101)/AccountInfo/MiddleName", UriKind.Absolute);

var requestMessage = new TestCommon.Common.HttpClientRequestMessage(requestUri, base.Client)
var requestMessage = new TestHttpClientRequestMessage(requestUri, base.Client)
{
Method = "GET"
};
Expand All @@ -756,7 +756,7 @@ public async Task FilteringByAnOpenProperty_ExecutesSuccessfully(string mimeType

Uri requestUri = new(_baseUri.AbsoluteUri + "Accounts?$filter=AccountInfo/MiddleName eq 'Hood'", UriKind.Absolute);

var requestMessage = new TestCommon.Common.HttpClientRequestMessage(requestUri, base.Client);
var requestMessage = new TestHttpClientRequestMessage(requestUri, base.Client);
requestMessage.SetHeader("Accept", mimeType);
var responseMessage = await requestMessage.GetResponseAsync();

Expand Down Expand Up @@ -939,7 +939,7 @@ public async Task InsertingAndDeletingAnEntityWithAnOpenComplexTypeProperty_Exec

var requestUri = new Uri(_baseUri + "Accounts");

var requestMessage = new TestCommon.Common.HttpClientRequestMessage(requestUri, base.Client)
var requestMessage = new TestHttpClientRequestMessage(requestUri, base.Client)
{
Method = "POST"
};
Expand Down Expand Up @@ -972,7 +972,7 @@ public async Task InsertingAndDeletingAnEntityWithAnOpenComplexTypeProperty_Exec
// delete the entry
var deleteRequestUri = new Uri(_baseUri + "Accounts(10086)");

var deleteRequestMessage = new TestCommon.Common.HttpClientRequestMessage(deleteRequestUri, base.Client)
var deleteRequestMessage = new TestHttpClientRequestMessage(deleteRequestUri, base.Client)
{
Method = "DELETE"
};
Expand All @@ -993,7 +993,7 @@ public async Task FunctionReturnsAnOpenComplexType_Correctly(string mimeType)

Uri requestUri = new(_baseUri + "Accounts(101)/Default.GetAccountInfo", UriKind.Absolute);

var requestMessage = new TestCommon.Common.HttpClientRequestMessage(requestUri, base.Client)
var requestMessage = new TestHttpClientRequestMessage(requestUri, base.Client)
{
Method = "GET"
};
Expand Down Expand Up @@ -1024,7 +1024,7 @@ public async Task FunctionReturnsAnOpenComplexType_Correctly(string mimeType)

requestUri = new Uri(_baseUri.AbsoluteUri + "Accounts(103)/Default.GetAccountInfo", UriKind.Absolute);

requestMessage = new TestCommon.Common.HttpClientRequestMessage(requestUri, base.Client)
requestMessage = new TestHttpClientRequestMessage(requestUri, base.Client)
{
Method = "GET"
};
Expand Down Expand Up @@ -1251,7 +1251,7 @@ public async Task DeletingAndInsertingAnEntityWithAnOpenComplexTypeProperty_Work
// delete the entry
Uri requestUri = new(_baseUri + "Accounts(101)");

var deleteRequestMessage = new TestCommon.Common.HttpClientRequestMessage(requestUri, base.Client)
var deleteRequestMessage = new TestHttpClientRequestMessage(requestUri, base.Client)
{
Method = "DELETE"
};
Expand Down Expand Up @@ -1295,7 +1295,7 @@ public async Task DeletingAndInsertingAnEntityWithAnOpenComplexTypeProperty_Work

var reqUrl = new Uri(_baseUri + "Accounts");

var requestMessage = new TestCommon.Common.HttpClientRequestMessage(reqUrl, base.Client)
var requestMessage = new TestHttpClientRequestMessage(reqUrl, base.Client)
{
Method = "POST"
};
Expand Down Expand Up @@ -1362,7 +1362,7 @@ public async Task OpenCollectionPropertyRoundTrip()

var requestUrl = new Uri(_baseUri + "Accounts(101)/AccountInfo");

var requestMessage = new TestCommon.Common.HttpClientRequestMessage(requestUrl, base.Client)
var requestMessage = new TestHttpClientRequestMessage(requestUrl, base.Client)
{
Method = "PATCH"
};
Expand Down Expand Up @@ -1409,7 +1409,7 @@ public async Task OpenCollectionPropertyRoundTrip()

var requestUrl = new Uri(_baseUri.AbsoluteUri + uri, UriKind.Absolute);

var queryRequestMessage = new TestCommon.Common.HttpClientRequestMessage(requestUrl, base.Client)
var queryRequestMessage = new TestHttpClientRequestMessage(requestUrl, base.Client)
{
Method = "GET"
};
Expand Down
Loading

0 comments on commit 0d7f2da

Please sign in to comment.