From 2c8927c2e9b64ff01b577e6b5318593c2f9caec7 Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Date: Wed, 18 Jan 2023 12:28:54 +0100 Subject: [PATCH] Rename old FIXME to TODO (#13646) * Rename old FIXME to TODO, so we can track new FIXME starting v13 * Remove empty TODO --- src/Umbraco.Core/IO/PhysicalFileSystem.cs | 2 +- src/Umbraco.Core/Models/Content.cs | 2 +- .../Models/Mapping/PropertyTypeGroupMapper.cs | 2 +- .../Models/PublishedContent/IPublishedContent.cs | 2 +- .../ModelsBuilder/Building/TextBuilder.cs | 4 ++-- .../ModelsBuilder/PublishedElementExtensions.cs | 2 +- .../ModelsBuilder/PublishedModelUtility.cs | 4 ++-- .../Persistence/Mappers/BaseMapper.cs | 2 +- src/Umbraco.PublishedCache.NuCache/readme.md | 4 ++-- .../Controllers/MacroRenderingController.cs | 2 +- .../AspNetCore/AspNetCoreHostingEnvironment.cs | 2 +- .../AspNetCore/AspNetCoreRequestAccessor.cs | 2 +- .../InMemoryAuto/InMemoryModelFactory.cs | 2 +- .../Umbraco.Core/IO/FileSystemsTests.cs | 2 +- .../Umbraco.Core/Mapping/UserModelMapperTests.cs | 2 +- .../Persistence/NPocoTests/NPocoBulkInsertTests.cs | 2 +- .../Persistence/NPocoTests/NPocoFetchTests.cs | 2 +- .../Repositories/PublicAccessRepositoryTest.cs | 2 +- .../Repositories/RedirectUrlRepositoryTests.cs | 6 +++--- .../Repositories/SimilarNodeNameTests.cs | 2 +- .../Persistence/Repositories/UserRepositoryTest.cs | 2 +- .../Services/ContentServiceTagsTests.cs | 6 +++--- .../Services/ContentServiceTests.cs | 14 +++++++------- .../TestHelpers/TestHelper.cs | 2 +- .../Umbraco.Core/Components/ComponentTests.cs | 4 ++-- .../Umbraco.Core/Manifest/ManifestParserTests.cs | 6 +++--- .../Umbraco.Core/Models/ContentTests.cs | 2 +- .../Umbraco.Core/ReflectionUtilitiesTests.cs | 4 ++-- .../Routing/ContentFinderByUrlTests.cs | 2 +- .../Umbraco.Core/Routing/GetContentUrlsTests.cs | 8 ++++---- .../Umbraco.Core/Routing/UriUtilityTests.cs | 2 +- .../DefaultShortStringHelperTestsWithoutSetup.cs | 8 ++++---- 32 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/Umbraco.Core/IO/PhysicalFileSystem.cs b/src/Umbraco.Core/IO/PhysicalFileSystem.cs index ede481b833..f2ddb74f0b 100644 --- a/src/Umbraco.Core/IO/PhysicalFileSystem.cs +++ b/src/Umbraco.Core/IO/PhysicalFileSystem.cs @@ -321,7 +321,7 @@ namespace Umbraco.Cms.Core.IO var originalPath = path; path = EnsureDirectorySeparatorChar(path); - // FIXME: this part should go! + // TODO: this part should go! // not sure what we are doing here - so if input starts with a (back) slash, // we assume it's not a FS relative path and we try to convert it... but it // really makes little sense? diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs index 4e251a323e..ce8f769cad 100644 --- a/src/Umbraco.Core/Models/Content.cs +++ b/src/Umbraco.Core/Models/Content.cs @@ -529,7 +529,7 @@ public class Content : ContentBase, IContent var clonedContent = (Content)clone; - // fixme - need to reset change tracking bits + // TODO: need to reset change tracking bits // if culture infos exist then deal with event bindings if (clonedContent._publishInfos != null) diff --git a/src/Umbraco.Core/Models/Mapping/PropertyTypeGroupMapper.cs b/src/Umbraco.Core/Models/Mapping/PropertyTypeGroupMapper.cs index da4383ed1d..6db5c56f94 100644 --- a/src/Umbraco.Core/Models/Mapping/PropertyTypeGroupMapper.cs +++ b/src/Umbraco.Core/Models/Mapping/PropertyTypeGroupMapper.cs @@ -244,7 +244,7 @@ public class PropertyTypeGroupMapper IDataEditor? propertyEditor = _propertyEditors[propertyEditorAlias]; IDataType? dataType = _dataTypeService.GetDataType(p.DataTypeId); - // fixme: Don't explode if we can't find this, log an error and change this to a label + // TODO: Don't explode if we can't find this, log an error and change this to a label if (propertyEditor == null) { _logger.LogError( diff --git a/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs index 6ecac18711..9028a501ad 100644 --- a/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs +++ b/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs @@ -87,7 +87,7 @@ public interface IPublishedContent : IPublishedElement /// have a non-empty content name. /// /// Does not contain the invariant culture. - /// // fixme? + /// // TODO? /// IReadOnlyDictionary Cultures { get; } diff --git a/src/Umbraco.Infrastructure/ModelsBuilder/Building/TextBuilder.cs b/src/Umbraco.Infrastructure/ModelsBuilder/Building/TextBuilder.cs index 0fa866ec23..d2f8f6cf14 100644 --- a/src/Umbraco.Infrastructure/ModelsBuilder/Building/TextBuilder.cs +++ b/src/Umbraco.Infrastructure/ModelsBuilder/Building/TextBuilder.cs @@ -277,7 +277,7 @@ public class TextBuilder : Builder sb.AppendFormat( "\t\tpublic new const string ModelTypeAlias = \"{0}\";\n", type.Alias); - TypeModel.ItemTypes itemType = type.IsElement ? TypeModel.ItemTypes.Content : type.ItemType; // fixme + TypeModel.ItemTypes itemType = type.IsElement ? TypeModel.ItemTypes.Content : type.ItemType; // TODO WriteGeneratedCodeAttribute(sb, "\t\t"); sb.AppendFormat( "\t\tpublic new const PublishedItemType ModelItemType = PublishedItemType.{0};\n", @@ -584,7 +584,7 @@ public class TextBuilder : Builder WriteNonGenericClrType(sb, type[..p]); sb.Append("<"); var args = type[(p + 1)..].TrimEnd(Constants.CharArrays.GreaterThan) - .Split(Constants.CharArrays.Comma); // fixme will NOT work with nested generic types + .Split(Constants.CharArrays.Comma); // TODO: will NOT work with nested generic types for (var i = 0; i < args.Length; i++) { if (i > 0) diff --git a/src/Umbraco.Infrastructure/ModelsBuilder/PublishedElementExtensions.cs b/src/Umbraco.Infrastructure/ModelsBuilder/PublishedElementExtensions.cs index 5da139b147..59b415ed51 100644 --- a/src/Umbraco.Infrastructure/ModelsBuilder/PublishedElementExtensions.cs +++ b/src/Umbraco.Infrastructure/ModelsBuilder/PublishedElementExtensions.cs @@ -29,7 +29,7 @@ public static class PublishedElementExtensions return model.Value(publishedValueFallback, alias, culture, segment, fallback, defaultValue); } - // fixme that one should be public so ppl can use it + // TODO: that one should be public so ppl can use it private static string GetAlias(TModel model, Expression> property) { if (property.NodeType != ExpressionType.Lambda) diff --git a/src/Umbraco.Infrastructure/ModelsBuilder/PublishedModelUtility.cs b/src/Umbraco.Infrastructure/ModelsBuilder/PublishedModelUtility.cs index cfcbd82229..b59ddc4cef 100644 --- a/src/Umbraco.Infrastructure/ModelsBuilder/PublishedModelUtility.cs +++ b/src/Umbraco.Infrastructure/ModelsBuilder/PublishedModelUtility.cs @@ -51,9 +51,9 @@ public static class PublishedModelUtility IPublishedContentType contentType, Expression> selector) - // where TModel : PublishedContentModel // fixme PublishedContentModel _or_ PublishedElementModel + // where TModel : PublishedContentModel // TODO: PublishedContentModel _or_ PublishedElementModel { - // fixme therefore, missing a check on TModel here + // TODO therefore, missing a check on TModel here if (selector.Body is not MemberExpression expr) { throw new ArgumentException("Not a property expression.", nameof(selector)); diff --git a/src/Umbraco.Infrastructure/Persistence/Mappers/BaseMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/BaseMapper.cs index f482d7da6d..8566bcf464 100644 --- a/src/Umbraco.Infrastructure/Persistence/Mappers/BaseMapper.cs +++ b/src/Umbraco.Infrastructure/Persistence/Mappers/BaseMapper.cs @@ -63,7 +63,7 @@ public abstract class BaseMapper protected abstract void DefineMaps(); - // fixme: TSource is used for nothing + // TODO: TSource is used for nothing protected void DefineMap(string sourceName, string targetName) { if (_sqlSyntax == null) diff --git a/src/Umbraco.PublishedCache.NuCache/readme.md b/src/Umbraco.PublishedCache.NuCache/readme.md index c8e8a363e9..e97ab0d561 100644 --- a/src/Umbraco.PublishedCache.NuCache/readme.md +++ b/src/Umbraco.PublishedCache.NuCache/readme.md @@ -1,4 +1,4 @@ -NuCache Documentation +NuCache Documentation ====================== HOW IT WORKS @@ -106,7 +106,7 @@ possible to support detached contents & properties, even those that do not have int id, but again this should be refactored entirely anyway. Not doing any row-version checks (see XmlStore) when reloading from database, though it -is maintained in the database. Two FIXME in PublishedSnapshotService. Should we do it? +is maintained in the database. Two TODO in PublishedSnapshotService. Should we do it? There is no on-disk cache at all so everything is reloaded from the cmsContentNu table when the site restarts. This is pretty fast, but we should experiment with solutions to diff --git a/src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs b/src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs index a4cb568857..479b6e482f 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs @@ -127,7 +127,7 @@ public class MacroRenderingController : UmbracoAuthorizedJsonController // Since a Macro might contain thing thats related to the culture of the "IPublishedContent" (ie Dictionary keys) we want // to set the current culture to the culture related to the content item. This is hacky but it works. - // fixme + // TODO: // in a 1:1 situation we do not handle the language being edited // so the macro renders in the wrong language diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs index af8fec7f69..27251aaf5a 100644 --- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs +++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs @@ -175,7 +175,7 @@ public class AspNetCoreHostingEnvironment : IHostingEnvironment public void EnsureApplicationMainUrl(Uri? currentApplicationUrl) { - // Fixme: This causes problems with site swap on azure because azure pre-warms a site by calling into `localhost` and when it does that + // TODO: This causes problems with site swap on azure because azure pre-warms a site by calling into `localhost` and when it does that // it changes the URL to `localhost:80` which actually doesn't work for pinging itself, it only works internally in Azure. The ironic part // about this is that this is here specifically for the slot swap scenario https://issues.umbraco.org/issue/U4-10626 diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreRequestAccessor.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreRequestAccessor.cs index 66384b8aba..92f48a8d89 100644 --- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreRequestAccessor.cs +++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreRequestAccessor.cs @@ -67,7 +67,7 @@ public class AspNetCoreRequestAccessor : IRequestAccessor, INotificationHandler< public Uri? GetApplicationUrl() { - // Fixme: This causes problems with site swap on azure because azure pre-warms a site by calling into `localhost` and when it does that + // TODO: This causes problems with site swap on azure because azure pre-warms a site by calling into `localhost` and when it does that // it changes the URL to `localhost:80` which actually doesn't work for pinging itself, it only works internally in Azure. The ironic part // about this is that this is here specifically for the slot swap scenario https://issues.umbraco.org/issue/U4-10626 diff --git a/src/Umbraco.Web.Common/ModelsBuilder/InMemoryAuto/InMemoryModelFactory.cs b/src/Umbraco.Web.Common/ModelsBuilder/InMemoryAuto/InMemoryModelFactory.cs index 12846f6bdd..4ed40eaf55 100644 --- a/src/Umbraco.Web.Common/ModelsBuilder/InMemoryAuto/InMemoryModelFactory.cs +++ b/src/Umbraco.Web.Common/ModelsBuilder/InMemoryAuto/InMemoryModelFactory.cs @@ -30,7 +30,7 @@ namespace Umbraco.Cms.Web.Common.ModelsBuilder.InMemoryAuto private readonly IProfilingLogger _profilingLogger; private readonly ILogger _logger; private readonly FileSystemWatcher? _watcher; - private readonly Lazy _umbracoServices; // fixme: this is because of circular refs :( + private readonly Lazy _umbracoServices; // TODO: this is because of circular refs :( private readonly IHostingEnvironment _hostingEnvironment; private readonly IApplicationShutdownRegistry _hostingLifetime; private readonly ModelsGenerationError _errors; diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs index 8fa8f0e252..350b80d328 100644 --- a/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs +++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs @@ -68,7 +68,7 @@ public class FileSystemsTests : UmbracoIntegrationTest Assert.IsTrue(Directory.Exists(physPath)); } - // FIXME: don't make sense anymore + // TODO: don't make sense anymore /* [Test] public void Cannot_Get_InvalidFileSystem() diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UserModelMapperTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UserModelMapperTests.cs index 8ec6988a06..fb3773e1d0 100644 --- a/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UserModelMapperTests.cs +++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UserModelMapperTests.cs @@ -38,7 +38,7 @@ public class UserModelMapperTests : UmbracoIntegrationTest JsonConvert.DeserializeObject(json.Replace("@@@ID@@@", userGroup.Id.ToString())); // failed, AutoMapper complained, "Unable to cast object of type 'WhereSelectArrayIterator`2[System.Char,System.String]' to type 'System.Collections.IList'". - // FIXME: added ToList() in UserGroupFactory + // TODO: added ToList() in UserGroupFactory _sut.Map(userGroupSave, userGroup); } } diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoBulkInsertTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoBulkInsertTests.cs index 48aa0e2849..0b50d0bdef 100644 --- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoBulkInsertTests.cs +++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoBulkInsertTests.cs @@ -16,7 +16,7 @@ using Umbraco.Extensions; namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.NPocoTests; -// FIXME: npoco - is this still appropriate? +// TODO: npoco - is this still appropriate? [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] public class NPocoBulkInsertTests : UmbracoIntegrationTest diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoFetchTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoFetchTests.cs index d342a1b3cc..bdbf58a38f 100644 --- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoFetchTests.cs +++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoFetchTests.cs @@ -310,7 +310,7 @@ public class NPocoFetchTests : UmbracoIntegrationTest // GROUP BY zbThing1.id, zbThing1.name"; var sql = ScopeAccessor.AmbientScope.SqlContext.Sql() .Select() - .Append(", COUNT(zbThing2Group.groupId) AS groupCount") // FIXME: + .Append(", COUNT(zbThing2Group.groupId) AS groupCount") .From() .InnerJoin().On((t, t2g) => t.Id == t2g.ThingId) .GroupBy(x => x.Id, x => x.Name); diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PublicAccessRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PublicAccessRepositoryTest.cs index a7c04d2503..0629208ef5 100644 --- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PublicAccessRepositoryTest.cs +++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PublicAccessRepositoryTest.cs @@ -191,7 +191,7 @@ public class PublicAccessRepositoryTest : UmbracoIntegrationTest // now remove a few rules from a few of the items and then add some more, this will put things 'out of order' which // we need to verify our sort order is working for the relator - // FIXME: no "relator" in v8?! + // TODO: no "relator" in v8?! for (var i = 0; i < allEntries.Count; i++) { // all the even ones diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RedirectUrlRepositoryTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RedirectUrlRepositoryTests.cs index e6e06a684f..95104172a6 100644 --- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RedirectUrlRepositoryTests.cs +++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RedirectUrlRepositoryTests.cs @@ -91,7 +91,7 @@ public class RedirectUrlRepositoryTests : UmbracoIntegrationTest Assert.AreNotEqual(0, rurl.Id); - // FIXME: too fast = same date = key violation? + // TODO: too fast = same date = key violation? // and... can that happen in real life? // we don't really *care* about the IX, only supposed to make things faster... // BUT in realife we AddOrUpdate in a trx so it should be safe, always @@ -134,7 +134,7 @@ public class RedirectUrlRepositoryTests : UmbracoIntegrationTest Assert.AreNotEqual(0, rurl.Id); - // FIXME: too fast = same date = key violation? + // TODO: too fast = same date = key violation? // and... can that happen in real life? // we don't really *care* about the IX, only supposed to make things faster... // BUT in realife we AddOrUpdate in a trx so it should be safe, always @@ -177,7 +177,7 @@ public class RedirectUrlRepositoryTests : UmbracoIntegrationTest Assert.AreNotEqual(0, rurl.Id); - // FIXME: goes too fast and bam, errors, first is blah + // TODO: goes too fast and bam, errors, first is blah rurl = new RedirectUrl { ContentKey = _textpage.Key, diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/SimilarNodeNameTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/SimilarNodeNameTests.cs index a7f05c0387..573e018219 100644 --- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/SimilarNodeNameTests.cs +++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/SimilarNodeNameTests.cs @@ -194,7 +194,7 @@ public class SimilarNodeNameTests new SimilarNodeName {Id = 22, Name = "Test (1) (1)"} }; - // fixme - this will yield "Test (2)" which is already in use + // TODO: this will yield "Test (2)" which is already in use Assert.AreEqual("Test (3)", SimilarNodeName.GetUniqueName(names, 0, "Test")); } } diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs index 4886a7b497..ba1f577e44 100644 --- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs +++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs @@ -185,7 +185,7 @@ public class UserRepositoryTest : UmbracoIntegrationTest // Act var updatedItem = repository.Get(user.Id); - // FIXME: this test cannot work, user has 2 sections but the way it's created, + // TODO: this test cannot work, user has 2 sections but the way it's created, // they don't show, so the comparison with updatedItem fails - fix! // Assert diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs index e998f8a591..88da06b009 100644 --- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs +++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs @@ -423,7 +423,7 @@ public class ContentServiceTagsTests : UmbracoIntegrationTest propertyType.Variations = ContentVariation.Nothing; ContentTypeService.Save(contentType); - // FIXME: This throws due to index violations + // TODO: This throws due to index violations propertyType.Variations = ContentVariation.Culture; ContentTypeService.Save(contentType); @@ -555,7 +555,7 @@ public class ContentServiceTagsTests : UmbracoIntegrationTest tags = TagService.GetTagsForEntity(content1.Id); Assert.AreEqual(5, tags.Count()); - // FIXME: tag & tree issue + // TODO: tag & tree issue // when we publish, we 'just' publish the top one and not the ones below = fails // what we should do is... NOT clear tags when unpublishing or trashing or... // and just update the tag service to NOT return anything related to trashed or @@ -620,7 +620,7 @@ public class ContentServiceTagsTests : UmbracoIntegrationTest var tags = TagService.GetTagsForEntity(content1.Id); Assert.AreEqual(0, tags.Count()); - // FIXME: tag & tree issue + // TODO: tag & tree issue // when we (un)publish, we 'just' publish the top one and not the ones below = fails // see similar note above tags = TagService.GetTagsForEntity(content2.Id); diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs index d489e6a26c..0623f89170 100644 --- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs +++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs @@ -2789,13 +2789,13 @@ public class ContentServiceTests : UmbracoIntegrationTestWithContent Assert.IsFalse(content.Published); Assert.IsTrue(content.Edited); - // FIXME: depending on 1 line in ContentBaseFactory.BuildEntity + // TODO: depending on 1 line in ContentBaseFactory.BuildEntity // the published infos can be gone or not // if gone, it's not consistent with above Assert.AreEqual(vpk, ((Content)content).VersionId); Assert.AreEqual(ppk, ((Content)content).PublishedVersionId); // still there - // FIXME: depending on 1 line in ContentRepository.MapDtoToContent + // TODO: depending on 1 line in ContentRepository.MapDtoToContent // the published values can be null or not // if null, it's not consistent with above // Assert.IsNull(content.GetValue("title", published: true)); @@ -2811,7 +2811,7 @@ public class ContentServiceTests : UmbracoIntegrationTestWithContent // // ContentService.SaveAndPublish(content); - // FIXME: what shall we do of all this? + // TODO: what shall we do of all this? /* // this basically republishes a content // what if it never was published? @@ -2822,11 +2822,11 @@ public class ContentServiceTests : UmbracoIntegrationTestWithContent Assert.IsTrue(content.Published); Assert.IsFalse(content.Edited); - // FIXME: should it be 2 or 3 + // TODO: should it be 2 or 3 versions = ContentService.GetVersions(content.Id); Assert.AreEqual(2, versions.Count()); - // FIXME: now test rollbacks + // TODO: now test rollbacks var version = ContentService.GetByVersion(content.Id); // test that it gets a version - should be GetVersion var previousVersion = ContentService.GetVersions(content.Id).Skip(1).FirstOrDefault(); // need an optimized way to do this content.CopyValues(version); // copies the edited value - always @@ -2871,7 +2871,7 @@ public class ContentServiceTests : UmbracoIntegrationTestWithContent // the name will be set to the default culture variant name Assert.AreEqual("name-us", content.Name); - // FIXME: should we always sync the invariant name even on update? see EnsureInvariantNameValues + // TODO: should we always sync the invariant name even on update? see EnsureInvariantNameValues ////updating the default culture variant name should also update the invariant name so they stay in sync // content.SetName("name-us-2", langUk.IsoCode); // ContentService.Save(content); @@ -3083,7 +3083,7 @@ public class ContentServiceTests : UmbracoIntegrationTestWithContent ValueStorageType.Nvarchar, "prop") { Variations = ContentVariation.Culture }); - // FIXME: add test w/ an invariant prop + // TODO: add test w/ an invariant prop ContentTypeService.Save(contentType); var content = ContentService.Create("Home US", Constants.System.Root, "umbTextpage"); diff --git a/tests/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs b/tests/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs index cfc57ee9ff..8a1b9f2458 100644 --- a/tests/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs +++ b/tests/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs @@ -156,7 +156,7 @@ public static class TestHelper } // TODO: Move to Assertions or AssertHelper - // FIXME: obsolete the dateTimeFormat thing and replace with dateDelta + // TODO: obsolete the dateTimeFormat thing and replace with dateDelta public static void AssertPropertyValuesAreEqual( object actual, object expected, diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs index 47ea784fdc..fe34dfb621 100644 --- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs +++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs @@ -44,7 +44,7 @@ public class ComponentTests private static IServiceProvider MockFactory(Action> setup = null) { - // FIXME: use IUmbracoDatabaseFactory vs UmbracoDatabaseFactory, clean it all up! + // TODO: use IUmbracoDatabaseFactory vs UmbracoDatabaseFactory, clean it all up! var mock = new Mock(); ILoggerFactory loggerFactory = NullLoggerFactory.Instance; var logger = loggerFactory.CreateLogger("GenericLogger"); @@ -650,7 +650,7 @@ public class ComponentTests { } - // FIXME: move to Testing + // TODO: move to Testing private static Type[] TypeArray() => new[] { typeof(T1) }; private static Type[] TypeArray() => new[] { typeof(T1), typeof(T2) }; diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs index 71d1a25228..2cb1341f0a 100644 --- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs +++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs @@ -380,12 +380,12 @@ javascript: ['~/test.js',/*** some note about stuff asd09823-4**09234*/ '~/test2 Assert.AreEqual(2, config.Count); Assert.IsTrue(config.ContainsKey("image")); var c = config["image"]; - Assert.IsInstanceOf(c); // FIXME: is this what we want? + Assert.IsInstanceOf(c); // TODO: is this what we want? Assert.IsTrue(config.ContainsKey("link")); c = config["link"]; - Assert.IsInstanceOf(c); // FIXME: is this what we want? + Assert.IsInstanceOf(c); // TODO: is this what we want? - // FIXME: should we resolveUrl in configs? + // TODO: should we resolveUrl in configs? } [Test] diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTests.cs index a2da904889..38f0256613 100644 --- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTests.cs +++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTests.cs @@ -242,7 +242,7 @@ public class ContentTests return new ProfilingLogger(logger, profiler); } - [Ignore("fixme - ignored test")] + [Ignore("TODO - ignored test")] [Test] public void Can_Deep_Clone_Perf_Test() { diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionUtilitiesTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionUtilitiesTests.cs index c29116c8bd..6c381fbf73 100644 --- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionUtilitiesTests.cs +++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionUtilitiesTests.cs @@ -340,7 +340,7 @@ public class ReflectionUtilitiesTests setterInt4(object4, 42); Assert.AreEqual(42, object4.IntValue); - // FIXME: the code below runs fine with ReSharper test running within VisualStudio + // TODO: the code below runs fine with ReSharper test running within VisualStudio // but it crashes when running via vstest.console.exe - unless some settings are required? // converting works @@ -582,7 +582,7 @@ public class ReflectionUtilitiesTests Assert.AreEqual(44, getter3(c)); } - // FIXME: missing tests specifying 'returned' on method, property + // TODO: missing tests specifying 'returned' on method, property [Test] public void DeconstructAnonymousType() { diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlTests.cs index e877ace137..1c24a8a56f 100644 --- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlTests.cs +++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlTests.cs @@ -55,7 +55,7 @@ public class ContentFinderByUrlTests : PublishedSnapshotServiceTestBase Assert.IsTrue(GlobalSettings.HideTopLevelNodeFromPath); - // FIXME: debugging - going further down, the routes cache is NOT empty?! + // TODO: debugging - going further down, the routes cache is NOT empty?! if (urlString == "/home/sub1") { Debugger.Break(); diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/GetContentUrlsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/GetContentUrlsTests.cs index b17e4ecfa0..8f1fceb615 100644 --- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/GetContentUrlsTests.cs +++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/GetContentUrlsTests.cs @@ -77,7 +77,7 @@ public class GetContentUrlsTests : PublishedSnapshotServiceTestBase { var contentType = ContentTypeBuilder.CreateBasicContentType(); var content = ContentBuilder.CreateBasicContent(contentType); - content.Id = 1046; // FIXME: we are using this ID only because it's built into the test XML published cache + content.Id = 1046; // TODO: we are using this ID only because it's built into the test XML published cache content.Path = "-1,1046"; var umbracoContextAccessor = GetUmbracoContextAccessor("http://localhost:8000"); @@ -109,7 +109,7 @@ public class GetContentUrlsTests : PublishedSnapshotServiceTestBase { var contentType = ContentTypeBuilder.CreateBasicContentType(); var content = ContentBuilder.CreateBasicContent(contentType); - content.Id = 1046; // FIXME: we are using this ID only because it's built into the test XML published cache + content.Id = 1046; // TODO: we are using this ID only because it's built into the test XML published cache content.Path = "-1,1046"; content.Published = true; @@ -150,13 +150,13 @@ public class GetContentUrlsTests : PublishedSnapshotServiceTestBase { var contentType = ContentTypeBuilder.CreateBasicContentType(); var parent = ContentBuilder.CreateBasicContent(contentType); - parent.Id = 1046; // FIXME: we are using this ID only because it's built into the test XML published cache + parent.Id = 1046; // TODO: we are using this ID only because it's built into the test XML published cache parent.Name = "home"; parent.Path = "-1,1046"; parent.Published = true; var child = ContentBuilder.CreateBasicContent(contentType); child.Name = "sub1"; - child.Id = 1173; // FIXME: we are using this ID only because it's built into the test XML published cache + child.Id = 1173; // TODO: we are using this ID only because it's built into the test XML published cache child.Path = "-1,1046,1173"; child.Published = true; diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UriUtilityTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UriUtilityTests.cs index 04ab83801d..c566c77bf2 100644 --- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UriUtilityTests.cs +++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UriUtilityTests.cs @@ -10,7 +10,7 @@ using Umbraco.Cms.Core.Routing; namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing; -// FIXME: not testing virtual directory! +// TODO: not testing virtual directory! [TestFixture] public class UriUtilityTests { diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTestsWithoutSetup.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTestsWithoutSetup.cs index 9d7d95554a..b27ec8dfdb 100644 --- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTestsWithoutSetup.cs +++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTestsWithoutSetup.cs @@ -304,8 +304,8 @@ public class DefaultShortStringHelperTestsWithoutSetup })); Assert.AreEqual("house*2", helper.CleanString("house (2)", CleanStringType.Alias)); - // FIXME: but for a filename we want to keep them! - // FIXME: and what about a URL? + // TODO: but for a filename we want to keep them! + // TODO: and what about a URL? } [Test] @@ -424,8 +424,8 @@ public class DefaultShortStringHelperTestsWithoutSetup // E is a word (too short to be an acronym) // FF is an acronym - // FIXME: "C" can't be an acronym - // FIXME: "DBXreview" = acronym?! + // TODO: "C" can't be an acronym + // TODO: "DBXreview" = acronym?! Assert.AreEqual( "aaa BBB CCc Ddd E FF", helper.CleanString("aaa BBB CCc Ddd E FF", CleanStringType.Alias)); // unchanged