From d48cb8a66d03e6cb9a958009fa512d207f1304bf Mon Sep 17 00:00:00 2001 From: Stephan Date: Wed, 6 Dec 2017 09:58:50 +0100 Subject: [PATCH] Fix content event tests --- src/Umbraco.Core/Models/ContentExtensions.cs | 27 --- .../Integration/ContentEventsTests.cs | 156 +++++++++--------- 2 files changed, 78 insertions(+), 105 deletions(-) diff --git a/src/Umbraco.Core/Models/ContentExtensions.cs b/src/Umbraco.Core/Models/ContentExtensions.cs index 4a423295a4..21d6b9b80f 100644 --- a/src/Umbraco.Core/Models/ContentExtensions.cs +++ b/src/Umbraco.Core/Models/ContentExtensions.cs @@ -48,13 +48,6 @@ namespace Umbraco.Core.Models return contentService.GetAncestors(content); } - [Obsolete("Use the overload with the service reference instead")] - [EditorBrowsable(EditorBrowsableState.Never)] - public static IEnumerable Ancestors(this IContent content) - { - return Current.Services.ContentService.GetAncestors(content); - } - /// /// Returns a list of the current contents children. /// @@ -66,13 +59,6 @@ namespace Umbraco.Core.Models return contentService.GetChildren(content.Id); } - [Obsolete("Use the overload with the service reference instead")] - [EditorBrowsable(EditorBrowsableState.Never)] - public static IEnumerable Children(this IContent content) - { - return Current.Services.ContentService.GetChildren(content.Id); - } - /// /// Returns a list of the current contents descendants, not including the content itself. /// @@ -84,13 +70,6 @@ namespace Umbraco.Core.Models return contentService.GetDescendants(content); } - [Obsolete("Use the overload with the service reference instead")] - [EditorBrowsable(EditorBrowsableState.Never)] - public static IEnumerable Descendants(this IContent content) - { - return Current.Services.ContentService.GetDescendants(content); - } - /// /// Returns the parent of the current content. /// @@ -102,12 +81,6 @@ namespace Umbraco.Core.Models return contentService.GetById(content.ParentId); } - [Obsolete("Use the overload with the service reference instead")] - [EditorBrowsable(EditorBrowsableState.Never)] - public static IContent Parent(this IContent content) - { - return Current.Services.ContentService.GetById(content.ParentId); - } #endregion #region IMedia diff --git a/src/Umbraco.Tests/Integration/ContentEventsTests.cs b/src/Umbraco.Tests/Integration/ContentEventsTests.cs index b4a8358dc0..e2a11a56e3 100644 --- a/src/Umbraco.Tests/Integration/ContentEventsTests.cs +++ b/src/Umbraco.Tests/Integration/ContentEventsTests.cs @@ -1062,27 +1062,27 @@ namespace Umbraco.Tests.Integration Assert.AreEqual(14, _events.Count); var i = 0; var m = 0; - var content1C = content1.Children().ToArray(); - var content2C = content1C[0].Children().ToArray(); - var content3C = content1C[1].Children().ToArray(); - var content4C = content1C[2].Children().ToArray(); - var content5C = content1C[3].Children().ToArray(); + var content1C = Children(content1).ToArray(); + var content2C = Children(content1C[0]).ToArray(); + var content3C = Children(content1C[1]).ToArray(); + var content4C = Children(content1C[2]).ToArray(); + var content5C = Children(content1C[3]).ToArray(); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/pm-{1}", m++, content1.Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/pm-{1}", m++, content1C[0].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content1C[1].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/um-{1}", m++, content1C[2].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content1C[3].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/pm-{1}", m++, content2C[0].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content3C[0].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/pm-{1}", m++, content4C[0].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/pm-{1}", m++, content5C[0].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content2C[1].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content3C[1].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content4C[1].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m, content5C[1].Id), _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content1.Id}.p=m", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content1C[0].Id}.p=m", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content1C[1].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content1C[2].Id}.p=m", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content1C[3].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content2C[0].Id}.p=m", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content3C[0].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content4C[0].Id}.p=m", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content5C[0].Id}.p=m", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content2C[1].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content3C[1].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content4C[1].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m:000}: ContentRepository/Refresh/{content5C[1].Id}.u=u", _events[i++].ToString()); m++; - Assert.AreEqual(string.Format("{0:000}: ContentCacheRefresher/RefreshBranch/{1}", m, content1.Id), _events[i].ToString()); + Assert.AreEqual($"{m:000}: ContentCacheRefresher/RefreshBranch/{content1.Id}", _events[i].ToString()); } [Test] @@ -1902,26 +1902,26 @@ namespace Umbraco.Tests.Integration Assert.AreEqual(14, _events.Count); var i = 0; var m = 0; - var content1C = content1.Children().ToArray(); - var content2C = content1C[0].Children().ToArray(); - var content3C = content1C[1].Children().ToArray(); - var content4C = content1C[2].Children().ToArray(); - var content5C = content1C[3].Children().ToArray(); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/pp-{1}", m++, content1.Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/pp-{1}", m++, content1C[0].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content1C[1].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/up-{1}", m++, content1C[2].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content1C[3].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/pp-{1}", m++, content2C[0].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content3C[0].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/pp-{1}", m++, content4C[0].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/pm-{1}", m++, content5C[0].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content2C[1].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content3C[1].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content4C[1].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m, content5C[1].Id), _events[i++].ToString()); + var content1C = Children(content1).ToArray(); + var content2C = Children(content1C[0]).ToArray(); + var content3C = Children(content1C[1]).ToArray(); + var content4C = Children(content1C[2]).ToArray(); + var content5C = Children(content1C[3]).ToArray(); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content1.Id}.p=p", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content1C[0].Id}.p=p", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content1C[1].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content1C[2].Id}.p=p", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content1C[3].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content2C[0].Id}.p=p", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content3C[0].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content4C[0].Id}.p=p", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content5C[0].Id}.p=m", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content2C[1].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content3C[1].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content4C[1].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m:000}: ContentRepository/Refresh/{content5C[1].Id}.u=u", _events[i++].ToString()); m++; - Assert.AreEqual(string.Format("{0:000}: ContentCacheRefresher/RefreshBranch/{1}", m, content1.Id), _events[i++].ToString()); + Assert.AreEqual($"{m:000}: ContentCacheRefresher/RefreshBranch/{content1.Id}", _events[i++].ToString()); /* Assert.AreEqual(string.Format("{0:000}: ContentCacheRefresher/RefreshPublished,Refresh/{1}", m, content1C[0].Id), _events[i++].ToString()); Assert.AreEqual(string.Format("{0:000}: ContentCacheRefresher/Refresh/{1}", m, content1C[1].Id), _events[i++].ToString()); @@ -1956,26 +1956,26 @@ namespace Umbraco.Tests.Integration Assert.AreEqual(14, _events.Count); var i = 0; var m = 0; - var content1C = content1.Children().ToArray(); - var content2C = content1C[0].Children().ToArray(); - var content3C = content1C[1].Children().ToArray(); - var content4C = content1C[2].Children().ToArray(); - var content5C = content1C[3].Children().ToArray(); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/pp-{1}", m++, content1.Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/pp-{1}", m++, content1C[0].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content1C[1].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/up-{1}", m++, content1C[2].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content1C[3].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/pp-{1}", m++, content2C[0].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content3C[0].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/pp-{1}", m++, content4C[0].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/pm-{1}", m++, content5C[0].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content2C[1].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content3C[1].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content4C[1].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m, content5C[1].Id), _events[i++].ToString()); + var content1C = Children(content1).ToArray(); + var content2C = Children(content1C[0]).ToArray(); + var content3C = Children(content1C[1]).ToArray(); + var content4C = Children(content1C[2]).ToArray(); + var content5C = Children(content1C[3]).ToArray(); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content1.Id}.p=p", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content1C[0].Id}.p=p", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content1C[1].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content1C[2].Id}.p=p", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content1C[3].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content2C[0].Id}.p=p", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content3C[0].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content4C[0].Id}.p=p", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content5C[0].Id}.p=m", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content2C[1].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content3C[1].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content4C[1].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m:000}: ContentRepository/Refresh/{content5C[1].Id}.u=u", _events[i++].ToString()); m++; - Assert.AreEqual(string.Format("{0:000}: ContentCacheRefresher/RefreshBranch/{1}", m, content1.Id), _events[i++].ToString()); + Assert.AreEqual($"{m:000}: ContentCacheRefresher/RefreshBranch/{content1.Id}", _events[i++].ToString()); /* Assert.AreEqual(string.Format("{0:000}: ContentCacheRefresher/RefreshPublished,Refresh/{1}", m, content1C[0].Id), _events[i++].ToString()); Assert.AreEqual(string.Format("{0:000}: ContentCacheRefresher/Refresh/{1}", m, content1C[1].Id), _events[i++].ToString()); @@ -2017,26 +2017,26 @@ namespace Umbraco.Tests.Integration Assert.AreEqual(14, _events.Count); var i = 0; var m = 0; - var content1C = content1.Children().ToArray(); - var content2C = content1C[0].Children().ToArray(); - var content3C = content1C[1].Children().ToArray(); - var content4C = content1C[2].Children().ToArray(); - var content5C = content1C[3].Children().ToArray(); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/pp-{1}", m++, content1.Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/pp-{1}", m++, content1C[0].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content1C[1].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/up-{1}", m++, content1C[2].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content1C[3].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/pp-{1}", m++, content2C[0].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content3C[0].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/pp-{1}", m++, content4C[0].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/pm-{1}", m++, content5C[0].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content2C[1].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content3C[1].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content4C[1].Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m, content5C[1].Id), _events[i++].ToString()); + var content1C = Children(content1).ToArray(); + var content2C = Children(content1C[0]).ToArray(); + var content3C = Children(content1C[1]).ToArray(); + var content4C = Children(content1C[2]).ToArray(); + var content5C = Children(content1C[3]).ToArray(); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content1.Id}.p=p", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content1C[0].Id}.p=p", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content1C[1].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content1C[2].Id}.p=p", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content1C[3].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content2C[0].Id}.p=p", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content3C[0].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content4C[0].Id}.p=p", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content5C[0].Id}.p=m", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content2C[1].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content3C[1].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content4C[1].Id}.u=u", _events[i++].ToString()); + Assert.AreEqual($"{m:000}: ContentRepository/Refresh/{content5C[1].Id}.u=u", _events[i++].ToString()); m++; - Assert.AreEqual(string.Format("{0:000}: ContentCacheRefresher/RefreshBranch/{1}", m, content1.Id), _events[i++].ToString()); + Assert.AreEqual($"{m:000}: ContentCacheRefresher/RefreshBranch/{content1.Id}", _events[i++].ToString()); /* Assert.AreEqual(string.Format("{0:000}: ContentCacheRefresher/RefreshPublished,Refresh/{1}", m, content1C[0].Id), _events[i++].ToString()); Assert.AreEqual(string.Format("{0:000}: ContentCacheRefresher/Refresh/{1}", m, content1C[1].Id), _events[i++].ToString()); @@ -2191,8 +2191,8 @@ namespace Umbraco.Tests.Integration Assert.AreEqual(2, _events.Count); var i = 0; var m = 0; - Assert.AreEqual(string.Format("{0:000}: ContentRepository/Refresh/uu-{1}", m++, content.Id), _events[i++].ToString()); - Assert.AreEqual(string.Format("{0:000}: ContentCacheRefresher/RefreshNode/{1}", m, content.Id), _events[i].ToString()); + Assert.AreEqual($"{m++:000}: ContentRepository/Refresh/{content.Id}.p=p", _events[i++].ToString()); + Assert.AreEqual($"{m:000}: ContentCacheRefresher/RefreshNode/{content.Id}", _events[i].ToString()); } #endregion