yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice

Browse Source
This commit is contained in:
Bjarke Berg
2020-02-24 14:58:58 +01:00
parent e74c22ec87 c9b970e872
commit 20201fb6be
19 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
View File

@@ -42,7 +42,7 @@ namespace Umbraco.Tests.Cache
// we should really refactor events entirely - in the meantime, let it be an UmbracoTestBase ;(
//var testObjects = new TestObjects(null);
//var serviceContext = testObjects.GetServiceContextMock();
var serviceContext = Current.Services;
var serviceContext = ServiceContext;
var definitions = new IEventDefinition[]
{
@@ -150,7 +150,7 @@ namespace Umbraco.Tests.Cache
var definitions = new IEventDefinition[]
{
// works because that event definition maps to an empty handler
new EventDefinition<IContentTypeService, SaveEventArgs<IContentType>>(null, Current.Services.ContentTypeService, new SaveEventArgs<IContentType>(Enumerable.Empty<IContentType>()), "Saved"),
new EventDefinition<IContentTypeService, SaveEventArgs<IContentType>>(null, ServiceContext.ContentTypeService, new SaveEventArgs<IContentType>(Enumerable.Empty<IContentType>()), "Saved"),
};

2
src/Umbraco.Tests/Issues/U9560.cs
View File

@@ -22,7 +22,7 @@ namespace Umbraco.Tests.Issues
contentType.Name = "test";
var propertyType = new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext, "prop") { Name = "Prop", Description = "", Mandatory = false, SortOrder = 1, DataTypeId = -88 };
contentType.PropertyTypeCollection.Add(propertyType);
Current.Services.ContentTypeService.Save(contentType);
ServiceContext.ContentTypeService.Save(contentType);
var aliasName = string.Empty;

6
src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
View File

@@ -252,8 +252,8 @@ namespace Umbraco.Tests.Models.Mapping
}
Assert.AreEqual(contentType.CompositionPropertyGroups.Count(), invariantContent.Tabs.Count() - 1);
Assert.IsTrue(invariantContent.Tabs.Any(x => x.Label == Current.Services.TextService.Localize("general/properties")));
Assert.AreEqual(2, invariantContent.Tabs.Where(x => x.Label == Current.Services.TextService.Localize("general/properties")).SelectMany(x => x.Properties.Where(p => p.Alias.StartsWith("_umb_") == false)).Count());
Assert.IsTrue(invariantContent.Tabs.Any(x => x.Label == ServiceContext.TextService.Localize("general/properties")));
Assert.AreEqual(2, invariantContent.Tabs.Where(x => x.Label == ServiceContext.TextService.Localize("general/properties")).SelectMany(x => x.Properties.Where(p => p.Alias.StartsWith("_umb_") == false)).Count());
}
#region Assertions
@@ -348,7 +348,7 @@ namespace Umbraco.Tests.Models.Mapping
Assert.AreEqual(p.PropertyType.ValidationRegExp, pDto.ValidationRegExp);
Assert.AreEqual(p.PropertyType.Description, pDto.Description);
Assert.AreEqual(p.PropertyType.Name, pDto.Label);
Assert.AreEqual(Current.Services.DataTypeService.GetDataType(p.PropertyType.DataTypeId), pDto.DataType);
Assert.AreEqual(ServiceContext.DataTypeService.GetDataType(p.PropertyType.DataTypeId), pDto.DataType);
Assert.AreEqual(Current.PropertyEditors[p.PropertyType.PropertyEditorAlias], pDto.PropertyEditor);
}

7
src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs
View File

