From 7aeb400fce00de37c22f1a363688751e8415e8ef Mon Sep 17 00:00:00 2001 From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Date: Tue, 21 Jun 2022 08:09:38 +0200 Subject: [PATCH] V10: fix build warnings in test projects (#12509) * Run code cleanup * Dotnet format benchmarks project * Fix up Test.Common * Run dotnet format + manual cleanup * Run code cleanup for unit tests * Run dotnet format * Fix up errors * Manual cleanup of Unit test project * Update tests/Umbraco.Tests.Benchmarks/HexStringBenchmarks.cs Co-authored-by: Mole * Update tests/Umbraco.Tests.Integration/Testing/TestDbMeta.cs Co-authored-by: Mole * Update tests/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs Co-authored-by: Mole * Update tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs Co-authored-by: Mole * Update tests/Umbraco.Tests.Integration/Umbraco.Core/Events/EventAggregatorTests.cs Co-authored-by: Mole * Fix according to review * Fix after merge * Fix errors Co-authored-by: Nikolaj Geisle Co-authored-by: Mole Co-authored-by: Zeegaan --- .../Configuration/TestDataSettings.cs | 27 +- .../Extensions/UmbracoBuilderExtensions.cs | 72 +- tests/Umbraco.TestData/LoadTestComposer.cs | 9 +- tests/Umbraco.TestData/LoadTestController.cs | 549 +- .../Umbraco.TestData/SegmentTestController.cs | 190 +- .../UmbracoTestDataController.cs | 497 +- .../CombineGuidBenchmarks.cs | 69 +- .../ConcurrentDictionaryBenchmarks.cs | 207 +- .../Config/QuickRunConfigAttribute.cs | 39 +- ...ckRunWithMemoryDiagnoserConfigAttribute.cs | 23 +- .../EnumeratorBenchmarks.cs | 45 +- .../HashFromStreams.cs | 219 +- .../HexStringBenchmarks.cs | 111 +- .../JsonSerializerSettingsBenchmarks.cs | 111 +- .../LinqCastBenchmarks.cs | 67 +- .../LoggerAllocationBenchmark.cs | 92 +- .../ModelToSqlExpressionHelperBenchmarks.cs | 108 +- tests/Umbraco.Tests.Benchmarks/Program.cs | 11 +- .../SqlTemplatesBenchmark.cs | 132 +- .../StringReplaceManyBenchmarks.cs | 247 +- .../TryConvertToBenchmarks.cs | 50 +- .../TypeFinderBenchmarks.cs | 45 +- .../TypeLoaderBenchmarks.cs | 114 +- .../Umbraco.Tests.Benchmarks/XmlBenchmarks.cs | 162 +- .../Builders/AuditEntryBuilder.cs | 291 +- .../Builders/BuilderBase.cs | 21 +- .../Builders/ChildBuilderBase.cs | 13 +- .../Builders/ConfigurationEditorBuilder.cs | 39 +- .../Builders/ContentBuilder.cs | 810 +- .../Builders/ContentCultureInfosBuilder.cs | 56 +- .../ContentCultureInfosCollectionBuilder.cs | 47 +- .../Builders/ContentDataBuilder.cs | 347 +- .../Builders/ContentItemSaveBuilder.cs | 119 +- .../Builders/ContentNodeKitBuilder.cs | 167 +- .../Builders/ContentPropertyBasicBuilder.cs | 70 +- .../Builders/ContentTypeBaseBuilder.cs | 424 +- .../Builders/ContentTypeBuilder.cs | 990 +-- .../Builders/ContentTypeSortBuilder.cs | 79 +- .../Builders/ContentVariantSaveBuilder.cs | 121 +- .../Builders/DataEditorBuilder.cs | 118 +- .../Builders/DataTypeBuilder.cs | 284 +- .../Builders/DataValueEditorBuilder.cs | 103 +- .../Builders/DictionaryItemBuilder.cs | 192 +- .../Builders/DictionaryTranslationBuilder.cs | 138 +- .../Builders/DocumentEntitySlimBuilder.cs | 334 +- .../Builders/EntitySlimBuilder.cs | 61 +- .../Builders/Extensions/BuilderExtensions.cs | 441 +- .../ContentItemSaveBuilderExtensions.cs | 65 +- .../ContentTypeBuilderExtensions.cs | 195 +- .../Builders/Extensions/StringExtensions.cs | 27 +- .../Builders/GenericCollectionBuilder.cs | 35 +- .../Builders/GenericDictionaryBuilder.cs | 33 +- .../Builders/Interfaces/IAccountBuilder.cs | 19 +- .../IBuildContentCultureInfosCollection.cs | 8 +- .../Builders/Interfaces/IBuildContentTypes.cs | 7 +- .../Interfaces/IBuildPropertyGroups.cs | 7 +- .../Interfaces/IBuildPropertyTypes.cs | 7 +- .../Builders/Interfaces/IWithAliasBuilder.cs | 9 +- .../Interfaces/IWithAllowAsRootBuilder.cs | 9 +- .../Interfaces/IWithCreateDateBuilder.cs | 9 +- .../Interfaces/IWithCreatorIdBuilder.cs | 9 +- .../Interfaces/IWithCultureInfoBuilder.cs | 9 +- .../Builders/Interfaces/IWithDateBuilder.cs | 11 +- .../Interfaces/IWithDeleteDateBuilder.cs | 9 +- .../Interfaces/IWithDescriptionBuilder.cs | 9 +- .../Builders/Interfaces/IWithEmailBuilder.cs | 9 +- .../IWithFailedPasswordAttemptsBuilder.cs | 9 +- .../Builders/Interfaces/IWithIconBuilder.cs | 9 +- .../Builders/Interfaces/IWithIdBuilder.cs | 19 +- .../Interfaces/IWithIsApprovedBuilder.cs | 11 +- .../Interfaces/IWithIsContainerBuilder.cs | 9 +- .../Interfaces/IWithIsLockedOutBuilder.cs | 13 +- .../Builders/Interfaces/IWithKeyBuilder.cs | 9 +- .../Interfaces/IWithLastLoginDateBuilder.cs | 9 +- .../IWithLastPasswordChangeDateBuilder.cs | 9 +- .../Builders/Interfaces/IWithLevelBuilder.cs | 9 +- .../Builders/Interfaces/IWithLoginBuilder.cs | 13 +- .../Builders/Interfaces/IWithNameBuilder.cs | 9 +- .../IWithParentContentTypeBuilder.cs | 9 +- .../Interfaces/IWithParentIdBuilder.cs | 9 +- .../Builders/Interfaces/IWithPathBuilder.cs | 9 +- .../IWithPropertyTypeIdsIncrementingFrom.cs | 9 +- .../Interfaces/IWithPropertyValues.cs | 13 +- .../Interfaces/IWithSortOrderBuilder.cs | 9 +- .../Interfaces/IWithSupportsPublishing.cs | 9 +- .../Interfaces/IWithThumbnailBuilder.cs | 9 +- .../Interfaces/IWithTrashedBuilder.cs | 9 +- .../Interfaces/IWithUpdateDateBuilder.cs | 9 +- .../Builders/LanguageBuilder.cs | 234 +- .../Builders/MacroBuilder.cs | 215 +- .../Builders/MacroPropertyBuilder.cs | 117 +- .../Builders/MediaBuilder.cs | 496 +- .../Builders/MediaTypeBuilder.cs | 506 +- .../Builders/MemberBuilder.cs | 684 +- .../Builders/MemberGroupBuilder.cs | 164 +- .../Builders/MemberTypeBuilder.cs | 241 +- .../Builders/PropertyBuilder.cs | 146 +- .../Builders/PropertyDataBuilder.cs | 45 +- .../Builders/PropertyGroupBuilder.cs | 277 +- .../Builders/PropertyTypeBuilder.cs | 403 +- .../Builders/RelationBuilder.cs | 180 +- .../Builders/RelationTypeBuilder.cs | 211 +- .../Builders/StylesheetBuilder.cs | 46 +- .../Builders/TemplateBuilder.cs | 249 +- .../Builders/TreeBuilder.cs | 125 +- .../Builders/UmbracoIdentityRoleBuilder.cs | 61 +- .../Builders/UserBuilder.cs | 573 +- .../Builders/UserGroupBuilder.cs | 300 +- .../Builders/XmlDocumentBuilder.cs | 39 +- .../Extensions/ContentBaseExtensions.cs | 43 +- .../Extensions/StringExtensions.cs | 2 +- .../Published/PublishedContentXml.cs | 148 +- .../Published/PublishedContentXmlAdapter.cs | 231 +- .../Published/PublishedSnapshotTestObjects.cs | 70 +- tests/Umbraco.Tests.Common/TaskHelper.cs | 118 +- tests/Umbraco.Tests.Common/TestClone.cs | 151 +- .../TestDefaultCultureAccessor.cs | 19 +- tests/Umbraco.Tests.Common/TestHelperBase.cs | 285 +- .../TestHelpers/FileSystemsCreator.cs | 56 +- .../TestHelpers/LogTestHelper.cs | 56 +- .../TestHelpers/MockedValueEditors.cs | 31 +- .../TestHelpers/StringNewlineExtensions.cs | 81 +- .../TestHelpers/Stubs/TestProfiler.cs | 57 +- .../TestHelpers/TestDatabase.cs | 891 ++- .../TestHelpers/TestEnvironment.cs | 13 +- .../TestLastChanceFinder.cs | 9 +- .../TestOptionsMonitor.cs | 17 +- .../TestOptionsSnapshot.cs | 15 +- .../TestPublishedSnapshotAccessor.cs | 21 +- .../TestUmbracoContextAccessor.cs | 35 +- .../TestVariationContextAccessor.cs | 17 +- .../Testing/TestHostingEnvironment.cs | 43 +- .../Testing/TestOptionAttributeBase.cs | 121 +- .../Testing/UmbracoTestAttribute.cs | 151 +- .../Testing/UmbracoTestOptions.cs | 109 +- .../ComponentRuntimeTests.cs | 81 +- .../UmbracoBuilderExtensions.cs | 220 +- .../Extensions/ServiceCollectionExtensions.cs | 26 +- .../GlobalSetupTeardown.cs | 23 +- .../Implementations/TestHelper.cs | 532 +- .../Implementations/TestLifetime.cs | 19 +- .../TestUmbracoBootPermissionChecker.cs | 11 +- ...reNotAmbiguousActionNameControllerTests.cs | 175 +- .../TestServerTest/TestAuthHandler.cs | 60 +- .../UmbracoTestServerTestBase.cs | 393 +- .../UmbracoWebApplicationFactory.cs | 43 +- .../Testing/BaseTestDatabase.cs | 219 +- .../Testing/ITestDatabase.cs | 13 +- .../Testing/IntegrationTestComponent.cs | 45 +- .../Testing/LocalDbTestDatabase.cs | 225 +- .../Testing/SqlServerBaseTestDatabase.cs | 17 +- .../Testing/SqlServerTestDatabase.cs | 180 +- .../Testing/SqliteTestDatabase.cs | 48 +- .../Testing/TestConflictingRouteService.cs | 14 +- .../Testing/TestDatabaseFactory.cs | 82 +- .../Testing/TestDatabaseSettings.cs | 46 +- .../Testing/TestDbMeta.cs | 61 +- .../TestUmbracoDatabaseFactoryProvider.cs | 84 +- .../Testing/UmbracoIntegrationTest.cs | 329 +- .../Testing/UmbracoIntegrationTestBase.cs | 188 +- .../UmbracoIntegrationTestWithContent.cs | 99 +- .../Events/EventAggregatorTests.cs | 105 +- .../Umbraco.Core/IO/FileSystemsTests.cs | 170 +- .../Umbraco.Core/IO/ShadowFileSystemTests.cs | 1811 ++--- .../Mapping/ContentTypeModelMappingTests.cs | 2120 +++--- .../Mapping/UmbracoMapperTests.cs | 669 +- .../Mapping/UserModelMapperTests.cs | 49 +- .../CreatedPackagesRepositoryTests.cs | 539 +- .../PublishedContentQueryAccessorTests.cs | 61 +- .../Umbraco.Core/RuntimeStateTests.cs | 140 +- .../Services/MetricsConsentServiceTest.cs | 53 +- .../Services/SectionServiceTests.cs | 96 +- .../Services/TelemetryProviderTests.cs | 604 +- .../Telemetry/TelemetryServiceTests.cs | 105 +- .../UmbracoExamine/ExamineBaseTest.cs | 204 +- .../ExamineDemoDataContentService.cs | 79 +- .../ExamineDemoDataMediaService.cs | 40 +- .../UmbracoExamine/ExamineExtensions.cs | 264 +- .../UmbracoExamine/IndexInitializer.cs | 461 +- .../UmbracoExamine/IndexTest.cs | 598 +- .../PublishedContentQueryTests.cs | 140 +- .../UmbracoExamine/RandomIdRAMDirectory.cs | 11 +- .../UmbracoExamine/SearchTests.cs | 147 +- .../Migrations/AdvancedMigrationTests.cs | 538 +- .../Packaging/CreatedPackageSchemaTests.cs | 88 +- .../Packaging/PackageDataInstallationTests.cs | 1741 ++--- .../Packaging/PackageInstallationTest.cs | 151 +- .../Persistence/LocksTests.cs | 1207 +-- .../NPocoTests/NPocoBulkInsertTests.cs | 294 +- .../Persistence/NPocoTests/NPocoFetchTests.cs | 945 ++- .../Repositories/AuditRepositoryTest.cs | 313 +- .../CacheInstructionRepositoryTest.cs | 240 +- .../Repositories/ContentTypeRepositoryTest.cs | 1939 ++--- .../DataTypeDefinitionRepositoryTest.cs | 565 +- .../Repositories/DictionaryRepositoryTest.cs | 729 +- .../Repositories/DocumentRepositoryTest.cs | 2128 +++--- .../DocumentVersionRepositoryTest.cs | 356 +- .../Repositories/DomainRepositoryTest.cs | 681 +- .../Repositories/EntityRepositoryTest.cs | 154 +- .../Repositories/KeyValueRepositoryTests.cs | 101 +- .../Repositories/LanguageRepositoryTest.cs | 753 +- .../Repositories/MacroRepositoryTest.cs | 632 +- .../Repositories/MediaRepositoryTest.cs | 1105 +-- .../Repositories/MediaTypeRepositoryTest.cs | 778 +- .../Repositories/MemberRepositoryTest.cs | 751 +- .../Repositories/MemberTypeRepositoryTest.cs | 547 +- .../NotificationsRepositoryTest.cs | 361 +- .../PartialViewRepositoryTests.cs | 207 +- .../PublicAccessRepositoryTest.cs | 456 +- .../RedirectUrlRepositoryTests.cs | 541 +- .../Repositories/RelationRepositoryTest.cs | 1065 +-- .../RelationTypeRepositoryTest.cs | 349 +- .../Repositories/ScriptRepositoryTest.cs | 661 +- .../ServerRegistrationRepositoryTest.cs | 369 +- .../Repositories/SimilarNodeNameTests.cs | 357 +- .../Repositories/StylesheetRepositoryTest.cs | 676 +- .../Repositories/TagRepositoryTest.cs | 1977 +++-- .../Repositories/TemplateRepositoryTest.cs | 1043 ++- .../Repositories/UserGroupRepositoryTest.cs | 809 +- .../Repositories/UserRepositoryTest.cs | 881 +-- .../Persistence/SchemaValidationTest.cs | 46 +- .../SqlServerSyntaxProviderTests.cs | 319 +- .../Persistence/UnitOfWorkTests.cs | 90 +- .../Runtime/FileSystemMainDomLockTests.cs | 167 +- .../Scoping/LegacyScopeProviderTests.cs | 6 +- .../Scoping/ScopeFileSystemsTests.cs | 363 +- .../Scoping/ScopeTests.cs | 9 +- .../Scoping/ScopedNuCacheTests.cs | 164 +- .../Scoping/ScopedRepositoryTests.cs | 518 +- .../Scoping/SupressNotificationsTests.cs | 186 +- .../Security/BackOfficeUserStoreTests.cs | 95 +- .../Services/AuditServiceTests.cs | 169 +- .../Services/CacheInstructionServiceTests.cs | 517 +- .../Services/CachedDataTypeServiceTests.cs | 57 +- .../Services/ConsentServiceTests.cs | 170 +- .../Services/ContentEventsTests.cs | 12 +- .../ContentServiceNotificationTests.cs | 816 +- .../Services/ContentServicePerformanceTest.cs | 479 +- .../ContentServicePublishBranchTests.cs | 937 +-- .../Services/ContentServiceTagsTests.cs | 1523 ++-- .../Services/ContentServiceTests.cs | 6723 +++++++++-------- .../Services/ContentTypeServiceTests.cs | 3760 ++++----- .../ContentTypeServiceVariantsTests.cs | 2581 ++++--- .../ContentVersionCleanupServiceTest.cs | 192 +- .../Services/DataTypeServiceTests.cs | 129 +- .../Services/EntityServiceTests.cs | 1609 ++-- .../Services/EntityXmlSerializerTests.cs | 556 +- .../Services/ExternalLoginServiceTests.cs | 464 +- .../Services/FileServiceTests.cs | 91 +- .../Services/KeyValueServiceTests.cs | 153 +- .../Services/LocalizationServiceTests.cs | 879 ++- .../Services/MacroServiceTests.cs | 479 +- .../Services/MediaServiceTests.cs | 595 +- .../Services/MediaTypeServiceTests.cs | 351 +- .../Services/MemberServiceTests.cs | 2692 +++---- .../Services/MemberTypeServiceTests.cs | 745 +- .../Services/NuCacheRebuildTests.cs | 109 +- .../Services/PublicAccessServiceTests.cs | 240 +- .../Services/RedirectUrlServiceTests.cs | 126 +- .../Services/RelationServiceTests.cs | 454 +- .../Services/TagServiceTests.cs | 176 +- .../Services/ThreadSafetyServiceTest.cs | 15 +- .../Services/TrackRelationsTests.cs | 95 +- .../Services/UserServiceTests.cs | 2000 +++-- .../BackOfficeAssetsControllerTests.cs | 26 +- .../Controllers/ContentControllerTests.cs | 1153 ++- .../Controllers/DataTypeControllerTests.cs | 21 +- .../Controllers/EntityControllerTests.cs | 713 +- .../PropertyTypeControllerTests.cs | 20 +- .../TemplateQueryControllerTests.cs | 56 +- .../Controllers/UsersControllerTests.cs | 374 +- .../Filters/ContentModelValidatorTests.cs | 502 +- ...kOfficeServiceCollectionExtensionsTests.cs | 49 +- .../UrlAndDomains/DomainAndUrlsTests.cs | 226 +- ...MembersServiceCollectionExtensionsTests.cs | 35 +- .../Routing/FrontEndRouteTests.cs | 150 +- .../AutoFixture/AutoMoqDataAttribute.cs | 23 +- .../OmitRecursionCustomization.cs | 11 +- .../Customizations/UmbracoCustomizations.cs | 83 +- .../AutoFixture/InlineAutoMoqDataAttribute.cs | 23 +- .../UmbracoAutoMoqFixtureFactory.cs | 17 +- .../TestHelpers/BaseUsingSqlSyntax.cs | 57 +- .../TestHelpers/CompositionExtensions.cs | 17 +- .../Objects/TestUmbracoContextFactory.cs | 100 +- .../PublishedSnapshotServiceTestBase.cs | 433 +- .../TestHelpers/TestHelper.cs | 468 +- .../TestHelpers/TestNuCacheContentService.cs | 180 +- .../Umbraco.Core/AttemptTests.cs | 29 +- .../BackOffice/IdentityExtensionsTests.cs | 65 +- .../UmbracoBackOfficeIdentityTests.cs | 199 +- .../Umbraco.Core/Cache/AppCacheTests.cs | 474 +- .../Cache/DeepCloneAppCacheTests.cs | 171 +- .../Cache/DefaultCachePolicyTests.cs | 209 +- .../Cache/DictionaryAppCacheTests.cs | 29 +- .../DistributedCache/DistributedCacheTests.cs | 289 +- .../Cache/FullDataSetCachePolicyTests.cs | 364 +- .../Cache/HttpContextRequestAppCacheTests.cs | 33 +- .../Umbraco.Core/Cache/ObjectAppCacheTests.cs | 31 +- .../Umbraco.Core/Cache/RefresherTests.cs | 108 +- .../Cache/RuntimeAppCacheTests.cs | 31 +- .../Cache/SingleItemsOnlyCachePolicyTests.cs | 93 +- .../Cache/ValueEditorCacheTests.cs | 228 +- .../ClaimsIdentityExtensionsTests.cs | 63 +- .../Collections/DeepCloneableListTests.cs | 149 +- .../Collections/OrderedHashSetTests.cs | 153 +- .../Collections/StackQueueTests.cs | 114 +- .../Umbraco.Core/Components/ComponentTests.cs | 1169 +-- .../Composing/CollectionBuildersTests.cs | 1025 +-- .../Composing/ComposingTestBase.cs | 37 +- .../Composing/LazyCollectionBuilderTests.cs | 327 +- .../Umbraco.Core/Composing/TypeFinderTests.cs | 109 +- .../Umbraco.Core/Composing/TypeHelperTests.cs | 412 +- .../Composing/TypeLoaderExtensions.cs | 21 +- .../Umbraco.Core/Composing/TypeLoaderTests.cs | 421 +- .../ConfigureConnectionStringsTests.cs | 3 +- .../HealthCheckSettingsExtensionsTests.cs | 63 +- .../Models/GlobalSettingsTests.cs | 37 +- .../Models/RequestHandlerSettingsTests.cs | 136 +- .../ContentSettingsValidatorTests.cs | 8 +- .../GlobalSettingsValidatorTests.cs | 101 +- .../HealthChecksSettingsValidatorTests.cs | 62 +- .../RequestHandlerSettingsValidatorTests.cs | 42 +- .../Configuration/NCronTabParserTests.cs | 50 +- .../CoreThings/ObjectExtensionsTests.cs | 551 +- .../CoreThings/TryConvertToTests.cs | 221 +- .../Umbraco.Core/CoreThings/UdiTests.cs | 560 +- .../Umbraco.Core/CoreXml/FrameworkXmlTests.cs | 396 +- .../CoreXml/NavigableNavigatorTests.cs | 1916 +++-- .../CoreXml/RenamedRootNavigatorTests.cs | 153 +- .../Umbraco.Core/DelegateExtensionsTests.cs | 63 +- .../Umbraco.Core/Deploy/ArtifactBaseTests.cs | 95 +- .../EmbeddedResources/LanguageXmlTests.cs | 43 +- .../Umbraco.Core/EnumExtensionsTests.cs | 99 +- .../Umbraco.Core/EnumerableExtensionsTests.cs | 310 +- .../Events/EventAggregatorTests.cs | 214 +- .../ClaimsPrincipalExtensionsTests.cs | 124 +- .../ConfigurationExtensionsTests.cs | 186 +- .../UmbracoBuilderExtensionsTests.cs | 124 +- .../Extensions/UriExtensionsTests.cs | 268 +- .../Umbraco.Core/GuidUtilsTests.cs | 59 +- .../Umbraco.Core/HashCodeCombinerTests.cs | 237 +- .../Umbraco.Core/HashGeneratorTests.cs | 313 +- .../Umbraco.Core/HexEncoderTests.cs | 112 +- .../IO/AbstractFileSystemTests.cs | 343 +- .../IO/PhysicalFileSystemTests.cs | 175 +- .../Manifest/ManifestContentAppTests.cs | 133 +- .../Manifest/ManifestParserTests.cs | 548 +- .../Umbraco.Core/Models/Collections/Item.cs | 418 +- .../Models/Collections/OrderItem.cs | 77 +- .../Collections/PropertyCollectionTests.cs | 127 +- .../Models/Collections/SimpleOrder.cs | 127 +- .../Models/ContentExtensionsTests.cs | 342 +- .../Models/ContentScheduleTests.cs | 170 +- .../Umbraco.Core/Models/ContentTests.cs | 1998 ++--- .../Models/ContentTypeHistoryCleanupTests.cs | 183 +- .../Umbraco.Core/Models/ContentTypeTests.cs | 640 +- .../Umbraco.Core/Models/CultureImpactTests.cs | 249 +- .../Models/DeepCloneHelperTests.cs | 409 +- .../Models/DictionaryItemTests.cs | 84 +- .../Models/DictionaryTranslationTests.cs | 98 +- .../Models/DocumentEntityTests.cs | 62 +- .../Umbraco.Core/Models/LanguageTests.cs | 72 +- .../Umbraco.Core/Models/MacroTests.cs | 120 +- .../Umbraco.Core/Models/MemberGroupTests.cs | 110 +- .../Umbraco.Core/Models/MemberTests.cs | 234 +- .../Umbraco.Core/Models/PropertyGroupTests.cs | 122 +- .../Umbraco.Core/Models/PropertyTests.cs | 90 +- .../Umbraco.Core/Models/PropertyTypeTests.cs | 127 +- .../Umbraco.Core/Models/RangeTests.cs | 239 +- .../Umbraco.Core/Models/RelationTests.cs | 116 +- .../Umbraco.Core/Models/RelationTypeTests.cs | 84 +- .../Umbraco.Core/Models/StylesheetTests.cs | 208 +- .../Umbraco.Core/Models/TemplateTests.cs | 117 +- .../Models/UserExtensionsTests.cs | 178 +- .../Umbraco.Core/Models/UserGroupTests.cs | 82 +- .../Umbraco.Core/Models/UserTests.cs | 94 +- .../Umbraco.Core/Models/VariationTests.cs | 1183 +-- .../PendingPackageMigrationsTests.cs | 131 +- .../BlockEditorComponentTests.cs | 342 +- .../BlockListPropertyValueConverterTests.cs | 455 +- .../PropertyEditors/ColorListValidatorTest.cs | 98 +- .../PropertyEditors/ConvertersTests.cs | 354 +- ...ataValueReferenceFactoryCollectionTests.cs | 334 +- .../EnsureUniqueValuesValidatorTest.cs | 158 +- .../MultiValuePropertyEditorTests.cs | 274 +- .../NestedContentPropertyComponentTests.cs | 291 +- .../PropertyEditorValueConverterTests.cs | 226 +- .../PropertyEditorValueEditorTests.cs | 206 +- .../Umbraco.Core/Published/ConvertersTests.cs | 294 +- .../Umbraco.Core/Published/ModelTypeTests.cs | 119 +- .../Published/NestedContentTests.cs | 439 +- .../Published/PropertyCacheLevelTests.cs | 477 +- .../Umbraco.Core/ReflectionTests.cs | 48 +- .../Umbraco.Core/ReflectionUtilitiesTests.cs | 1373 ++-- .../Routing/ContentFinderByAliasTests.cs | 63 +- .../ContentFinderByAliasWithDomainsTests.cs | 87 +- .../Routing/ContentFinderByIdTests.cs | 65 +- .../ContentFinderByPageIdQueryTests.cs | 71 +- .../Routing/ContentFinderByUrlAliasTests.cs | 82 +- .../ContentFinderByUrlAndTemplateTests.cs | 101 +- .../Routing/ContentFinderByUrlTests.cs | 278 +- .../ContentFinderByUrlWithDomainsTests.cs | 283 +- .../Routing/DomainsAndCulturesTests.cs | 506 +- .../Routing/GetContentUrlsTests.cs | 357 +- .../Routing/PublishedRouterTests.cs | 133 +- .../Routing/SiteDomainMapperTests.cs | 695 +- .../Routing/UmbracoRequestPathsTests.cs | 180 +- .../Umbraco.Core/Routing/UriUtilityTests.cs | 172 +- ...oviderWithHideTopLevelNodeFromPathTests.cs | 68 +- ...derWithoutHideTopLevelNodeFromPathTests.cs | 565 +- .../Routing/UrlRoutingTestBase.cs | 185 +- .../Routing/UrlsProviderWithDomainsTests.cs | 710 +- .../Routing/UrlsWithNestedDomains.cs | 254 +- .../Umbraco.Core/Routing/WebPathTests.cs | 46 +- .../Scheduling/ContentVersionCleanupTest.cs | 205 +- .../Scoping/EventNameExtractorTests.cs | 94 +- .../ScopedNotificationPublisherTests.cs | 144 +- .../Security/ContentPermissionsTests.cs | 683 +- .../Security/LegacyPasswordSecurityTests.cs | 187 +- .../Security/MediaPermissionsTests.cs | 305 +- .../Services/BasicAuthServiceTests.cs | 51 +- .../ContentTypeServiceExtensionsTests.cs | 424 +- .../ContentVersionCleanupServiceTest.cs | 262 +- .../DefaultContentVersionCleanupPolicyTest.cs | 54 +- .../Services/UserDataServiceTests.cs | 241 +- .../ShortStringHelper/CmsHelperCasingTests.cs | 56 +- .../DefaultShortStringHelperTests.cs | 304 +- ...faultShortStringHelperTestsWithoutSetup.cs | 780 +- .../MockShortStringHelper.cs | 34 +- .../StringExtensionsTests.cs | 560 +- .../StringValidationTests.cs | 63 +- .../StylesheetHelperTests.cs | 320 +- .../Umbraco.Core/TaskHelperTests.cs | 94 +- .../Telemetry/SiteIdentifierServiceTests.cs | 121 +- ...SystemInformationTelemetryProviderTests.cs | 176 +- .../Telemetry/TelemetryServiceTests.cs | 239 +- .../DefaultViewContentProviderTests.cs | 149 +- .../Templates/HtmlImageSourceParserTests.cs | 227 +- .../Templates/HtmlLocalLinkParserTests.cs | 163 +- .../Umbraco.Core/VersionExtensionTests.cs | 39 +- .../Routing/PublishedRequestBuilderTests.cs | 137 +- .../Umbraco.Core/Xml/XmlHelperTests.cs | 223 +- .../Umbraco.Core/XmlExtensionsTests.cs | 59 +- .../BackOfficeClaimsPrincipalFactoryTests.cs | 276 +- .../UserEditorAuthorizationHelperTests.cs | 817 +- .../UmbracoContentValueSetValidatorTests.cs | 671 +- .../Extensions/EmailMessageExtensionsTests.cs | 355 +- .../HealthChecks/HealthCheckResultsTests.cs | 260 +- .../HealthCheckNotifierTests.cs | 312 +- .../HostedServices/KeepAliveTests.cs | 207 +- .../HostedServices/LogScrubberTests.cs | 163 +- .../ScheduledPublishingTests.cs | 233 +- .../InstructionProcessTaskTests.cs | 91 +- .../TouchServerTaskTests.cs | 175 +- .../HostedServices/TempFileCleanupTests.cs | 4 +- .../Logging/LogviewerTests.cs | 471 +- .../Mapping/MappingTests.cs | 630 +- .../Migrations/AlterMigrationTests.cs | 209 +- .../Migrations/MigrationPlanTests.cs | 397 +- .../Migrations/MigrationTests.cs | 180 +- .../Migrations/PostMigrationTests.cs | 230 +- .../Stubs/AlterUserTableMigrationStub.cs | 29 +- .../Stubs/DropForeignKeyMigrationStub.cs | 23 +- .../Migrations/Stubs/Dummy.cs | 25 +- .../Migrations/Stubs/FiveZeroMigration.cs | 23 +- .../Migrations/Stubs/FourElevenMigration.cs | 22 +- .../Migrations/Stubs/SixZeroMigration1.cs | 22 +- .../Migrations/Stubs/SixZeroMigration2.cs | 22 +- .../AddPropertyTypeGroupColumnsTests.cs | 66 +- .../Models/DataTypeTests.cs | 86 +- .../Models/PathValidationTests.cs | 254 +- .../Persistence/BulkDataReaderTests.cs | 5181 +++++++------ .../Persistence/Mappers/ContentMapperTest.cs | 60 +- .../Mappers/ContentTypeMapperTest.cs | 71 +- .../Persistence/Mappers/DataTypeMapperTest.cs | 73 +- .../Mappers/DictionaryMapperTest.cs | 55 +- .../DictionaryTranslationMapperTest.cs | 58 +- .../Persistence/Mappers/LanguageMapperTest.cs | 55 +- .../Persistence/Mappers/MediaMapperTest.cs | 61 +- .../Mappers/PropertyGroupMapperTest.cs | 55 +- .../Mappers/PropertyTypeMapperTest.cs | 107 +- .../Persistence/Mappers/RelationMapperTest.cs | 87 +- .../Mappers/RelationTypeMapperTest.cs | 73 +- .../NPocoTests/NPocoSqlExtensionsTests.cs | 416 +- .../NPocoTests/NPocoSqlTemplateTests.cs | 328 +- .../Persistence/NPocoTests/NPocoSqlTests.cs | 514 +- .../ContentTypeRepositorySqlClausesTest.cs | 285 +- ...aTypeDefinitionRepositorySqlClausesTest.cs | 60 +- .../Persistence/Querying/ExpressionTests.cs | 373 +- .../Querying/MediaRepositorySqlClausesTest.cs | 67 +- .../MediaTypeRepositorySqlClausesTest.cs | 60 +- .../Persistence/Querying/QueryBuilderTests.cs | 161 +- .../SqlAzureDatabaseProviderMetadataTests.cs | 78 +- .../ContentSerializationTests.cs | 174 +- .../PublishedContentCacheTests.cs | 113 +- .../PublishedContentDataTableTests.cs | 314 +- .../PublishedContentExtensionTests.cs | 103 +- .../PublishedContentLanguageVariantTests.cs | 686 +- .../PublishedCache/PublishedContentTests.cs | 1904 +++-- .../PublishedCache/PublishedMediaTests.cs | 357 +- ...PublishedSnapshotServiceCollectionTests.cs | 1918 ++--- .../PublishedSnapshotServiceContentTests.cs | 337 +- .../PublishedCache/RootNodeTests.cs | 64 +- .../PublishedCache/UrlRoutesTests.cs | 572 +- .../DefaultMainDomKeyGeneratorTests.cs | 61 +- .../Scoping/ScopeUnitTests.cs | 25 +- .../Security/MemberManagerTests.cs | 398 +- .../Security/MemberPasswordHasherTests.cs | 130 +- .../Security/MemberRoleStoreTests.cs | 760 +- .../Security/MemberUserStoreTests.cs | 458 +- .../Security/NoOpLookupNormalizerTests.cs | 75 +- .../Security/UmbracoPasswordHasherTests.cs | 204 +- .../AutoInterningStringConverterTests.cs | 90 +- .../Serialization/JsonNetSerializerTests.cs | 114 +- .../Services/AmbiguousEventTests.cs | 158 +- .../Services/LocalizedTextServiceTests.cs | 677 +- .../PropertyValidationServiceTests.cs | 379 +- .../BuilderTests.cs | 861 ++- .../StringExtensions.cs | 9 +- .../UmbracoApplicationTests.cs | 89 +- .../SnapDictionaryTests.cs | 2137 +++--- .../Builders/AllowedContentTypeDetail.cs | 15 +- .../Builders/ContentTypeBuilderTests.cs | 243 +- .../Builders/DataTypeBuilderTests.cs | 58 +- .../DocumentEntitySlimBuilderTests.cs | 134 +- .../Builders/LanguageBuilderTests.cs | 34 +- .../Builders/MacroBuilderTests.cs | 122 +- .../Builders/MediaTypeBuilderTests.cs | 183 +- .../Builders/MemberBuilderTests.cs | 274 +- .../Builders/MemberGroupBuilderTests.cs | 82 +- .../Builders/MemberTypeBuilderTests.cs | 191 +- .../Builders/PropertyBuilderTests.cs | 60 +- .../Builders/PropertyGroupBuilderTests.cs | 74 +- .../Builders/PropertyTypeBuilderTests.cs | 117 +- .../Builders/PropertyTypeDetail.cs | 19 +- .../Builders/RelationBuilderTests.cs | 109 +- .../Builders/RelationTypeBuilderTests.cs | 92 +- .../Builders/StylesheetBuilderTests.cs | 38 +- .../Builders/TemplateBuilderTests.cs | 85 +- .../Builders/TemplateDetail.cs | 15 +- .../Builders/UserBuilderTests.cs | 124 +- .../Builders/UserGroupBuilderTests.cs | 74 +- .../Builders/XmlDocumentBuilderTests.cs | 34 +- .../Authorization/AdminUsersHandlerTests.cs | 307 +- .../Authorization/BackOfficeHandlerTests.cs | 209 +- ...entPermissionsPublishBranchHandlerTests.cs | 281 +- ...ntentPermissionsQueryStringHandlerTests.cs | 457 +- .../ContentPermissionsResourceHandlerTests.cs | 177 +- .../DenyLocalLoginHandlerTests.cs | 72 +- ...MediaPermissionsQueryStringHandlerTests.cs | 379 +- .../MediaPermissionsResourceHandlerTests.cs | 159 +- .../Authorization/SectionHandlerTests.cs | 142 +- .../Authorization/TreeHandlerTests.cs | 184 +- .../Authorization/UserGroupHandlerTests.cs | 319 +- .../TreeCollectionBuilderTests.cs | 51 +- .../Controllers/ContentControllerTests.cs | 483 +- .../Controllers/MemberControllerUnitTests.cs | 1264 ++-- .../Controllers/UsersControllerTests.cs | 39 +- .../Extensions/ModelStateExtensionsTests.cs | 177 +- .../AppendUserModifiedHeaderAttributeTests.cs | 208 +- .../Filters/ContentModelValidatorTests.cs | 185 +- ...terAllowedOutgoingContentAttributeTests.cs | 285 +- .../Filters/ValidationFilterAttributeTests.cs | 91 +- .../BackOfficeAuthenticationBuilderTests.cs | 55 +- .../Security/BackOfficeCookieManagerTests.cs | 161 +- .../ContentModelSerializationTests.cs | 116 +- .../JsInitializationTests.cs | 28 +- .../ServerVariablesParserTests.cs | 36 +- .../HtmlHelperExtensionMethodsTests.cs | 165 +- .../Extensions/HttpContextExtensionTests.cs | 45 +- ...ImageCropperTemplateCoreExtensionsTests.cs | 192 +- .../Umbraco.Web.Common/FileNameTests.cs | 171 +- ...lidateUmbracoFormRouteStringFilterTests.cs | 62 +- ...noreRequiredAttributesResolverUnitTests.cs | 52 +- .../Umbraco.Web.Common/ImageCropperTest.cs | 852 ++- .../ImageProcessors/CropWebProcessorTests.cs | 63 +- .../Macros/MacroParserTests.cs | 314 +- .../Umbraco.Web.Common/Macros/MacroTests.cs | 56 +- .../Media/ImageSharpImageUrlGeneratorTests.cs | 364 +- .../ModelBinders/ContentModelBinderTests.cs | 423 +- .../HttpQueryStringModelBinderTests.cs | 152 +- .../Mvc/HtmlStringUtilitiesTests.cs | 73 +- .../Routing/BackOfficeAreaRoutesTests.cs | 138 +- .../EndpointRouteBuilderExtensionsTests.cs | 229 +- .../Routing/InstallAreaRoutesTests.cs | 139 +- .../Routing/PreviewRoutesTests.cs | 96 +- .../Routing/RoutableDocumentFilterTests.cs | 252 +- .../Routing/TestRouteBuilder.cs | 48 +- .../UmbracoSmidgeConfigCacheBusterTests.cs | 146 +- .../Security/EncryptionHelperTests.cs | 88 +- .../Security/MemberSignInManagerTests.cs | 207 +- .../Security/PublicAccessCheckerTests.cs | 454 +- .../Views/UmbracoViewPageTests.cs | 639 +- .../AspNetCoreHostingEnvironmentTests.cs | 65 +- .../RenderNoContentControllerTests.cs | 90 +- .../Controllers/SurfaceControllerTests.cs | 235 +- .../Routing/ControllerActionSearcherTests.cs | 128 +- .../UmbracoRouteValueTransformerTests.cs | 408 +- .../Routing/UmbracoRouteValuesFactoryTests.cs | 116 +- 599 files changed, 87303 insertions(+), 86123 deletions(-) diff --git a/tests/Umbraco.TestData/Configuration/TestDataSettings.cs b/tests/Umbraco.TestData/Configuration/TestDataSettings.cs index 78084f726a..687a696bcc 100644 --- a/tests/Umbraco.TestData/Configuration/TestDataSettings.cs +++ b/tests/Umbraco.TestData/Configuration/TestDataSettings.cs @@ -1,16 +1,15 @@ -namespace Umbraco.TestData.Configuration -{ - public class TestDataSettings - { - /// - /// Gets or sets a value indicating whether the test data generation is enabled. - /// - public bool Enabled { get; set; } = false; +namespace Umbraco.TestData.Configuration; - /// - /// Gets or sets a value indicating whether persisted local database cache files for content and media are disabled. - /// - /// The URL path. - public bool IgnoreLocalDb { get; set; } = false; - } +public class TestDataSettings +{ + /// + /// Gets or sets a value indicating whether the test data generation is enabled. + /// + public bool Enabled { get; set; } = false; + + /// + /// Gets or sets a value indicating whether persisted local database cache files for content and media are disabled. + /// + /// The URL path. + public bool IgnoreLocalDb { get; set; } = false; } diff --git a/tests/Umbraco.TestData/Extensions/UmbracoBuilderExtensions.cs b/tests/Umbraco.TestData/Extensions/UmbracoBuilderExtensions.cs index 7e3e2a70b1..c695653503 100644 --- a/tests/Umbraco.TestData/Extensions/UmbracoBuilderExtensions.cs +++ b/tests/Umbraco.TestData/Extensions/UmbracoBuilderExtensions.cs @@ -7,48 +7,44 @@ using Umbraco.Cms.Infrastructure.PublishedCache; using Umbraco.Cms.Web.Common.ApplicationBuilder; using Umbraco.TestData.Configuration; -namespace Umbraco.TestData.Extensions +namespace Umbraco.TestData.Extensions; + +public static class UmbracoBuilderExtensions { - public static class UmbracoBuilderExtensions + public static IUmbracoBuilder AddUmbracoTestData(this IUmbracoBuilder builder) { - public static IUmbracoBuilder AddUmbracoTestData(this IUmbracoBuilder builder) + if (builder.Services.Any(x => x.ServiceType == typeof(LoadTestController))) { - if (builder.Services.Any(x => x.ServiceType == typeof(LoadTestController))) - { - // We assume the test data project is composed if any implementations of LoadTestController exist. - return builder; - } - - IConfigurationSection testDataSection = builder.Config.GetSection("Umbraco:CMS:TestData"); - TestDataSettings config = testDataSection.Get(); - if (config == null || config.Enabled == false) - { - return builder; - } - - builder.Services.Configure(testDataSection); - - if (config.IgnoreLocalDb) - { - builder.Services.AddSingleton(factory => new PublishedSnapshotServiceOptions - { - IgnoreLocalDb = true - }); - } - - builder.Services.Configure(options => - options.AddFilter(new UmbracoPipelineFilter(nameof(LoadTestController)) - { - Endpoints = app => app.UseEndpoints(endpoints => - endpoints.MapControllerRoute( - "LoadTest", - "/LoadTest/{action}", - new { controller = "LoadTest", Action = "Index" })) - })); - - builder.Services.AddScoped(typeof(LoadTestController)); - + // We assume the test data project is composed if any implementations of LoadTestController exist. return builder; } + + var testDataSection = builder.Config.GetSection("Umbraco:CMS:TestData"); + var config = testDataSection.Get(); + if (config == null || config.Enabled == false) + { + return builder; + } + + builder.Services.Configure(testDataSection); + + if (config.IgnoreLocalDb) + { + builder.Services.AddSingleton(factory => new PublishedSnapshotServiceOptions { IgnoreLocalDb = true }); + } + + builder.Services.Configure(options => + options.AddFilter(new UmbracoPipelineFilter(nameof(LoadTestController)) + { + Endpoints = app => app.UseEndpoints(endpoints => + endpoints.MapControllerRoute( + "LoadTest", + "/LoadTest/{action}", + new { controller = "LoadTest", Action = "Index" })) + })); + + builder.Services.AddScoped(typeof(LoadTestController)); + + return builder; } } diff --git a/tests/Umbraco.TestData/LoadTestComposer.cs b/tests/Umbraco.TestData/LoadTestComposer.cs index 3d3302b881..f44d8edfb2 100644 --- a/tests/Umbraco.TestData/LoadTestComposer.cs +++ b/tests/Umbraco.TestData/LoadTestComposer.cs @@ -4,10 +4,9 @@ using Umbraco.TestData.Extensions; // see https://github.com/Shazwazza/UmbracoScripts/tree/master/src/LoadTesting -namespace Umbraco.TestData +namespace Umbraco.TestData; + +public class LoadTestComposer : IComposer { - public class LoadTestComposer : IComposer - { - public void Compose(IUmbracoBuilder builder) => builder.AddUmbracoTestData(); - } + public void Compose(IUmbracoBuilder builder) => builder.AddUmbracoTestData(); } diff --git a/tests/Umbraco.TestData/LoadTestController.cs b/tests/Umbraco.TestData/LoadTestController.cs index c245aae816..741fe4e94b 100644 --- a/tests/Umbraco.TestData/LoadTestController.cs +++ b/tests/Umbraco.TestData/LoadTestController.cs @@ -10,24 +10,28 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; +using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment; // see https://github.com/Shazwazza/UmbracoScripts/tree/master/src/LoadTesting -namespace Umbraco.TestData +namespace Umbraco.TestData; + +public class LoadTestController : Controller { - public class LoadTestController : Controller - { - private static readonly Random s_random = new Random(); - private static readonly object s_locko = new object(); + private const string ContainerAlias = "LoadTestContainer"; + private const string ContentAlias = "LoadTestContent"; + private const int TextboxDefinitionId = -88; + private const int MaxCreate = 1000; - private static volatile int s_containerId = -1; + private const string FootHtml = @" +"; - private const string ContainerAlias = "LoadTestContainer"; - private const string ContentAlias = "LoadTestContent"; - private const int TextboxDefinitionId = -88; - private const int MaxCreate = 1000; + private static readonly Random s_random = new(); + private static readonly object s_locko = new(); - private static readonly string s_headHtml = @" + private static volatile int s_containerId = -1; + + private static readonly string s_headHtml = @" LoadTest