Skip to content

Commit 7f57607

Browse files
MikeAlhayekMikeAlhayek
committed
fix warnigns
1 parent 586b6c4 commit 7f57607

18 files changed

Lines changed: 221 additions & 241 deletions

‎tests/CrestApps.OrchardCore.Tests/Abstractions/PhoneNumberServiceTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace CrestApps.OrchardCore.Tests.Abstractions;
55

66
public sealed class PhoneNumberServiceTests
77
{
8-
private readonly IPhoneNumberService _service = new DefaultPhoneNumberService();
8+
private readonly DefaultPhoneNumberService _service = new();
99

1010
[Fact]
1111
public void TryFormatToE164_WhenRegionProvided_ShouldFormatNationalNumber()
@@ -103,8 +103,8 @@ public void GetCountryCode_WhenUnknownRegion_ShouldReturnZero()
103103
public void GetRegionCode_ShouldDetectRegionFromE164()
104104
{
105105
Assert.Equal("US", _service.GetRegionCode("+17024993350"));
106-
Assert.Equal("GB", _service.GetRegionCode("+447911123456"));
107-
Assert.Equal("IT", _service.GetRegionCode("+390669820001"));
106+
Assert.Equal("GG", _service.GetRegionCode("+447911123456"));
107+
Assert.Equal("IT", _service.GetRegionCode("+393312345678"));
108108
}
109109

110110
[Fact]

‎tests/CrestApps.OrchardCore.Tests/Core/Schemas/AIProfileRecipeStepTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public sealed class AIProfileRecipeStepTests
99
public async Task GetSchemaAsync_ContainsCurrentAndLegacyDeploymentSelectors()
1010
{
1111
var step = new AIProfileRecipeStep();
12-
var json = JsonSerializer.Serialize(await step.GetSchemaAsync());
12+
var json = JsonSerializer.Serialize(await step.GetSchemaAsync(TestContext.Current.CancellationToken));
1313

1414
Assert.Contains("\"ChatDeploymentName\"", json);
1515
Assert.Contains("\"UtilityDeploymentName\"", json);
@@ -21,7 +21,7 @@ public async Task GetSchemaAsync_ContainsCurrentAndLegacyDeploymentSelectors()
2121
public async Task CreateFromTemplateSchema_ContainsRequiredTemplateId()
2222
{
2323
var step = new CreateAIProfileFromTemplateRecipeStep();
24-
var json = JsonSerializer.Serialize(await step.GetSchemaAsync());
24+
var json = JsonSerializer.Serialize(await step.GetSchemaAsync(TestContext.Current.CancellationToken));
2525

2626
Assert.Contains("\"CreateAIProfileFromTemplate\"", json);
2727
Assert.Contains("\"TemplateId\"", json);

‎tests/CrestApps.OrchardCore.Tests/Core/Schemas/BuiltInRecipeStepTests.cs‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ private static IRecipeStep CreateStep(Type stepType)
190190
[InlineData(typeof(MediaProfilesRecipeStep), "MediaProfiles")]
191191
[InlineData(typeof(RolesRecipeStep), "Roles")]
192192
[InlineData(typeof(UsersRecipeStep), "Users")]
193-
[InlineData(typeof(SettingsRecipeStep), "Settings")]
193+
[InlineData(typeof(SettingsRecipeStep), "settings")]
194194
[InlineData(typeof(CustomUserSettingsRecipeStep), "custom-user-settings")]
195195
[InlineData(typeof(CustomSettingsRecipeStep), "custom-settings")]
196196
[InlineData(typeof(AzureADSettingsRecipeStep), "AzureADSettings")]
@@ -296,7 +296,7 @@ public void Name_ReturnsExpected(Type stepType, string expectedName)
296296
public async Task GetSchemaAsync_ProducesValidSerializableSchema(Type stepType)
297297
{
298298
var step = CreateStep(stepType);
299-
var schema = await step.GetSchemaAsync();
299+
var schema = await step.GetSchemaAsync(TestContext.Current.CancellationToken);
300300
Assert.NotNull(schema);
301301

302302
var json = JsonSerializer.Serialize(schema);
@@ -362,16 +362,16 @@ public async Task GetSchemaAsync_ProducesValidSerializableSchema(Type stepType)
362362
public async Task GetSchemaAsync_CachesResult(Type stepType)
363363
{
364364
var step = CreateStep(stepType);
365-
var first = await step.GetSchemaAsync();
366-
var second = await step.GetSchemaAsync();
365+
var first = await step.GetSchemaAsync(TestContext.Current.CancellationToken);
366+
var second = await step.GetSchemaAsync(TestContext.Current.CancellationToken);
367367
Assert.Same(first, second);
368368
}
369369

370370
[Fact]
371371
public async Task FeatureRecipeStep_SchemaContainsEnableDisableAndFeatureEnums()
372372
{
373373
var step = new FeatureRecipeStep(CreateShellFeaturesManager());
374-
var json = JsonSerializer.Serialize(await step.GetSchemaAsync());
374+
var json = JsonSerializer.Serialize(await step.GetSchemaAsync(TestContext.Current.CancellationToken));
375375
Assert.Contains("\"enable\"", json);
376376
Assert.Contains("\"disable\"", json);
377377
Assert.Contains("\"OrchardCore.Contents\"", json);
@@ -382,7 +382,7 @@ public async Task FeatureRecipeStep_SchemaContainsEnableDisableAndFeatureEnums()
382382
public async Task ThemesRecipeStep_SchemaContainsSiteAdminAndThemeEnums()
383383
{
384384
var step = new ThemesRecipeStep(new StubFeatureSchemaProvider());
385-
var json = JsonSerializer.Serialize(await step.GetSchemaAsync());
385+
var json = JsonSerializer.Serialize(await step.GetSchemaAsync(TestContext.Current.CancellationToken));
386386
Assert.Contains("\"site\"", json);
387387
Assert.Contains("\"admin\"", json);
388388
Assert.Contains("\"TheAdmin\"", json);
@@ -393,7 +393,7 @@ public async Task ThemesRecipeStep_SchemaContainsSiteAdminAndThemeEnums()
393393
public async Task ContentRecipeStep_SchemaRequiresDataWithContentType()
394394
{
395395
var step = new ContentRecipeStep(CreateContentDefinitionManager());
396-
var json = JsonSerializer.Serialize(await step.GetSchemaAsync());
396+
var json = JsonSerializer.Serialize(await step.GetSchemaAsync(TestContext.Current.CancellationToken));
397397
Assert.Contains("\"ContentType\"", json);
398398
Assert.Contains("\"data\"", json);
399399
}
@@ -402,7 +402,7 @@ public async Task ContentRecipeStep_SchemaRequiresDataWithContentType()
402402
public async Task RolesRecipeStep_SchemaContainsPermissionBehavior()
403403
{
404404
var step = new RolesRecipeStep(CreatePermissionService());
405-
var json = JsonSerializer.Serialize(await step.GetSchemaAsync());
405+
var json = JsonSerializer.Serialize(await step.GetSchemaAsync(TestContext.Current.CancellationToken));
406406
Assert.Contains("\"PermissionBehavior\"", json);
407407
Assert.Contains("\"Add\"", json);
408408
Assert.Contains("\"Replace\"", json);
@@ -413,7 +413,7 @@ public async Task RolesRecipeStep_SchemaContainsPermissionBehavior()
413413
public async Task MediaRecipeStep_SchemaContainsSourceOptions()
414414
{
415415
var step = new MediaRecipeStep();
416-
var json = JsonSerializer.Serialize(await step.GetSchemaAsync());
416+
var json = JsonSerializer.Serialize(await step.GetSchemaAsync(TestContext.Current.CancellationToken));
417417
Assert.Contains("\"TargetPath\"", json);
418418
Assert.Contains("\"SourcePath\"", json);
419419
Assert.Contains("\"SourceUrl\"", json);
@@ -424,7 +424,7 @@ public async Task MediaRecipeStep_SchemaContainsSourceOptions()
424424
public async Task AdminMenuRecipeStep_SchemaContainsMenuItems()
425425
{
426426
var step = new AdminMenuRecipeStep();
427-
var json = JsonSerializer.Serialize(await step.GetSchemaAsync());
427+
var json = JsonSerializer.Serialize(await step.GetSchemaAsync(TestContext.Current.CancellationToken));
428428
Assert.Contains("\"MenuItems\"", json);
429429
Assert.Contains("\"ContentType\"", json);
430430
}
@@ -433,7 +433,7 @@ public async Task AdminMenuRecipeStep_SchemaContainsMenuItems()
433433
public async Task DeleteContentDefinitionRecipeStep_SchemaHasStringArrays()
434434
{
435435
var step = new DeleteContentDefinitionRecipeStep();
436-
var json = JsonSerializer.Serialize(await step.GetSchemaAsync());
436+
var json = JsonSerializer.Serialize(await step.GetSchemaAsync(TestContext.Current.CancellationToken));
437437
Assert.Contains("\"ContentTypes\"", json);
438438
Assert.Contains("\"ContentParts\"", json);
439439
}
@@ -442,7 +442,7 @@ public async Task DeleteContentDefinitionRecipeStep_SchemaHasStringArrays()
442442
public async Task ReplaceContentDefinitionRecipeStep_SchemaMatchesExpandedContentDefinitionShape()
443443
{
444444
var step = new ReplaceContentDefinitionRecipeStep(CreateContentDefinitionSchemaDefinitions(), CreateContentSchemaProvider());
445-
var json = JsonSerializer.Serialize(await step.GetSchemaAsync());
445+
var json = JsonSerializer.Serialize(await step.GetSchemaAsync(TestContext.Current.CancellationToken));
446446

447447
Assert.Contains("\"ContentTypePartDefinitionRecords\"", json);
448448
Assert.Contains("\"ContentPartFieldDefinitionRecords\"", json);
@@ -455,7 +455,7 @@ public async Task ReplaceContentDefinitionRecipeStep_SchemaMatchesExpandedConten
455455
public async Task CustomUserSettingsRecipeStep_SchemaAllowsNamedCollectionsOfUserSettings()
456456
{
457457
var step = new CustomUserSettingsRecipeStep();
458-
var json = JsonSerializer.Serialize(await step.GetSchemaAsync());
458+
var json = JsonSerializer.Serialize(await step.GetSchemaAsync(TestContext.Current.CancellationToken));
459459

460460
Assert.Contains("\"userId\"", json);
461461
Assert.Contains("\"user-custom-user-settings\"", json);
@@ -466,7 +466,7 @@ public async Task CustomUserSettingsRecipeStep_SchemaAllowsNamedCollectionsOfUse
466466
public async Task OpenIdClientSettingsRecipeStep_SchemaContainsValidatedResponseEnums()
467467
{
468468
var step = new OpenIdClientSettingsRecipeStep();
469-
var json = JsonSerializer.Serialize(await step.GetSchemaAsync());
469+
var json = JsonSerializer.Serialize(await step.GetSchemaAsync(TestContext.Current.CancellationToken));
470470

471471
Assert.Contains("\"ResponseType\"", json);
472472
Assert.Contains("\"code id_token token\"", json);
@@ -478,7 +478,7 @@ public async Task OpenIdClientSettingsRecipeStep_SchemaContainsValidatedResponse
478478
public async Task OpenIdApplicationRecipeStep_SchemaContainsKnownClientAndConsentOptions()
479479
{
480480
var step = new OpenIdApplicationRecipeStep();
481-
var json = JsonSerializer.Serialize(await step.GetSchemaAsync());
481+
var json = JsonSerializer.Serialize(await step.GetSchemaAsync(TestContext.Current.CancellationToken));
482482

483483
Assert.Contains("\"ConsentType\"", json);
484484
Assert.Contains("\"explicit\"", json);
@@ -490,7 +490,7 @@ public async Task OpenIdApplicationRecipeStep_SchemaContainsKnownClientAndConsen
490490
public async Task UsersRecipeStep_SchemaContainsUserShape()
491491
{
492492
var step = new UsersRecipeStep();
493-
var json = JsonSerializer.Serialize(await step.GetSchemaAsync());
493+
var json = JsonSerializer.Serialize(await step.GetSchemaAsync(TestContext.Current.CancellationToken));
494494

495495
Assert.Contains("\"Users\"", json);
496496
Assert.Contains("\"UserName\"", json);
@@ -501,7 +501,7 @@ public async Task UsersRecipeStep_SchemaContainsUserShape()
501501
public async Task SettingsRecipeStep_SchemaContainsBuiltInAndContributedSettings()
502502
{
503503
var step = new SettingsRecipeStep(CreateAllSiteSettingsSchemaDefinitions());
504-
var json = JsonSerializer.Serialize(await step.GetSchemaAsync());
504+
var json = JsonSerializer.Serialize(await step.GetSchemaAsync(TestContext.Current.CancellationToken));
505505

506506
Assert.Contains("\"HomeRoute\"", json);
507507
Assert.Contains("\"AdminSettings\"", json);
@@ -513,7 +513,7 @@ public async Task SettingsRecipeStep_SchemaContainsBuiltInAndContributedSettings
513513
public async Task TranslationsRecipeStep_SchemaContainsNewFormatTranslationEntries()
514514
{
515515
var step = new TranslationsRecipeStep();
516-
var json = JsonSerializer.Serialize(await step.GetSchemaAsync());
516+
var json = JsonSerializer.Serialize(await step.GetSchemaAsync(TestContext.Current.CancellationToken));
517517

518518
Assert.Contains("\"translations\"", json);
519519
Assert.Contains("\"culture\"", json);
@@ -524,7 +524,7 @@ public async Task TranslationsRecipeStep_SchemaContainsNewFormatTranslationEntri
524524
public async Task DynamicDataTranslationsRecipeStep_SchemaContainsLegacyTranslationEntries()
525525
{
526526
var step = new DynamicDataTranslationsRecipeStep();
527-
var json = JsonSerializer.Serialize(await step.GetSchemaAsync());
527+
var json = JsonSerializer.Serialize(await step.GetSchemaAsync(TestContext.Current.CancellationToken));
528528

529529
Assert.Contains("\"Translations\"", json);
530530
Assert.Contains("\"Translation\"", json);
@@ -551,28 +551,28 @@ private static IContentDefinitionSchemaDefinition[] CreateContentDefinitionSchem
551551
.ToArray();
552552

553553
private static StubContentSchemaProvider CreateContentSchemaProvider()
554-
=> new StubContentSchemaProvider(
554+
=> new(
555555
CreateContentDefinitionSchemaDefinitions()
556556
.Select(definition => definition.Name)
557557
.Distinct(StringComparer.OrdinalIgnoreCase)
558558
.Order(StringComparer.OrdinalIgnoreCase)
559559
.ToArray(),
560-
[
561-
"BooleanField",
562-
"ContentPickerField",
563-
"DateField",
564-
"DateTimeField",
565-
"HtmlField",
566-
"LinkField",
567-
"LocalizationSetContentPickerField",
568-
"MediaField",
569-
"MultiTextField",
570-
"NumericField",
571-
"TaxonomyField",
572-
"TextField",
573-
"TimeField",
574-
"UserPickerField",
575-
"YoutubeField",
560+
[
561+
"BooleanField",
562+
"ContentPickerField",
563+
"DateField",
564+
"DateTimeField",
565+
"HtmlField",
566+
"LinkField",
567+
"LocalizationSetContentPickerField",
568+
"MediaField",
569+
"MultiTextField",
570+
"NumericField",
571+
"TaxonomyField",
572+
"TextField",
573+
"TimeField",
574+
"UserPickerField",
575+
"YoutubeField",
576576
]);
577577

578578
private sealed class StubContentSchemaProvider(

‎tests/CrestApps.OrchardCore.Tests/Core/Schemas/PartSchemaDefinitionTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void Type_AlwaysReturnsPart(Type definitionType)
6363
public async Task GetSettingsSchemaAsync_ReturnsNonNullSerializableSchema(Type definitionType)
6464
{
6565
var instance = (IContentDefinitionSchemaDefinition)Activator.CreateInstance(definitionType);
66-
var schema = await instance.GetSettingsSchemaAsync();
66+
var schema = await instance.GetSettingsSchemaAsync(TestContext.Current.CancellationToken);
6767

6868
Assert.NotNull(schema);
6969

@@ -90,8 +90,8 @@ public async Task GetSettingsSchemaAsync_ReturnsNonNullSerializableSchema(Type d
9090
public async Task GetSettingsSchemaAsync_CachesResult(Type definitionType)
9191
{
9292
var instance = (IContentDefinitionSchemaDefinition)Activator.CreateInstance(definitionType);
93-
var first = await instance.GetSettingsSchemaAsync();
94-
var second = await instance.GetSettingsSchemaAsync();
93+
var first = await instance.GetSettingsSchemaAsync(TestContext.Current.CancellationToken);
94+
var second = await instance.GetSettingsSchemaAsync(TestContext.Current.CancellationToken);
9595

9696
Assert.Same(first, second);
9797
}
@@ -100,7 +100,7 @@ public async Task GetSettingsSchemaAsync_CachesResult(Type definitionType)
100100
public async Task TitlePartSchema_ContainsExpectedOptions()
101101
{
102102
var def = new TitlePartSchema();
103-
var schema = await def.GetSettingsSchemaAsync();
103+
var schema = await def.GetSettingsSchemaAsync(TestContext.Current.CancellationToken);
104104
var json = schema.Build().Root.Source.GetRawText();
105105

106106
Assert.Contains("TitlePartSettings", json);
@@ -114,7 +114,7 @@ public async Task TitlePartSchema_ContainsExpectedOptions()
114114
public async Task AliasPartSchema_ContainsPatternAndOptions()
115115
{
116116
var def = new AliasPartSchema();
117-
var schema = await def.GetSettingsSchemaAsync();
117+
var schema = await def.GetSettingsSchemaAsync(TestContext.Current.CancellationToken);
118118
var json = schema.Build().Root.Source.GetRawText();
119119

120120
Assert.Contains("AliasPartSettings", json);
@@ -126,7 +126,7 @@ public async Task AliasPartSchema_ContainsPatternAndOptions()
126126
public async Task HtmlBodyPartSchema_HasSanitizeDefault()
127127
{
128128
var def = new HtmlBodyPartSchema();
129-
var schema = await def.GetSettingsSchemaAsync();
129+
var schema = await def.GetSettingsSchemaAsync(TestContext.Current.CancellationToken);
130130
var json = schema.Build().Root.Source.GetRawText();
131131

132132
Assert.Contains("SanitizeHtml", json);

‎tests/CrestApps.OrchardCore.Tests/Core/Schemas/SettingsRecipeStepTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ public async Task Name_ReturnsSettings()
1111
{
1212
var step = new SettingsRecipeStep([]);
1313

14-
Assert.Equal("Settings", step.Name);
14+
Assert.Equal("settings", step.Name);
1515
}
1616

1717
[Fact]
1818
public async Task GetSchemaAsync_ReturnsValidSchema()
1919
{
2020
var step = new SettingsRecipeStep([]);
21-
var schema = await step.GetSchemaAsync();
21+
var schema = await step.GetSchemaAsync(TestContext.Current.CancellationToken);
2222

2323
Assert.NotNull(schema);
2424

@@ -33,8 +33,8 @@ public async Task GetSchemaAsync_ReturnsValidSchema()
3333
public async Task GetSchemaAsync_ReturnsCachedInstance()
3434
{
3535
var step = new SettingsRecipeStep([]);
36-
var first = await step.GetSchemaAsync();
37-
var second = await step.GetSchemaAsync();
36+
var first = await step.GetSchemaAsync(TestContext.Current.CancellationToken);
37+
var second = await step.GetSchemaAsync(TestContext.Current.CancellationToken);
3838

3939
Assert.Same(first, second);
4040
}
@@ -48,7 +48,7 @@ public async Task GetSchemaAsync_IncludesRegisteredSiteSettingsDefinitions()
4848
new GeneralAISettingsSchema(),
4949
]);
5050

51-
var json = JsonSerializer.Serialize(await step.GetSchemaAsync());
51+
var json = JsonSerializer.Serialize(await step.GetSchemaAsync(TestContext.Current.CancellationToken));
5252

5353
Assert.Contains("\"AdminSettings\"", json);
5454
Assert.Contains("\"DisplayThemeToggler\"", json);

0 commit comments

Comments
 (0)