yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,014 Commits 4 Branches 7 Tags
63acacab7e998cab6dfd20c6ac975fb6c722d640
Commit Graph

182 Commits

Author SHA1 Message Date
Paul Johnson
4ae329589a NetCore: MSDI refactor remove IFactory & IRegister (#9308) 
* Replace IFactory with IServiceProvider

* Replace IRegister with IServiceCollection

* Fix Rte.cshtml so the view can service locate.

* Replace Composing Lifetime with MSDI ServiceLifetime

* Remove ServiceProvider AddMultipleUnique extension

* Remove Umbraco.Web.Composing.Current.Reset and any calls

* Remove LightInject from net framework projects

* Brought back a helper for setting MediaFileSystem underlying IFileSystem
 2020-10-30 12:16:17 +01:00
Bjarke Berg
4d260b036b Merge branch 'netcore/bugfix/azure-devops-tests' into netcore/netcore 2020-10-27 11:57:38 +01:00
Bjarke Berg
6c2ece0619 Remove build warnings 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-27 11:57:15 +01:00
Paul Johnson
ec66990e72 NetCore: MSDI refactor phase 2 (#9280) 
* Moved adapters from Infra -> Core

* Allow Composition to accept a service collection instead of an IRegister

* Composition no longer takes IRegister as constructor arg

all tests passing

* Composition no longer implements IRegister

* Lose _uniques in Composition

* lose Composition OnCreatingFactory actions

* Clean up UmbracoCoreServiceCollectionExtensions & Composition

Less IFactory

* LightInject gone where TFW == netstandard2.0 || TFW == netcoreapp3.1

* Resolve dead code issues

* Rename IFactory methods to match IServiceProvider so they can be trivially swapped later.

* Rename IFactory methods to match IServiceProvider so they can be trivially swapped later (continued)

Thought the counts were low, it's mostly extension method usage
 2020-10-27 11:53:01 +01:00
Andy Butland
5e70c503cd NetCore: migrated further unit tests (#9211) 
* Moved model unit tests into correct folder and namespace.

* Migrated ContentTests.

* Migrated VariationTests.

* Migrated ImageSharpImageUrlGeneratorTests.

* Fixes to integration tests.

* Unit and integration test updates from PR comments.

* Delete accidentally added log file.
 2020-10-20 14:49:52 +02:00
Mole
e87caac0dd Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/move-tests 
# Conflicts:
#	src/Umbraco.Tests.Common/TestHelpers/MockedValueEditors.cs
#	src/Umbraco.Tests.Common/TestHelpers/StringNewlineExtensions.cs
#	src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestContentAppTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Macros/MacroParserTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Manifest/ManifestContentAppTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Manifest/ManifestParserTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroParserTests.cs
#	src/Umbraco.Tests/Macros/MacroParserTests.cs
#	src/Umbraco.Tests/Manifest/ManifestContentAppTests.cs
#	src/Umbraco.Tests/Manifest/ManifestParserTests.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
 2020-10-20 08:40:41 +02:00
Bjarke Berg
d74ec6e130 Changed default test setting to Boot=false 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-16 07:08:50 +02:00
Bjarke Berg
231771a10e Migrated ContentServicePerformanceTest 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-14 08:02:43 +02:00
Bjarke Berg
34f6682d88 Merge branch 'netcore/feature/migrate/relation-tests' into feature/migrate-service-integration-tests 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RelationRepository.cs
#	src/Umbraco.Tests.Common/Builders/MediaBuilder.cs
#	src/Umbraco.Tests.Integration/Services/RelationServiceTests.cs
 2020-10-12 14:48:52 +02:00
Bjarke Berg
372060a463 Merge remote-tracking branch 'origin/netcore/netcore' into feature/migrate-service-integration-tests 
# Conflicts:
#	src/Umbraco.Tests.Common/Builders/ContentTypeBuilder.cs
 2020-10-12 11:03:42 +02:00
Andy Butland
ef962b6934 Migrated ContentServiceTests. 2020-10-11 22:31:54 +02:00
Bjarke Berg
928f42be2e Updated tests after merge 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-11 21:08:21 +02:00
Andy Butland
31e87c0f31 Migrated ContentServiceTagsTests. 2020-10-11 12:33:27 +02:00
Andy Butland
4565da0010 Migrated MemberServiceTests. 2020-10-11 09:46:48 +02:00
Andy Butland
d3ebeedf72 Migrated MemberTypeServiceTests. 2020-10-11 09:23:17 +02:00
Andy Butland
ea10860101 Migrated ContentTypeServiceTests and RelationServiceTests. 2020-10-11 09:13:31 +02:00
Andy Butland
874e585bfb Migrated EntityXmlSerializerTests. Also aligned namespaces and update LocalizationServiceTests to use test model builders. 2020-10-10 18:25:18 +02:00
Bjarke Berg
2a4439e93a Migrated DocumentRepositoryTest 2020-10-09 13:08:23 +02:00
Bjarke Berg
15897f1736 Migrated ContentTypeRepositoryTest 2020-10-09 11:37:25 +02:00
Mole
2418b616a6 Merge pull request #9102 from AndyButland/feature/7898-services-integration-tests-migration-3 
NetCore: make use of builder classes for model creation in migrated tests
 2020-10-08 17:03:23 +02:00
Bjarke Berg
c7cdfaa775 Update nuget packages 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-08 14:49:24 +02:00
Mole
3c986f403e Remove Entities and Objects from common testshelpers since they don't exist anymore 
And fix a single typo
 2020-10-08 14:36:30 +02:00
Andy Butland
ff65788d38 Corrected comment. 
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2020-10-08 12:04:59 +02:00
Andy Butland
9838dbaf51 Corrected comment. 
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2020-10-08 12:04:40 +02:00
Andy Butland
9fc3546e67 Updated variable name. 
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2020-10-08 12:04:21 +02:00
Andy Butland
2925d5e1db Fixed failing tests. 2020-10-07 16:24:36 +02:00
Andy Butland
31b2f1ec4f Combined test user/group test objects created for repository and service tests. 2020-10-07 15:47:26 +02:00
Andy Butland
78c4a17503 Resolved issues after rebase from main branch. 
Fixed failing tests where test model builders showing slightly different behaviour to those used from legacy tests.
 2020-10-07 14:54:14 +02:00
Andy Butland
a331e6db30 Removed Mocked entity static helpers from new test projects, so they are only used for legacy tests. 
Created equivalent methods as static builder methods, that use the builders to construct the model objects.
 2020-10-07 11:28:09 +02:00
Bjarke Berg
baf2aaecab Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Tests.Integration/Packaging/CreatedPackagesRepositoryTests.cs
#	src/Umbraco.Tests.Integration/Services/CachedDataTypeServiceTests.cs
#	src/Umbraco.Tests.Integration/Services/DataTypeServiceTests.cs
#	src/Umbraco.Tests.Integration/Services/MacroServiceTests.cs
#	src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Services/LocalizedTextServiceTests.cs
 2020-10-06 18:49:03 +02:00
Andy Butland
11dc3459bc Further update to user service and controller tests to use test builders. 2020-10-06 12:02:29 +02:00
Andy Butland
1f83c61043 Aligned service integration tests with naming convention for private variables and use of test model builders. 2020-10-06 09:23:15 +02:00
Mole
7a8a7104c7 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
# Conflicts:
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs
#	src/Umbraco.Tests/IO/ShadowFileSystemTests.cs
 2020-10-06 08:13:29 +02:00
Elitsa Marinovska
e1170b8f12 Migrates more service tests and other required implementation changes 2020-10-04 21:19:40 +02:00
Bjarke Berg
8dc1c9768c Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
# Conflicts:
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
 2020-09-29 08:58:24 +02:00
Mole
d750d2c2c1 Use generic logger more places and clean up 2020-09-28 14:59:17 +02:00
Mole
b5aedde616 Do some ILogger cleaning 2020-09-28 08:48:49 +02:00
Bjarke Berg
ddc2fea0e9 Migrated unit tests 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-25 09:41:56 +02:00
Mole
75608919cd Merge pull request #8925 from umbraco/netcore/feature/use-serilog-to-log-all-messages 
Netcore: Use serilog to log all messages and use appsettings as config
 2020-09-23 09:37:43 +02:00
Bjarke Berg
f413f279eb Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
#	src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
#	src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
#	src/Umbraco.Tests.Integration/Persistence/Repositories/TemplateRepositoryTest.cs
#	src/Umbraco.Tests.Integration/RuntimeTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ColorListValidatorTest.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/EnsureUniqueValuesValidatorTest.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/MultiValuePropertyEditorTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/NestedContentTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/PropertyCacheLevelTests.cs
#	src/Umbraco.Tests/Components/ComponentTests.cs
#	src/Umbraco.Tests/IO/ShadowFileSystemTests.cs
#	src/Umbraco.Tests/Models/VariationTests.cs
#	src/Umbraco.Tests/Packaging/PackageDataInstallationTests.cs
#	src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
#	src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs
#	src/Umbraco.Tests/Published/ConvertersTests.cs
#	src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs
#	src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs
#	src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs
#	src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
#	src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
#	src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs
#	src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
#	src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
#	src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
 2020-09-23 07:59:10 +02:00
Bjarke Berg
25c7418d66 Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-validation 
# Conflicts:
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueEditorTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/CmsHelperCasingTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTestsWithoutSetup.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs
#	src/Umbraco.Tests/Models/MediaXmlTest.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
#	src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.json
 2020-09-22 20:25:28 +02:00
Bjarke Berg
0ea251945b Netcore: migrate more unittests (#8939) 
* Migrated unit tests

* Migrated CoreThings tests

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Migrated Property Editor unit tests

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Migrated CoreXml tests

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Moved more tests

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* revert some IsSZArray test code

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Renamed bad named test

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* removed unnecessary file mentions in csproj file

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2020-09-22 15:59:37 +02:00
Mole
4b5fbf83e1 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
 2020-09-22 15:24:01 +02:00
Mole
438515fa66 Merge Netcore: Use serilog to log all messages and use appsettings as config into Netcore/feature/migrate logging 2020-09-22 15:09:16 +02:00
Andy Butland
1bd22d72c2 Removed configuration model builders. 2020-09-21 21:06:24 +02:00
Andy Butland
d55b54ce49 Added unit tests for introduced unit test configuration setting builders. 2020-09-21 08:54:03 +02:00
Andy Butland
d5d6082d07 Moved configuration settings builders into own folder. 2020-09-21 08:54:03 +02:00
Andy Butland
8aadbe02d6 Added unit tests for configuration validators. 2020-09-21 08:54:03 +02:00
Mole
578e8c4f9e Use MS ILogger for DataEditor 2020-09-18 14:37:19 +02:00
Andy Butland
b9e67dde55 Added configuration validation for models builder and hosting settings. 
Renamed models builder config class suffix to match others.
 2020-09-18 12:53:10 +02:00