Skip to content

Commit 1c4f39f

Browse files
bkoelmanbkoelman
committed
Consistency renames in tests
1 parent 2724d63 commit 1c4f39f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+153
-155
lines changed

‎test/OpenApiKiotaEndToEndTests/Headers/ETagTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515
namespace OpenApiKiotaEndToEndTests.Headers;
1616

17-
public sealed class ETagTests : IClassFixture<IntegrationTestContext<OpenApiStartup<HeadersDbContext>, HeadersDbContext>>
17+
public sealed class ETagTests : IClassFixture<IntegrationTestContext<OpenApiStartup<HeaderDbContext>, HeaderDbContext>>
1818
{
19-
private readonly IntegrationTestContext<OpenApiStartup<HeadersDbContext>, HeadersDbContext> _testContext;
19+
private readonly IntegrationTestContext<OpenApiStartup<HeaderDbContext>, HeaderDbContext> _testContext;
2020
private readonly TestableHttpClientRequestAdapterFactory _requestAdapterFactory;
2121
private readonly HeaderFakers _fakers = new();
2222

23-
public ETagTests(IntegrationTestContext<OpenApiStartup<HeadersDbContext>, HeadersDbContext> testContext, ITestOutputHelper testOutputHelper)
23+
public ETagTests(IntegrationTestContext<OpenApiStartup<HeaderDbContext>, HeaderDbContext> testContext, ITestOutputHelper testOutputHelper)
2424
{
2525
_testContext = testContext;
2626
_requestAdapterFactory = new TestableHttpClientRequestAdapterFactory(testOutputHelper);

‎test/OpenApiKiotaEndToEndTests/QueryStrings/FilterTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111

1212
namespace OpenApiKiotaEndToEndTests.QueryStrings;
1313

14-
public sealed class FilterTests : IClassFixture<IntegrationTestContext<OpenApiStartup<QueryStringsDbContext>, QueryStringsDbContext>>
14+
public sealed class FilterTests : IClassFixture<IntegrationTestContext<OpenApiStartup<QueryStringDbContext>, QueryStringDbContext>>
1515
{
16-
private readonly IntegrationTestContext<OpenApiStartup<QueryStringsDbContext>, QueryStringsDbContext> _testContext;
16+
private readonly IntegrationTestContext<OpenApiStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
1717
private readonly TestableHttpClientRequestAdapterFactory _requestAdapterFactory;
1818
private readonly QueryStringFakers _fakers = new();
1919

20-
public FilterTests(IntegrationTestContext<OpenApiStartup<QueryStringsDbContext>, QueryStringsDbContext> testContext, ITestOutputHelper testOutputHelper)
20+
public FilterTests(IntegrationTestContext<OpenApiStartup<QueryStringDbContext>, QueryStringDbContext> testContext, ITestOutputHelper testOutputHelper)
2121
{
2222
_testContext = testContext;
2323
_requestAdapterFactory = new TestableHttpClientRequestAdapterFactory(testOutputHelper);

‎test/OpenApiKiotaEndToEndTests/QueryStrings/IncludeTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010

1111
namespace OpenApiKiotaEndToEndTests.QueryStrings;
1212

13-
public sealed class IncludeTests : IClassFixture<IntegrationTestContext<OpenApiStartup<QueryStringsDbContext>, QueryStringsDbContext>>
13+
public sealed class IncludeTests : IClassFixture<IntegrationTestContext<OpenApiStartup<QueryStringDbContext>, QueryStringDbContext>>
1414
{
15-
private readonly IntegrationTestContext<OpenApiStartup<QueryStringsDbContext>, QueryStringsDbContext> _testContext;
15+
private readonly IntegrationTestContext<OpenApiStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
1616
private readonly TestableHttpClientRequestAdapterFactory _requestAdapterFactory;
1717
private readonly QueryStringFakers _fakers = new();
1818

19-
public IncludeTests(IntegrationTestContext<OpenApiStartup<QueryStringsDbContext>, QueryStringsDbContext> testContext, ITestOutputHelper testOutputHelper)
19+
public IncludeTests(IntegrationTestContext<OpenApiStartup<QueryStringDbContext>, QueryStringDbContext> testContext, ITestOutputHelper testOutputHelper)
2020
{
2121
_testContext = testContext;
2222
_requestAdapterFactory = new TestableHttpClientRequestAdapterFactory(testOutputHelper);

‎test/OpenApiKiotaEndToEndTests/QueryStrings/PaginationTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111

1212
namespace OpenApiKiotaEndToEndTests.QueryStrings;
1313

14-
public sealed class PaginationTests : IClassFixture<IntegrationTestContext<OpenApiStartup<QueryStringsDbContext>, QueryStringsDbContext>>
14+
public sealed class PaginationTests : IClassFixture<IntegrationTestContext<OpenApiStartup<QueryStringDbContext>, QueryStringDbContext>>
1515
{
16-
private readonly IntegrationTestContext<OpenApiStartup<QueryStringsDbContext>, QueryStringsDbContext> _testContext;
16+
private readonly IntegrationTestContext<OpenApiStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
1717
private readonly TestableHttpClientRequestAdapterFactory _requestAdapterFactory;
1818
private readonly QueryStringFakers _fakers = new();
1919

20-
public PaginationTests(IntegrationTestContext<OpenApiStartup<QueryStringsDbContext>, QueryStringsDbContext> testContext, ITestOutputHelper testOutputHelper)
20+
public PaginationTests(IntegrationTestContext<OpenApiStartup<QueryStringDbContext>, QueryStringDbContext> testContext, ITestOutputHelper testOutputHelper)
2121
{
2222
_testContext = testContext;
2323
_requestAdapterFactory = new TestableHttpClientRequestAdapterFactory(testOutputHelper);

‎test/OpenApiKiotaEndToEndTests/QueryStrings/SortTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111

1212
namespace OpenApiKiotaEndToEndTests.QueryStrings;
1313

14-
public sealed class SortTests : IClassFixture<IntegrationTestContext<OpenApiStartup<QueryStringsDbContext>, QueryStringsDbContext>>
14+
public sealed class SortTests : IClassFixture<IntegrationTestContext<OpenApiStartup<QueryStringDbContext>, QueryStringDbContext>>
1515
{
16-
private readonly IntegrationTestContext<OpenApiStartup<QueryStringsDbContext>, QueryStringsDbContext> _testContext;
16+
private readonly IntegrationTestContext<OpenApiStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
1717
private readonly TestableHttpClientRequestAdapterFactory _requestAdapterFactory;
1818
private readonly QueryStringFakers _fakers = new();
1919

20-
public SortTests(IntegrationTestContext<OpenApiStartup<QueryStringsDbContext>, QueryStringsDbContext> testContext, ITestOutputHelper testOutputHelper)
20+
public SortTests(IntegrationTestContext<OpenApiStartup<QueryStringDbContext>, QueryStringDbContext> testContext, ITestOutputHelper testOutputHelper)
2121
{
2222
_testContext = testContext;
2323
_requestAdapterFactory = new TestableHttpClientRequestAdapterFactory(testOutputHelper);

‎test/OpenApiKiotaEndToEndTests/QueryStrings/SparseFieldSetTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010

1111
namespace OpenApiKiotaEndToEndTests.QueryStrings;
1212

13-
public sealed class SparseFieldSetTests : IClassFixture<IntegrationTestContext<OpenApiStartup<QueryStringsDbContext>, QueryStringsDbContext>>
13+
public sealed class SparseFieldSetTests : IClassFixture<IntegrationTestContext<OpenApiStartup<QueryStringDbContext>, QueryStringDbContext>>
1414
{
15-
private readonly IntegrationTestContext<OpenApiStartup<QueryStringsDbContext>, QueryStringsDbContext> _testContext;
15+
private readonly IntegrationTestContext<OpenApiStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
1616
private readonly TestableHttpClientRequestAdapterFactory _requestAdapterFactory;
1717
private readonly QueryStringFakers _fakers = new();
1818

19-
public SparseFieldSetTests(IntegrationTestContext<OpenApiStartup<QueryStringsDbContext>, QueryStringsDbContext> testContext,
19+
public SparseFieldSetTests(IntegrationTestContext<OpenApiStartup<QueryStringDbContext>, QueryStringDbContext> testContext,
2020
ITestOutputHelper testOutputHelper)
2121
{
2222
_testContext = testContext;

‎test/OpenApiNSwagClientTests/LegacyClient/GeneratedCode/IOpenApiClient.cs

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎test/OpenApiNSwagClientTests/LegacyOpenApi/GeneratedCode/ILegacyClient.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
using JsonApiDotNetCore.OpenApi.Client.NSwag;
2+
3+
namespace OpenApiNSwagClientTests.LegacyOpenApi.GeneratedCode;
4+
5+
// ReSharper disable once MemberCanBeInternal
6+
public partial interface ILegacyClient : IJsonApiClient;

‎test/OpenApiNSwagClientTests/LegacyClient/GeneratedCode/OpenApiClient.cs renamed to ‎test/OpenApiNSwagClientTests/LegacyOpenApi/GeneratedCode/LegacyClient.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using JsonApiDotNetCore.OpenApi.Client.NSwag;
22
using Newtonsoft.Json;
33

4-
namespace OpenApiNSwagClientTests.LegacyClient.GeneratedCode;
4+
namespace OpenApiNSwagClientTests.LegacyOpenApi.GeneratedCode;
55

6-
internal partial class OpenApiClient : JsonApiClient
6+
internal partial class LegacyClient : JsonApiClient
77
{
88
partial void UpdateJsonSerializerSettings(JsonSerializerSettings settings)
99
{

‎test/OpenApiNSwagClientTests/LegacyClient/PartialAttributeSerializationLifetimeTests.cs renamed to ‎test/OpenApiNSwagClientTests/LegacyOpenApi/PartialAttributeSerializationLifetimeTests.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
using System.Net;
22
using FluentAssertions;
33
using JsonApiDotNetCore.OpenApi.Client.NSwag;
4-
using OpenApiNSwagClientTests.LegacyClient.GeneratedCode;
4+
using OpenApiNSwagClientTests.LegacyOpenApi.GeneratedCode;
55
using TestBuildingBlocks;
66
using Xunit;
77

8-
namespace OpenApiNSwagClientTests.LegacyClient;
8+
namespace OpenApiNSwagClientTests.LegacyOpenApi;
99

1010
public sealed class PartialAttributeSerializationLifetimeTests
1111
{
@@ -14,7 +14,7 @@ public async Task Disposed_registration_does_not_affect_request()
1414
{
1515
// Arrange
1616
using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
17-
IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
17+
ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
1818

1919
const string airplaneId = "XUuiP";
2020

@@ -58,7 +58,7 @@ public async Task Registration_can_be_used_for_multiple_requests()
5858
{
5959
// Arrange
6060
using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
61-
IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
61+
ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
6262

6363
const string airplaneId = "XUuiP";
6464

@@ -107,7 +107,7 @@ public async Task Request_is_unaffected_by_registration_for_different_document_o
107107
{
108108
// Arrange
109109
using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
110-
IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
110+
ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
111111

112112
const string airplaneId1 = "XUuiP";
113113

@@ -164,7 +164,7 @@ public async Task Attribute_values_can_be_changed_after_registration()
164164
{
165165
// Arrange
166166
using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
167-
IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
167+
ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
168168

169169
const string airplaneId = "XUuiP";
170170

@@ -209,7 +209,7 @@ public async Task Registration_is_unaffected_by_successive_registration_for_docu
209209
{
210210
// Arrange
211211
using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
212-
IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
212+
ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
213213

214214
const string airplaneId1 = "XUuiP";
215215

@@ -262,7 +262,7 @@ public async Task Registration_is_unaffected_by_preceding_disposed_registration_
262262
{
263263
// Arrange
264264
using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
265-
IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
265+
ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
266266

267267
const string airplaneId1 = "XUuiP";
268268

@@ -326,7 +326,7 @@ public async Task Registration_is_unaffected_by_preceding_disposed_registration_
326326
{
327327
// Arrange
328328
using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
329-
IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
329+
ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
330330

331331
var requestDocument1 = new AirplanePostRequestDocument
332332
{
@@ -390,7 +390,7 @@ public async Task Registration_is_unaffected_by_preceding_registration_for_diffe
390390
{
391391
// Arrange
392392
using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
393-
IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
393+
ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
394394

395395
const string airplaneId1 = "XUuiP";
396396

0 commit comments

Comments
 (0)