Skip to content

Commit 894c385

Browse files
committed
Fix coding style
1 parent 0cfe1f7 commit 894c385

File tree

3 files changed

+44
-20
lines changed

3 files changed

+44
-20
lines changed

test/OpenApiNSwagEndToEndTests/ModelStateValidation/ModelStateValidationTests.cs

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

1111
namespace OpenApiNSwagEndToEndTests.ModelStateValidation;
1212

13-
public sealed class ModelStateValidationTests : IClassFixture<IntegrationTestContext<OpenApiStartup<ModelStateValidationDbContext>, ModelStateValidationDbContext>>
13+
public sealed class ModelStateValidationTests
14+
: IClassFixture<IntegrationTestContext<OpenApiStartup<ModelStateValidationDbContext>, ModelStateValidationDbContext>>
1415
{
1516
private readonly IntegrationTestContext<OpenApiStartup<ModelStateValidationDbContext>, ModelStateValidationDbContext> _testContext;
1617
private readonly XUnitLogHttpMessageHandler _logHttpMessageHandler;
1718
private readonly ModelStateValidationFakers _fakers = new();
1819

19-
public ModelStateValidationTests(IntegrationTestContext<OpenApiStartup<ModelStateValidationDbContext>, ModelStateValidationDbContext> testContext, ITestOutputHelper testOutputHelper)
20+
public ModelStateValidationTests(IntegrationTestContext<OpenApiStartup<ModelStateValidationDbContext>, ModelStateValidationDbContext> testContext,
21+
ITestOutputHelper testOutputHelper)
2022
{
2123
_testContext = testContext;
2224
_logHttpMessageHandler = new XUnitLogHttpMessageHandler(testOutputHelper);
@@ -31,6 +33,7 @@ public async Task Cannot_violate_compare_constraint()
3133
using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
3234
ModelStateValidationClient apiClient = new(httpClient);
3335
SocialMediaAccount newAccount = _fakers.SocialMediaAccount.Generate();
36+
3437
SocialMediaAccountPostRequestDocument requestBody = new()
3538
{
3639
Data = new SocialMediaAccountDataInPostRequest
@@ -67,6 +70,7 @@ public async Task Cannot_exceed_length_constraint(string firstName)
6770
using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
6871
ModelStateValidationClient apiClient = new(httpClient);
6972
SocialMediaAccount newAccount = _fakers.SocialMediaAccount.Generate();
73+
7074
SocialMediaAccountPostRequestDocument requestBody = new()
7175
{
7276
Data = new SocialMediaAccountDataInPostRequest
@@ -103,14 +107,15 @@ public async Task Cannot_exceed_string_length_constraint(string userName)
103107
using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
104108
ModelStateValidationClient apiClient = new(httpClient);
105109
SocialMediaAccount newAccount = _fakers.SocialMediaAccount.Generate();
110+
106111
SocialMediaAccountPostRequestDocument requestBody = new()
107112
{
108113
Data = new SocialMediaAccountDataInPostRequest
109114
{
110115
Attributes = new SocialMediaAccountAttributesInPostRequest
111116
{
112117
LastName = newAccount.LastName,
113-
UserName = userName,
118+
UserName = userName
114119
}
115120
}
116121
};
@@ -136,14 +141,15 @@ public async Task Cannot_violate_regular_expression_constraint()
136141
using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
137142
ModelStateValidationClient apiClient = new(httpClient);
138143
SocialMediaAccount newAccount = _fakers.SocialMediaAccount.Generate();
144+
139145
SocialMediaAccountPostRequestDocument requestBody = new()
140146
{
141147
Data = new SocialMediaAccountDataInPostRequest
142148
{
143149
Attributes = new SocialMediaAccountAttributesInPostRequest
144150
{
145151
LastName = newAccount.LastName,
146-
UserName = "aB1",
152+
UserName = "aB1"
147153
}
148154
}
149155
};
@@ -169,14 +175,15 @@ public async Task Cannot_use_invalid_credit_card_number()
169175
using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
170176
ModelStateValidationClient apiClient = new(httpClient);
171177
SocialMediaAccount newAccount = _fakers.SocialMediaAccount.Generate();
178+
172179
SocialMediaAccountPostRequestDocument requestBody = new()
173180
{
174181
Data = new SocialMediaAccountDataInPostRequest
175182
{
176183
Attributes = new SocialMediaAccountAttributesInPostRequest
177184
{
178185
LastName = newAccount.LastName,
179-
CreditCard = "123-456",
186+
CreditCard = "123-456"
180187
}
181188
}
182189
};
@@ -202,14 +209,15 @@ public async Task Cannot_use_invalid_email_address()
202209
using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
203210
ModelStateValidationClient apiClient = new(httpClient);
204211
SocialMediaAccount newAccount = _fakers.SocialMediaAccount.Generate();
212+
205213
SocialMediaAccountPostRequestDocument requestBody = new()
206214
{
207215
Data = new SocialMediaAccountDataInPostRequest
208216
{
209217
Attributes = new SocialMediaAccountAttributesInPostRequest
210218
{
211219
LastName = newAccount.LastName,
212-
Email = "abc",
220+
Email = "abc"
213221
}
214222
}
215223
};
@@ -239,14 +247,15 @@ public async Task Cannot_use_double_outside_of_valid_range(int age)
239247
using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
240248
ModelStateValidationClient apiClient = new(httpClient);
241249
SocialMediaAccount newAccount = _fakers.SocialMediaAccount.Generate();
250+
242251
SocialMediaAccountPostRequestDocument requestBody = new()
243252
{
244253
Data = new SocialMediaAccountDataInPostRequest
245254
{
246255
Attributes = new SocialMediaAccountAttributesInPostRequest
247256
{
248257
LastName = newAccount.LastName,
249-
Age = age,
258+
Age = age
250259
}
251260
}
252261
};
@@ -272,14 +281,15 @@ public async Task Cannot_use_relative_url()
272281
using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
273282
ModelStateValidationClient apiClient = new(httpClient);
274283
SocialMediaAccount newAccount = _fakers.SocialMediaAccount.Generate();
284+
275285
SocialMediaAccountPostRequestDocument requestBody = new()
276286
{
277287
Data = new SocialMediaAccountDataInPostRequest
278288
{
279289
Attributes = new SocialMediaAccountAttributesInPostRequest
280290
{
281291
LastName = newAccount.LastName,
282-
BackgroundPicture = new Uri("/justapath", UriKind.Relative),
292+
BackgroundPicture = new Uri("/justapath", UriKind.Relative)
283293
}
284294
}
285295
};
@@ -307,14 +317,15 @@ public async Task Cannot_exceed_collection_length_constraint(int length)
307317
using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
308318
ModelStateValidationClient apiClient = new(httpClient);
309319
SocialMediaAccount newAccount = _fakers.SocialMediaAccount.Generate();
320+
310321
SocialMediaAccountPostRequestDocument requestBody = new()
311322
{
312323
Data = new SocialMediaAccountDataInPostRequest
313324
{
314325
Attributes = new SocialMediaAccountAttributesInPostRequest
315326
{
316327
LastName = newAccount.LastName,
317-
Tags = Enumerable.Repeat("-", length).ToArray(),
328+
Tags = Enumerable.Repeat("-", length).ToArray()
318329
}
319330
}
320331
};
@@ -340,6 +351,7 @@ public async Task Cannot_use_non_allowed_value()
340351
using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
341352
ModelStateValidationClient apiClient = new(httpClient);
342353
SocialMediaAccount newAccount = _fakers.SocialMediaAccount.Generate();
354+
343355
SocialMediaAccountPostRequestDocument requestBody = new()
344356
{
345357
Data = new SocialMediaAccountDataInPostRequest
@@ -373,6 +385,7 @@ public async Task Cannot_use_denied_value()
373385
using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
374386
ModelStateValidationClient apiClient = new(httpClient);
375387
SocialMediaAccount newAccount = _fakers.SocialMediaAccount.Generate();
388+
376389
SocialMediaAccountPostRequestDocument requestBody = new()
377390
{
378391
Data = new SocialMediaAccountDataInPostRequest
@@ -406,6 +419,7 @@ public async Task Cannot_use_TimeSpan_outside_of_valid_range()
406419
using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
407420
ModelStateValidationClient apiClient = new(httpClient);
408421
SocialMediaAccount newAccount = _fakers.SocialMediaAccount.Generate();
422+
409423
SocialMediaAccountPostRequestDocument requestBody = new()
410424
{
411425
Data = new SocialMediaAccountDataInPostRequest
@@ -439,6 +453,7 @@ public async Task Cannot_use_culture_sensitive_TimeSpan()
439453
using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
440454
ModelStateValidationClient apiClient = new(httpClient);
441455
SocialMediaAccount newAccount = _fakers.SocialMediaAccount.Generate();
456+
442457
SocialMediaAccountPostRequestDocument requestBody = new()
443458
{
444459
Data = new SocialMediaAccountDataInPostRequest
@@ -460,7 +475,10 @@ public async Task Cannot_use_culture_sensitive_TimeSpan()
460475

461476
ErrorObject errorObject = document.Errors.First();
462477
errorObject.Title.Should().Be("Failed to deserialize request body: Incompatible attribute value found.");
463-
errorObject.Detail.Should().Be("Failed to convert attribute 'nextRevalidation' with value '2:00:00,001' of type 'String' to type 'Nullable<TimeSpan>'.");
478+
479+
errorObject.Detail.Should()
480+
.Be("Failed to convert attribute 'nextRevalidation' with value '2:00:00,001' of type 'String' to type 'Nullable<TimeSpan>'.");
481+
464482
errorObject.Source.ShouldNotBeNull();
465483
errorObject.Source.Pointer.Should().Be("/data/attributes/nextRevalidation");
466484
}
@@ -472,14 +490,15 @@ public async Task Cannot_use_invalid_TimeOnly()
472490
using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
473491
ModelStateValidationClient apiClient = new(httpClient);
474492
SocialMediaAccount newAccount = _fakers.SocialMediaAccount.Generate();
493+
475494
SocialMediaAccountPostRequestDocument requestBody = new()
476495
{
477496
Data = new SocialMediaAccountDataInPostRequest
478497
{
479498
Attributes = new SocialMediaAccountAttributesInPostRequest
480499
{
481500
LastName = newAccount.LastName,
482-
ValidatedAtTime = TimeSpan.FromSeconds(-1),
501+
ValidatedAtTime = TimeSpan.FromSeconds(-1)
483502
}
484503
}
485504
};
@@ -505,6 +524,7 @@ public async Task Can_create_resource_with_valid_properties()
505524
using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
506525
ModelStateValidationClient apiClient = new(httpClient);
507526
SocialMediaAccount newAccount = _fakers.SocialMediaAccount.Generate();
527+
508528
SocialMediaAccountPostRequestDocument requestBody = new()
509529
{
510530
Data = new SocialMediaAccountDataInPostRequest

test/OpenApiTests/ModelStateValidation/ModelStateValidationFakers.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ public sealed class ModelStateValidationFakers
2525
.RuleFor(socialMediaAccount => socialMediaAccount.ProfilePicture, faker => new Uri(faker.Image.LoremFlickrUrl()))
2626
.RuleFor(socialMediaAccount => socialMediaAccount.BackgroundPicture, faker => faker.Image.LoremFlickrUrl())
2727
.RuleFor(socialMediaAccount => socialMediaAccount.Tags, faker => faker.Make(faker.Random.Number(1, 10), () => faker.Random.String2(2, 10)))
28-
.RuleFor(socialMediaAccount => socialMediaAccount.CountryCode, faker => faker.Random.ListItem(["NL", "FR"]))
28+
.RuleFor(socialMediaAccount => socialMediaAccount.CountryCode, faker => faker.Random.ListItem([
29+
"NL",
30+
"FR"
31+
]))
2932
.RuleFor(socialMediaAccount => socialMediaAccount.Planet, faker => faker.Random.String2(2, 8))
3033
.RuleFor(socialMediaAccount => socialMediaAccount.NextRevalidation, faker => TimeSpan.FromHours(faker.Random.Number(1, 5)))
3134
.RuleFor(socialMediaAccount => socialMediaAccount.ValidatedAt, faker => faker.Date.Recent().ToUniversalTime())

test/OpenApiTests/ModelStateValidation/ModelStateValidationTests.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ namespace OpenApiTests.ModelStateValidation;
77

88
public sealed class ModelStateValidationTests : IClassFixture<OpenApiTestContext<OpenApiStartup<ModelStateValidationDbContext>, ModelStateValidationDbContext>>
99
{
10+
// ReSharper disable once UseCollectionExpression (https://youtrack.jetbrains.com/issue/RSRP-497450)
11+
public static readonly TheoryData<string> ModelNames = new()
12+
{
13+
"socialMediaAccountAttributesInPostRequest",
14+
"socialMediaAccountAttributesInPatchRequest",
15+
"socialMediaAccountAttributesInResponse"
16+
};
17+
1018
private readonly OpenApiTestContext<OpenApiStartup<ModelStateValidationDbContext>, ModelStateValidationDbContext> _testContext;
1119

1220
public ModelStateValidationTests(OpenApiTestContext<OpenApiStartup<ModelStateValidationDbContext>, ModelStateValidationDbContext> testContext)
@@ -241,6 +249,7 @@ public async Task Length_annotation_on_resource_list_property_produces_expected_
241249
tagsElement.Should().HaveProperty("minItems", 1);
242250
#endif
243251
tagsElement.Should().HaveProperty("type", "array");
252+
244253
tagsElement.Should().ContainPath("items").With(itemsEl =>
245254
{
246255
itemsEl.Should().HaveProperty("type", "string");
@@ -335,12 +344,4 @@ public async Task TimeOnly_type_produces_expected_schema(string modelName)
335344
validatedTimeAtElement.Should().HaveProperty("format", "time");
336345
});
337346
}
338-
339-
// ReSharper disable once UseCollectionExpression (https://youtrack.jetbrains.com/issue/RSRP-497450)
340-
public static readonly TheoryData<string> ModelNames = new()
341-
{
342-
"socialMediaAccountAttributesInPostRequest",
343-
"socialMediaAccountAttributesInPatchRequest",
344-
"socialMediaAccountAttributesInResponse"
345-
};
346347
}

0 commit comments

Comments
 (0)