@@ -12,6 +12,7 @@ using Umbraco.Core.PropertyEditors;
using Umbraco.Core.Services;
using Umbraco.Core.Strings;
using Umbraco.Tests.TestHelpers;
using Umbraco.Tests.Testing;
using Umbraco.Web;
using PublishedContentExtensions = Umbraco.Web.PublishedContentExtensions;
@@ -78,7 +79,7 @@ namespace Umbraco.Tests.PublishedContent
public void To_DataTable()
{
var doc = GetContent(true, 1);
var dt = doc.ChildrenAsTable(Current.Services);
var dt = doc.ChildrenAsTable(ServiceContext);
Assert.AreEqual(11, dt.Columns.Count);
Assert.AreEqual(3, dt.Rows.Count);
@@ -101,7 +102,7 @@ namespace Umbraco.Tests.PublishedContent
var c = (SolidPublishedContent)doc.Children.ElementAt(0);
c.ContentType = new PublishedContentType(22, "DontMatch", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing);
var dt = doc.ChildrenAsTable(Current.Services, "Child");
var dt = doc.ChildrenAsTable(ServiceContext, "Child");
Assert.AreEqual(11, dt.Columns.Count);
Assert.AreEqual(2, dt.Rows.Count);
@@ -117,7 +118,7 @@ namespace Umbraco.Tests.PublishedContent
public void To_DataTable_No_Rows()
{
var doc = GetContent(false, 1);
var dt = doc.ChildrenAsTable(Current.Services);
var dt = doc.ChildrenAsTable(ServiceContext);
//will return an empty data table
Assert.AreEqual(0, dt.Columns.Count);
Assert.AreEqual(0, dt.Rows.Count);

2
src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs
View File

@@ -74,7 +74,7 @@ namespace Umbraco.Tests.PublishedContent
_ctx = GetUmbracoContext("/", 1, null, true);
if (_createContentTypes)
{
var contentTypeService = Current.Services.ContentTypeService;
var contentTypeService = ServiceContext.ContentTypeService;
var baseType = new ContentType(ShortStringHelper, -1) { Alias = "base", Name = "Base" };
const string contentTypeAlias = "inherited";
var inheritedType = new ContentType(ShortStringHelper, baseType, contentTypeAlias) { Alias = contentTypeAlias, Name = "Inherited" };

2
src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs
View File

@@ -73,7 +73,7 @@ namespace Umbraco.Tests.PublishedContent
var umbracoContext = new UmbracoContext(
httpContextAccessor,
publishedSnapshotService.Object,
new WebSecurity(httpContextAccessor, Current.Services.UserService, globalSettings, IOHelper),
new WebSecurity(httpContextAccessor, ServiceContext.UserService, globalSettings, IOHelper),
globalSettings,
new TestVariationContextAccessor(),
IOHelper,

2
src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs
View File

@@ -19,7 +19,7 @@ namespace Umbraco.Tests.Routing
{
var template = new Template(ShortStringHelper, alias, alias);
template.Content = ""; // else saving throws with a dirty internal error
Current.Services.FileService.SaveTemplate(template);
ServiceContext.FileService.SaveTemplate(template);
return template;
}

2
src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
View File

@@ -90,7 +90,7 @@ namespace Umbraco.Tests.Routing
var name = "Template";
var template = new Template(ShortStringHelper, name, alias);
template.Content = ""; // else saving throws with a dirty internal error
Current.Services.FileService.SaveTemplate(template);
ServiceContext.FileService.SaveTemplate(template);
return template;
}

8
src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
View File

@@ -121,7 +121,7 @@ namespace Umbraco.Tests.Scoping
var umbracoContext = new UmbracoContext(
httpContextAccessor,
service,
new WebSecurity(httpContextAccessor, Current.Services.UserService, globalSettings, IOHelper),
new WebSecurity(httpContextAccessor, ServiceContext.UserService, globalSettings, IOHelper),
globalSettings,
new TestVariationContextAccessor(),
IOHelper,
@@ -146,7 +146,7 @@ namespace Umbraco.Tests.Scoping
// create document type, document
var contentType = new ContentType(ShortStringHelper, -1) { Alias = "CustomDocument", Name = "Custom Document" };
Current.Services.ContentTypeService.Save(contentType);
ServiceContext.ContentTypeService.Save(contentType);
var item = new Content("name", -1, contentType);
// event handler
@@ -164,7 +164,7 @@ namespace Umbraco.Tests.Scoping
using (var scope = ScopeProvider.CreateScope())
{
Current.Services.ContentService.SaveAndPublish(item);
ServiceContext.ContentService.SaveAndPublish(item);
scope.Complete();
}
@@ -178,7 +178,7 @@ namespace Umbraco.Tests.Scoping
using (var scope = ScopeProvider.CreateScope())
{
item.Name = "changed";
Current.Services.ContentService.SaveAndPublish(item);
ServiceContext.ContentService.SaveAndPublish(item);
if (complete)
scope.Complete();

6
src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs
View File

@@ -60,7 +60,7 @@ namespace Umbraco.Tests.Scoping
public void DefaultRepositoryCachePolicy(bool complete)
{
var scopeProvider = ScopeProvider;
var service = Current.Services.UserService;
var service = ServiceContext.UserService;
var globalCache = Current.AppCaches.IsolatedCaches.GetOrCreate(typeof(IUser));
var user = (IUser)new User(TestObjects.GetGlobalSettings(), "name", "email", "username", "rawPassword");
@@ -137,7 +137,7 @@ namespace Umbraco.Tests.Scoping
public void FullDataSetRepositoryCachePolicy(bool complete)
{
var scopeProvider = ScopeProvider;
var service = Current.Services.LocalizationService;
var service = ServiceContext.LocalizationService;
var globalCache = Current.AppCaches.IsolatedCaches.GetOrCreate(typeof (ILanguage));
var lang = (ILanguage) new Language(TestObjects.GetGlobalSettings(), "fr-FR");
@@ -229,7 +229,7 @@ namespace Umbraco.Tests.Scoping
public void SingleItemsOnlyRepositoryCachePolicy(bool complete)
{
var scopeProvider = ScopeProvider;
var service = Current.Services.LocalizationService;
var service = ServiceContext.LocalizationService;
var globalCache = Current.AppCaches.IsolatedCaches.GetOrCreate(typeof (IDictionaryItem));
var lang = (ILanguage)new Language(TestObjects.GetGlobalSettings(), "fr-FR");

12
src/Umbraco.Tests/Scoping/ScopedXmlTests.cs
View File

@@ -89,7 +89,7 @@ namespace Umbraco.Tests.Scoping
// create document type, document
var contentType = new ContentType(ShortStringHelper, -1) { Alias = "CustomDocument", Name = "Custom Document" };
Current.Services.ContentTypeService.Save(contentType);
ServiceContext.ContentTypeService.Save(contentType);
var item = new Content("name", -1, contentType);
// wire cache refresher
@@ -126,9 +126,9 @@ namespace Umbraco.Tests.Scoping
using (var scope = ScopeProvider.CreateScope())
{
Current.Services.ContentService.SaveAndPublish(item); // should create an xml clone
ServiceContext.ContentService.SaveAndPublish(item); // should create an xml clone
item.Name = "changed";
Current.Services.ContentService.SaveAndPublish(item); // should re-use the xml clone
ServiceContext.ContentService.SaveAndPublish(item); // should re-use the xml clone
// this should never change
Assert.AreEqual(beforeOuterXml, beforeXml.OuterXml);
@@ -203,7 +203,7 @@ namespace Umbraco.Tests.Scoping
// create document type
var contentType = new ContentType(ShortStringHelper,-1) { Alias = "CustomDocument", Name = "Custom Document" };
Current.Services.ContentTypeService.Save(contentType);
ServiceContext.ContentTypeService.Save(contentType);
// wire cache refresher
_distributedCacheBinder = new DistributedCacheBinder(new DistributedCache(Current.ServerMessenger, Current.CacheRefreshers), Mock.Of<IUmbracoContextFactory>(), Mock.Of<ILogger>());
@@ -225,12 +225,12 @@ namespace Umbraco.Tests.Scoping
using (var scope = ScopeProvider.CreateScope())
{
Current.Services.ContentService.SaveAndPublish(item);
ServiceContext.ContentService.SaveAndPublish(item);
for (var i = 0; i < count; i++)
{
var temp = new Content("content_" + i, -1, contentType);
Current.Services.ContentService.SaveAndPublish(temp);
ServiceContext.ContentService.SaveAndPublish(temp);
ids[i] = temp.Id;
}

4
src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
View File

@@ -34,7 +34,7 @@ namespace Umbraco.Tests.Security
var umbracoContext = new UmbracoContext(
httpContextAccessor,
Mock.Of<IPublishedSnapshotService>(),
new WebSecurity(httpContextAccessor, Current.Services.UserService, globalSettings, IOHelper), globalSettings,
new WebSecurity(httpContextAccessor, ServiceContext.UserService, globalSettings, IOHelper), globalSettings,
new TestVariationContextAccessor(),
IOHelper,
UriUtility,
@@ -57,7 +57,7 @@ namespace Umbraco.Tests.Security
var umbCtx = new UmbracoContext(
httpContextAccessor,
Mock.Of<IPublishedSnapshotService>(),
new WebSecurity(httpContextAccessor, Current.Services.UserService, globalSettings, IOHelper),
new WebSecurity(httpContextAccessor, ServiceContext.UserService, globalSettings, IOHelper),
globalSettings,
new TestVariationContextAccessor(),
IOHelper,

2
src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
View File

@@ -54,8 +54,6 @@ namespace Umbraco.Tests.TestHelpers
protected PublishedContentTypeCache ContentTypesCache { get; private set; }
protected override ISqlSyntaxProvider SqlSyntax => GetSyntaxProvider();
protected ServiceContext ServiceContext => Current.Services;
protected IVariationContextAccessor VariationContextAccessor => new TestVariationContextAccessor();
internal ScopeProvider ScopeProvider => Current.ScopeProvider as ScopeProvider;

1
src/Umbraco.Tests/Testing/UmbracoTestBase.cs
View File

@@ -112,6 +112,7 @@ namespace Umbraco.Tests.Testing
private TypeLoader _featureTypeLoader;
#region Accessors
protected ServiceContext ServiceContext => Factory.GetInstance<ServiceContext>();
protected ILogger Logger => Factory.GetInstance<ILogger>();
protected IJsonSerializer JsonNetSerializer { get; } = new JsonNetSerializer();

2
src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
View File

@@ -64,7 +64,7 @@ namespace Umbraco.Tests.Web.Controllers
ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
{
//setup some mocks
var userServiceMock = Mock.Get(Current.Services.UserService);
var userServiceMock = Mock.Get(ServiceContext.UserService);
userServiceMock.Setup(service => service.GetUserById(It.IsAny<int>()))
.Returns(() => null);

14
src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
View File

@@ -160,10 +160,10 @@ namespace Umbraco.Tests.Web.Controllers
if (_contentTypeForMockedContent == null)
{
_contentTypeForMockedContent = GetMockedContentType();
Mock.Get(Current.Services.ContentTypeService)
Mock.Get(ServiceContext.ContentTypeService)
.Setup(x => x.Get(_contentTypeForMockedContent.Id))
.Returns(_contentTypeForMockedContent);
Mock.Get(Current.Services.ContentTypeService)
Mock.Get(ServiceContext.ContentTypeService)
.As<IContentTypeBaseService>()
.Setup(x => x.Get(_contentTypeForMockedContent.Id))
.Returns(_contentTypeForMockedContent);
@@ -254,7 +254,7 @@ namespace Umbraco.Tests.Web.Controllers
{
ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
{
var contentServiceMock = Mock.Get(Current.Services.ContentService);
var contentServiceMock = Mock.Get(ServiceContext.ContentService);
contentServiceMock.Setup(x => x.GetById(123)).Returns(() => null); //do not find it
var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
@@ -337,7 +337,7 @@ namespace Umbraco.Tests.Web.Controllers
{
ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
{
var contentServiceMock = Mock.Get(Current.Services.ContentService);
var contentServiceMock = Mock.Get(ServiceContext.ContentService);
contentServiceMock.Setup(x => x.GetById(123)).Returns(() => GetMockedContent());
var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
@@ -385,7 +385,7 @@ namespace Umbraco.Tests.Web.Controllers
ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
{
var contentServiceMock = Mock.Get(Current.Services.ContentService);
var contentServiceMock = Mock.Get(ServiceContext.ContentService);
contentServiceMock.Setup(x => x.GetById(123)).Returns(() => content);
contentServiceMock.Setup(x => x.Save(It.IsAny<IContent>(), It.IsAny<int>(), It.IsAny<bool>()))
.Returns(new OperationResult(OperationResultType.Success, new Core.Events.EventMessages())); //success
@@ -427,7 +427,7 @@ namespace Umbraco.Tests.Web.Controllers
ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
{
var contentServiceMock = Mock.Get(Current.Services.ContentService);
var contentServiceMock = Mock.Get(ServiceContext.ContentService);
contentServiceMock.Setup(x => x.GetById(123)).Returns(() => content);
contentServiceMock.Setup(x => x.Save(It.IsAny<IContent>(), It.IsAny<int>(), It.IsAny<bool>()))
.Returns(new OperationResult(OperationResultType.Success, new Core.Events.EventMessages())); //success
@@ -476,7 +476,7 @@ namespace Umbraco.Tests.Web.Controllers
ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
{
var contentServiceMock = Mock.Get(Current.Services.ContentService);
var contentServiceMock = Mock.Get(ServiceContext.ContentService);
contentServiceMock.Setup(x => x.GetById(123)).Returns(() => content);
contentServiceMock.Setup(x => x.Save(It.IsAny<IContent>(), It.IsAny<int>(), It.IsAny<bool>()))
.Returns(new OperationResult(OperationResultType.Success, new Core.Events.EventMessages())); //success

6
src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
View File

@@ -64,7 +64,7 @@ namespace Umbraco.Tests.Web.Controllers
{
ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
{
var userServiceMock = Mock.Get(Current.Services.UserService);
var userServiceMock = Mock.Get(ServiceContext.UserService);
userServiceMock.Setup(service => service.Save(It.IsAny<IUser>(), It.IsAny<bool>()))
.Callback((IUser u, bool raiseEvents) =>
@@ -186,7 +186,7 @@ namespace Umbraco.Tests.Web.Controllers
ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
{
//setup some mocks
var userServiceMock = Mock.Get(Current.Services.UserService);
var userServiceMock = Mock.Get(ServiceContext.UserService);
var users = MockedUser.CreateMulipleUsers(10);
long outVal = 10;
userServiceMock.Setup(service => service.GetAll(
@@ -269,7 +269,7 @@ namespace Umbraco.Tests.Web.Controllers
ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
{
//setup some mocks
var userServiceMock = Mock.Get(Current.Services.UserService);
var userServiceMock = Mock.Get(ServiceContext.UserService);
userServiceSetup(userServiceMock);
var usersController = new UsersController(

2
src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
View File

@@ -441,7 +441,7 @@ namespace Umbraco.Tests.Web.Mvc
var ctx = new UmbracoContext(
httpContextAccessor,
_service,
new WebSecurity(httpContextAccessor, Current.Services.UserService, globalSettings, IOHelper),
new WebSecurity(httpContextAccessor, ServiceContext.UserService, globalSettings, IOHelper),
globalSettings,
new TestVariationContextAccessor(),
IOHelper,

6
src/Umbraco.Tests/Web/WebExtensionMethodTests.cs
View File

@@ -32,7 +32,7 @@ namespace Umbraco.Tests.Web
var umbCtx = new UmbracoContext(
httpContextAccessor,
Mock.Of<IPublishedSnapshotService>(),
new WebSecurity(httpContextAccessor, Current.Services.UserService, TestObjects.GetGlobalSettings(), IOHelper),
new WebSecurity(httpContextAccessor, ServiceContext.UserService, TestObjects.GetGlobalSettings(), IOHelper),
TestObjects.GetGlobalSettings(),
new TestVariationContextAccessor(),
IOHelper,
@@ -53,7 +53,7 @@ namespace Umbraco.Tests.Web
var umbCtx = new UmbracoContext(
httpContextAccessor,
Mock.Of<IPublishedSnapshotService>(),
new WebSecurity(httpContextAccessor, Current.Services.UserService, TestObjects.GetGlobalSettings(), IOHelper),
new WebSecurity(httpContextAccessor, ServiceContext.UserService, TestObjects.GetGlobalSettings(), IOHelper),
TestObjects.GetGlobalSettings(),
new TestVariationContextAccessor(),
IOHelper,
@@ -84,7 +84,7 @@ namespace Umbraco.Tests.Web
var umbCtx = new UmbracoContext(
httpContextAccessor,
Mock.Of<IPublishedSnapshotService>(),
new WebSecurity(httpContextAccessor, Current.Services.UserService, TestObjects.GetGlobalSettings(), IOHelper),
new WebSecurity(httpContextAccessor, ServiceContext.UserService, TestObjects.GetGlobalSettings(), IOHelper),
TestObjects.GetGlobalSettings(),
new TestVariationContextAccessor(),
IOHelper,